This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 00c676b8c23ae4ea9c15a4201a9e5b4fd1411f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:41 2015 +0100 amelioration de la cinematique lors de l'ouverture de l'ui de remplacement des referentiels --- .../AbstractOpenReplaceTemporaryUIAction.java | 64 ++++++++++++---------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java index 4950ce7..c36268a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java @@ -27,7 +27,6 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; @@ -36,13 +35,13 @@ import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemp import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JButton; -import javax.swing.SwingUtilities; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -73,6 +72,10 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere protected E target; + protected List<E> targetList; + + protected List<E> sourceList; + protected AbstractOpenReplaceTemporaryUIAction(ManageTemporaryReferentialUIHandler handler) { super(handler, true); } @@ -96,78 +99,81 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere @Override public void releaseAction() { source = target = null; + targetList = sourceList = null; super.releaseAction(); } @Override public void doAction() throws Exception { - // Load model - - M model = createNewModel(); - PersistenceService persistenceService = getContext().getPersistenceService(); String entityLabel = getEntityLabel(); - getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.target", entityLabel)); - // Get target list - List<E> targetList = getTargetList(persistenceService); + getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.target", entityLabel)); + targetList = getTargetList(persistenceService); + log.info("Loaded official referentials: " + targetList.size()); + // Get source list getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.source", entityLabel)); + sourceList = retainTemporaryList(persistenceService, targetList); + log.info("Loaded temporary referentials: " + sourceList.size()); - // Get source list - List<E> sourceList = retainTemporaryList(persistenceService, targetList); + } - log.info("Loaded temporary referentials: " + sourceList.size()); - log.info("Loaded official referentials: " + targetList.size()); + @Override + public void postSuccessAction() { boolean showDialog = true; + String entityLabel = getEntityLabel(); + + M model = createNewModel(); + if (targetList.isEmpty()) { + showDialog = false; displayWarningMessage(t("tutti.title.openReplaceTemporaryUI.noTarget", entityLabel), t("tutti.message.openReplaceTemporaryUI.noTarget", entityLabel)); - showDialog = false; + } else { + + model.setTargetList(targetList); + } if (sourceList.isEmpty()) { + showDialog = false; + displayWarningMessage(t("tutti.title.openReplaceTemporaryUI.noSource", entityLabel), t("tutti.message.openReplaceTemporaryUI.noSource", entityLabel)); - showDialog = false; + } else { + + model.setSourceList(sourceList); + } if (showDialog) { getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.open.dialog")); - model.setTargetList(targetList); - model.setSourceList(sourceList); - JAXXInitialContext ctx = new JAXXInitialContext(); ctx.add(getUI()); ctx.add(model); - final UI dialog = createUI(ctx); + UI dialog = createUI(ctx); MainUI mainUI = TuttiUIUtil.getApplicationContext(dialog).getMainUI(); SwingUtil.setComponentHeight(dialog, 400); SwingUtil.setComponentWidth(dialog, mainUI.getWidth() - 100); SwingUtil.center(mainUI, dialog); - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - dialog.setContextValue(getUI(), "owner"); - dialog.setVisible(true); - ((TuttiUI) dialog).getHandler().onCloseUI(); - } - } - ); + dialog.setContextValue(getUI(), "owner"); + dialog.setVisible(true); + ((TuttiUI) dialog).getHandler().onCloseUI(); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.