This is an automated email from the git hooks/post-receive script. New commit to branch feature/8302 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 01f13d8f11132ee6cb87234987cdd867f4c12504 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 09:55:19 2016 +0200 On recharge les ui après avoir charge le modèle --- .../actions/ImportProtocolCaracteristicAction.java | 34 +++++++++++++++------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolCaracteristicAction.java index 1282984..073f393 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolCaracteristicAction.java @@ -23,8 +23,10 @@ package fr.ifremer.tutti.ui.swing.content.protocol.actions; */ import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; +import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolCaracteristicsRowModel; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; @@ -33,6 +35,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.File; +import java.util.Collections; +import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -49,6 +53,7 @@ public class ImportProtocolCaracteristicAction extends LongActionSupport<EditPro LogFactory.getLog(ImportProtocolCaracteristicAction.class); private File file; + protected TuttiProtocol protocol; public ImportProtocolCaracteristicAction(EditProtocolUIHandler handler) { super(handler, true); @@ -89,27 +94,36 @@ public class ImportProtocolCaracteristicAction extends LongActionSupport<EditPro EditProtocolUIModel model = getModel(); // bind to a protocol - TuttiProtocol protocol = model.toEntity(); + protocol = model.toEntity(); - ProtocolImportExportService service = - getContext().getTuttiProtocolImportExportService(); + ProtocolImportExportService service = getContext().getTuttiProtocolImportExportService(); - service.importProtocolCaracteristic(file, - protocol, - model.getAllCaracteristic()); + service.importProtocolCaracteristic(file, protocol, model.getAllCaracteristic()); + + } + + @Override + public void postSuccessAction() { + + super.postSuccessAction(); handler.addDoubleListListeners(); try { // rebind to model - model.fromEntity(protocol); + getModel().fromEntity(protocol); } finally { handler.removeDoubleListListeners(); } - sendMessage( - t("tutti.flash.info.caracteristic.imported.in.protocol", - file)); + List<CaracteristicMappingRow> caracteristicMapping = protocol.getCaracteristicMapping(); + List<EditProtocolCaracteristicsRowModel> caracteristicsRowModels = getHandler().toProtocolCaracteristicRows(caracteristicMapping); + getModel().setCaracteristicMappingRows(Collections.emptyList()); + getModel().setCaracteristicMappingRows(caracteristicsRowModels); + getHandler().getCaracteristicMappingTableModel().setRows(caracteristicsRowModels); + + sendMessage(t("tutti.flash.info.caracteristic.imported.in.protocol", file)); } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.