branch feature/9526 updated (4c87588b -> 9596da19)
This is an automated email from the git hooks/post-receive script. New change to branch feature/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 4c87588b Merge branch 'feature/9526' of https://gitlab.nuiton.org/codelutin/faxtomail into feature/9526 new 311a69ed fix wrong parameter name new 9596da19 refs #9526 fix combobox loading The 2 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 9596da19f93d4b4f41bfb74fa9fbb64c9999771a Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 14 11:50:31 2017 +0100 refs #9526 fix combobox loading commit 311a69ed4f0df9e738dbbd3a7608504381314ad7 Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 14 11:49:56 2017 +0100 fix wrong parameter name Summary of changes: .../ui/swing/content/demande/TakenByFormUI.css | 2 +- .../swing/content/demande/TakenByFormUIHandler.java | 12 ++---------- .../demande/actions/OpenTakenByFormAction.java | 21 ++++++--------------- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- 4 files changed, 10 insertions(+), 27 deletions(-) -- 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 feature/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 311a69ed4f0df9e738dbbd3a7608504381314ad7 Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 14 11:49:56 2017 +0100 fix wrong parameter name --- .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index 4cf8b7cd..8efd789f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -108,7 +108,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo } @Override - public void afterInit(ReplyFormUI replyFormUI) { + public void afterInit(final ReplyFormUI ui) { initUI(ui); JTextPane editor = ui.getMessage(); -- 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 feature/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 9596da19f93d4b4f41bfb74fa9fbb64c9999771a Author: Kevin Morin <morin@codelutin.com> Date: Thu Dec 14 11:50:31 2017 +0100 refs #9526 fix combobox loading --- .../ui/swing/content/demande/TakenByFormUI.css | 2 +- .../swing/content/demande/TakenByFormUIHandler.java | 12 ++---------- .../demande/actions/OpenTakenByFormAction.java | 21 ++++++--------------- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css index 23c45def..a3440599 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUI.css @@ -29,7 +29,7 @@ showReset: true; showDecorator: false; bean: {model}; - property: users; + property: takenBy; selectedItem: { model.getTakenBy() }; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIHandler.java index 1d41605b..cc4fb7a3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/TakenByFormUIHandler.java @@ -16,19 +16,11 @@ import java.util.Collection; public class TakenByFormUIHandler extends AbstractFaxToMailUIHandler<TakenByFormUIModel, TakenByFormUI> implements Cancelable { @Override - public void beforeInit(TakenByFormUI ui) { - super.beforeInit(ui); - - TakenByFormUIModel model = new TakenByFormUIModel(); - this.ui.setContextValue(model); - } - - @Override - public void afterInit(TakenByFormUI takenByFormUI) { + public void afterInit(TakenByFormUI ui) { initUI(ui); // users - initBeanFilterableComboBox(ui.getTakenByComboBox(), getModel().getUsers(), null); + initBeanFilterableComboBox(ui.getTakenByComboBox(), getModel().getUsers(), getModel().getTakenBy()); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java index 88e05c63..22331e26 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenTakenByFormAction.java @@ -26,27 +26,18 @@ public class OpenTakenByFormAction extends AbstractFaxToMailAction<DemandeListUI protected TakenByFormUI frameContent; protected JFrame frame; - protected List<DemandeUIModel> demandsToTake; - public OpenTakenByFormAction(DemandeListUIHandler handler) { super(handler, false); } @Override - public boolean prepareAction() throws Exception { - demandsToTake = getModel().getSelectedEmails(); - return true; - } - - @Override public void doAction() throws Exception { - + List<DemandeUIModel> demandsToTake = getModel().getSelectedEmails(); DemandeUIModel demand = demandsToTake.get(0); - frameContent = new TakenByFormUI(getUI()); - TakenByFormUIModel model = frameContent.getModel(); + TakenByFormUIModel model = new TakenByFormUIModel(); - if (demandsToTake.size()==1){ + if (demandsToTake.size() == 1) { model.setTakenBy(demand.getTakenBy()); } @@ -58,14 +49,14 @@ public class OpenTakenByFormAction extends AbstractFaxToMailAction<DemandeListUI List<FaxToMailUser> users = (List<FaxToMailUser>)mailFolderService.getUsersForFolder(folder.getTopiaId()); model.setUsers(users); - frameContent.setContextValue(model); + getUI().setContextValue(model); + + frameContent = new TakenByFormUI(getUI()); } @Override public void postSuccessAction() { super.postSuccessAction(); - //frameContent.getTakenByComboBox().addItems(frameContent.getModel().getUsers()); - //frameContent.getTakenByComboBox().setSelectedItem(frameContent.getModel().getTakenBy()); frame = getHandler().openModalFrame(frameContent, t("faxtomail.takenby.modalTitle"), new Dimension(300, 30)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm