branch feature/7739 updated (61b7ec8 -> 32ac58a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 61b7ec8 correction de traduction new 8213590 Transformation en référence de référentiel plutôt que de conserver les entitées new 5b471c8 Correction de la génération de remplacement pour une association many-to-many new 32ac58a Dernier ajustement d'interface graphique The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 32ac58a65909308945cedc986a25d2826725fe40 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 19 12:19:33 2016 +0200 Dernier ajustement d'interface graphique commit 5b471c82d43bc6ac3c11a0d6f503e0d160162645 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 19 12:19:20 2016 +0200 Correction de la génération de remplacement pour une association many-to-many commit 8213590b504ef520445329575bffcc31d131a449 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 19 12:18:58 2016 +0200 Transformation en référence de référentiel plutôt que de conserver les entitées Summary of changes: .../main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 ++ .../ObsoleteReferentialReferenceListCellRenderer.java | 4 ++-- .../ui/admin/synchronize/SynchronizeUIHandler.java | 7 ++++++- .../actions/synchro/ReplaceSqlStatementGenerator.java | 2 +- ...rectionalReferentialSynchronizeLocalServiceTopia.java | 16 ++++++++++++---- 5 files changed, 23 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 8213590b504ef520445329575bffcc31d131a449 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 19 12:18:58 2016 +0200 Transformation en référence de référentiel plutôt que de conserver les entitées --- ...rectionalReferentialSynchronizeLocalServiceTopia.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeLocalServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeLocalServiceTopia.java index 36b8049..bf8456a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -5,6 +5,7 @@ import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import org.apache.commons.logging.Log; @@ -18,7 +19,6 @@ import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -79,7 +79,8 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser ObserveEntityEnum entityEnum = ObserveEntityEnum.valueOf(referentialName); Class entityType = entityEnum.getContract(); - return getLocalSourceReferentialToDelete0(entityType, ids); + Class dtoType = BinderEngine.get().getReferentialDtoType(entityType); + return getLocalSourceReferentialToDelete0(entityType, dtoType, ids); } @@ -177,10 +178,17 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser } - private <E extends ObserveReferentialEntity> Set<E> getLocalSourceReferentialToDelete0(Class<E> entityType, Set<String> ids) { + private <E extends ObserveReferentialEntity, R extends ReferentialDto> Set<ReferentialReference<R>> getLocalSourceReferentialToDelete0(Class<E> entityType,Class<R> dtoType, Set<String> ids) { TopiaDao<E> dao = getTopiaPersistenceContext().getDao(entityType); - return new HashSet<>(dao.forTopiaIdIn(ids).findAll()); + List<E> entities = dao.forTopiaIdIn(ids).findAll(); + ReferentialBinderSupport<E, R> referentialBinder = BinderEngine.get().getReferentialBinder(dtoType); + Set<ReferentialReference<R>> result = new LinkedHashSet<>(); + for (E entity : entities) { + ReferentialReference<R> rReferentialReference = referentialBinder.toReferentialReference(getReferentialLocale(), entity); + result.add(rReferentialReference); + } + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 5b471c82d43bc6ac3c11a0d6f503e0d160162645 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 19 12:19:20 2016 +0200 Correction de la génération de remplacement pour une association many-to-many --- .../services/service/actions/synchro/ReplaceSqlStatementGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/ReplaceSqlStatementGenerator.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/ReplaceSqlStatementGenerator.java index 919959a..3622dcd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/ReplaceSqlStatementGenerator.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/ReplaceSqlStatementGenerator.java @@ -101,7 +101,7 @@ public class ReplaceSqlStatementGenerator { result.addAll(metadataEntity.getManyToManyAssociations().entrySet().stream() .filter(entry -> entry.getValue().equals(referentialName)) .map(entry -> new ReplacementStruct(metadataEntity.getDbSchemaName(), - metadataEntity.getBdManyToManyAssociationTableName(entry.getValue()), + metadataEntity.getBdManyToManyAssociationTableName(entry.getKey()), metadataEntity.getDbColumnName(entry.getKey()))) .collect(Collectors.toList())); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 32ac58a65909308945cedc986a25d2826725fe40 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jul 19 12:19:33 2016 +0200 Dernier ajustement d'interface graphique --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 ++ .../synchronize/ObsoleteReferentialReferenceListCellRenderer.java | 4 ++-- .../fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 4d6c174..d0af9d5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -1208,6 +1208,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { validate &= validate(AdminStep.SELECT_DATA); break; case SYNCHRONIZE: + validate = getStepState(s) == WizardState.SUCCESSED; + break; case IMPORT_GPS: //FIXME //validate &= getStepState(s) == diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java index ff15ad6..6b1b349 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteReferentialReferenceListCellRenderer.java @@ -59,11 +59,11 @@ public class ObsoleteReferentialReferenceListCellRenderer extends DefaultListCel String type = t(DecoratorService.getEntityLabel(referentialReferenceType)); Decorator<?> decorator = service.getReferentialReferenceDecorator(referentialReferenceType); - String text = type + " " + service.decorate(referentialReference); + String text = type + " : " + decorator.toString(referentialReference.getReferentialReference()); return super.getListCellRendererComponent( list, - value, + text, index, isSelected, cellHasFocus diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java index 28aa641..93b0a6f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java @@ -191,13 +191,18 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { getStepModel().getObsoleteReferences().removeElement(obsoleteRef); + // on supprime la sélection de la liste des remplacements + + safeComboBox.setSelectedItem(null); + // S'il ne reste plus de référentiel à corriger, on peut terminer le traitement if (getStepModel().getObsoleteReferences().isEmpty()) { beforeSuccess(); - updateState(getUi(), WizardState.SUCCESSED); + getModel().setStepState(WizardState.SUCCESSED); +// updateState(getUi(), WizardState.SUCCESSED); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm