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 970720538b0baced809fcc6d7ab575276230c0f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 17 13:39:36 2016 +0200 Quelques adaptations niveau ui pour utiliser les nouvelles api --- .../legacy/ObsoleteReferentialReference.java | 17 +++++++------ .../referential/legacy/SynchronizeUIHandler.java | 28 +++++++++++++--------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java index 8573212..1eb9498 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.admin.synchronize.referential.legacy; * #L% */ +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import java.util.Objects; @@ -34,21 +35,19 @@ import java.util.Objects; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public class ObsoleteReferentialReference { +public class ObsoleteReferentialReference<R extends ReferentialDto> { - private final String referentialName; - private final ReferentialReference referentialReference; + private final ReferentialReference<R> referentialReference; - public ObsoleteReferentialReference(String referentialName, ReferentialReference referentialReference) { - this.referentialName = referentialName; + public ObsoleteReferentialReference(Class<R>referentialName, ReferentialReference<R> referentialReference) { this.referentialReference = referentialReference; } - public String getReferentialName() { - return referentialName; + public Class<R> getReferentialName() { + return getType(); } - public ReferentialReference getReferentialReference() { + public ReferentialReference<R> getReferentialReference() { return referentialReference; } @@ -56,7 +55,7 @@ public class ObsoleteReferentialReference { return referentialReference.getId(); } - public Class getType() { + public Class<R> getType() { return referentialReference.getType(); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java index d09f583..41c7782 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java @@ -24,7 +24,9 @@ package fr.ird.observe.ui.admin.synchronize.referential.legacy; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackRequest; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackRequests; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackResults; @@ -124,10 +126,14 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { // construction du différentiel sendMessage(t("observe.actions.synchro.referential.message.build.diff", centralSource.getLabel())); + ReferentialSynchronizeDiffsEngine diffsEngine = new ReferentialSynchronizeDiffsEngine( + source.newReferentialSynchronizeDiffService(), + centralSource.newReferentialSynchronizeDiffService() + ); UnidirectionalReferentialSynchronizeEngine engine = new UnidirectionalReferentialSynchronizeEngine( - source.newUnidirectionalReferentialSynchronizeLocalService(), - centralSource.newUnidirectionalReferentialSynchronizeRemoteService()); + diffsEngine, source.newUnidirectionalReferentialSynchronizeLocalService() + ); stepModel.setEngine(engine); @@ -153,7 +159,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { for (UnidirectionalReferentialSynchronizeCallbackRequest<?> callbackRequest : callbackRequests) { - String referentialName = callbackRequest.getReferentialName(); + Class referentialName = callbackRequest.getReferentialName(); obsoleteReferentialReferences.addAll( callbackRequest.getReferentialsToReplace().stream() @@ -177,15 +183,15 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { } - public void resolveObsoleteReference() { + public <R extends ReferentialDto> void resolveObsoleteReference() { - ObsoleteReferentialReference obsoleteRef = (ObsoleteReferentialReference) getUi().getObsoleteReferencesList().getSelectedValue(); + ObsoleteReferentialReference<R> obsoleteRef = (ObsoleteReferentialReference) getUi().getObsoleteReferencesList().getSelectedValue(); - BeanComboBox<?> safeComboBox = getSafeComboBox(); - ReferentialReference safeRef = (ReferentialReference) safeComboBox.getSelectedItem(); + BeanComboBox<ReferentialReference<R>> safeComboBox = (BeanComboBox<ReferentialReference<R>>) getSafeComboBox(); + ReferentialReference<R> safeRef = (ReferentialReference<R>) safeComboBox.getSelectedItem(); UnidirectionalReferentialSynchronizeCallbackResults referentialSynchronizeCallbackResults = getStepModel().getReferentialSynchronizeCallbackResults(); - referentialSynchronizeCallbackResults.addCallbackResult(obsoleteRef.getReferentialName(), obsoleteRef.getId(), safeRef.getId()); + referentialSynchronizeCallbackResults.addCallbackResult(obsoleteRef.getType(), obsoleteRef.getId(), safeRef.getId()); // On supprime le référentiel corrigé de la liste des référentiels à corriger @@ -224,7 +230,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { ObsoleteReferentialReference referentialReference = obsoleteReferences.getElementAt(row); - String key = referentialReference.getReferentialName(); + String key = referentialReference.getReferentialName().getName(); CardLayout2 safeRefsPanelLayout = ui.getSafeRefsPanelLayout(); JPanel safeRefsPanel = ui.getSafeRefsPanel(); if (safeRefsPanelLayout.contains(key)) { @@ -243,7 +249,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { ReferentialReferenceDecorator decorator = getDecoratorService().getReferentialReferenceDecorator(referentialReference.getType()); - UnidirectionalReferentialSynchronizeCallbackRequest<?> callbackRequest = getStepModel().getReferentialSynchronizeContext().getCallbackRequests().getCallbackRequest(key); + UnidirectionalReferentialSynchronizeCallbackRequest<?> callbackRequest = getStepModel().getReferentialSynchronizeContext().getCallbackRequests().getCallbackRequest(referentialReference.getReferentialName()); ImmutableSet<? extends ReferentialReference<?>> availableReferentials = callbackRequest.getAvailableReferentials(); List<ReferentialReference> data = new ArrayList<>(availableReferentials); @@ -295,7 +301,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { } else { - for (String referentialName : referentialSynchronizeResult.getReferentialNames()) { + for (Class<? extends ReferentialDto> referentialName : referentialSynchronizeResult.getReferentialNames()) { Collection<String> referentialAdded = referentialSynchronizeResult.getReferentialAdded(referentialName); if (CollectionUtils.isNotEmpty(referentialAdded)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.