branch develop updated (0749a8e -> b13274a)
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 0749a8e [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 1ce94f6 move reply actions new 0f68eed move reply actions new 892445e move attachment actions new f36f643 move demand actions new 2b893c7 move search actions new 83dbf52 move pdfeditor actions new 45f2923 move pdfeditor actions new 5048719 move demandgroup actions new d43b575 move transmit actions new d756fd8 remplacement du champ code client par une combobox de clients (refs #7422) new 42eed45 déplacmeent du widget de validation de la main ui vers l'ui des demandes new b13274a Correction de validation (refs #7422) The 12 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 b13274ae0cba5ac3544af8b5b72f685dd53f7be9 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 18:23:20 2015 +0200 Correction de validation (refs #7422) commit 42eed45d8d7a8c3ed751016a1bc6d9ba394bc759 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 18:21:13 2015 +0200 déplacmeent du widget de validation de la main ui vers l'ui des demandes commit d756fd83971fc5fc51d0e1685e2d54d2022735c0 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 17:50:31 2015 +0200 remplacement du champ code client par une combobox de clients (refs #7422) commit d43b5753f1ee6d7cfb91fc79e4b72351c2db9c24 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:49:48 2015 +0200 move transmit actions commit 50487192f885e581dbb9005f053cdedf5014ffb9 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:48:30 2015 +0200 move demandgroup actions commit 45f29235a858bd314dede10ddee1c3ffd2c3be0d Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:47:53 2015 +0200 move pdfeditor actions commit 83dbf52de718c7fe4285f1655df89a124959fc4c Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:47:29 2015 +0200 move pdfeditor actions commit 2b893c7892e89be4800c60793f1bf42d8c966e4a Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:46:22 2015 +0200 move search actions commit f36f64368e5f33548eb9d5bb5a70b0c6663c69fd Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:44:08 2015 +0200 move demand actions commit 892445e66a554e8b334db85c81b2dafe1e22025f Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:37:38 2015 +0200 move attachment actions commit 0f68eed2cdbee093aa66f483d6cb4260c9452c74 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:33:45 2015 +0200 move reply actions commit 1ce94f6bd624c1ae3ec3109a988b0f66def9879b Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:31:53 2015 +0200 move reply actions Summary of changes: .../faxtomail/services/service/ClientService.java | 4 ++ .../services/service/ClientServiceImpl.java | 14 +++++ .../faxtomail/services/service/EmailService.java | 2 +- .../services/service/EmailServiceImpl.java | 41 +++++++------- .../services/service/InitFaxToMailServiceImpl.java | 2 +- .../services/service/InitTestDataImpl.java | 2 +- .../ui/swing/actions/ShowDemandeAction.java | 20 +++++-- .../faxtomail/ui/swing/content/MainUI.css | 4 -- .../faxtomail/ui/swing/content/MainUI.jaxx | 3 -- .../faxtomail/ui/swing/content/MainUIHandler.java | 11 ---- .../content/attachment/AttachmentEditorUI.css | 2 +- .../attachment/AttachmentEditorUIHandler.java | 4 +- .../attachment}/actions/AddAttachmentAction.java | 3 +- .../attachment}/actions/EditAttachmentAction.java | 3 +- .../attachment}/actions/OpenAttachmentAction.java | 3 +- .../content/demande/DemandeListTableFilter.java | 2 +- .../ui/swing/content/demande/DemandeListUI.css | 6 +-- .../content/demande/DemandeListUIHandler.java | 7 ++- .../ui/swing/content/demande/DemandeUI.css | 10 +++- .../ui/swing/content/demande/DemandeUI.jaxx | 50 ++++++++--------- .../ui/swing/content/demande/DemandeUIHandler.java | 25 +++++++-- .../ui/swing/content/demande/DemandeUIModel.java | 40 ++++++-------- .../ui/swing/content/demande/DemandesUI.css | 10 ++++ .../ui/swing/content/demande/DemandesUI.jaxx | 63 +++++++++++++--------- .../swing/content/demande/DemandesUIHandler.java | 31 +++++++---- .../demande}/actions/ArchiveAction.java | 2 +- .../demande}/actions/ArchiveFromListAction.java | 2 +- .../actions/ComputeQuantitiesByRangeAction.java | 3 +- .../demande}/actions/LoadFolderEmailsAction.java | 3 +- .../OpenMailFolderChooserFromListAction.java | 3 +- .../demande}/actions/OpenReplyFormAction.java | 3 +- .../SaveAndOpenChooseAttachmentToPrintAction.java | 2 +- .../SaveAndOpenMailFolderChooserAction.java | 2 +- .../actions/SaveAndOpenModalFrameAction.java | 2 +- .../actions/SaveAndOpenReplyFormAction.java | 2 +- .../actions/SaveAndOpenSearchToGroupAction.java | 2 +- .../demande}/actions/SaveDemandeAction.java | 35 ++++++------ .../demande}/actions/SaveDemandeAndExitAction.java | 2 +- .../actions/SaveDemandeFromListAction.java | 3 +- .../demande/demandgroup/DemandGroupUIHandler.java | 2 +- .../actions/OpenGroupedDemandAction.java | 16 ++++-- .../demande/replies/DemandRepliesUIHandler.java | 2 +- .../demande/replies}/actions/OpenReplyAction.java | 3 +- .../ui/swing/content/pdfeditor/PDFEditorUI.css | 2 +- .../content/pdfeditor/PDFEditorUIHandler.java | 2 +- .../actions/GenerateAnnotatedAttachmentAction.java | 3 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../reply}/actions/AddAttachmentToReplyAction.java | 3 +- .../content/search/SearchToGroupUIHandler.java | 4 +- .../ui/swing/content/search/SearchUIHandler.java | 3 +- .../{ => content/search}/actions/GroupAction.java | 3 +- .../{ => content/search}/actions/SearchAction.java | 3 +- .../search}/actions/SearchToGroupAction.java | 3 +- .../swing/content/transmit/MailFolderChooserUI.css | 2 +- .../transmit}/actions/TransmitAction.java | 4 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 39 -------------- .../demande/DemandeUIModel-error-validation.xml | 6 +-- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 +- 58 files changed, 291 insertions(+), 243 deletions(-) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/attachment}/actions/AddAttachmentAction.java (95%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/attachment}/actions/EditAttachmentAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/attachment}/actions/OpenAttachmentAction.java (94%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/ArchiveAction.java (98%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/ArchiveFromListAction.java (98%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/ComputeQuantitiesByRangeAction.java (95%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/LoadFolderEmailsAction.java (98%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/OpenMailFolderChooserFromListAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/OpenReplyFormAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenChooseAttachmentToPrintAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenMailFolderChooserAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenModalFrameAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenReplyFormAction.java (97%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveAndOpenSearchToGroupAction.java (95%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveDemandeAction.java (86%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveDemandeAndExitAction.java (95%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande}/actions/SaveDemandeFromListAction.java (94%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande/demandgroup}/actions/OpenGroupedDemandAction.java (93%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/demande/replies}/actions/OpenReplyAction.java (97%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/pdfeditor}/actions/GenerateAnnotatedAttachmentAction.java (98%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/reply}/actions/AddAttachmentToReplyAction.java (94%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/search}/actions/GroupAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/search}/actions/SearchAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/search}/actions/SearchToGroupAction.java (96%) rename faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/{ => content/transmit}/actions/TransmitAction.java (96%) -- 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 1ce94f6bd624c1ae3ec3109a988b0f66def9879b Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:31:53 2015 +0200 move reply actions --- .../ui/swing/content/demande/replies/DemandRepliesUIHandler.java | 2 +- .../swing/{ => content/demande/replies}/actions/OpenReplyAction.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java index 4cf08d1..b6319c8 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java @@ -33,7 +33,7 @@ import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.persistence.entities.ReplyContent; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.OpenReplyAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.replies.actions.OpenReplyAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyAttachmentModel; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java similarity index 97% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java index cb1b4fa..4d7b0ee 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/actions/OpenReplyAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.replies.actions; /* * #%L @@ -29,6 +29,7 @@ import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.persistence.entities.ReplyContent; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.replies.DemandRepliesUI; import com.franciaflex.faxtomail.ui.swing.content.demande.replies.DemandRepliesUIHandler; -- 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 0f68eed2cdbee093aa66f483d6cb4260c9452c74 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:33:45 2015 +0200 move reply actions --- .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../swing/{ => content/reply}/actions/AddAttachmentToReplyAction.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 a2f4c59..19f0fbd 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 @@ -32,7 +32,7 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Stamp; import com.franciaflex.faxtomail.services.service.ldap.Contact; -import com.franciaflex.faxtomail.ui.swing.actions.AddAttachmentToReplyAction; +import com.franciaflex.faxtomail.ui.swing.content.reply.actions.AddAttachmentToReplyAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/AddAttachmentToReplyAction.java similarity index 94% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/AddAttachmentToReplyAction.java index caaad82..352d5da 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/AddAttachmentToReplyAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.reply.actions; /* * #%L @@ -27,6 +27,7 @@ package com.franciaflex.faxtomail.ui.swing.actions; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.services.service.EmailService; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyAttachmentModel; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIHandler; -- 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 892445e66a554e8b334db85c81b2dafe1e22025f Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:37:38 2015 +0200 move attachment actions --- .../faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css | 2 +- .../ui/swing/content/attachment/AttachmentEditorUIHandler.java | 4 ++-- .../swing/{ => content/attachment}/actions/AddAttachmentAction.java | 3 ++- .../swing/{ => content/attachment}/actions/EditAttachmentAction.java | 3 ++- .../swing/{ => content/attachment}/actions/OpenAttachmentAction.java | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css index e346522..565279d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css @@ -59,6 +59,6 @@ actionIcon: add; toolTipText: "faxtomail.attachmentEditor.action.add.tip"; enabled: { model.isEditable() }; - _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.AddAttachmentAction.class }; + _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.attachment.actions.AddAttachmentAction.class }; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java index f50fc09..7c4f642 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java @@ -25,8 +25,8 @@ package com.franciaflex.faxtomail.ui.swing.content.attachment; */ import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.ui.swing.actions.EditAttachmentAction; -import com.franciaflex.faxtomail.ui.swing.actions.OpenAttachmentAction; +import com.franciaflex.faxtomail.ui.swing.content.attachment.actions.EditAttachmentAction; +import com.franciaflex.faxtomail.ui.swing.content.attachment.actions.OpenAttachmentAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Iterables; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/AddAttachmentAction.java similarity index 95% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/AddAttachmentAction.java index 7837b2a..2c42c01 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/AddAttachmentAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.attachment.actions; /* * #%L @@ -28,6 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java index c969411..baf2ea1 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/EditAttachmentAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.attachment.actions; /* * #%L @@ -28,6 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Stamp; import com.franciaflex.faxtomail.services.service.MailFolderService; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/OpenAttachmentAction.java similarity index 94% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/OpenAttachmentAction.java index 85c0b75..9e40298 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/actions/OpenAttachmentAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.attachment.actions; /* * #%L @@ -24,6 +24,7 @@ package com.franciaflex.faxtomail.ui.swing.actions; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; -- 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 f36f64368e5f33548eb9d5bb5a70b0c6663c69fd Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:44:08 2015 +0200 move demand actions --- .../ui/swing/content/demande/DemandeListTableFilter.java | 2 +- .../faxtomail/ui/swing/content/demande/DemandeListUI.css | 6 +++--- .../ui/swing/content/demande/DemandeListUIHandler.java | 6 +++--- .../faxtomail/ui/swing/content/demande/DemandeUIHandler.java | 2 +- .../ui/swing/content/demande/DemandesUIHandler.java | 12 ++++++------ .../swing/{ => content/demande}/actions/ArchiveAction.java | 2 +- .../{ => content/demande}/actions/ArchiveFromListAction.java | 2 +- .../demande}/actions/ComputeQuantitiesByRangeAction.java | 3 ++- .../demande}/actions/LoadFolderEmailsAction.java | 3 ++- .../actions/OpenMailFolderChooserFromListAction.java | 3 ++- .../{ => content/demande}/actions/OpenReplyFormAction.java | 3 ++- .../actions/SaveAndOpenChooseAttachmentToPrintAction.java | 2 +- .../demande}/actions/SaveAndOpenMailFolderChooserAction.java | 2 +- .../demande}/actions/SaveAndOpenModalFrameAction.java | 2 +- .../demande}/actions/SaveAndOpenReplyFormAction.java | 2 +- .../demande}/actions/SaveAndOpenSearchToGroupAction.java | 2 +- .../{ => content/demande}/actions/SaveDemandeAction.java | 3 ++- .../demande}/actions/SaveDemandeAndExitAction.java | 2 +- .../demande}/actions/SaveDemandeFromListAction.java | 3 ++- 19 files changed, 34 insertions(+), 28 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java index 21b53da..3768ac4 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java @@ -37,7 +37,7 @@ import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.LoadFolderEmailsAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.LoadFolderEmailsAction; import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.table.filter.AbstractTableFilter; import org.apache.commons.logging.Log; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css index 841e4df..96786d0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css @@ -105,7 +105,7 @@ text: "faxtomail.demandeList.action.reply"; toolTipText: "faxtomail.demandeList.action.reply.tip"; enabled: { model.isReplyEnabled() }; - _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.OpenReplyFormAction.class }; + _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.demande.actions.OpenReplyFormAction.class }; } #archiveMenu { @@ -113,7 +113,7 @@ text: "faxtomail.demandeList.action.archive"; toolTipText: "faxtomail.demandeList.action.archive.tip"; enabled: { model.isArchiveEnabled() }; - _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.ArchiveFromListAction.class }; + _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.demande.actions.ArchiveFromListAction.class }; } #moveMenu { @@ -121,7 +121,7 @@ text: "faxtomail.demandeList.action.transmit"; toolTipText: "faxtomail.demandeList.action.transmit.tip"; enabled: { model.isTransmitEnabled() }; - _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.OpenMailFolderChooserFromListAction.class }; + _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.demande.actions.OpenMailFolderChooserFromListAction.class }; } #totalDemandCountLabel { 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 4bab379..1b9ee0f 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 @@ -37,10 +37,10 @@ import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.OriginalEmailImpl; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.ComputeQuantitiesByRangeAction; -import com.franciaflex.faxtomail.ui.swing.actions.LoadFolderEmailsAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.ComputeQuantitiesByRangeAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.LoadFolderEmailsAction; import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction; -import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeFromListAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeFromListAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 3ee6eb3..5c277bd 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -35,7 +35,7 @@ import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentListener; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; 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 fec3ef5..ddf701f 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 @@ -27,12 +27,12 @@ package com.franciaflex.faxtomail.ui.swing.content.demande; import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailAction; -import com.franciaflex.faxtomail.ui.swing.actions.ArchiveAction; -import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenChooseAttachmentToPrintAction; -import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenMailFolderChooserAction; -import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenReplyFormAction; -import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenSearchToGroupAction; -import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAndExitAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.ArchiveAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveAndOpenChooseAttachmentToPrintAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveAndOpenMailFolderChooserAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveAndOpenReplyFormAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveAndOpenSearchToGroupAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAndExitAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java similarity index 98% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java index ee811b1..0fad329 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java similarity index 98% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java index 94e0d71..0bc0695 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java similarity index 95% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java index 06b466c..9e3a503 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ComputeQuantitiesByRangeAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L @@ -27,6 +27,7 @@ package com.franciaflex.faxtomail.ui.swing.actions; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIModel; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java similarity index 98% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java index f3b2f78..fdef7ad 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/LoadFolderEmailsAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L @@ -30,6 +30,7 @@ import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java index 684241d..bd4e991 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L @@ -25,6 +25,7 @@ package com.franciaflex.faxtomail.ui.swing.actions; */ import com.franciaflex.faxtomail.persistence.entities.MailAction; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java index 54f5bb7..92a5335 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L @@ -28,6 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenChooseAttachmentToPrintAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenChooseAttachmentToPrintAction.java index dbb4a39..d9e9a56 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenChooseAttachmentToPrintAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenMailFolderChooserAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenMailFolderChooserAction.java index 9540b8f..f66469e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenMailFolderChooserAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenModalFrameAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenModalFrameAction.java index 2f594b6..798de13 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenModalFrameAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenReplyFormAction.java similarity index 97% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenReplyFormAction.java index ef980e5..00f4d3b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenReplyFormAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenSearchToGroupAction.java similarity index 95% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenSearchToGroupAction.java index 0865ccc..c92bf49 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenSearchToGroupAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAction.java similarity index 97% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAction.java index 38f7d7d..1a5aadc 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L @@ -35,6 +35,7 @@ import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.exceptions.InvalidClientException; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; 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/content/demande/actions/SaveDemandeAndExitAction.java similarity index 95% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAndExitAction.java index ddca486..81e5ebd 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/content/demande/actions/SaveDemandeAndExitAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeFromListAction.java similarity index 94% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeFromListAction.java index 8a35175..7394fe5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeFromListAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.actions; /* * #%L @@ -29,6 +29,7 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; -- 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 2b893c7892e89be4800c60793f1bf42d8c966e4a Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:46:22 2015 +0200 move search actions --- .../faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java | 4 ++-- .../faxtomail/ui/swing/content/search/SearchUIHandler.java | 2 +- .../faxtomail/ui/swing/{ => content/search}/actions/GroupAction.java | 3 ++- .../faxtomail/ui/swing/{ => content/search}/actions/SearchAction.java | 3 ++- .../ui/swing/{ => content/search}/actions/SearchToGroupAction.java | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) 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 b6ed269..02515ea 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 @@ -30,8 +30,8 @@ import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.GroupAction; -import com.franciaflex.faxtomail.ui.swing.actions.SearchToGroupAction; +import com.franciaflex.faxtomail.ui.swing.content.search.actions.GroupAction; +import com.franciaflex.faxtomail.ui.swing.content.search.actions.SearchToGroupAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; 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 23c2e90..cd985f9 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 @@ -28,7 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.SearchAction; +import com.franciaflex.faxtomail.ui.swing.content.search.actions.SearchAction; import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeListAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/GroupAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/GroupAction.java index eb126a4..35cb0d7 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/GroupAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.search.actions; /* * #%L @@ -28,6 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.EmailService; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUIHandler; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/SearchAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/SearchAction.java index 23c615a..e486ae6 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/SearchAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.search.actions; /* * #%L @@ -29,6 +29,7 @@ import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/SearchToGroupAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/SearchToGroupAction.java index e92da3a..264056a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/actions/SearchToGroupAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.search.actions; /* * #%L @@ -30,6 +30,7 @@ import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; -- 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 83dbf52de718c7fe4285f1655df89a124959fc4c Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:47:29 2015 +0200 move pdfeditor actions --- .../franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css index 577bd52..8abd26e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css @@ -124,5 +124,5 @@ JSeparator { actionIcon: validate; text: "faxtomail.pdfEditor.action.validate"; toolTipText: "faxtomail.pdfEditor.action.validate.tip"; - _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.GenerateAnnotatedAttachmentAction.class}; + _applicationAction: {com.franciaflex.faxtomail.ui.swing.content.pdfeditor.actions.GenerateAnnotatedAttachmentAction.class}; } -- 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 45f29235a858bd314dede10ddee1c3ffd2c3be0d Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:47:53 2015 +0200 move pdfeditor actions --- .../faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 2 +- .../pdfeditor}/actions/GenerateAnnotatedAttachmentAction.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java index b90c4ae..c5a74c0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java @@ -30,7 +30,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.persistence.entities.Stamp; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.ui.swing.actions.GenerateAnnotatedAttachmentAction; +import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.actions.GenerateAnnotatedAttachmentAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIModel.EditionComponent; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIModel.Page; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/GenerateAnnotatedAttachmentAction.java similarity index 98% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/GenerateAnnotatedAttachmentAction.java index 48446c8..e723bd7 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/GenerateAnnotatedAttachmentAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.pdfeditor.actions; /* * #%L @@ -26,6 +26,7 @@ package com.franciaflex.faxtomail.ui.swing.actions; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorCrossUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorHighlighterUI; -- 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 50487192f885e581dbb9005f053cdedf5014ffb9 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:48:30 2015 +0200 move demandgroup actions --- .../ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java | 2 +- .../demande/demandgroup}/actions/OpenGroupedDemandAction.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java index ea4ef1c..695403d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java @@ -24,7 +24,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup; * #L% */ -import com.franciaflex.faxtomail.ui.swing.actions.OpenGroupedDemandAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.actions.OpenGroupedDemandAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; import com.google.common.collect.Iterables; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java similarity index 98% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java index eab1fc3..c70ca0a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.actions; /* * #%L @@ -31,6 +31,7 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.exceptions.AlreadyLockedMailException; import com.franciaflex.faxtomail.services.service.exceptions.FolderNotReadableException; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUI; -- 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 d43b5753f1ee6d7cfb91fc79e4b72351c2db9c24 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 16:49:48 2015 +0200 move transmit actions --- .../faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css | 2 +- .../ui/swing/{ => content/transmit}/actions/TransmitAction.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css index 9e16ca8..14aaa49 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css @@ -42,6 +42,6 @@ actionIcon: validate; text: "faxtomail.chooseMailFolder.action.validate"; toolTipText: "faxtomail.chooseMailFolder.action.validate.tip"; - _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.TransmitAction.class}; + _applicationAction: {com.franciaflex.faxtomail.ui.swing.content.transmit.actions.TransmitAction.class}; enabled: { model.getMailFolder() != null }; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java similarity index 96% rename from faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java rename to faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java index 44bf9b0..267df22 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java @@ -1,4 +1,4 @@ -package com.franciaflex.faxtomail.ui.swing.actions; +package com.franciaflex.faxtomail.ui.swing.content.transmit.actions; /* * #%L @@ -25,6 +25,8 @@ package com.franciaflex.faxtomail.ui.swing.actions; */ import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; +import com.franciaflex.faxtomail.ui.swing.actions.GoToPreviousScreenAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; -- 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 d756fd83971fc5fc51d0e1685e2d54d2022735c0 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 17:50:31 2015 +0200 remplacement du champ code client par une combobox de clients (refs #7422) --- .../faxtomail/services/service/ClientService.java | 4 ++ .../services/service/ClientServiceImpl.java | 14 ++++++ .../faxtomail/services/service/EmailService.java | 2 +- .../services/service/EmailServiceImpl.java | 41 +++++++++--------- .../services/service/InitFaxToMailServiceImpl.java | 2 +- .../services/service/InitTestDataImpl.java | 2 +- .../ui/swing/actions/ShowDemandeAction.java | 18 +++++++- .../ui/swing/content/demande/DemandeUI.css | 10 ++++- .../ui/swing/content/demande/DemandeUI.jaxx | 50 +++++++++++----------- .../ui/swing/content/demande/DemandeUIHandler.java | 4 +- .../ui/swing/content/demande/DemandeUIModel.java | 40 +++++++---------- .../content/demande/actions/SaveDemandeAction.java | 32 +++++++------- .../actions/OpenGroupedDemandAction.java | 13 +++++- 13 files changed, 136 insertions(+), 96 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java index 271aecf..5a4bceb 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java @@ -26,6 +26,7 @@ package com.franciaflex.faxtomail.services.service; import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.FaxToMailService; import java.util.List; @@ -34,9 +35,12 @@ import java.util.List; * @author Kevin Morin (Code Lutin) */ public interface ClientService extends FaxToMailService { + List<Client> getClientForEmailAddress(String emailAddress, Email email, String company, List<String> brand); Client getClientForCode(String code, String company); + List<Client> getClientsForFolder(MailFolder folder); + void updateNewClients(); } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java index ea916a3..005fba7 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java @@ -30,6 +30,7 @@ import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.NewClient; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.base.Function; @@ -144,6 +145,19 @@ public class ClientServiceImpl extends FaxToMailServiceSupport implements Client return client; } + @Override + public List<Client> getClientsForFolder(MailFolder folder) { + while (!folder.isUseCurrentLevelCompany() && folder.getParent() != null) { + folder = folder.getParent(); + } + + String company = folder.getCompany(); + + ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); + List<Client> result = clientDao.forCompanyEquals(company).findAll(); + return result; + } + /** * Récupère les information de la table NewClient pour mettre à jour la table Client. */ diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java index 3da0a7b..f8352a8 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java @@ -74,7 +74,7 @@ public interface EmailService extends FaxToMailService { Email saveEmail(Email email, FaxToMailUser user, String... modifiedFields) throws InvalidClientException; - Email saveEmail(Email email, Collection<Attachment> attachments, Collection<Reply> replies, String clientCode, + Email saveEmail(Email email, Collection<Attachment> attachments, Collection<Reply> replies, FaxToMailUser user, String... modifiedFields) throws InvalidClientException; void transmitPendingDemandsToEdi(); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index b4b99a2..5bc93e0 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -246,12 +246,11 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe */ @Override public Email saveEmail(Email email, FaxToMailUser user, String... modifiedFields) throws InvalidClientException { - Client client = email.getClient(); - return saveEmail(email, null, email.getReplies(), client != null ? client.getCode() : null, user, modifiedFields); + return saveEmail(email, null, email.getReplies(), user, modifiedFields); } @Override - public Email saveEmail(Email email, Collection<Attachment> attachments, Collection<Reply> replies, String clientCode, + public Email saveEmail(Email email, Collection<Attachment> attachments, Collection<Reply> replies, FaxToMailUser user, String... modifiedFields) throws InvalidClientException { Date now = getNow(); EmailTopiaDao dao = getPersistenceContext().getEmailDao(); @@ -261,24 +260,25 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe while (!folder.isUseCurrentLevelCompany() && folder.getParent() != null) { folder = folder.getParent(); } - String company = folder.getCompany(); - // if client code is null, do not manage client at all - Client client = null; - if (StringUtils.isNotBlank(clientCode)) { - Client emailClient = email.getClient(); - if (emailClient != null && clientCode.equals(email.getClient().getCode())) { - client = emailClient; +// String company = folder.getCompany(); - } else { - client = getClientService().getClientForCode(clientCode, company); - if (client == null) { - String message = t("faxtomail.service.email.save.clientCode.error", clientCode); - throw new InvalidClientException(message); - } - } - } - email.setClient(client); + // if client code is null, do not manage client at all +// Client client = null; +// if (StringUtils.isNotBlank(clientCode)) { +// Client emailClient = email.getClient(); +// if (emailClient != null && clientCode.equals(email.getClient().getCode())) { +// client = emailClient; +// +// } else { +// client = getClientService().getClientForCode(clientCode, company); +// if (client == null) { +// String message = t("faxtomail.service.email.save.clientCode.error", clientCode); +// throw new InvalidClientException(message); +// } +// } +// } +// email.setClient(client); if (attachments != null) { updateAttachments(email, attachments, user); @@ -1194,8 +1194,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe History.PROPERTY_EMAIL, email); email.addHistory(history); - Client client = email.getClient(); - email = saveEmail(email, null, null, client != null ? client.getCode() : null, user); + email = saveEmail(email, null, null, user); return email; } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java index d629b37..458a782 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java @@ -440,7 +440,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements email.setDemandType(demandType); email.setPriority(priorities.get(random.nextInt(priorities.size()))); email.setRangeRow(rangeRows); - getEmailService().saveEmail(email, null, null, email.getClient().getCode(), user, + getEmailService().saveEmail(email, null, null, user, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_PRIORITY, Email.PROPERTY_RANGE_ROW); } } diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java index 504a70d..f9f3128 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java @@ -353,7 +353,7 @@ public class InitTestDataImpl extends FaxToMailServiceSupport implements InitTes email.setDemandType(demandType); email.setPriority(priorities.get(0)); email.setRangeRow(rangeRows); - getEmailService().saveEmail(email, null, null, email.getClient().getCode(), user, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_PRIORITY, + getEmailService().saveEmail(email, null, null, user, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_PRIORITY, Email.PROPERTY_RANGE_ROW); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index 97f2c8e..cd7ea57 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -22,6 +22,7 @@ package com.franciaflex.faxtomail.ui.swing.actions; * #L% */ +import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; @@ -43,6 +44,8 @@ import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.util.List; + import static org.nuiton.i18n.I18n.t; /** @@ -146,9 +149,11 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { @Override public void doAction() throws Exception { DemandeUIModel currentEmail = getContext().getCurrentEmail(); + MailFolder folder = currentEmail.getMailFolder(); + + FaxToMailServiceContext serviceContext = getContext().newServiceContext(); if (StringUtils.isNotBlank(currentEmail.getTopiaId())) { - FaxToMailServiceContext serviceContext = getContext().newServiceContext(); Email email = serviceContext.getEmailService().openEmail(currentEmail.getTopiaId(), getContext().getCurrentUser(), @@ -166,7 +171,6 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { currentEmail.fromEntity(email); - MailFolder folder = currentEmail.getMailFolder(); if (currentEmail.getArchiveDate() != null || !folder.isFolderWritable() || !currentEmail.getDemandStatus().isEditableStatus()) { @@ -174,6 +178,16 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { } } + List<Client> allowedClients = serviceContext.getClientService().getClientsForFolder(folder); + currentEmail.setAllowedClients(allowedClients); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + + DemandeUIModel currentEmail = getContext().getCurrentEmail(); + frame = getContext().getFrameForDemande(currentEmail); if (frame == null) { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css index 9e482c5..2dc88e5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css @@ -74,11 +74,16 @@ JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment, Bu text: "faxtomail.demande.clientCode.label"; } -#clientField { +/*#clientField { text: { model.getClientCode() }; +}*/ + +#clientComboBox { + property: client; + selectedItem: { model.getClient() }; _validatorLabel: { t("faxtomail.demande.clientCode.label") }; } - +/* #brandLabel { text: "faxtomail.demande.clientBrand.label"; } @@ -86,6 +91,7 @@ JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment, Bu #brandField { text: {model.getClientBrand()}; } +*/ #warningClient { actionIcon: warning; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx index 85a81b1..6c263be 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx @@ -31,6 +31,7 @@ com.franciaflex.faxtomail.ui.swing.content.demande.history.ButtonHistory com.franciaflex.faxtomail.ui.swing.content.demande.replies.ButtonDemandReplies + com.franciaflex.faxtomail.persistence.entities.Client com.franciaflex.faxtomail.persistence.entities.Email com.franciaflex.faxtomail.persistence.entities.DemandType com.franciaflex.faxtomail.persistence.entities.DemandStatus @@ -67,7 +68,7 @@ <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='clientCode' component='clientField'/> + <field name='client' component='clientComboBox'/> <field name='object' component='objectField'/> <field name='demandType' component='docTypeComboBox'/> <field name='projectReference' component='projectReferenceField'/> @@ -110,7 +111,7 @@ <cell> <JLabel id='senderLabel'/> </cell> - <cell columns="4"> + <cell columns="2"> <JLabel id='senderField'/> </cell> </row> @@ -118,7 +119,7 @@ <cell> <JLabel id='objectLabel'/> </cell> - <cell weightx='1' columns="4"> + <cell weightx='1' columns="2"> <JTextField id='objectField' onKeyReleased='handler.setText(event, "object")'/> </cell> @@ -131,23 +132,24 @@ <JButton id='warningClient' onActionPerformed="handler.showMatchingClientsPopup(event)"/> </cell> <cell weightx='1'> - <JTextField id='clientField' - onKeyReleased='handler.setText(event, "clientCode")'/> - </cell> - <cell> - <JLabel id='brandLabel'/> - </cell> - <cell weightx='1'> - <!--<JTextField id='brandField'--> - <!--onKeyReleased='handler.setText(event, "clientBrand")'/>--> - <JLabel id='brandField'/> + <BeanFilterableComboBox id='clientComboBox' + constructorParams='this' + genericType="Client"/> </cell> + <!--<cell>--> + <!--<JLabel id='brandLabel'/>--> + <!--</cell>--> + <!--<cell weightx='1'>--> + <!--<!–<JTextField id='brandField'–>--> + <!--<!–onKeyReleased='handler.setText(event, "clientBrand")'/>–>--> + <!--<JLabel id='brandField'/>--> + <!--</cell>--> </row> <row> <cell> <JLabel id='docTypeLabel'/> </cell> - <cell weightx='1' columns="4"> + <cell weightx='1' columns="2"> <BeanFilterableComboBox id='docTypeComboBox' constructorParams='this' genericType="DemandType"/> @@ -157,7 +159,7 @@ <cell> <JLabel id='priorityLabel'/> </cell> - <cell weightx='1' columns="4"> + <cell weightx='1' columns="2"> <BeanFilterableComboBox id='priorityComboBox' constructorParams='this' genericType="Priority"/> @@ -167,7 +169,7 @@ <cell> <JLabel id='projectReferenceLabel'/> </cell> - <cell weightx='1' columns="4"> + <cell weightx='1' columns="2"> <JTextField id='projectReferenceField' onKeyReleased='handler.setText(event, "projectReference")'/> </cell> @@ -176,7 +178,7 @@ <cell> <JLabel id='companyReferenceLabel'/> </cell> - <cell weightx='1' columns="4"> + <cell weightx='1' columns="2"> <JTextField id='companyReferenceField' onKeyReleased='handler.setText(event, "companyReference")'/> </cell> @@ -185,7 +187,7 @@ <cell> <JLabel id='waitingStateLabel'/> </cell> - <cell weightx='1' columns="4"> + <cell weightx='1' columns="2"> <BeanFilterableComboBox id='waitingStateComboBox' constructorParams='this' genericType="WaitingState"/> @@ -195,7 +197,7 @@ <cell> <JLabel id='statusLabel'/> </cell> - <cell weightx='1' columns="4"> + <cell weightx='1' columns="2"> <JPanel layout="{new BorderLayout()}"> <JLabel id='statusField' constraints='BorderLayout.NORTH'/> <BeanFilterableComboBox id='statusComboBox' @@ -209,19 +211,19 @@ <cell> <JLabel id="takenByLabel"/> </cell> - <cell weightx='1' columns="4"> + <cell weightx='1' columns="2"> <JLabel id="takenByField"/> </cell> </row> <row> - <cell columns="4" insets="10"> + <cell columns="3" insets="10"> <JSeparator/> </cell> </row> <row> - <cell columns='4'> + <cell columns='3'> <JPanel styleClass="text-row"> <JLabel id="firstOpenedLabel"/> <JLabel id="firstOpenedByLabel"/> @@ -232,7 +234,7 @@ </cell> </row> <row> - <cell columns='4'> + <cell columns='3'> <JPanel styleClass="text-row"> <JLabel id="lastModifiedLabel"/> <JLabel id="lastModifiedByLabel"/> @@ -243,7 +245,7 @@ </cell> </row> <row> - <cell columns='4'> + <cell columns='3'> <JPanel id="lastAttachmentOpeningPanel" styleClass="text-row"> <JLabel id="lastAttachmentOpeningLabel"/> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 5c277bd..210a838 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -433,7 +433,9 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, } } - listModelIsModify(getModel()); + initBeanFilterableComboBox(ui.getClientComboBox(), model.getAllowedClients(), model.getClient()); + + listModelIsModify(model); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java index bbc845f..1901b8b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java @@ -109,10 +109,6 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU protected int savNb; - protected String clientCode; - - protected String clientBrand; - protected boolean editable = true; protected String htmlContent; @@ -125,6 +121,8 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU protected List<String> ccRecipients; + protected List<Client> allowedClients; + protected boolean closeable; protected static final Binder<DemandeUIModel, Email> toBeanBinder = @@ -362,12 +360,6 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU return originalEmail != null ? originalEmail.getContent() : null; } - public void setClientCode(String clientCode) { - Object oldValue = getClientCode(); - this.clientCode = clientCode; - firePropertyChanged(PROPERTY_CLIENT_CODE, oldValue, clientCode); - } - public boolean isFax() { return editObject.isFax(); } @@ -381,10 +373,6 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU public void setClient(Client client) { Object oldValue = getClient(); editObject.setClient(client); - if (client != null) { - setClientCode(client.getCode()); - setClientBrand(client.getBrand()); - } firePropertyChanged(Email.PROPERTY_CLIENT, oldValue, client); } @@ -393,17 +381,13 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU } public String getClientCode() { - return clientCode; - } - - public void setClientBrand(String clientBrand) { - Object oldValue = getClientBrand(); - this.clientBrand = clientBrand; - firePropertyChanged(PROPERTY_CLIENT_BRAND, oldValue, clientBrand); + Client client = getClient(); + return client != null ? client.getCode() : null; } public String getClientBrand() { - return clientBrand; + Client client = getClient(); + return client != null ? client.getBrand() : null; } public Collection<Client> getMatchingClients() { @@ -836,6 +820,14 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU setValidRangeRowModels(validRangeRowModels); } + public List<Client> getAllowedClients() { + return allowedClients; + } + + public void setAllowedClients(List<Client> allowedClients) { + this.allowedClients = allowedClients; + } + /** * Appelée par la validation. * @@ -848,9 +840,9 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU DemandType demandType = getDemandType(); boolean result = demandType == null; if (!result) { - if (PROPERTY_CLIENT_CODE.equals(field)) { + if (Email.PROPERTY_CLIENT.equals(field)) { result = !FaxToMailServiceUtils.contains(demandType.getRequiredFields(), MailField.CLIENT) - || StringUtils.isNotBlank(getClientCode()); + || getClient() != null; } else if (PROPERTY_VALID_RANGE_ROW_MODELS.equals(field)) { result = !FaxToMailServiceUtils.contains(demandType.getRequiredFields(), MailField.RANGE_ROW) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAction.java index 1a5aadc..ae1fe1b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveDemandeAction.java @@ -33,7 +33,6 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.exceptions.InvalidClientException; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; @@ -129,11 +128,10 @@ public class SaveDemandeAction extends AbstractFaxToMailAction<DemandeUIModel, D Collection<Attachment> attachments = model.getAttachment(); Collection<Reply> replies = model.getReplies(); - String clientCode = model.getClientCode(); BeanMonitor monitor = getHandler().getMonitor(); String[] modifiedProperties = monitor.getModifiedProperties(); - email = serviceContext.getEmailService().saveEmail(email, attachments, replies, clientCode, currentUser, modifiedProperties); + email = serviceContext.getEmailService().saveEmail(email, attachments, replies, currentUser, modifiedProperties); model.fromEntity(email); MailFolder folder = model.getMailFolder(); @@ -153,18 +151,18 @@ public class SaveDemandeAction extends AbstractFaxToMailAction<DemandeUIModel, D monitor.clearModified(); } - public void postFailedAction(Throwable error) { - - if (error instanceof InvalidClientException) { - DemandeUIModel model = getModel(); -// BeanMonitor monitor = getHandler().getMonitor(); -// String previousClientCode = (String) monitor.getOriginalValues().get(DemandeUIModel.PROPERTY_CLIENT_CODE); - model.setClientCode(null); - - // reset the range rows of the model -// BeanMonitor monitor = getHandler().getMonitor(); -// List<RangeRow> rangeRows = (List<RangeRow>) monitor.getOriginalValues().get(Email.PROPERTY_RANGE_ROW); -// model.setRangeRow(rangeRows); - } - } +// public void postFailedAction(Throwable error) { +// +// if (error instanceof InvalidClientException) { +// DemandeUIModel model = getModel(); +//// BeanMonitor monitor = getHandler().getMonitor(); +//// String previousClientCode = (String) monitor.getOriginalValues().get(DemandeUIModel.PROPERTY_CLIENT_CODE); +// model.setClientCode(null); +// +// // reset the range rows of the model +//// BeanMonitor monitor = getHandler().getMonitor(); +//// List<RangeRow> rangeRows = (List<RangeRow>) monitor.getOriginalValues().get(Email.PROPERTY_RANGE_ROW); +//// model.setRangeRow(rangeRows); +// } +// } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java index c70ca0a..a9742ba 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/actions/OpenGroupedDemandAction.java @@ -24,6 +24,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.actions; * #L% */ +import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; @@ -41,6 +42,8 @@ import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import javax.swing.*; +import java.util.List; + import static org.nuiton.i18n.I18n.t; /** @@ -144,8 +147,11 @@ public class OpenGroupedDemandAction extends AbstractFaxToMailAction<DemandeUIMo @Override public void doAction() throws Exception { + MailFolder folder = demandToOpen.getMailFolder(); + + FaxToMailServiceContext serviceContext = getContext().newServiceContext(); + if (StringUtils.isNotBlank(demandToOpen.getTopiaId())) { - FaxToMailServiceContext serviceContext = getContext().newServiceContext(); Email email = serviceContext.getEmailService().openEmail(demandToOpen.getTopiaId(), getContext().getCurrentUser(), @@ -154,14 +160,17 @@ public class OpenGroupedDemandAction extends AbstractFaxToMailAction<DemandeUIMo demandToOpen.fromEntity(email); demandToOpen.recomputeValidRangeRows(); - MailFolder folder = demandToOpen.getMailFolder(); if (demandToOpen.getArchiveDate() != null || !folder.isFolderWritable() || !demandToOpen.getDemandStatus().isEditableStatus()) { demandToOpen.setEditable(false); } demandToOpen.setCloseable(true); + } + + List<Client> allowedClients = serviceContext.getClientService().getClientsForFolder(folder); + demandToOpen.setAllowedClients(allowedClients); } @Override -- 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 42eed45d8d7a8c3ed751016a1bc6d9ba394bc759 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 18:21:13 2015 +0200 déplacmeent du widget de validation de la main ui vers l'ui des demandes --- .../ui/swing/actions/ShowDemandeAction.java | 2 +- .../faxtomail/ui/swing/content/MainUI.css | 4 -- .../faxtomail/ui/swing/content/MainUI.jaxx | 3 -- .../faxtomail/ui/swing/content/MainUIHandler.java | 11 ---- .../content/demande/DemandeListUIHandler.java | 1 - .../ui/swing/content/demande/DemandeUIHandler.java | 21 ++++++-- .../ui/swing/content/demande/DemandesUI.css | 10 ++++ .../ui/swing/content/demande/DemandesUI.jaxx | 63 +++++++++++++--------- .../swing/content/demande/DemandesUIHandler.java | 19 +++++-- .../ui/swing/content/search/SearchUIHandler.java | 1 - .../ui/swing/util/AbstractFaxToMailUIHandler.java | 39 -------------- 11 files changed, 82 insertions(+), 92 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index cd7ea57..7351c80 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -194,7 +194,7 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { final DemandesUI screenUI = new DemandesUI(getUI()); String screenTitle = t("faxtomail.demand.title"); ImageIcon icon = JAXXWidgetUtil.createActionIcon("email-group"); - screenUI.setLeftDecoration(new JLabel(icon)); + screenUI.getDemandsPanel().setLeftDecoration(new JLabel(icon)); frame = getHandler().openFrame(screenUI, screenTitle, new Dimension(800, 600)); getContext().setFrameForDemande(currentEmail, frame); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css index af413bd..c255400 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css @@ -76,10 +76,6 @@ JSeparator { borderPainted: false; } -#validatorMessageWidget { - focusPainted: false; -} - #status { showClock: false; showMemoryStatus: true; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx index 83219c6..554d377 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx @@ -29,8 +29,6 @@ com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil com.franciaflex.faxtomail.ui.swing.actions.* - jaxx.runtime.validator.swing.SwingValidatorMessageWidget - org.jdesktop.swingx.JXTitledPanel javax.swing.Box @@ -56,7 +54,6 @@ </JToolBar> <JToolBar id='bottomBar'> - <SwingValidatorMessageWidget id='validatorMessageWidget'/> <JButton id='aboutButton'/> </JToolBar> 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 7eac0ff..2035969 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 @@ -270,15 +270,6 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext ui.getStatus().setStatus("<html><body>" + message + "</body></html>"); } - public void registerValidator(SwingValidator validator) { - ui.getValidatorMessageWidget().registerValidator(validator); - } - - @Override - public void clearValidators() { - ui.getValidatorMessageWidget().clearValidators(); - } - public boolean quitCurrentScreen() { boolean canClose; @@ -340,7 +331,6 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext JComponent screenUI; JToolBar rightDecoration = null; String screenTitle; - boolean validatorWidgetEnabled = false; Icon icon; switch (screen) { @@ -386,7 +376,6 @@ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext ui.getBody().setLeftDecoration(new JLabel(icon)); ui.getBody().setRightDecoration(rightDecoration); ui.getBody().add(currentBody); - ui.getValidatorMessageWidget().setEnabled(validatorWidgetEnabled); } } 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 1b9ee0f..4480f48 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 @@ -639,7 +639,6 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem getContext().removePropertyChangeListener(FaxToMailUIContext.PROPERTY_ACTION_IN_PROGRESS, actionInProgressListener); - clearValidators(); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 210a838..d37c69d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -35,11 +35,12 @@ import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentListener; +import com.franciaflex.faxtomail.ui.swing.content.demande.actions.SaveDemandeAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Sets; +import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -362,8 +363,6 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, // if new fishingOperation can already cancel his creation model.setModify(false); - registerValidators(validator); - ui.getAttachmentsButton().getBean().addAttachmentListener( new AttachmentListener() { @@ -564,6 +563,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, @Override public void onShowTab(int currentIndex, int newIndex) { + registerValidators(getValidator()); } @Override @@ -579,4 +579,19 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, JButton button = (JButton) event.getSource(); getUI().getMatchingClientsPopup().show(button, 0, button.getBounds().height); } + + protected void registerValidators(SwingValidator... validators) { + DemandesUI demandesUI = JAXXWidgetUtil.getParent(getUI(), DemandesUI.class); + DemandesUIHandler handler = demandesUI.getHandler(); + handler.clearValidators(); + for (SwingValidator validator : validators) { + handler.registerValidator(validator); + } + } + + protected void clearValidators() { + DemandesUI demandesUI = JAXXWidgetUtil.getParent(getUI(), DemandesUI.class); + DemandesUIHandler handler = demandesUI.getHandler(); + handler.clearValidators(); + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css index 5feb326..317e2e0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css @@ -73,3 +73,13 @@ actionIcon: group; enabled: { model.isGroupEnabled() }; } + +#bottomToolBar { + floatable: false; + margin: {new java.awt.Insets(0, 0, 0, 5)}; + borderPainted: false; +} + +#validatorMessageWidget { + focusPainted: false; +} \ No newline at end of file diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx index af11030..0e61050 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx @@ -21,10 +21,9 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<org.jdesktop.swingx.JXTitledPanel - id='demandsPanel' decorator='boxed' - implements='com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI<DemandesUIModel, DemandesUIHandler>' - onAncestorAdded="handler.showDemandGroupHighlightDialog()"> +<JPanel layout="{ new BorderLayout() }" + implements='com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI<DemandesUIModel, DemandesUIHandler>' + onAncestorAdded="handler.showDemandGroupHighlightDialog()"> <import> com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext @@ -32,6 +31,10 @@ com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.ButtonEmailGroup com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupHighlightDialog + + jaxx.runtime.validator.swing.SwingValidatorMessageWidget + + org.jdesktop.swingx.JXTitledPanel </import> <script><![CDATA[ @@ -45,31 +48,43 @@ <DemandesUIModel id='model' initializer='getContextValue(DemandesUIModel.class)'/> - <JToolBar id='topToolBar'> - <ButtonEmailGroup id="demandGroupButton"/> - </JToolBar> - <JPanel layout="{ new BorderLayout() }"> + <JXTitledPanel id='demandsPanel' + decorator='boxed' + constraints="BorderLayout.CENTER"> - <JTabbedPane id="demandsTabPane" constraints="BorderLayout.CENTER"> - <!--<tab id="mainDemandTab">--> - <!--<DemandeUI id="mainDemand" constructorParams="this"/>--> - <!--</tab>--> - </JTabbedPane> + <JToolBar id='topToolBar'> + <ButtonEmailGroup id="demandGroupButton"/> + </JToolBar> + + <JPanel layout="{ new BorderLayout() }"> + + <JTabbedPane id="demandsTabPane" constraints="BorderLayout.CENTER"> + <!--<tab id="mainDemandTab">--> + <!--<DemandeUI id="mainDemand" constructorParams="this"/>--> + <!--</tab>--> + </JTabbedPane> + + <JPanel layout='{new GridLayout(1,0)}' + constraints='BorderLayout.SOUTH'> + <JButton id="backButton" onActionPerformed="handler.closeFrame()"/> + <JButton id="saveButton" onActionPerformed="handler.save()"/> + <JButton id="transmitButton" onActionPerformed="handler.transmitDemande()"/> + <JButton id="printButton" onActionPerformed="handler.print()"/> + <JButton id="archiveButton" onActionPerformed="handler.archive()"/> + <JButton id="replyButton" onActionPerformed="handler.reply()"/> + <JButton id="groupButton" onActionPerformed="handler.group()"/> + </JPanel> - <JPanel layout='{new GridLayout(1,0)}' - constraints='BorderLayout.SOUTH'> - <JButton id="backButton" onActionPerformed="handler.closeFrame()"/> - <JButton id="saveButton" onActionPerformed="handler.save()"/> - <JButton id="transmitButton" onActionPerformed="handler.transmitDemande()"/> - <JButton id="printButton" onActionPerformed="handler.print()"/> - <JButton id="archiveButton" onActionPerformed="handler.archive()"/> - <JButton id="replyButton" onActionPerformed="handler.reply()"/> - <JButton id="groupButton" onActionPerformed="handler.group()"/> </JPanel> - </JPanel> + </JXTitledPanel> + + <JToolBar id='bottomToolBar' + constraints='BorderLayout.SOUTH'> + <SwingValidatorMessageWidget id='validatorMessageWidget'/> + </JToolBar> <DemandGroupHighlightDialog id="demandGroupHighlightDialog" constructorParams="getHandler().getContext(), demandGroupButton"/> -</org.jdesktop.swingx.JXTitledPanel> +</JPanel> 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 ddf701f..fdebab4 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 @@ -312,19 +312,28 @@ public class DemandesUIHandler extends AbstractFaxToMailUIHandler<DemandesUIMode if (handler != null) { change = handler.onHideTab(currentIndex, newIndex); } - - handler = getTabHandler(newIndex); - if (handler != null) { - handler.onShowTab(currentIndex, newIndex); - } } if (change) { getModel().setCurrentIndex(newIndex); getContext().setCurrentEmail(getModel().getCurrentDemand()); + + TabHandler handler = getTabHandler(newIndex); + if (handler != null) { + handler.onShowTab(currentIndex, newIndex); + } + } return change; } + public void registerValidator(SwingValidator validator) { + ui.getValidatorMessageWidget().registerValidator(validator); + } + + public void clearValidators() { + ui.getValidatorMessageWidget().clearValidators(); + } + public void closeButtonPopups() { getUI().getDemandGroupHighlightDialog().setVisible(false); 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 cd985f9..c5b91a3 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 @@ -302,7 +302,6 @@ public class SearchUIHandler extends AbstractFaxToMailDemandListHandler<SearchUI if (log.isDebugEnabled()) { log.debug("closing: " + ui); } - clearValidators(); } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index 658b300..37cf2be 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -31,8 +31,6 @@ import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.content.MainUI; -import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -40,7 +38,6 @@ import com.google.common.collect.Sets; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanUIUtil; -import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; @@ -58,8 +55,6 @@ import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.*; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import javax.swing.table.TableColumnModel; import javax.swing.text.JTextComponent; import java.awt.*; @@ -126,14 +121,6 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> return getContext().getMainUI(); } - public void clearValidators() { - MainUI main = getContext().getMainUI(); - Preconditions.checkNotNull( - main, "No mainUI registred in application context"); - MainUIHandler handler = main.getHandler(); - handler.clearValidators(); - } - @Override public <O> Decorator<O> getDecorator(Class<O> type, String name) { DecoratorService decoratorService = getContext().newServiceContext().getDecoratorService(); @@ -174,17 +161,6 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> //-- Internal methods --// //------------------------------------------------------------------------// - protected void registerValidators(SwingValidator... validators) { - MainUI main = getContext().getMainUI(); - Preconditions.checkNotNull( - main, "No mainUI registred in application context"); - MainUIHandler handler = main.getHandler(); - handler.clearValidators(); - for (SwingValidator validator : validators) { - handler.registerValidator(validator); - } - } - protected void listenValidatorValid(SimpleBeanValidator validator, final AbstractFaxToMailBeanUIModel model) { validator.addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, new PropertyChangeListener() { @@ -200,21 +176,6 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> }); } - protected void listenValidationTableHasNoFatalError(final SimpleBeanValidator validator, - final AbstractFaxToMailBeanUIModel model) { - getContext().getMainUI().getValidatorMessageWidget().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - boolean valid = !validator.hasFatalErrors(); - if (log.isDebugEnabled()) { - log.debug("Model [" + model + - "] pass to valid state [" + valid + "]"); - } - model.setValid(valid); - } - }); - } - protected void listModelIsModify(AbstractFaxToMailBeanUIModel model) { model.addPropertyChangeListener(listModelListener); } -- 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 b13274ae0cba5ac3544af8b5b72f685dd53f7be9 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 26 18:23:20 2015 +0200 Correction de validation (refs #7422) --- .../ui/swing/content/demande/DemandeUIModel-error-validation.xml | 6 +++--- .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml b/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml index 273a409..161d54b 100644 --- a/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml +++ b/faxtomail-ui-swing/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml @@ -36,12 +36,12 @@ </field-validator> </field> - <field name="clientCode"> + <field name="client"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ isValid("clientCode") ]]> + <![CDATA[ isValid("client") ]]> </param> - <message>faxtomail.validator.error.email.clientCode.required</message> + <message>faxtomail.validator.error.email.client.required</message> </field-validator> </field> diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 50357dc..710628a 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -337,8 +337,8 @@ faxtomail.signings.settings.saveBeforeLeaving=Vous avez modifié la signature %s faxtomail.signings.settings.text.label=Texte faxtomail.signings.settings.title=Configuration des signatures faxtomail.systemUser=Système -faxtomail.validator.error.email.clientCode.required=Code client requis -faxtomail.validator.error.email.comment.required=Message requis +faxtomail.validator.error.email.client.required=Client requis +faxtomail.validator.error.email.comment.required=Message requis faxtomail.validator.error.email.companyReference.required=Notre référence requis faxtomail.validator.error.email.demandType.required=Type de demande requis faxtomail.validator.error.email.object.required=Objet requis -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm