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

[Git][ultreiaio/ird-observe][develop-7.x] La synchronisation des référentiels pourrait ne pas fonctionner sur la…
by Tony CHEMIT 12 Sep '18

12 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 82296bfa by Tony CHEMIT at 2018-09-12T14:04:00Z La synchronisation des référentiels pourrait ne pas fonctionner sur la suppression de certains référentiels - Closes #1048 - - - - - 4 changed files: - 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/ReferentialSynchronizeSqlsRequestBuilder.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java ===================================== @@ -26,11 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; -import fr.ird.observe.dto.referential.GearCaracteristicDto; -import fr.ird.observe.dto.referential.GearDto; -import fr.ird.observe.dto.referential.OceanDto; import fr.ird.observe.dto.referential.ReferentialDto; -import fr.ird.observe.dto.referential.SpeciesDto; import fr.ird.observe.dto.referential.seine.ObjectMaterialDto; import fr.ird.observe.dto.referential.seine.ObjectMaterialHelper; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; @@ -48,18 +44,19 @@ import fr.ird.observe.services.service.actions.synchro.referential.legacy.Unidir import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; import fr.ird.observe.spi.context.ReferentialReferenceEntityContext; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; import org.nuiton.topia.persistence.support.TopiaSqlWork; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Created on 27/06/16. * @@ -163,30 +160,8 @@ public class UnidirectionalReferentialSynchronizeLocalServiceLocal extends Obser DeleteSqlStatementGenerator sqlStatementGenerator = new DeleteSqlStatementGenerator(metadataEntity); for (String id : request.getReferentialToRemove()) { - if (SpeciesDto.class.equals(request.getReferentialName())) { - - // also remove ocean_species association - result.add(sqlStatementGenerator.generateAssociationSql("ocean_species", "species", id)); - - // also remove species_specieslist association - result.add(sqlStatementGenerator.generateAssociationSql("species_specieslist", "species", id)); - } - if (OceanDto.class.equals(request.getReferentialName())) { - - // also remove ocean_species association - result.add(sqlStatementGenerator.generateAssociationSql("ocean_species", "ocean", id)); - } - if (GearDto.class.equals(request.getReferentialName())) { - - // also remove gear_gearcaracteristic association - result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic", "gear", id)); - } - if (GearCaracteristicDto.class.equals(request.getReferentialName())) { - - // also remove gear_gearcaracteristic association - result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic", "gearcaracteristic", id)); - } - result.add(sqlStatementGenerator.generateSql(id)); + List<String> sql = sqlStatementGenerator.generateSql(id); + result.addAll(sql); } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java ===================================== @@ -24,12 +24,10 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.ng; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.dto.reference.ReferentialDtoReference; -import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport; -import fr.ird.observe.spi.DtoModelClasses; -import fr.ird.observe.dto.referential.ReferentialLocale; +import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.local.service.actions.synchro.referential.sql.DeleteSqlStatementGenerator; @@ -42,15 +40,18 @@ import fr.ird.observe.services.local.service.actions.synchro.referential.sql.Upd import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeRequest; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeSqlsRequest; import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTask; +import fr.ird.observe.spi.DbModelHelper; +import fr.ird.observe.spi.DtoModelClasses; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; +import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; + import java.util.List; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; -import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; /** * Created on 14/08/16. @@ -134,7 +135,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { if (log.isInfoEnabled()) { log.info("Delete: " + deleteTasks.size()); } - onDelete(referentialName, referenceType, deleteTasks, binder); + onDelete(referentialName, referenceType, deleteTasks); Set<ReferentialSynchronizeTask<R>> desactivateTasks = request.getDesactivateTasks(referenceType); if (log.isInfoEnabled()) { @@ -258,7 +259,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { } - private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onDelete(String referentialName, Class<R> type, Set<ReferentialSynchronizeTask<R>> tasks, ReferentialEntityDtoBinderSupport<D, E> binder) { + private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void onDelete(String referentialName, Class<R> type, Set<ReferentialSynchronizeTask<R>> tasks) { TopiaMetadataEntity metadata = metadataModel.getEntity(referentialName); @@ -271,16 +272,14 @@ public class ReferentialSynchronizeSqlsRequestBuilder { Optional<String> replaceReferentialId = task.getOptionalReplaceReferentialId(); if (replaceReferentialId.isPresent()) { ImmutableList<String> sqls = replaceGenerator.generateSqls(referentialId, replaceReferentialId.get()); - for (String sql : sqls) { - resultBuilder.addDeleteStatement(sql); - } + sqls.forEach(resultBuilder::addDeleteStatement); } - String sql = deleteGenerator.generateSql(referentialId); + List<String> sql = deleteGenerator.generateSql(referentialId); if (log.isInfoEnabled()) { log.info("Delete referential: " + type.getName() + " / " + referentialId + " -- " + sql); } - resultBuilder.addDeleteStatement(sql); + sql.forEach(resultBuilder::addDeleteStatement); } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java ===================================== @@ -10,22 +10,30 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.sql; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -import org.apache.logging.log4j.Logger; +import com.google.common.collect.ImmutableList; +import fr.ird.observe.services.local.service.actions.synchro.referential.sql.UpdateSqlStatementGenerator.ManyToManyAssociationStruct; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; + +import static fr.ird.observe.services.local.service.actions.synchro.referential.sql.UpdateSqlStatementGenerator.MANY_TO_MANY_ASSOCIATION_DELETE_STATEMENT; + /** * Pour générer une requète sql de suppression à partir d'un référentiel donné. * <p> @@ -43,34 +51,48 @@ public class DeleteSqlStatementGenerator { private final String schemaName; private final String tableName; + private final LinkedHashSet<ManyToManyAssociationStruct> manyToManyAssociations; public DeleteSqlStatementGenerator(TopiaMetadataEntity metadataEntity) { this.schemaName = metadataEntity.getDbSchemaName(); this.tableName = metadataEntity.getDbTableName(); + Map<String, String> manyToManyAssociationsMap = metadataEntity.getManyToManyAssociations(); + this.manyToManyAssociations = new LinkedHashSet<>(); + for (Map.Entry<String, String> entry : manyToManyAssociationsMap.entrySet()) { + String propertyName = entry.getKey(); + String dbColumnName = metadataEntity.getDbColumnName(propertyName); + String tableName = metadataEntity.getBdManyToManyAssociationTableName(propertyName); + ManyToManyAssociationStruct manyToManyAssociation = new ManyToManyAssociationStruct(propertyName, dbColumnName, tableName); + manyToManyAssociations.add(manyToManyAssociation); + } } - public String generateSql(String id) { - - String result = String.format(DELETE_STATEMENT, schemaName, tableName, id); - + public List<String> generateSql(String id) { + ImmutableList.Builder<String> result = ImmutableList.builder(); + String sql = String.format(DELETE_STATEMENT, schemaName, tableName, id); if (log.isDebugEnabled()) { - log.debug("sql: " + result); + log.debug("sql: " + sql); } - - return result; - + result.add(sql); + for (ManyToManyAssociationStruct manyToManyAssociation : manyToManyAssociations) { + generateManyToManyAssociationSql(id, manyToManyAssociation, result); + } + return result.build(); } - public String generateAssociationSql(String tableName, String columnName, String id) { + private void generateManyToManyAssociationSql(String referentialDtoId, ManyToManyAssociationStruct manyToManyAssociation, ImmutableList.Builder<String> result) { - String result = String.format(DELETE_ASSOCIATION_STATEMENT, schemaName, tableName, columnName, id); + String manyToManyAssociationTableName = manyToManyAssociation.tableName; + // On commence toujours par supprimer toutes les anciennes associations, elles seront ré-ajoutées juste après + String deleteSql = String.format(MANY_TO_MANY_ASSOCIATION_DELETE_STATEMENT, + schemaName, + manyToManyAssociationTableName, + tableName, + referentialDtoId); + result.add(deleteSql); if (log.isDebugEnabled()) { - log.debug("sql: " + result); + log.debug("sql: " + deleteSql); } - - return result; - } - } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java ===================================== @@ -57,7 +57,7 @@ public class UpdateSqlStatementGenerator<D extends ReferentialDto> { private static final String UPDATE_STATEMENT = "UPDATE %s.%s SET %s WHERE topiaId ='%s';\n"; // We use a special prefix because those requests must be applied before all simple insert requests - private static final String MANY_TO_MANY_ASSOCIATION_DELETE_STATEMENT = "$$_DELETE FROM %s.%s WHERE %s = '%s';\n"; + static final String MANY_TO_MANY_ASSOCIATION_DELETE_STATEMENT = "$$_DELETE FROM %s.%s WHERE %s = '%s';\n"; private final Map<String, String> columnNames; private final String schemaName; @@ -329,7 +329,7 @@ public class UpdateSqlStatementGenerator<D extends ReferentialDto> { /** * Pour décrire une association nm. */ - private static class ManyToManyAssociationStruct { + static class ManyToManyAssociationStruct { /** * Le nom de la propriété dans l'objet. @@ -342,9 +342,9 @@ public class UpdateSqlStatementGenerator<D extends ReferentialDto> { /** * Le nom de la table d'association. */ - private final String tableName; + final String tableName; - private ManyToManyAssociationStruct(String propertyName, String dbColumnName, String tableName) { + ManyToManyAssociationStruct(String propertyName, String dbColumnName, String tableName) { this.propertyName = propertyName; this.dbColumnName = dbColumnName; this.tableName = tableName; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/82296bfa2b4972bf1ead88b2d2a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/82296bfa2b4972bf1ead88b2d2a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] La synchro référentiel simple ne fonctionne pas, l'ordre des requetes à executer…
by Tony CHEMIT 12 Sep '18

12 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 13700605 by Tony CHEMIT at 2018-09-12T12:38:59Z La synchro référentiel simple ne fonctionne pas, l'ordre des requetes à executer n'est pas bon - Closes #1047 - - - - - 3 changed files: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java ===================================== @@ -24,9 +24,17 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.sql; import com.google.common.collect.ImmutableList; import fr.ird.observe.dto.reference.ReferentialDtoReference; -import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.spi.DbModelHelper; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + import java.sql.Timestamp; import java.util.Collection; import java.util.Date; @@ -35,13 +43,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; /** * Pour générer une requète sql d'ajout à partir d'un référentiel donné. @@ -56,7 +57,8 @@ public class InsertSqlStatementGenerator<D extends ReferentialDto> { private static final Logger log = LogManager.getLogger(InsertSqlStatementGenerator.class); private static final String INSERT_STATEMENT = "INSERT INTO %s.%s(%s) VALUES (%s);\n"; - private static final String NM_ASSOCIATION_INSERT_STATEMENT = "INSERT INTO %s.%s(%s, %s) VALUES ('%s', '%s');\n"; + // We use a special prefix because those requests must be applied after all simple insert requests + public static final String MANY_TO_MANY_ASSOCIATION_INSERT_STATEMENT = "$$_INSERT INTO %s.%s(%s, %s) VALUES ('%s', '%s');\n"; private final Set<String> columnNames; private final String schemaName; @@ -207,7 +209,7 @@ public class InsertSqlStatementGenerator<D extends ReferentialDto> { String associationId, ImmutableList.Builder<String> builder) { - String sql = String.format(NM_ASSOCIATION_INSERT_STATEMENT, + String sql = String.format(MANY_TO_MANY_ASSOCIATION_INSERT_STATEMENT, schemaName, nmAssociationTableName, this.tableName, ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java ===================================== @@ -25,6 +25,14 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.sql; import com.google.common.collect.ImmutableList; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + import java.sql.Timestamp; import java.util.Collection; import java.util.Date; @@ -32,13 +40,8 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; + +import static fr.ird.observe.services.local.service.actions.synchro.referential.sql.InsertSqlStatementGenerator.MANY_TO_MANY_ASSOCIATION_INSERT_STATEMENT; /** * Pour générer une requète sql de mise à jour à partir d'un référentiel donné. @@ -53,8 +56,8 @@ public class UpdateSqlStatementGenerator<D extends ReferentialDto> { private static final Logger log = LogManager.getLogger(UpdateSqlStatementGenerator.class); private static final String UPDATE_STATEMENT = "UPDATE %s.%s SET %s WHERE topiaId ='%s';\n"; - private static final String MANY_TO_MANY_ASSOCIATION_DELETE_STATEMENT = "DELETE FROM %s.%s WHERE %s = '%s';\n"; - private static final String MANY_TO_MANY_ASSOCIATION_INSERT_STATEMENT = "INSERT INTO %s.%s(%s, %s) VALUES ('%s', '%s');\n"; + // We use a special prefix because those requests must be applied before all simple insert requests + private static final String MANY_TO_MANY_ASSOCIATION_DELETE_STATEMENT = "$$_DELETE FROM %s.%s WHERE %s = '%s';\n"; private final Map<String, String> columnNames; private final String schemaName; ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java ===================================== @@ -23,21 +23,22 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.spi.DtoModelHelper; -import fr.ird.observe.spi.DtoModelClasses; import fr.ird.observe.dto.reference.DtoReferenceDefinition; -import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.reference.ReferentialDtoReference; +import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffs; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; +import fr.ird.observe.spi.DtoModelClasses; +import fr.ird.observe.spi.DtoModelHelper; +import org.apache.commons.collections4.CollectionUtils; + import java.util.LinkedHashSet; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.collections4.CollectionUtils; /** * Created on 28/06/16. @@ -90,6 +91,8 @@ public class UnidirectionalReferentialSynchronizeEngine { UnidirectionalReferentialSynchronizeResult result = new UnidirectionalReferentialSynchronizeResult(); Set<String> insertSqlRequests = new LinkedHashSet<>(); + Set<String> insertAssociationSqlRequests = new LinkedHashSet<>(); + Set<String> deleteAssociationSqlRequests = new LinkedHashSet<>(); Set<String> updateSqlRequests = new LinkedHashSet<>(); Set<String> deleteSqlRequests = new LinkedHashSet<>(); @@ -126,8 +129,11 @@ public class UnidirectionalReferentialSynchronizeEngine { if (sqlStatement.startsWith("INSERT")) { insertSqlRequests.add(sqlStatement); - } - if (sqlStatement.startsWith("UPDATE")) { + } else if (sqlStatement.startsWith("$$_INSERT")) { + insertAssociationSqlRequests.add(sqlStatement.substring(3)); + } else if (sqlStatement.startsWith("$$_DELETE")) { + deleteAssociationSqlRequests.add(sqlStatement.substring(3)); + } else if (sqlStatement.startsWith("UPDATE")) { updateSqlRequests.add(sqlStatement); } else { deleteSqlRequests.add(sqlStatement); @@ -135,7 +141,9 @@ public class UnidirectionalReferentialSynchronizeEngine { } } + sqlRequests.addAll(deleteAssociationSqlRequests); sqlRequests.addAll(insertSqlRequests); + sqlRequests.addAll(insertAssociationSqlRequests); sqlRequests.addAll(updateSqlRequests); sqlRequests.addAll(deleteSqlRequests); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1370060583b65385bb4ca6906f9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1370060583b65385bb4ca6906f9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] correction suite à la suppression d'un objet openable
by Tony CHEMIT 11 Sep '18

11 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 1a354580 by Tony CHEMIT at 2018-09-11T15:07:15Z correction suite à la suppression d'un objet openable - - - - - 1 changed file: - client/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/open/ContentOpenableUIHandler.java ===================================== @@ -36,8 +36,8 @@ import fr.ird.observe.client.validation.ClientValidationContext; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.longline.TripLonglineDto; import fr.ird.observe.dto.data.seine.TripSeineDto; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.validator.NuitonValidatorScope; import static org.nuiton.i18n.I18n.t; @@ -122,9 +122,9 @@ public abstract class ContentOpenableUIHandler<E extends DataDto, U extends Cont @Override protected void afterDelete() { - super.afterDelete(); NavigationTree treeHelper = getNavigationTree(); NavigationTreeNodeSupport parent = treeHelper.getSelectedNode().getParent(); + super.afterDelete(); if (!(parent instanceof ReferenceNavigationTreeNodeSupport)) { parent = parent.getParent(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1a354580e650d3967f79b8ff926… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1a354580e650d3967f79b8ff926… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 6 commits: [PS] Un classement de liste déroulante est inversé - Closes #1039
by Tony CHEMIT 11 Sep '18

11 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 81475e9b by Tony CHEMIT at 2018-09-11T11:59:59Z [PS] Un classement de liste déroulante est inversé - Closes #1039 - - - - - b302a443 by Tony CHEMIT at 2018-09-11T12:01:02Z add license headers - - - - - d3be666d by Tony CHEMIT at 2018-09-11T13:08:26Z Affichage du nom de base dans les écrans de synchro avancée - Closes #1041 - - - - - f2ac1c8a by Tony CHEMIT at 2018-09-11T13:40:23Z Synchro avancée de marées : sélection de marées impossible à droite ? - Closes #1043 - - - - - 29518b8f by Tony CHEMIT at 2018-09-11T14:28:01Z [PS] Un libellé à corriger - Closes #1040 - - - - - 229c9061 by Tony CHEMIT at 2018-09-11T14:38:37Z Types de mesures par défaut manquants pour 94 espèces dans le référentiel - Closes #1013 - - - - - 14 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentListUIObserveLayoutFocusTraversalPolicy.java - client/src/main/java/fr/ird/observe/client/ui/content/ObserveLayoutFocusTraversalPolicy.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/java/fr/ird/observe/binder/referential/seine/WeightCategoryDtoReferenceBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/seine/WeightCategoryEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/seine/WeightCategoryEntityReferenceBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.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/content/ContentListUIObserveLayoutFocusTraversalPolicy.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content; +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.client.ui.content.list.ContentListUI; import javax.swing.JComponent; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ObserveLayoutFocusTraversalPolicy.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content; +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.client.ui.content.open.ContentOpenableUI; import fr.ird.observe.client.ui.content.ref.ContentReferenceUI; import fr.ird.observe.client.ui.content.table.ContentTableUI; ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java ===================================== @@ -8,12 +8,12 @@ * 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>. @@ -57,8 +57,8 @@ import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.swing.wizard.WizardModel; import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; @@ -74,6 +74,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.Set; import static fr.ird.observe.client.ui.admin.AdminUIModel.LOG_PROPERTY_CHANGE_LISTENER; @@ -631,7 +632,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { public void setCanUseLocalService(boolean canUseLocalService) { this.canUseLocalService = canUseLocalService; firePgConfigChanged(CAN_USE_LOCALE_SERVICE_PROPERTY_NAME, null, - canUseLocalService); + canUseLocalService); } public boolean isCanCreateLocalService() { @@ -641,7 +642,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { public void setCanCreateLocalService(boolean canCreateLocalService) { this.canCreateLocalService = canCreateLocalService; firePgConfigChanged(CAN_CREATE_LOCALE_SERVICE_PROPERTY_NAME, null, - canCreateLocalService); + canCreateLocalService); } public boolean isCanUseRemoteService() { @@ -700,8 +701,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { CreationMode oldValue = this.referentielImportMode; this.referentielImportMode = referentielImportMode; firePropertyChange(REFERENTIEL_IMPORT_MODE_PROPERTY_NAME, - oldValue, - referentielImportMode); + oldValue, + referentielImportMode); if (oldValue != referentielImportMode) { updateUniverse(); @@ -717,8 +718,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { CreationMode oldValue = this.dataImportMode; this.dataImportMode = dataImportMode; firePropertyChange(DATA_IMPORT_MODE_PROPERTY_NAME, - oldValue, - dataImportMode); + oldValue, + dataImportMode); if (oldValue != dataImportMode) { // reset selected data to import @@ -1109,6 +1110,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { break; case USE_SERVER: txt = restConfig.getServerUrl() == null ? "" : restConfig.getServerUrl().toString(); + Optional<String> optionalDatabaseName = restConfig.getOptionalDatabaseName(); + txt += " - " + t("observe.storage.server.dataBase.name") + " " + (optionalDatabaseName.orElse(t("observe.storage.server.default.dataBase"))); break; case USE_REMOTE: txt = pgConfig.getJdbcUrl(); ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java ===================================== @@ -97,6 +97,14 @@ public class SelectionTree extends JXTree { } } }); + oppositeTree.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + oppositeTree.selectUnSelectWithOpposite(SelectionTree.this); + } + } + }); } private void selectUnSelectWithOpposite(SelectionTree oppositeTree) { ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -1444,7 +1444,9 @@ observe.storage.report.no.create.mode=Create mode not needed observe.storage.required.rw.on.data=You don't have sufficient credentials to perform this operation.\n\nTo perform this operation, you need Read/Write permissions on data. observe.storage.security.administrateur=Owner of database observe.storage.server.dataBase=Databases +observe.storage.server.dataBase.name=Database observe.storage.server.db=(remote server) +observe.storage.server.default.dataBase=default observe.storage.server.presets.title=Remote servers observe.storage.server.sessionExpire=Server connexion is no more active. You can\n\n\t - Close server connexion, \n\t - Change data source, \n\t - Re-connect to server.\n\n BE WARE \: Local modifications will be lost\! observe.storage.server.sessionExpire.change=Change ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -1444,7 +1444,9 @@ observe.storage.report.no.create.mode=No se necesita seleccionar un modo de crea observe.storage.required.rw.on.data=No tiene los permisos necesarios para realizar esta operación.\n\nDebe tener permios de lectura y escritura de los datos del obaservador. observe.storage.security.administrateur=Propietario de la base observe.storage.server.dataBase=Base de datos +observe.storage.server.dataBase.name=Database \#TODO observe.storage.server.db=(servidor remoto) +observe.storage.server.default.dataBase=default \#TODO observe.storage.server.presets.title=Serveurs distants \#TODO observe.storage.server.sessionExpire=La conexión con el servidor ya no está activa. Qué quiere hacer ?\n\n\t - Cerrar la conexión con el servidor, \n\t - Cambiar de fuente de datos, \n\t - Se re-connectar con el servidor.\n\n CUIDADO \: Las modificaciones en curso se perderán \! observe.storage.server.sessionExpire.change=Cambiar ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -1444,7 +1444,9 @@ observe.storage.report.no.create.mode=Mode de création de base non requis observe.storage.required.rw.on.data=Vous n'avez pas les droits suffisants pour effectuer cette opération.\n\nPour effectuer cette opération vous devez avoir les droits de lecture et d'écriture sur les données observateur. observe.storage.security.administrateur=Propriétaire de la base observe.storage.server.dataBase=Base de données +observe.storage.server.dataBase.name=Base observe.storage.server.db=(serveur distant) +observe.storage.server.default.dataBase=par défaut observe.storage.server.presets.title=Serveurs distants observe.storage.server.sessionExpire=La connexion avec le serveur n'est plus active. Que voulez-faire ?\n\n\t - Fermer la connexion avec le serveur, \n\t - Changer de source de données, \n\t - Se re-conncter au serveur.\n\n ATTENTION \: Les modifications en cours seront perdu \! observe.storage.server.sessionExpire.change=Changer ===================================== dto/src/main/java/fr/ird/observe/binder/referential/seine/WeightCategoryDtoReferenceBinder.java ===================================== @@ -41,8 +41,9 @@ public class WeightCategoryDtoReferenceBinder extends ReferentialDtoReferenceBin @Override public WeightCategoryReference toReference(ReferentialLocale referentialLocale, WeightCategoryDto dto) { - return new WeightCategoryReference(dto, dto.getLabel(referentialLocale), + return new WeightCategoryReference(dto, dto.getCode(), + dto.getLabel(referentialLocale), dto.getSpecies().getId()); } ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/seine/WeightCategoryEntityDtoBinder.java ===================================== @@ -40,22 +40,16 @@ public class WeightCategoryEntityDtoBinder extends ReferentialEntityDtoBinderSup @Override public void copyToEntity(ReferentialLocale referentialLocale, WeightCategoryDto dto, WeightCategory entity) { - - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); entity.setSpecies(toEntity(dto.getSpecies())); - } @Override public void copyToDto(ReferentialLocale referentialLocale, WeightCategory entity, WeightCategoryDto dto) { - - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies())); - } } ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/seine/WeightCategoryEntityReferenceBinder.java ===================================== @@ -41,10 +41,9 @@ public class WeightCategoryEntityReferenceBinder extends ReferentialEntityRefere @Override public WeightCategoryReference toReference(ReferentialLocale referentialLocale, WeightCategory dto) { - - return new WeightCategoryReference(dto, dto.getLabel(referentialLocale), + return new WeightCategoryReference(dto, dto.getCode(), + dto.getLabel(referentialLocale), dto.getSpecies().getTopiaId()); - } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java ===================================== @@ -205,6 +205,7 @@ public class DataSourceMigrationForVersion_6_0 extends MigrationVersionResource .put("DML", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093") .put("CDML", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447") .put("PFL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902") + .put("SCL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1479120383659#0.03964411579456617") .build(); ImmutableMap.Builder<String, String> existingSizeMeasureMappingBuilder = ImmutableMap.builder(); ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -31,7 +31,7 @@ observe.common.ActivitySeineDto.vesselSpeed=Vessel speed observe.common.ActivitySeineDto.wind=Wind observe.common.BaitsCompositionDto.baitSettingStatus=Bait setting status observe.common.BaitsCompositionDto.baitType=Bait type -observe.common.BaitsCompositionDto.individualSize=Size +observe.common.BaitsCompositionDto.individualSize=Size (cm) observe.common.BaitsCompositionDto.individualWeight=Weight observe.common.BaitsCompositionDto.proportion=Proportion observe.common.BasketDto.floatline1Length=floatline 1 length @@ -258,7 +258,7 @@ observe.common.TargetCatchDto.species=Species observe.common.TargetCatchDto.weightCategory=Weight category observe.common.TargetCatchDto.well=Well observe.common.TargetLengthDto.count=Count -observe.common.TargetLengthDto.length=Length +observe.common.TargetLengthDto.length=Length (cm) observe.common.TargetLengthDto.sex=Sex observe.common.TargetLengthDto.sizeMeasureType=Size measure type observe.common.TargetLengthDto.species=Species ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -260,7 +260,7 @@ observe.common.TargetCatchDto.species=Especie observe.common.TargetCatchDto.weightCategory=Categoría de peso observe.common.TargetCatchDto.well=Cuba observe.common.TargetLengthDto.count=Número -observe.common.TargetLengthDto.length=Longitud eslora total +observe.common.TargetLengthDto.length=Tamaño (cm) observe.common.TargetLengthDto.sex=Sexo observe.common.TargetLengthDto.sizeMeasureType=Tipo de medida observe.common.TargetLengthDto.species=Especie ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -258,7 +258,7 @@ observe.common.TargetCatchDto.species=Espèce observe.common.TargetCatchDto.weightCategory=Catégorie de poids observe.common.TargetCatchDto.well=Cuve observe.common.TargetLengthDto.count=Nombre -observe.common.TargetLengthDto.length=Longueur hors tout +observe.common.TargetLengthDto.length=Taille (en cm) observe.common.TargetLengthDto.sex=Sexe observe.common.TargetLengthDto.sizeMeasureType=Type de mensuration observe.common.TargetLengthDto.species=Espèce View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/33431054908f662dd6a687b3b1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/33431054908f662dd6a687b3b1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: Migrates to Log4J2
by Tony CHEMIT 06 Aug '18

06 Aug '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2ab3ce85 by Tony CHEMIT at 2018-08-06T09:45:24Z Migrates to Log4J2 - - - - - a19fd956 by Tony CHEMIT at 2018-08-06T09:45:26Z update toolkit - - - - - 77e71a34 by Tony CHEMIT at 2018-08-06T09:45:26Z update pom - - - - - bb2214e8 by Tony CHEMIT at 2018-08-06T09:45:26Z [LL][SERVER] Sur section Capture, le racourcis Nouveau (F4) ne fonctionne pas - Closes #1029 - Closes #1025 - - - - - 33431054 by Tony CHEMIT at 2018-08-06T09:46:01Z Review focus management - Closes #1036 - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - − client-configuration/src/main/resources/log4j.properties - + client-configuration/src/main/resources/log4j2.xml - − client-configuration/src/main/resources/observe-log4j.properties - + client-configuration/src/main/resources/observe-log4j2.xml - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/src/main/java/fr/ird/observe/client/ObserveCLAction.java - client/src/main/java/fr/ird/observe/client/ObserveResourceManager.java - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveSwingSessionHelper.java - client/src/main/java/fr/ird/observe/client/RunObserve.java - client/src/main/java/fr/ird/observe/client/backup/AtCloseApplicationLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/AutomaticLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client/src/main/java/fr/ird/observe/client/backup/LocalDatabaseBackupTaskSupport.java - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/ui/ObserveUICallback.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AbstractContentUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditFloatingObjectPresetUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a68e62aef6f98c7f3000385dea… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a68e62aef6f98c7f3000385dea… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: update pom
by Tony CHEMIT 06 Aug '18

06 Aug '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5a3aa21f by Tony CHEMIT at 2018-08-03T23:37:04Z update pom - - - - - a68e62ae by Tony CHEMIT at 2018-08-06T06:31:17Z [LL][SERVER] Sur section Capture, le racourcis Nouveau (F4) ne fonctionne pas - Closes #1029 - Closes #1025 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - pom.xml Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java ===================================== @@ -432,6 +432,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> if (log.isDebugEnabled()) { log.debug("init combobox for " + BeanFilterableComboBox.getBeanType()); } + BeanFilterableComboBox.getCombobox().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0), "none"); Class referenceType = BeanFilterableComboBox.getBeanType(); BeanFilterableComboBox.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType)); BeanFilterableComboBox.setI18nPrefix("observe.common."); @@ -646,6 +647,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } }); } + editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0), "none"); } protected void init(JComponent editor, Set<String> notBlockingComponents) { @@ -734,6 +736,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> labelsBuilder.put(e, label); } editor.setRenderer(new EnumEditorRenderer<>(labelsBuilder.build())); + editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0), "none"); } private boolean isAutoSelectOnFocus(JComponent comp) { ===================================== pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.49</version> + <version>2018.50</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/067ee40a5d1288bfcc94bb2e74… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/067ee40a5d1288bfcc94bb2e74… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Migrates to Log4J2
by Tony CHEMIT 03 Aug '18

03 Aug '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8835d91b by Tony CHEMIT at 2018-08-03T23:10:57Z Migrates to Log4J2 - - - - - 067ee40a by Tony CHEMIT at 2018-08-03T23:21:04Z update toolkit - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - − client-configuration/src/main/resources/log4j.properties - + client-configuration/src/main/resources/log4j2.xml - − client-configuration/src/main/resources/observe-log4j.properties - + client-configuration/src/main/resources/observe-log4j2.xml - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/src/main/java/fr/ird/observe/client/ObserveCLAction.java - client/src/main/java/fr/ird/observe/client/ObserveResourceManager.java - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveSwingSessionHelper.java - client/src/main/java/fr/ird/observe/client/RunObserve.java - client/src/main/java/fr/ird/observe/client/backup/AtCloseApplicationLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/AutomaticLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client/src/main/java/fr/ird/observe/client/backup/LocalDatabaseBackupTaskSupport.java - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/ui/ObserveUICallback.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AbstractContentUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditFloatingObjectPresetUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e327b842231f078381be991681… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e327b842231f078381be991681… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Migrates to Log4J2
by Tony CHEMIT 03 Aug '18

03 Aug '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e327b842 by Tony CHEMIT at 2018-08-03T12:31:02Z Migrates to Log4J2 - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - − client-configuration/src/main/resources/log4j.properties - + client-configuration/src/main/resources/log4j2.xml - − client-configuration/src/main/resources/observe-log4j.properties - + client-configuration/src/main/resources/observe-log4j2.xml - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/src/main/java/fr/ird/observe/client/ObserveCLAction.java - client/src/main/java/fr/ird/observe/client/ObserveResourceManager.java - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveSwingSessionHelper.java - client/src/main/java/fr/ird/observe/client/RunObserve.java - client/src/main/java/fr/ird/observe/client/backup/AtCloseApplicationLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/AutomaticLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client/src/main/java/fr/ird/observe/client/backup/LocalDatabaseBackupTaskSupport.java - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/ui/ObserveUICallback.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AbstractContentUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditFloatingObjectPresetUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e327b842231f078381be991681e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e327b842231f078381be991681e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: remove create milestone before release
by Tony CHEMIT 03 Aug '18

03 Aug '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0a8ff175 by Tony CHEMIT at 2018-08-03T11:53:49Z remove create milestone before release - - - - - 84f12a30 by Tony CHEMIT at 2018-08-03T11:55:08Z Migrates to Log4J2 - - - - - 30 changed files: - .gitlab-ci.yml - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - + client-configuration/src/main/resources/log4j2.xml - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/src/main/java/fr/ird/observe/client/ObserveCLAction.java - client/src/main/java/fr/ird/observe/client/ObserveResourceManager.java - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveSwingSessionHelper.java - client/src/main/java/fr/ird/observe/client/RunObserve.java - client/src/main/java/fr/ird/observe/client/backup/AtCloseApplicationLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/AutomaticLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client/src/main/java/fr/ird/observe/client/backup/LocalDatabaseBackupTaskSupport.java - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/ui/ObserveUICallback.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AbstractContentUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionDeleteAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionGenerateAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/346751051f38117b164b5fd109… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/346751051f38117b164b5fd109… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Make jaxx works again on windows :( - Closes #696
by Tony CHEMIT 29 Jul '18

29 Jul '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 34675105 by Tony Chemit at 2018-07-29T16:15:13Z Make jaxx works again on windows :( - Closes #696 - - - - - 2 changed files: - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java Changes: ===================================== pom.xml ===================================== @@ -153,7 +153,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>3.7.3</observeToolkitVersion> -  + <lib.version.java4all.jaxx>3.0-alpha-34-SNAPSHOT</lib.version.java4all.jaxx> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  <xworkVersion>2.3.34</xworkVersion> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java ===================================== @@ -228,6 +228,14 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup protected void assertResultRow(DataMatrix result, int rowId, Object... row) { Object[] actualRow = result.getData()[rowId]; - Assert.assertArrayEquals(row, actualRow); + int index=0; + for (Object o : actualRow) { + if (o==null) { + Assert.assertEquals(row[index++], o); + }else { + Assert.assertArrayEquals(row[index++].toString().split("\\s*\\n\\s*"),o.toString().split("\\s*\\n\\s*")); + } + } + //Assert.assertArrayEquals(row, actualRow); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/346751051f38117b164b5fd1097… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/346751051f38117b164b5fd1097… You're receiving this email because of your account on gitlab.com.

1 0