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 ee9ee027f7e9de559c59ee507e25171ec9a998ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 16 12:52:54 2016 +0200 Bien enlever la référence à remplacer de la liste des choix possibles --- .../referential/ng/ReferentialReplaceUIHandler.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java index 661ba8f..8930cd3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java @@ -2,6 +2,7 @@ package fr.ird.observe.ui.admin.synchronize.referential.ng; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; @@ -9,6 +10,7 @@ import jaxx.runtime.swing.editor.bean.BeanComboBox; import java.awt.Dimension; import java.beans.PropertyChangeListener; +import java.util.List; /** * Created on 11/08/16. @@ -27,15 +29,16 @@ public class ReferentialReplaceUIHandler<R extends ReferentialDto> { public void init() { BeanComboBox<ReferentialReference<R>> beanComboBox = ui.getList(); - //beanComboBox.removePropertyChangeListener(BeanComboBox.PROPERTY_DATA, listenData); - //beanComboBox.addPropertyChangeListener(BeanComboBox.PROPERTY_DATA, listenData); ReferentialReferenceSet<R> referenceSet = ui.getContextValue(ReferentialReferenceSet.class); beanComboBox.setI18nPrefix("observe.common."); beanComboBox.setMinimumSize(new Dimension(0, 24)); beanComboBox.setBeanType((Class) ReferentialReference.class); - beanComboBox.init(ObserveSwingApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(referenceSet.getType()), - Lists.newArrayList(referenceSet.getReferences())); + List<ReferentialReference<R>> references = Lists.newArrayList(referenceSet.getReferences()); + ReferentialReference<R> reference = ui.getContextValue(ReferentialReference.class); + references.remove(reference); + ReferentialReferenceDecorator<R> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(referenceSet.getType()); + beanComboBox.init(decorator, references); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.