This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2c876441e300a8172979d034956208f895390432 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 20:23:48 2016 +0200 Bien conserver le nouvel ordre lors de la recopie de liste --- .../services/topia/binder/data/DataBinderSupport.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java index 259b07a..b10fbf2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java @@ -25,7 +25,6 @@ package fr.ird.observe.services.topia.binder.data; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import fr.ird.observe.entities.CommentableEntity; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.services.dto.CommentableDto; @@ -268,9 +267,10 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D ImmutableMap<String, EE> entitiesById = Maps.uniqueIndex(entityList, TopiaEntities.getTopiaIdFunction()); + entityList.clear(); + if (CollectionUtils.isNotEmpty(dtos)) { - Set<EE> entitiestoDelete = Sets.newConcurrentHashSet(entityList); DD firstDto = Iterables.get(dtos, 0, null); DataBinderSupport<EE, DD> binder = BinderEngine.get().getDataBinder(firstDto); @@ -288,18 +288,12 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D // Reuse existing entity binder.copyToEntity(referentialLocale, dto, entity); - entitiestoDelete.remove(entity); + entityList.add(entity); } } - entityList.removeAll(entitiestoDelete); - - } else { - - entityList.clear(); - } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.