branch develop updated (90837aa -> ccc25c7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 90837aa fixes #7414 Erreur quand on veut créer une nouvelle demande dans un dossier new ccc25c7 Mettre à jour la liste dans le dossier quand on quitte l'édition d'une demande fixes #7415 The 1 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 ccc25c74b59e22ca2c72bf3bf564a5ff15ffef75 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jul 28 11:15:20 2015 +0200 Mettre à jour la liste dans le dossier quand on quitte l'édition d'une demande fixes #7415 Summary of changes: .../faxtomail/ui/swing/FaxToMailScreen.java | 2 -- .../ui/swing/actions/SaveDemandeAndExitAction.java | 4 +++- .../faxtomail/ui/swing/content/MainUIHandler.java | 28 +++++++--------------- .../content/demande/DemandeListUIHandler.java | 4 ++++ .../swing/content/demande/DemandesUIHandler.java | 1 + .../content/search/SearchToGroupUIHandler.java | 5 ++++ .../ui/swing/content/search/SearchUIHandler.java | 6 +++++ .../util/AbstractFaxToMailDemandListHandler.java | 4 ++-- .../faxtomail/ui/swing/util/ReloadableListUI.java | 11 +++++++++ 9 files changed, 40 insertions(+), 25 deletions(-) create mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/ReloadableListUI.java -- 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 develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit ccc25c74b59e22ca2c72bf3bf564a5ff15ffef75 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jul 28 11:15:20 2015 +0200 Mettre à jour la liste dans le dossier quand on quitte l'édition d'une demande fixes #7415 --- .../faxtomail/ui/swing/FaxToMailScreen.java | 2 -- .../ui/swing/actions/SaveDemandeAndExitAction.java | 4 +++- .../faxtomail/ui/swing/content/MainUIHandler.java | 28 +++++++--------------- .../content/demande/DemandeListUIHandler.java | 4 ++++ .../swing/content/demande/DemandesUIHandler.java | 1 + .../content/search/SearchToGroupUIHandler.java | 5 ++++ .../ui/swing/content/search/SearchUIHandler.java | 6 +++++ .../util/AbstractFaxToMailDemandListHandler.java | 4 ++-- .../faxtomail/ui/swing/util/ReloadableListUI.java | 11 +++++++++ 9 files changed, 40 insertions(+), 25 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java index c681509..19d1c0e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java @@ -31,7 +31,5 @@ public enum FaxToMailScreen { SEARCH, - DEMANDE, - LIST } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java index 9db1aad..ddca486 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java @@ -25,6 +25,8 @@ package com.franciaflex.faxtomail.ui.swing.actions; */ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; +import jaxx.runtime.swing.JAXXWidgetUtil; /** * @author Kevin Morin (Code Lutin) @@ -39,6 +41,6 @@ public class SaveDemandeAndExitAction extends SaveDemandeAction { @Override public void postSuccessAction() { super.postSuccessAction(); - getHandler().closeFrame(); + JAXXWidgetUtil.getParent(getUI(), DemandesUI.class).getHandler().closeFrame(); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java index 52137d3..7eac0ff 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java @@ -26,15 +26,14 @@ import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.RunFaxToMail; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; +import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.franciaflex.faxtomail.ui.swing.util.RemoveablePropertyChangeListener; import com.google.common.base.Preconditions; import jaxx.runtime.JAXXBinding; import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.session.SwingSession; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -361,24 +360,6 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext icon = ui.getSearchButton().getIcon(); break; - case DEMANDE: - // cf #6426, if a Nimbus ClassCastException, then retry to create the ui - // TODO remove this when we use the ng actions - try { - screenUI = new DemandesUI(ui); - - } catch (ClassCastException e) { - if (log.isErrorEnabled()) { - log.error("ClassCastException caught", e); - } - screenUI = new DemandesUI(ui); - } - screenTitle = t("faxtomail.demand.title"); - icon = JAXXWidgetUtil.createActionIcon("email-group"); - rightDecoration = ((DemandesUI) screenUI).getTopToolBar(); - validatorWidgetEnabled = true; - break; - default: case LIST: ui.getDemandListButton().setVisible(true); @@ -423,4 +404,11 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext public JComponent getCurrentBody() { return currentBody; } + + public void reloadDemandList() { + if (log.isInfoEnabled()) { + log.info("reload demand list"); + } + ((FaxToMailUI<?, ? extends AbstractFaxToMailDemandListHandler>) currentBody).getHandler().reloadList(); + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 8102b04..2dd8a5a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -756,4 +756,8 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem getContext().getActionEngine().runAction(action); } + @Override + public void reloadList() { + runListAction(); + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java index b7b7930..fec3ef5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java @@ -213,6 +213,7 @@ public class DemandesUIHandler extends AbstractFaxToMailUIHandler<DemandesUIMode ui.getDemandGroupButton().onCloseUI(); + getContext().getMainUI().getHandler().reloadDemandList(); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java index 6a1fc3a..b6ed269 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java @@ -368,4 +368,9 @@ public class SearchToGroupUIHandler extends AbstractFaxToMailDemandListHandler<S getContext().getActionEngine().runAction(new GroupAction(this)); } } + + @Override + public void reloadList() { + searchDemandes(); + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java index 595d300..23c2e90 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java @@ -359,4 +359,10 @@ public class SearchUIHandler extends AbstractFaxToMailDemandListHandler<SearchUI return new MailField[] { MailField.ATTACHMENT, MailField.REPLIES }; } + @Override + public void reloadList() { + searchDemandes(); + } + + } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java index 37a3198..d1216a8 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java @@ -32,7 +32,6 @@ import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.Reply; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentCellEditor; @@ -76,7 +75,8 @@ import java.util.List; * @author Kevin Morin (Code Lutin) * */ -public abstract class AbstractFaxToMailDemandListHandler<M, UI extends FaxToMailUI<M, ?>> extends AbstractFaxToMailUIHandler<M, UI> { +public abstract class AbstractFaxToMailDemandListHandler<M, UI extends FaxToMailUI<M, ?>> extends AbstractFaxToMailUIHandler<M, UI> + implements ReloadableListUI { protected NuitonValidator<DemandeUIModel> demandeUIModelNuitonValidator = NuitonValidatorFactory.newValidator(DemandeUIModel.class);; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/ReloadableListUI.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/ReloadableListUI.java new file mode 100644 index 0000000..530568b --- /dev/null +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/ReloadableListUI.java @@ -0,0 +1,11 @@ +package com.franciaflex.faxtomail.ui.swing.util; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public interface ReloadableListUI { + + void reloadList(); + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm