- Faxtomail-commits - mailman.cloud.codelutin.com

branch develop updated (92fbd70 -> a4c5b1c)
by codelutin.com scm 21 Jan '15

21 Jan '15

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 92fbd70 make it build new 1c4e356 passage sous git new a4c5b1c fixes #6508 Les emails transférés en PJ ne sont pas extraits à la réception The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a4c5b1c4c3350e55542412a50989a41b655571b9 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 21 10:16:37 2015 +0100 fixes #6508 Les emails transférés en PJ ne sont pas extraits à la réception commit 1c4e35679c0cc216173a6effb5c19b37476bb524 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 19 15:26:34 2015 +0100 passage sous git Summary of changes: .gitignore | 158 +++++++++++++++++++++ .../faxtomail/FaxToMailConfiguration.java | 30 ++-- .../faxtomail/FaxToMailConfigurationOption.java | 11 +- .../entities/AbstractFaxToMailTopiaDao.java | 11 +- .../persistence/entities/AttachmentFileImpl.java | 12 +- .../faxtomail/persistence/entities/ClientImpl.java | 4 +- .../persistence/entities/ClientTopiaDao.java | 7 +- .../persistence/entities/EmailFilter.java | 2 - .../persistence/entities/HistoryImpl.java | 4 +- .../persistence/entities/MailFolderTopiaDao.java | 2 - .../persistence/entities/SearchFilter.java | 4 +- .../persistence/hibernate/EnumListUserType.java | 8 +- .../persistence/hibernate/EnumSetUserType.java | 8 +- faxtomail-service/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 2 +- .../faxtomail/services/DecoratorServiceImpl.java | 13 +- .../services/FaxToMailServiceContext.java | 24 ++-- .../faxtomail/services/FaxToMailServiceUtils.java | 12 +- .../services/service/ClientServiceImpl.java | 35 +++-- .../services/service/ConfigurationService.java | 10 +- .../services/service/ConfigurationServiceImpl.java | 40 +++--- .../faxtomail/services/service/EmailService.java | 46 +++--- .../services/service/EmailServiceImpl.java | 48 +++++-- .../services/service/InitFaxToMailServiceImpl.java | 41 +++--- .../services/service/LdapServiceImpl.java | 27 ++-- .../services/service/MailFolderService.java | 9 +- .../services/service/ReferentielService.java | 8 +- .../services/service/ReferentielServiceImpl.java | 32 ++--- .../services/service/UserServiceImpl.java | 7 +- .../services/service/ValidationServiceImpl.java | 5 +- .../service/imports/ArchiveImportExportModel.java | 19 ++- .../service/imports/ClientImportModel.java | 1 - .../service/imports/DemandTypeImportModel.java | 3 +- .../service/imports/EmailAccountImportModel.java | 5 +- .../service/imports/PriorityImportModel.java | 3 +- .../services/service/imports/RangeImportModel.java | 3 +- .../service/imports/WaitingStateImportModel.java | 3 +- .../services/service/ldap/LdapServiceMock.java | 9 +- .../i18n/faxtomail-service_fr_FR.properties | 4 +- .../service/AbstractFaxToMailServiceTest.java | 35 +++-- .../services/service/ClientServiceTest.java | 17 ++- .../services/service/EmailServiceTest.java | 40 +++--- .../faxtomail/services/service/InitTestData.java | 4 +- .../services/service/InitTestDataImpl.java | 43 +++--- .../services/service/MailFolderServiceTest.java | 10 +- .../faxtomail/services/service/MiscTest.java | 7 +- .../service/migration/FlywayMigrationTest.java | 23 ++- faxtomail-ui-swing/pom.xml | 6 +- .../src/license/THIRD-PARTY.properties | 4 +- .../faxtomail/ui/swing/RunFaxToMail.java | 4 - .../swing/actions/AbstractChangeScreenAction.java | 1 - .../ui/swing/actions/LoadFolderEmailsAction.java | 35 +++-- .../ui/swing/actions/OpenGroupedDemandAction.java | 1 - .../swing/actions/PrintOnDefaultPrinterAction.java | 3 - .../SaveAndOpenMailFolderChooserAction.java | 2 +- .../swing/actions/SaveAndOpenModalFrameAction.java | 3 - .../swing/actions/SaveAndOpenReplyFormAction.java | 1 - .../faxtomail/ui/swing/actions/SearchAction.java | 24 ++-- .../ui/swing/actions/SearchToGroupAction.java | 10 +- .../ui/swing/actions/ShowAboutAction.java | 1 + .../ui/swing/actions/ShowDemandeAction.java | 1 - .../ui/swing/actions/ShowDemandeListAction.java | 3 - .../faxtomail/ui/swing/actions/TransmitAction.java | 18 ++- .../content/demande/DemandeListTableFilter.java | 7 - .../swing/content/demande/DemandeListUIModel.java | 9 +- .../content/demande/QuantitiesByRangeUIModel.java | 7 +- .../ui/swing/content/demande/RangeTableModel.java | 1 + .../demandgroup/DemandGroupCellRenderer.java | 2 - .../demande/demandgroup/DemandGroupUIHandler.java | 3 - .../demande/history/HistoryListUIHandler.java | 5 +- .../content/demande/replies/RepliesCellEditor.java | 1 - .../swing/content/pdfeditor/PDFEditorUIModel.java | 14 +- .../print/AttachmentToPrintChooserUIHandler.java | 28 ++-- .../ui/swing/content/search/SearchUIHandler.java | 49 +++---- .../ui/swing/content/search/SearchUIModel.java | 17 ++- .../content/transmit/MailFolderChooserUIModel.java | 7 +- .../util/AbstractFaxToMailDemandListHandler.java | 67 ++++----- .../ui/swing/util/CheckBoxListCellRenderer.java | 13 +- .../faxtomail/ui/swing/util/DemandeTableModel.java | 1 - .../ui/swing/util/PaginationComboModel.java | 2 +- faxtomail-ui-web/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 24 +--- .../faxtomail/FaxToMailApplicationContext.java | 16 +-- .../faxtomail/web/FaxToMailActionSupport.java | 17 ++- .../web/FaxToMailApplicationListener.java | 17 ++- .../faxtomail/web/FaxToMailInterceptor.java | 21 ++- .../faxtomail/web/FaxToMailJsonAction.java | 3 +- .../faxtomail/web/FaxToMailJsonResultSupport.java | 16 +-- .../faxtomail/web/action/IndexAction.java | 1 - .../faxtomail/web/action/LoginAction.java | 5 +- .../faxtomail/web/action/LogoutAction.java | 3 +- .../web/action/admin/ConfigurationAction.java | 21 ++- .../web/action/admin/ConfigurationJsonAction.java | 3 +- .../faxtomail/web/action/admin/ImportAction.java | 13 +- .../web/action/admin/ImportArchiveAction.java | 15 +- .../faxtomail/web/action/admin/LdapAction.java | 9 +- .../faxtomail/web/action/admin/LockAction.java | 11 +- .../web/action/admin/UserFolderAction.java | 25 ++-- .../faxtomail/web/job/AbstractFaxToMailJob.java | 3 +- .../faxtomail/web/job/ClientUpdateJob.java | 9 +- .../faxtomail/web/job/EDIManagementJob.java | 1 - .../faxtomail/web/job/MailFilterJob.java | 116 +++++---------- .../web/json/HibernateProxyTypeAdapter.java | 9 +- .../faxtomail/web/json/TopiaEntityAdapter.java | 7 +- .../i18n/faxtomail-ui-web_fr_FR.properties | 4 +- pom.xml | 41 +++--- 106 files changed, 815 insertions(+), 798 deletions(-) create mode 100644 .gitignore -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch master updated (92fbd70 -> 1afbc97)
by codelutin.com scm 19 Jan '15

19 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See http://git.codelutin.com/faxtomail.git omits 92fbd70 make it build omits c5e10e2 garder des états différents pour les arbres de la liste et du transfert omits a68b2ea fix ldap loading in forward omits 26ff274 fixes #6426 Erreur Nimbus omits c340b86 fixes #6421 Erreur lors du groupage omits 0f1fe32 fixes #6418 Erreur à l'ouverture de certains pdf omits 744fc04 fixes #6418 Erreur à l'ouverture de certains pdf omits 3a2f493 fixes #6416 Erreur lors du retour sur la liste omits 2b2cf77 fix NPE on manual creation omits 870fbb2 fix search on body field omits 4f6687b refs #6391 Problème d'encoding dans la visualisation des réponses correction pbm impression omits 1072c99 fixes #6408 Erreur quand il n'y a pas de contenu dans la réponse omits 1cec966 correction de l'archivage depuis la liste omits ba01f48 fixes #6407 Erreur lors du transfert d'une réponse omits 54d4f6a throw lazy initialisation excpetion omits 31ac014 refs #6315 fuites mémoires fixes #6391 Problème d'encoding dans la visualisation des réponses corrige l'ouverture de certains pdf omits a20f330 qualité d'impression omits c49f646 refs #6335 Corriger les lenteurs d'affichage des listes omits 42b033a refs #6335 Corriger les lenteurs d'affichage des listes omits 847ab9b fixes #6349 "Aller au dossier" mène bien au dossier mais ne rafraichit pas le dossier omits 1f2da9c fixes #6260 Document rogné à l'impression catch ClassCastException (c'est moche, à voir comment faire mieux) omits b0622c6 fixes #6299 L'historique n'apparaît pas dans l'ordre dans la consultation via lien URL omits 56d3f5d refs #6315 fuites mémoires logs omits 05e839a use priorities in cache + add logs omits bfdec97 fix filter issues omits 854c60b fix diamond omits d97c089 fixes #6284 Garder le filtre du tableau tout au long de l'application omits 5cb1cdf fixes #6276 Les mails ne sont pas routés quand le destinataire est en copie caché omits cad1c98 fix mauvaise requete de recherche omits e33bf17 amelioration des perf de recherche omits f0f8c36 fixes #6250 Les pj ne sont pas dans la liste déroulante dans la réponse quand l'élément est groupé omits b7e0727 fixes #6248 Erreur quand on veut déplacer un élément omits 8086537 improve perfs omits 7a796ab forgot to remove comments omits feaf669 fix status lors du déplacement fix erreur réception d'email quand une pj est vide omits 849ceda fixes #6238 Erreur quand on ouvre un élément groupé refs #6237 La recherche pour grouper se lance parfois toute seule à l'ouverture de l'écran omits 06a5f1f fix compilation omits fa3b801 fix dependency omits ff5b6d4 refs #6234 Ajouter une sorte de carnet des adresses email du ldap dans l'écran de réponse fixes #6235 Ajouter un cache sur les emails des dossiers omits 4154756 fixes #6233 Pas d'émetteur lors d'une réponse à un fax omits 54349da fixes #6228 Certaines lignes de gamme envoyées à l'EDI ne sont plus liées à un email omits 51efd1f - fix error when recipient contains [] - catch invalid charset error omits 5b4d75a fix error + dependency omits 3a833a8 refs #6198 Certains emails sont mal interpêtés omits d044358 fixes #6199 Certains pdf impriment des pages blanches omits 433d5bb revert test amélioration perfs fixes #6197 Les pièces jointes avec des "/" dans le nom ne s'ouvrent pas omits 3ac3f8f test amélioration perfs omits dfff557 fixes #6192 Le tableau de gammes n'est pas chargé quand on ouvre un élément groupé omits 6e9fd9e adresses par ordre alphabétique omits 7962404 refs #6162 fixes #6173 Permettre l'envoi de réponse à plusieurs "to", "cc" et "bcc" omits c2bd3d8 adresses par ordre alphabétique omits daf7d87 fixes #6172 Mauvais envoyeur dans la citation d'un forward sur une réponse fixes #6171 Le filtre sur les colonnes des tables d'éléments ne fonctionnent pas avec les majuscules omits 09cddd5 fixes #6168 Les éléments ne sont pas transmis à l'EDI quand ils sont déplacés directement omits 39a92e3 remet en premier plan les frame après la fermeture de la popup de loading omits 1b477a6 fixes #6160 Les gammes ne sont pas affichées dans l'ordre fixes #6161 Appliquer le filtre de mail de position la moins grande sur l'ensemble des destinataires fixes #6162 Erreur lors de l'enregistrement après modification de pièce jointe fixes #6163 Erreur lors de l'enregistrement omits 51ee469 fixes #6158 Ajouter la colonne Gamme à la liste des éléments omits 8a07f26 fixes #6137 L'application se bloque quand on veut ajouter une PJ qui n'existe pas omits b5ff83f fixes #6137 L'application se bloque quand on veut ajouter une PJ qui n'existe pas fixes #6138 Permettre l'édition du formulaire en même temps que l'édition du pdf omits 8a90922 récupération de l'historique (quand on save depuis la liste, l'historique est à null dans le mail) omits bb08d8c fix erreur sauvegarde email omits 62c2d7d fixes #5965 Problème de taille et de décalage des annotations sur certains pdf fixes #6101 baisse qualité sur les docs annoté omits 5682388 fix missing 3rd party omits 68202ee add license headers + refactoring + add email content attachment in archive import omits bab564e fixes #6109 omits e6e5518 fixes #6109 Import Archives : les collections ne sont pas liées aux emails omits 0e57501 fixes #5944 Erreur à l'ouverture d'un élément fixes #6100 Elément du dossier Traitement/commandes/fse/ client P56789, si on veut visualiser la réponse au mail, on plante systématiquement. fixes #6102 Erreur lors de l'alimentation de la priorité depuis la liste lorsqu'un élément a au moins une réponse fixes #6110 Un historique de modification de PJ est ajouté même si on ne sauvegarde pas l'email omits 33ae495 - agrandissement des polices des emails html - sélection de fichier seulement pour les pj omits 1426a14 upgrade log4j version omits cb98b46 - fix archive import omits 325966a fix import archives omits d2ecb6a wording omits f984efd style omits f1e82ae - refs #5939 Page web de recherche des éléments archivés - refs #5940 Page web de détail d'un élément archivé omits 05fdd48 refs #5939 Page web de recherche des éléments archivés omits 50b72e9 fixes #5963 Prise en compte des dossier d'archive lors de l'import des archives fixes #5974 Erreur lors de l'import d'un grand nombre d'archives omits f89a86a fixes #5964 Problèmes de police sur l'éditeur de pdf et l'impression omits b8f3abc - refs #5940 Page web de détail d'un élément archivé omits 9a79d7d - refs #5940 Page web de détail d'un élément archivé - correction affichage des pdf (pdfbox fonctionne mal avec les polices embarquées, reprise du code avec pdf-renderer) omits 03309d7 refs #5939 Page web de recherche des éléments archivés omits 36f3540 Add fixme omits 1a59dd1 [maven-release-plugin] prepare for next development iteration omits 6f8caf6 [maven-release-plugin] prepare release faxtomail-1.0 omits 2c6e6d5 [maven-release-plugin] prepare for next development iteration adds 77c0ae5 [maven-release-plugin] copy for tag faxtomail-1.0 adds 1afbc97 [maven-release-plugin] copy for tag faxtomail-1.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (92fbd70) \ N -- N -- N refs/heads/master (1afbc97) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 9 - .../faxtomail/FaxToMailConfigurationOption.java | 9 - .../entities/AbstractFaxToMailTopiaDao.java | 24 - .../persistence/entities/AttachmentFileImpl.java | 3 +- .../persistence/entities/EmailFilter.java | 13 - .../faxtomail/persistence/entities/EmailImpl.java | 13 +- .../persistence/entities/EmailTopiaDao.java | 202 +--- .../persistence/entities/HistoryType.java | 1 - .../faxtomail/persistence/entities/MailField.java | 1 - .../persistence/entities/MailFolderTopiaDao.java | 2 - .../src/main/resources/faxToMail.properties | 5 +- .../i18n/faxtomail-persistence_fr_FR.properties | 1 - .../src/main/xmi/faxtomail.properties | 6 +- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 30153 -> 29652 bytes faxtomail-service/pom.xml | 25 +- .../src/license/THIRD-PARTY.properties | 8 +- .../faxtomail/services/DecoratorServiceImpl.java | 4 +- .../faxtomail/services/FaxToMailServiceUtils.java | 26 +- .../faxtomail/services/service/EmailService.java | 55 +- .../services/service/EmailServiceImpl.java | 1046 +++++--------------- .../services/service/InitFaxToMailServiceImpl.java | 6 +- .../faxtomail/services/service/LdapService.java | 5 - .../services/service/LdapServiceImpl.java | 52 - .../services/service/MailFolderService.java | 7 +- .../services/service/MailFolderServiceImpl.java | 63 +- .../services/service/ReferentielServiceImpl.java | 8 +- ...mportExportBean.java => ArchiveImportBean.java} | 37 +- .../service/imports/ArchiveImportExportModel.java | 149 --- .../service/imports/ArchiveImportModel.java | 129 +++ .../service/imports/ArchiveImportResult.java | 62 -- .../imports/InvalidArchiveImportBeanException.java | 44 - .../faxtomail/services/service/ldap/Contact.java | 65 -- .../validators/FaxToMailEmailsValidator.java | 47 - .../h2/V1_1_0_733__extract_originalemail.sql | 24 - .../V1_1_0_733__extract_originalemail.sql | 29 - .../i18n/faxtomail-service_fr_FR.properties | 5 - .../src/main/resources/validators.xml | 1 - .../services/service/InitTestDataImpl.java | 23 +- .../services/service/MailFolderServiceTest.java | 35 - faxtomail-ui-swing/pom.xml | 50 +- .../src/license/THIRD-PARTY.properties | 28 +- .../faxtomail/ui/swing/FaxToMailUIContext.java | 208 +--- .../ui/swing/actions/AddAttachmentAction.java | 48 +- .../faxtomail/ui/swing/actions/ArchiveAction.java | 33 +- .../ui/swing/actions/ArchiveFromListAction.java | 7 +- .../ui/swing/actions/EditAttachmentAction.java | 25 +- .../actions/GenerateAnnotatedAttachmentAction.java | 57 +- .../ui/swing/actions/LoadFolderEmailsAction.java | 58 +- .../ui/swing/actions/OpenGroupedDemandAction.java | 20 - .../OpenMailFolderChooserFromListAction.java | 13 +- .../ui/swing/actions/OpenReplyAction.java | 132 --- .../ui/swing/actions/OpenReplyFormAction.java | 104 -- .../faxtomail/ui/swing/actions/ReplyAction.java | 2 + .../swing/actions/SaveAndOpenModalFrameAction.java | 13 +- .../swing/actions/SaveAndOpenReplyFormAction.java | 4 +- .../ui/swing/actions/SaveDemandeAction.java | 46 +- .../ui/swing/actions/SearchToGroupAction.java | 14 +- .../ui/swing/actions/ShowDemandeAction.java | 4 - .../faxtomail/ui/swing/actions/TransmitAction.java | 5 - .../faxtomail/ui/swing/content/MainUI.css | 2 +- .../faxtomail/ui/swing/content/MainUIHandler.java | 43 +- .../content/attachment/AttachmentCellEditor.java | 10 +- .../content/attachment/AttachmentEditorUI.css | 5 - .../attachment/AttachmentEditorUIHandler.java | 30 +- .../attachment/AttachmentEditorUIModel.java | 7 + .../content/attachment/AttachmentListener.java | 39 - .../swing/content/attachment/ButtonAttachment.java | 11 +- .../content/demande/DemandeListTableFilter.java | 12 +- .../ui/swing/content/demande/DemandeListUI.css | 3 - .../ui/swing/content/demande/DemandeListUI.jaxx | 9 +- .../content/demande/DemandeListUIHandler.java | 423 +++----- .../swing/content/demande/DemandeListUIModel.java | 2 +- .../ui/swing/content/demande/DemandeUI.css | 4 + .../ui/swing/content/demande/DemandeUIHandler.java | 290 +++--- .../ui/swing/content/demande/DemandeUIModel.java | 118 +-- .../swing/content/demande/DemandesUIHandler.java | 68 +- .../ui/swing/content/demande/DemandesUIModel.java | 14 +- .../ui/swing/content/demande/DemandsListener.java | 37 - .../demande/demandgroup/ButtonEmailGroup.java | 29 +- .../demande/demandgroup/DemandGroupUIHandler.java | 17 +- .../content/demande/history/ButtonHistory.java | 7 - .../demande/replies/ButtonDemandReplies.java | 10 +- .../demande/replies/DemandRepliesUIHandler.java | 130 ++- .../content/demande/replies/RepliesCellEditor.java | 5 +- .../ui/swing/content/pdfeditor/PDFEditorUI.css | 6 +- .../content/pdfeditor/PDFEditorUIHandler.java | 146 +-- .../swing/content/pdfeditor/PDFEditorUIModel.java | 13 +- .../ui/swing/content/reply/ReplyFormUI.css | 37 - .../ui/swing/content/reply/ReplyFormUI.jaxx | 40 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 130 +-- .../ui/swing/content/reply/ReplyFormUIModel.java | 30 +- .../content/search/SearchToGroupUIHandler.java | 96 +- .../ui/swing/content/search/SearchUIHandler.java | 8 +- .../ui/swing/content/search/SearchUIModel.java | 2 +- .../transmit/MailFolderChooserUIHandler.java | 35 +- .../util/AbstractFaxToMailDemandListHandler.java | 43 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 132 ++- .../faxtomail/ui/swing/util/DemandeTableModel.java | 310 +----- .../ui/swing/util/FaxToMailExceptionHandler.java | 43 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 275 ++--- .../reply/ReplyFormUIModel-error-validation.xml | 6 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 12 +- faxtomail-ui-swing/src/main/resources/log4j2.xml | 7 +- faxtomail-ui-web/pom.xml | 25 +- .../web/FaxToMailApplicationListener.java | 2 +- .../web/FaxToMailExecuteAndWaitInterceptor.java | 83 -- .../faxtomail/web/FaxToMailInterceptor.java | 7 +- .../franciaflex/faxtomail/web/HasUploadedFile.java | 38 - .../faxtomail/web/action/DemandDetailAction.java | 519 ---------- .../faxtomail/web/action/SearchAction.java | 393 -------- .../web/action/admin/ImportArchiveAction.java | 183 +--- .../faxtomail/web/action/admin/LdapAction.java | 2 +- .../faxtomail/web/job/MailFilterJob.java | 427 ++++++-- .../i18n/faxtomail-ui-web_fr_FR.properties | 7 +- .../src/main/resources/struts.properties | 3 - faxtomail-ui-web/src/main/resources/struts.xml | 1 - .../WEB-INF/content/admin/import-archive-input.jsp | 63 +- .../WEB-INF/content/admin/import-archive-wait.jsp | 44 - .../webapp/WEB-INF/content/admin/lock-input.jsp | 2 +- .../WEB-INF/content/admin/user-folder-input.jsp | 2 +- .../main/webapp/WEB-INF/content/demand-detail.jsp | 308 ------ .../main/webapp/WEB-INF/content/search-input.jsp | 93 -- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 49 +- faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml | 14 +- .../src/main/webapp/css/demand-detail.css | 72 -- faxtomail-ui-web/src/main/webapp/css/faxtomail.css | 7 - .../src/main/webapp/js/demand-detail.js | 38 - faxtomail-ui-web/src/main/webapp/js/faxtomail.js | 8 - pom.xml | 125 +-- LICENSE.txt => trunk/LICENSE.txt | 0 README.txt => trunk/README.txt | 0 .../faxtomail-persistence/LICENSE.txt | 0 .../faxtomail-persistence/README.txt | 0 .../faxtomail-persistence}/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 0 .../faxtomail/FaxToMailConfiguration.java | 9 - .../faxtomail/FaxToMailConfigurationOption.java | 9 - .../faxtomail/FaxToMailConfigurationProvider.java | 0 .../faxtomail/persistence/ProgressionModel.java | 0 .../persistence/RessourceClassLoader.java | 0 .../entities/AbstractFaxToMailTopiaDao.java | 24 - .../persistence/entities/AttachmentFileImpl.java | 3 +- .../persistence/entities/AttachmentImpl.java | 0 .../faxtomail/persistence/entities/ClientImpl.java | 0 .../persistence/entities/ClientTopiaDao.java | 0 .../persistence/entities/DemandStatus.java | 0 .../faxtomail/persistence/entities/EdiReturn.java | 0 .../persistence/entities/EmailFilter.java | 13 - .../faxtomail/persistence/entities/EmailImpl.java | 13 +- .../persistence/entities/EmailProtocol.java | 0 .../persistence/entities/EmailTopiaDao.java | 202 +--- .../entities/ExtensionCommandTopiaDao.java | 0 .../persistence/entities/HistoryImpl.java | 0 .../persistence/entities/HistoryType.java | 1 - .../faxtomail/persistence/entities/MailAction.java | 0 .../faxtomail/persistence/entities/MailField.java | 1 - .../persistence/entities/MailFilterTopiaDao.java | 0 .../persistence/entities/MailFolderImpl.java | 0 .../persistence/entities/MailFolderTopiaDao.java | 2 - .../faxtomail/persistence/entities/NewClient.java | 0 .../persistence/entities/SearchFilter.java | 0 .../persistence/entities/WaitingStateTopiaDao.java | 0 .../persistence/hibernate/EnumListUserType.java | 0 .../persistence/hibernate/EnumSetUserType.java | 0 .../hibernate/MailActionEnumSetUserType.java | 0 .../hibernate/MailFieldEnumListUserType.java | 0 .../hibernate/MailFieldEnumSetUserType.java | 0 .../org.nuiton.config.ApplicationConfigProvider | 0 .../src/main/resources/faxToMail.properties | 5 +- .../i18n/faxtomail-persistence_fr_FR.properties | 1 - .../src/main/xmi/faxtomail.properties | 6 +- .../src/main/xmi/faxtomail.zargo | Bin 0 -> 29652 bytes LICENSE.txt => trunk/faxtomail-service/LICENSE.txt | 0 README.txt => trunk/faxtomail-service/README.txt | 0 .../faxtomail-service}/pom.xml | 25 +- .../src/license/THIRD-PARTY.properties | 8 +- .../faxtomail/services/DecoratorService.java | 0 .../faxtomail/services/DecoratorServiceImpl.java | 4 +- .../faxtomail/services/FaxToMailDecorator.java | 0 .../faxtomail/services/FaxToMailService.java | 0 .../services/FaxToMailServiceContext.java | 0 .../services/FaxToMailServiceFactory.java | 0 .../FaxToMailServiceInvocationHandler.java | 0 .../services/FaxToMailServiceSupport.java | 0 .../faxtomail/services/FaxToMailServiceUtils.java | 26 +- .../faxtomail/services/service/ClientService.java | 0 .../services/service/ClientServiceImpl.java | 0 .../services/service/ConfigurationService.java | 0 .../services/service/ConfigurationServiceImpl.java | 0 .../faxtomail/services/service/EmailService.java | 55 +- .../services/service/EmailServiceImpl.java | 1046 +++++--------------- .../services/service/InitFaxToMailService.java | 0 .../services/service/InitFaxToMailServiceImpl.java | 6 +- .../faxtomail/services/service/LdapService.java | 5 - .../services/service/LdapServiceImpl.java | 52 - .../services/service/MailFolderService.java | 7 +- .../services/service/MailFolderServiceImpl.java | 63 +- .../services/service/ReferentielService.java | 0 .../services/service/ReferentielServiceImpl.java | 8 +- .../faxtomail/services/service/UserService.java | 0 .../services/service/UserServiceImpl.java | 0 .../services/service/ValidationService.java | 0 .../services/service/ValidationServiceImpl.java | 0 .../exceptions/AlreadyLockedMailException.java | 0 .../exceptions/FolderNotReadableException.java | 0 .../service/exceptions/InvalidClientException.java | 0 .../service/imports/ArchiveImportBean.java | 37 +- .../service/imports/ArchiveImportModel.java | 129 +++ .../services/service/imports/ClientImportBean.java | 0 .../service/imports/ClientImportModel.java | 0 .../service/imports/DemandTypeImportModel.java | 0 .../service/imports/EmailAccountImportModel.java | 0 .../service/imports/EmailFilterImportModel.java | 0 .../service/imports/PriorityImportModel.java | 0 .../services/service/imports/RangeImportModel.java | 0 .../service/imports/WaitingStateImportModel.java | 0 .../service/ldap/AuthenticationException.java | 0 .../services/service/ldap/LdapServiceMock.java | 0 .../migration/FaxtomailFlywayMigrationService.java | 0 .../validators/FaxToMailEmailValidator.java | 0 .../entities/Email-error-validation.xml | 0 ..._0_442__move_object_to_folder_configuration.sql | 0 ..._0_448__add_mail_folder_level_configuration.sql | 0 .../migration/h2/V1_0_0_454__add_ldap_config.sql | 0 ...omailusergroup_loop_association_and_add_idx.sql | 0 .../h2/V1_0_0_520__add_performance_indexes.sql | 0 .../h2/V1_0_0_580__transform_enum_set_to_lists.sql | 0 .../V1_0_0_583__readd_editranfer_on_demandtype.sql | 0 .../h2/V1_0_0_597__mise_a_jour_performances.sql | 0 ...1_0_0_620__modification_newclient_edireturn.sql | 0 .../h2/V1_0_0_662__add_company_in_mailfolder.sql | 0 ..._0_442__move_object_to_folder_configuration.sql | 0 ..._0_448__add_mail_folder_level_configuration.sql | 0 .../postgres}/V1_0_0_454__add_ldap_config.sql | 0 ...omailusergroup_loop_association_and_add_idx.sql | 0 .../V1_0_0_520__add_performance_indexes.sql | 0 .../V1_0_0_580__transform_enum_set_to_lists.sql | 0 .../V1_0_0_583__readd_editranfer_on_demandtype.sql | 0 .../V1_0_0_597__mise_a_jour_performances.sql | 0 ...1_0_0_620__modification_newclient_edireturn.sql | 0 .../V1_0_0_662__add_company_in_mailfolder.sql | 0 ..._0_442__move_object_to_folder_configuration.sql | 0 ..._0_448__add_mail_folder_level_configuration.sql | 0 .../sqlserver/V1_0_0_454__add_ldap_config.sql | 0 ...omailusergroup_loop_association_and_add_idx.sql | 0 .../V1_0_0_520__add_performance_indexes.sql | 0 .../V1_0_0_580__transform_enum_set_to_lists.sql | 0 .../V1_0_0_583__readd_editranfer_on_demandtype.sql | 0 .../V1_0_0_597__mise_a_jour_performances.sql | 0 ...1_0_0_620__modification_newclient_edireturn.sql | 0 .../V1_0_0_662__add_company_in_mailfolder.sql | 0 .../i18n/faxtomail-service_fr_FR.properties | 5 - .../src/main/resources/pdf/demande.mustache | 0 .../src/main/resources/validators.xml | 1 - .../service/AbstractFaxToMailServiceTest.java | 0 .../services/service/ClientServiceTest.java | 0 .../services/service/EmailServiceTest.java | 0 .../faxtomail/services/service/InitTestData.java | 0 .../services/service/InitTestDataImpl.java | 23 +- .../services/service/MailFolderServiceTest.java | 35 - .../faxtomail/services/service/MiscTest.java | 0 .../service/migration/FlywayMigrationTest.java | 0 .../src/test/resources/archives/archives.csv | 0 .../src/test/resources/archives/att1.txt | 0 .../src/test/resources/archives/att2.txt | 0 .../src/test/resources/csv/clients.csv | 0 .../src/test/resources/csv/demandtypes.csv | 0 .../src/test/resources/csv/email_accounts.csv | 0 .../src/test/resources/csv/email_filters.csv | 0 .../src/test/resources/csv/etatattentes.csv | 0 .../src/test/resources/csv/fx_clients.csv | 0 .../src/test/resources/csv/priorities.csv | 0 .../src/test/resources/csv/ranges.csv | 0 .../src/test/resources/db/h2data-1_0_0_rc2.h2.db | Bin .../src/test/resources/log4j2.xml | 0 .../faxtomail-ui-swing/LICENSE.txt | 0 README.txt => trunk/faxtomail-ui-swing/README.txt | 0 .../faxtomail-ui-swing}/pom.xml | 50 +- .../src/license/THIRD-PARTY.properties | 25 +- .../src/main/assembly/faxtomail-full-component.xml | 0 .../src/main/assembly/full-linux-i586.xml | 0 .../src/main/assembly/full-linux-x64.xml | 0 .../src/main/assembly/full-windows-i586.xml | 0 .../src/main/assembly/full-windows-x64.xml | 0 .../src/main/assembly/full/faxtomail.bat | 0 .../src/main/assembly/full/faxtomail.sh | 0 .../faxtomail-ui-swing}/src/main/assembly/i18n.xml | 0 .../src/main/assembly/min/README.txt | 0 .../src/main/assembly/min/launch.bat | 0 .../src/main/assembly/min/launch.sh | 0 .../src/main/assembly/standalone.xml | 0 .../main/filtered-resources/faxToMail.properties | 0 .../faxtomail/ui/swing/FaxToMailActionFactory.java | 0 .../faxtomail/ui/swing/FaxToMailScreen.java | 0 .../faxtomail/ui/swing/FaxToMailUIContext.java | 208 +--- .../faxtomail/ui/swing/RunFaxToMail.java | 0 .../swing/actions/AbstractChangeScreenAction.java | 0 .../ui/swing/actions/AbstractFaxToMailAction.java | 0 .../actions/AbstractMainUIFaxToMailAction.java | 0 .../ui/swing/actions/AddAttachmentAction.java | 48 +- .../swing/actions/AddAttachmentToReplyAction.java | 0 .../faxtomail/ui/swing/actions/ArchiveAction.java | 33 +- .../ui/swing/actions/ArchiveFromListAction.java | 7 +- .../ui/swing/actions/CloseApplicationAction.java | 0 .../actions/ComputeQuantitiesByRangeAction.java | 0 .../ui/swing/actions/EditAttachmentAction.java | 25 +- .../actions/GenerateAnnotatedAttachmentAction.java | 57 +- .../ui/swing/actions/GoToPreviousScreenAction.java | 0 .../faxtomail/ui/swing/actions/GroupAction.java | 0 .../ui/swing/actions/LoadFolderEmailsAction.java | 58 +- .../ui/swing/actions/OpenAttachmentAction.java | 0 .../ui/swing/actions/OpenGroupedDemandAction.java | 20 - .../OpenMailFolderChooserFromListAction.java | 13 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 0 .../ui/swing/actions/ReloadFaxToMailAction.java | 0 .../faxtomail/ui/swing/actions/ReplyAction.java | 2 + .../SaveAndOpenChooseAttachmentToPrintAction.java | 0 .../SaveAndOpenMailFolderChooserAction.java | 0 .../swing/actions/SaveAndOpenModalFrameAction.java | 13 +- .../swing/actions/SaveAndOpenReplyFormAction.java | 4 +- .../actions/SaveAndOpenSearchToGroupAction.java | 0 .../ui/swing/actions/SaveDemandeAction.java | 46 +- .../ui/swing/actions/SaveDemandeAndExitAction.java | 0 .../swing/actions/SaveDemandeFromListAction.java | 0 .../faxtomail/ui/swing/actions/SearchAction.java | 0 .../ui/swing/actions/SearchToGroupAction.java | 14 +- .../ui/swing/actions/ShowAboutAction.java | 0 .../ui/swing/actions/ShowDemandeAction.java | 4 - .../ui/swing/actions/ShowDemandeListAction.java | 0 .../ui/swing/actions/ShowRechercheAction.java | 0 .../faxtomail/ui/swing/actions/TransmitAction.java | 5 - .../faxtomail/ui/swing/content/Common.css | 0 .../faxtomail/ui/swing/content/MainUI.css | 2 +- .../faxtomail/ui/swing/content/MainUI.jaxx | 0 .../faxtomail/ui/swing/content/MainUIHandler.java | 43 +- .../content/attachment/AttachmentCellEditor.java | 10 +- .../content/attachment/AttachmentCellRenderer.java | 0 .../content/attachment/AttachmentEditorUI.css | 5 - .../content/attachment/AttachmentEditorUI.jaxx | 0 .../attachment/AttachmentEditorUIHandler.java | 30 +- .../attachment/AttachmentEditorUIModel.java | 7 + .../ui/swing/content/attachment/AttachmentItem.css | 0 .../swing/content/attachment/AttachmentItem.jaxx | 0 .../content/attachment/AttachmentModelAware.java | 0 .../swing/content/attachment/ButtonAttachment.java | 11 +- .../content/demande/DemandeListTableFilter.java | 12 +- .../ui/swing/content/demande/DemandeListUI.css | 3 - .../ui/swing/content/demande/DemandeListUI.jaxx | 9 +- .../content/demande/DemandeListUIHandler.java | 423 +++----- .../swing/content/demande/DemandeListUIModel.java | 2 +- .../ui/swing/content/demande/DemandeUI.css | 4 + .../ui/swing/content/demande/DemandeUI.jaxx | 0 .../ui/swing/content/demande/DemandeUIHandler.java | 290 +++--- .../ui/swing/content/demande/DemandeUIModel.java | 118 +-- .../ui/swing/content/demande/DemandesUI.css | 0 .../ui/swing/content/demande/DemandesUI.jaxx | 0 .../swing/content/demande/DemandesUIHandler.java | 68 +- .../ui/swing/content/demande/DemandesUIModel.java | 14 +- .../swing/content/demande/QuantitiesByRangeUI.css | 0 .../swing/content/demande/QuantitiesByRangeUI.jaxx | 0 .../demande/QuantitiesByRangeUIHandler.java | 0 .../content/demande/QuantitiesByRangeUIModel.java | 0 .../ui/swing/content/demande/RangeRowModel.java | 0 .../ui/swing/content/demande/RangeTableModel.java | 0 .../demande/demandgroup/ButtonEmailGroup.java | 29 +- .../demandgroup/DemandGroupCellRenderer.java | 0 .../demande/demandgroup/DemandGroupItem.css | 0 .../demande/demandgroup/DemandGroupItem.jaxx | 0 .../content/demande/demandgroup/DemandGroupUI.css | 0 .../content/demande/demandgroup/DemandGroupUI.jaxx | 0 .../demande/demandgroup/DemandGroupUIHandler.java | 17 +- .../content/demande/history/ButtonHistory.java | 7 - .../swing/content/demande/history/HistoryItem.css | 0 .../swing/content/demande/history/HistoryItem.jaxx | 0 .../content/demande/history/HistoryItemModel.java | 0 .../content/demande/history/HistoryListUI.css | 0 .../content/demande/history/HistoryListUI.jaxx | 0 .../demande/history/HistoryListUIHandler.java | 0 .../demande/replies/ButtonDemandReplies.java | 10 +- .../content/demande/replies/DemandRepliesUI.css | 0 .../content/demande/replies/DemandRepliesUI.jaxx | 0 .../demande/replies/DemandRepliesUIHandler.java | 130 ++- .../content/demande/replies/DemandReplyItem.css | 0 .../content/demande/replies/DemandReplyItem.jaxx | 0 .../content/demande/replies/RepliesCellEditor.java | 5 +- .../demande/replies/RepliesCellRenderer.java | 0 .../swing/content/pdfeditor/PDFEditorCrossUI.css | 0 .../swing/content/pdfeditor/PDFEditorCrossUI.jaxx | 0 .../content/pdfeditor/PDFEditorHighlighterUI.css | 0 .../content/pdfeditor/PDFEditorHighlighterUI.jaxx | 0 .../ui/swing/content/pdfeditor/PDFEditorLineUI.css | 0 .../swing/content/pdfeditor/PDFEditorLineUI.jaxx | 0 .../ui/swing/content/pdfeditor/PDFEditorNoteUI.css | 0 .../swing/content/pdfeditor/PDFEditorNoteUI.jaxx | 0 .../ui/swing/content/pdfeditor/PDFEditorUI.css | 6 +- .../ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 0 .../content/pdfeditor/PDFEditorUIHandler.java | 146 +-- .../swing/content/pdfeditor/PDFEditorUIModel.java | 13 +- .../content/print/AttachmentToPrintChooserUI.css | 0 .../content/print/AttachmentToPrintChooserUI.jaxx | 0 .../print/AttachmentToPrintChooserUIHandler.java | 0 .../print/AttachmentToPrintChooserUIModel.java | 0 .../ui/swing/content/reply/AttachmentItem.css | 0 .../ui/swing/content/reply/AttachmentItem.jaxx | 0 .../swing/content/reply/ReplyAttachmentModel.java | 0 .../ui/swing/content/reply/ReplyFormUI.css | 37 - .../ui/swing/content/reply/ReplyFormUI.jaxx | 40 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 130 +-- .../ui/swing/content/reply/ReplyFormUIModel.java | 30 +- .../ui/swing/content/search/SearchToGroupUI.css | 0 .../ui/swing/content/search/SearchToGroupUI.jaxx | 0 .../content/search/SearchToGroupUIHandler.java | 96 +- .../faxtomail/ui/swing/content/search/SearchUI.css | 0 .../ui/swing/content/search/SearchUI.jaxx | 0 .../ui/swing/content/search/SearchUIHandler.java | 8 +- .../ui/swing/content/search/SearchUIModel.java | 2 +- .../swing/content/transmit/MailFolderChooserUI.css | 0 .../content/transmit/MailFolderChooserUI.jaxx | 0 .../transmit/MailFolderChooserUIHandler.java | 35 +- .../content/transmit/MailFolderChooserUIModel.java | 0 .../swing/util/AbstractFaxToMailBeanUIModel.java | 0 .../util/AbstractFaxToMailDemandListHandler.java | 43 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 132 ++- .../ui/swing/util/AbstractToolbarPopupButton.java | 0 .../ui/swing/util/AbstractToolbarPopupHandler.java | 0 .../ui/swing/util/AbstractToolbarPopupUI.css | 0 .../ui/swing/util/AbstractToolbarPopupUI.jaxx | 0 .../ui/swing/util/CheckBoxComboBoxModel.java | 0 .../ui/swing/util/CheckBoxListCellRenderer.java | 0 .../faxtomail/ui/swing/util/DemandeTableModel.java | 199 ++++ .../ui/swing/util/FaxToMailExceptionHandler.java | 43 +- .../faxtomail/ui/swing/util/FaxToMailUI.java | 0 .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 275 ++--- .../faxtomail/ui/swing/util/FolderTreeNode.java | 0 .../faxtomail/ui/swing/util/JImagePanel.java | 0 .../ui/swing/util/PaginationComboModel.java | 0 .../util/RemoveablePropertyChangeListener.java | 0 .../faxtomail/ui/swing/util/UIMessageNotifier.java | 0 .../src/main/resources/PoetsenOne-Regular.ttf | Bin .../demande/DemandeUIModel-error-validation.xml | 0 .../reply/ReplyFormUIModel-error-validation.xml | 6 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 12 +- .../src/main/resources/icons/action-about.png | Bin .../src/main/resources/icons/action-archive.png | Bin .../src/main/resources/icons/action-attachment.png | Bin .../src/main/resources/icons/action-cancel.png | Bin .../src/main/resources/icons/action-collapse.png | Bin .../src/main/resources/icons/action-compute.png | Bin .../src/main/resources/icons/action-config.png | Bin .../src/main/resources/icons/action-cross.png | Bin .../src/main/resources/icons/action-delete.png | Bin .../src/main/resources/icons/action-edit.png | Bin .../main/resources/icons/action-email-group.png | Bin .../src/main/resources/icons/action-email.png | Bin .../src/main/resources/icons/action-exit.png | Bin .../src/main/resources/icons/action-expand.png | Bin .../main/resources/icons/action-folder_edit.png | Bin .../src/main/resources/icons/action-group.png | Bin .../main/resources/icons/action-highlighter.png | Bin .../src/main/resources/icons/action-hline.png | Bin .../src/main/resources/icons/action-import.png | Bin .../src/main/resources/icons/action-left.png | Bin .../src/main/resources/icons/action-line.png | Bin .../src/main/resources/icons/action-list.png | Bin .../src/main/resources/icons/action-new-demand.png | Bin .../src/main/resources/icons/action-note.png | Bin .../src/main/resources/icons/action-open-file.png | Bin .../src/main/resources/icons/action-open.png | Bin .../src/main/resources/icons/action-print.png | Bin .../resources/icons/action-reload-application.png | Bin .../resources/icons/action-reload-shortcut.png | Bin .../src/main/resources/icons/action-reload-ui.png | Bin .../src/main/resources/icons/action-reply.png | Bin .../src/main/resources/icons/action-right.png | Bin .../icons/action-rotate-anticlockwise.png | Bin .../resources/icons/action-rotate-clockwise.png | Bin .../src/main/resources/icons/action-save.png | Bin .../src/main/resources/icons/action-search.png | Bin .../src/main/resources/icons/action-transmit.png | Bin .../src/main/resources/icons/action-user.png | Bin .../src/main/resources/icons/action-validate.png | Bin .../main/resources/icons/action-view-history.png | Bin .../src/main/resources/icons/action-vline.png | Bin .../src/main/resources/icons/action-zoom-in.png | Bin .../src/main/resources/icons/action-zoom-out.png | Bin .../src/main/resources/icons/add.png | Bin .../src/main/resources/icons/application_home.png | Bin .../src/main/resources/icons/cross_blue.png | Bin .../src/main/resources/icons/cross_red.png | Bin .../src/main/resources/icons/email.png | Bin .../src/main/resources/icons/house.png | Bin .../src/main/resources/log4j2.xml | 7 +- .../src/main/resources/splashscreen.png | Bin LICENSE.txt => trunk/faxtomail-ui-web/LICENSE.txt | 0 README.txt => trunk/faxtomail-ui-web/README.txt | 0 .../faxtomail-ui-web}/pom.xml | 25 +- .../src/license/THIRD-PARTY.properties | 0 .../faxtomail/FaxToMailApplicationContext.java | 0 .../faxtomail/web/FaxToMailActionSupport.java | 0 .../web/FaxToMailApplicationListener.java | 2 +- .../faxtomail/web/FaxToMailInterceptor.java | 7 +- .../faxtomail/web/FaxToMailJsonAction.java | 0 .../faxtomail/web/FaxToMailJsonResultSupport.java | 0 .../faxtomail/web/FaxToMailLoginInterceptor.java | 0 .../faxtomail/web/FaxToMailSession.java | 0 .../faxtomail/web/action/IndexAction.java | 0 .../faxtomail/web/action/LoginAction.java | 0 .../faxtomail/web/action/LogoutAction.java | 0 .../web/action/admin/ConfigurationAction.java | 0 .../web/action/admin/ConfigurationJsonAction.java | 0 .../faxtomail/web/action/admin/ImportAction.java | 0 .../web/action/admin/ImportArchiveAction.java | 137 +++ .../faxtomail/web/action/admin/LdapAction.java | 2 +- .../faxtomail/web/action/admin/LockAction.java | 0 .../web/action/admin/UserFolderAction.java | 0 .../faxtomail/web/job/AbstractFaxToMailJob.java | 0 .../faxtomail/web/job/ClientUpdateJob.java | 0 .../faxtomail/web/job/EDIManagementJob.java | 0 .../faxtomail/web/job/MailFilterJob.java | 427 ++++++-- .../web/json/HibernateProxyTypeAdapter.java | 0 .../faxtomail/web/json/TopiaEntityAdapter.java | 0 .../i18n/faxtomail-ui-web_fr_FR.properties | 7 +- .../src/main/resources/log4j2.xml | 0 .../src/main/resources/nuiton-js.properties | 0 .../src/main/resources/quartz.properties | 0 .../src/main/resources/struts.properties | 3 - .../src/main/resources/struts.xml | 1 - .../src/main/resources/validators.xml | 0 .../src/main/resources/xwork-conversion.properties | 0 .../WEB-INF/content/admin/configuration-input.jsp | 0 .../WEB-INF/content/admin/import-archive-input.jsp | 66 ++ .../webapp/WEB-INF/content/admin/import-input.jsp | 0 .../webapp/WEB-INF/content/admin/ldap-input.jsp | 0 .../webapp/WEB-INF/content/admin/ldap-wait.jsp | 0 .../webapp/WEB-INF/content/admin/lock-input.jsp | 2 +- .../WEB-INF/content/admin/user-folder-input.jsp | 2 +- .../src/main/webapp/WEB-INF/content/index.jsp | 0 .../main/webapp/WEB-INF/content/login-input.jsp | 0 .../src/main/webapp/WEB-INF/decorators.xml | 0 .../src/main/webapp/WEB-INF/decorators/layout.jsp | 49 +- .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/WEB-INF/wro.xml | 14 +- .../src/main/webapp/css/faxtomail.css | 7 - .../src/main/webapp/js/configuration.js | 0 .../src/main/webapp/js/faxtomail.js | 8 - .../src/main/webapp/js/select2.js | 0 .../src/main/webapp/js/select2sortable.js | 0 .../src/main/webapp/js/user-folder.js | 0 pom.xml => trunk/pom.xml | 125 +-- {src => trunk/src}/site/resources/img/notepad.png | Bin .../src}/site/resources/img/txt-to-csv.png | Bin {src => trunk/src}/site/rst/import.rst | 0 {src => trunk/src}/site/rst/index.rst | 0 {src => trunk/src}/site/rst/install.rst | 0 {src => trunk/src}/site/rst/mssql.rst | 0 {src => trunk/src}/site/site_fr.xml | 0 557 files changed, 4465 insertions(+), 9714 deletions(-) copy faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/{ArchiveImportExportBean.java => ArchiveImportBean.java} (68%) delete mode 100644 faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java create mode 100644 faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java delete mode 100644 faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportResult.java delete mode 100644 faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/InvalidArchiveImportBeanException.java delete mode 100644 faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/Contact.java delete mode 100644 faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailsValidator.java delete mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V1_1_0_733__extract_originalemail.sql delete mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V1_1_0_733__extract_originalemail.sql delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentListener.java delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandsListener.java delete mode 100644 faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailExecuteAndWaitInterceptor.java delete mode 100644 faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/HasUploadedFile.java delete mode 100644 faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/DemandDetailAction.java delete mode 100644 faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/SearchAction.java delete mode 100644 faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-wait.jsp delete mode 100644 faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp delete mode 100644 faxtomail-ui-web/src/main/webapp/WEB-INF/content/search-input.jsp delete mode 100644 faxtomail-ui-web/src/main/webapp/css/demand-detail.css delete mode 100644 faxtomail-ui-web/src/main/webapp/js/demand-detail.js copy LICENSE.txt => trunk/LICENSE.txt (100%) copy README.txt => trunk/README.txt (100%) copy LICENSE.txt => trunk/faxtomail-persistence/LICENSE.txt (100%) copy README.txt => trunk/faxtomail-persistence/README.txt (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/pom.xml (99%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/license/THIRD-PARTY.properties (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java (97%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java (96%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java (67%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java (97%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/DemandStatus.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/EdiReturn.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java (96%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailImpl.java (95%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailProtocol.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java (87%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/ExtensionCommandTopiaDao.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryType.java (96%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java (98%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFilterTopiaDao.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderImpl.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java (97%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClient.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/entities/WaitingStateTopiaDao.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailActionEnumSetUserType.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumListUserType.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/MailFieldEnumSetUserType.java (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider (100%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/resources/faxToMail.properties (85%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties (97%) copy {faxtomail-persistence => trunk/faxtomail-persistence}/src/main/xmi/faxtomail.properties (96%) create mode 100644 trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo copy LICENSE.txt => trunk/faxtomail-service/LICENSE.txt (100%) copy README.txt => trunk/faxtomail-service/README.txt (100%) copy {faxtomail-service => trunk/faxtomail-service}/pom.xml (92%) copy {faxtomail-service => trunk/faxtomail-service}/src/license/THIRD-PARTY.properties (80%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java (95%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/FaxToMailService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceFactory.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceInvocationHandler.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java (73%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java (72%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java (61%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java (98%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java (91%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java (87%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java (88%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java (89%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java (97%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/AlreadyLockedMailException.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/FolderNotReadableException.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/exceptions/InvalidClientException.java (100%) rename faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportBean.java => trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportBean.java (68%) create mode 100644 trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportModel.java copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportBean.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailFilterImportModel.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ldap/AuthenticationException.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/service/migration/FaxtomailFlywayMigrationService.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/java/com/franciaflex/faxtomail/services/validators/FaxToMailEmailValidator.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/com/franciaflex/faxtomail/persistence/entities/Email-error-validation.xml (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_442__move_object_to_folder_configuration.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_448__add_mail_folder_level_configuration.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_454__add_ldap_config.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_520__add_performance_indexes.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_580__transform_enum_set_to_lists.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_583__readd_editranfer_on_demandtype.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_597__mise_a_jour_performances.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_620__modification_newclient_edireturn.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/h2/V1_0_0_662__add_company_in_mailfolder.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/postgres/V1_0_0_442__move_object_to_folder_configuration.sql (100%) copy {faxtomail-service/src/main/resources/db/migration/h2 => trunk/faxtomail-service/src/main/resources/db/migration/postgres}/V1_0_0_448__add_mail_folder_level_configuration.sql (100%) copy {faxtomail-service/src/main/resources/db/migration/h2 => trunk/faxtomail-service/src/main/resources/db/migration/postgres}/V1_0_0_454__add_ldap_config.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/postgres/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql (100%) copy {faxtomail-service/src/main/resources/db/migration/h2 => trunk/faxtomail-service/src/main/resources/db/migration/postgres}/V1_0_0_520__add_performance_indexes.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/postgres/V1_0_0_580__transform_enum_set_to_lists.sql (100%) copy {faxtomail-service/src/main/resources/db/migration/h2 => trunk/faxtomail-service/src/main/resources/db/migration/postgres}/V1_0_0_583__readd_editranfer_on_demandtype.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/postgres/V1_0_0_597__mise_a_jour_performances.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/postgres/V1_0_0_620__modification_newclient_edireturn.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/postgres/V1_0_0_662__add_company_in_mailfolder.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_442__move_object_to_folder_configuration.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_448__add_mail_folder_level_configuration.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_454__add_ldap_config.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_480__remove_faxtomailusergroup_loop_association_and_add_idx.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_520__add_performance_indexes.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_580__transform_enum_set_to_lists.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_583__readd_editranfer_on_demandtype.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_597__mise_a_jour_performances.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_620__modification_newclient_edireturn.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/db/migration/sqlserver/V1_0_0_662__add_company_in_mailfolder.sql (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/i18n/faxtomail-service_fr_FR.properties (50%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/pdf/demande.mustache (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/main/resources/validators.xml (96%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java (93%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java (61%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/archives/archives.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/archives/att1.txt (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/archives/att2.txt (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/csv/clients.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/csv/demandtypes.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/csv/email_accounts.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/csv/email_filters.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/csv/etatattentes.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/csv/fx_clients.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/csv/priorities.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/csv/ranges.csv (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/db/h2data-1_0_0_rc2.h2.db (100%) copy {faxtomail-service => trunk/faxtomail-service}/src/test/resources/log4j2.xml (100%) copy LICENSE.txt => trunk/faxtomail-ui-swing/LICENSE.txt (100%) copy README.txt => trunk/faxtomail-ui-swing/README.txt (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/pom.xml (97%) copy {faxtomail-ui-web => trunk/faxtomail-ui-swing}/src/license/THIRD-PARTY.properties (78%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/faxtomail-full-component.xml (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/full-linux-i586.xml (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/full-linux-x64.xml (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/full-windows-i586.xml (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/full-windows-x64.xml (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/full/faxtomail.bat (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/full/faxtomail.sh (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/i18n.xml (100%) copy README.txt => trunk/faxtomail-ui-swing/src/main/assembly/min/README.txt (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/min/launch.bat (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/min/launch.sh (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/assembly/standalone.xml (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/filtered-resources/faxToMail.properties (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java (84%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentAction.java (62%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AddAttachmentToReplyAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java (88%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java (94%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java (89%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java (96%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java (76%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java (89%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java (93%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java (99%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenChooseAttachmentToPrintAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java (87%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java (95%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenSearchToGroupAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAction.java (84%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java (93%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java (97%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java (96%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/Common.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css (98%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java (89%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java (93%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css (96%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java (95%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java (95%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java (93%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java (96%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css (92%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx (94%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java (70%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java (99%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css (99%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java (73%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java (94%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java (88%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java (92%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java (74%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java (91%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java (92%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItem.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java (93%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java (82%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java (94%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.css (95%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java (88%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java (95%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css (81%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx (81%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java (86%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java (96%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java (89%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java (98%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java (99%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java (93%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java (89%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java (92%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupHandler.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.css (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupUI.jaxx (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java (100%) create mode 100644 trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java (69%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java (82%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/PoetsenOne-Regular.ttf (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel-error-validation.xml (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel-error-validation.xml (93%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties (96%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-about.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-archive.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-attachment.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-cancel.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-collapse.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-compute.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-config.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-cross.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-delete.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-edit.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-email-group.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-email.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-exit.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-expand.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-folder_edit.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-group.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-highlighter.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-hline.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-import.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-left.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-line.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-list.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-new-demand.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-note.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-open-file.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-open.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-print.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-reload-application.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-reload-shortcut.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-reload-ui.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-reply.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-right.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-rotate-anticlockwise.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-rotate-clockwise.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-save.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-search.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-transmit.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-user.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-validate.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-view-history.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-vline.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-zoom-in.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/action-zoom-out.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/add.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/application_home.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/cross_blue.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/cross_red.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/email.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/icons/house.png (100%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/log4j2.xml (82%) copy {faxtomail-ui-swing => trunk/faxtomail-ui-swing}/src/main/resources/splashscreen.png (100%) copy LICENSE.txt => trunk/faxtomail-ui-web/LICENSE.txt (100%) copy README.txt => trunk/faxtomail-ui-web/README.txt (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/pom.xml (96%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/license/THIRD-PARTY.properties (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java (99%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java (97%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/FaxToMailLoginInterceptor.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/FaxToMailSession.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java (100%) create mode 100644 trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java (97%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java (59%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties (90%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/resources/log4j2.xml (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/resources/nuiton-js.properties (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/resources/quartz.properties (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/resources/struts.properties (95%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/resources/struts.xml (95%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/resources/validators.xml (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/resources/xwork-conversion.properties (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp (100%) create mode 100644 trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-input.jsp copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/content/admin/import-input.jsp (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/content/admin/lock-input.jsp (97%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp (98%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/content/index.jsp (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/content/login-input.jsp (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/decorators.xml (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/decorators/layout.jsp (60%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/web.xml (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/WEB-INF/wro.xml (91%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/css/faxtomail.css (94%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/js/configuration.js (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/js/faxtomail.js (92%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/js/select2.js (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/js/select2sortable.js (100%) copy {faxtomail-ui-web => trunk/faxtomail-ui-web}/src/main/webapp/js/user-folder.js (100%) copy pom.xml => trunk/pom.xml (88%) copy {src => trunk/src}/site/resources/img/notepad.png (100%) copy {src => trunk/src}/site/resources/img/txt-to-csv.png (100%) copy {src => trunk/src}/site/rst/import.rst (100%) copy {src => trunk/src}/site/rst/index.rst (100%) copy {src => trunk/src}/site/rst/install.rst (100%) copy {src => trunk/src}/site/rst/mssql.rst (100%) copy {src => trunk/src}/site/site_fr.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

r752 - in trunk: . faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 19 Jan '15

19 Jan '15

Author: kmorin Date: 2015-01-19 12:27:39 +0000 (Mon, 19 Jan 2015) New Revision: 752 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/752 Log: make it build Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/pom.xml Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2015-01-19 10:15:03 UTC (rev 751) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2015-01-19 12:27:39 UTC (rev 752) @@ -177,10 +177,11 @@ if (FaxToMailUIUtil.isFileAPDF(attachmentFile)) { try { - pdDocument = PDDocument.loadLegacy(file); - if (pdDocument.isEncrypted()) { - pdDocument.decrypt(""); - } +// pdDocument = PDDocument.loadLegacy(file); +// if (pdDocument.isEncrypted()) { +// pdDocument.decrypt(""); +// } + pdDocument = PDDocument.load(file); model.setPageNumber(pdDocument.getNumberOfPages()); model.setCurrentPageIndex(1); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2015-01-19 10:15:03 UTC (rev 751) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2015-01-19 12:27:39 UTC (rev 752) @@ -531,10 +531,11 @@ result = defaultPrinter || printJob.printDialog(attributes); if (result) { - pdDocument = PDDocument.loadLegacy(fis); - if (pdDocument.isEncrypted()) { - pdDocument.decrypt(""); - } +// pdDocument = PDDocument.loadLegacy(fis); +// if (pdDocument.isEncrypted()) { +// pdDocument.decrypt(""); +// } + pdDocument = PDDocument.load(fis); final PDFRenderer renderer = new PDFRenderer(pdDocument); final int numOfPages = pdDocument.getNumberOfPages(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-01-19 10:15:03 UTC (rev 751) +++ trunk/pom.xml 2015-01-19 12:27:39 UTC (rev 752) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.1</version> + <version>6</version> </parent> <groupId>com.franciaflex</groupId> @@ -121,8 +121,15 @@ <slf4jVersion>1.7.7</slf4jVersion> <log4jVersion>2.1</log4jVersion> <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> + + <commonsIoVersion>2.4</commonsIoVersion> <commonsEmailVersion>1.3.3</commonsEmailVersion> + <commonsCollections4Version>4.0</commonsCollections4Version> + <commonsLang3Version>3.3.2</commonsLang3Version> + <commonsLoggingVersion>1.2</commonsLoggingVersion> + <junitVersion>4.11</junitVersion> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -135,6 +142,10 @@ <maven.compiler.target>1.7</maven.compiler.target> <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> + +  + <redmine.statusIds>18,19,3,10,11</redmine.statusIds> + </properties> <repositories> @@ -428,6 +439,24 @@ <version>${commonsIoVersion}</version> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commonsLoggingVersion}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>${commonsCollections4Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commonsLang3Version}</version> + </dependency> +  <dependency> <groupId>javax.servlet</groupId> @@ -698,6 +727,13 @@ <version>1.51</version> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junitVersion}</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement>

1 0

r751 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: . actions content/demande content/transmit util
by kmorin＠users.forge.codelutin.com 19 Jan '15

19 Jan '15

Author: kmorin Date: 2015-01-19 10:15:03 +0000 (Mon, 19 Jan 2015) New Revision: 751 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/751 Log: garder des ?\195?\169tats diff?\195?\169rents pour les arbres de la liste et du transfert Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2015-01-13 15:33:28 UTC (rev 750) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2015-01-19 10:15:03 UTC (rev 751) @@ -22,35 +22,36 @@ * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.awt.*; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.Closeable; -import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - -import javax.swing.JFrame; -import javax.swing.JOptionPane; - +import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.persistence.RessourceClassLoader; +import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.Priority; +import com.franciaflex.faxtomail.persistence.entities.Range; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; +import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.service.InitFaxToMailService; +import com.franciaflex.faxtomail.services.service.ReferentielService; +import com.franciaflex.faxtomail.services.service.UserService; +import com.franciaflex.faxtomail.services.service.ldap.AuthenticationException; import com.franciaflex.faxtomail.services.service.ldap.Contact; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListTableFilter; +import com.franciaflex.faxtomail.ui.swing.content.MainUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; +import com.franciaflex.faxtomail.ui.swing.util.UIMessageNotifier; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.session.BeanDoubleListState; import jaxx.runtime.swing.session.BeanFilterableComboBoxState; import jaxx.runtime.swing.session.State; import jaxx.runtime.swing.session.SwingSession; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -75,31 +76,24 @@ import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; import org.nuiton.jaxx.application.swing.util.Cancelable; import org.nuiton.util.converter.ConverterUtil; - -import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.RessourceClassLoader; -import com.franciaflex.faxtomail.persistence.entities.DemandType; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.Priority; -import com.franciaflex.faxtomail.persistence.entities.Range; -import com.franciaflex.faxtomail.persistence.entities.WaitingState; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.InitFaxToMailService; -import com.franciaflex.faxtomail.services.service.ReferentielService; -import com.franciaflex.faxtomail.services.service.UserService; -import com.franciaflex.faxtomail.services.service.ldap.AuthenticationException; -import com.franciaflex.faxtomail.ui.swing.content.MainUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; -import com.franciaflex.faxtomail.ui.swing.util.UIMessageNotifier; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import javax.swing.*; +import java.awt.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.Closeable; +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.t; + /** * UI application context. * @@ -209,8 +203,10 @@ protected FolderData currentFolderEmails = new FolderData(); - /** Les dossiers étendus (pour pouvoir les étendres encore au rechargement de l'UI). */ - protected List<MailFolder> expandedFolders = new ArrayList<MailFolder>(); + /** Les dossiers étendus dans la liste (pour pouvoir les étendres encore au rechargement de l'UI). */ + protected List<MailFolder> listExpandedFolders = new ArrayList<MailFolder>(); + /** Les dossiers étendus dans la sélection de dossier pour transfert (pour pouvoir les étendres encore au rechargement de l'UI). */ + protected List<MailFolder> transmitExpandedFolders = new ArrayList<MailFolder>(); protected SearchUIModel search; @@ -759,14 +755,22 @@ return currentFolderEmails; } - public List<MailFolder> getExpandedFolders() { - return expandedFolders; + public List<MailFolder> getListExpandedFolders() { + return listExpandedFolders; } - public void setExpandedFolders(List<MailFolder> expandedFolders) { - this.expandedFolders = expandedFolders; + public void setListExpandedFolders(List<MailFolder> listExpandedFolders) { + this.listExpandedFolders = listExpandedFolders; } + public List<MailFolder> getTransmitExpandedFolders() { + return transmitExpandedFolders; + } + + public void setTransmitExpandedFolders(List<MailFolder> transmitExpandedFolders) { + this.transmitExpandedFolders = transmitExpandedFolders; + } + public SearchUIModel getSearch() { return search; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java 2015-01-13 15:33:28 UTC (rev 750) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java 2015-01-19 10:15:03 UTC (rev 751) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.persistence.entities.ReplyContent; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java 2015-01-13 15:33:28 UTC (rev 750) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java 2015-01-19 10:15:03 UTC (rev 751) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2015-01-13 15:33:28 UTC (rev 750) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2015-01-19 10:15:03 UTC (rev 751) @@ -74,7 +74,6 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.table.TableCellEditor; import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; import java.awt.*; import java.awt.event.ItemEvent; @@ -89,7 +88,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.Enumeration; import java.util.List; import java.util.Map; @@ -275,8 +273,9 @@ // init tree final JTree navigationTree = ui.getNavigationTree(); + List<MailFolder> foldersToExpand = getContext().getListExpandedFolders(); final Map<MailFolder, FolderTreeNode> nodesByFolder = - FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, model.getFolders(), true); + FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, model.getFolders(), foldersToExpand, true); getContext().addPropertyChangeListener(FaxToMailUIContext.PROPERTY_ACTION_IN_PROGRESS, actionInProgressListener); @@ -607,19 +606,8 @@ } JTree tree = getUI().getNavigationTree(); - TreeModel treeModel = tree.getModel(); - Enumeration<TreePath> paths = tree.getExpandedDescendants(new TreePath(treeModel.getRoot())); - List<MailFolder> folders = new ArrayList<MailFolder>(); - if (paths != null) { - while (paths.hasMoreElements()) { - TreePath path = paths.nextElement(); - Object lastPathComponent = path.getLastPathComponent(); - if (FolderTreeNode.class.isAssignableFrom(lastPathComponent.getClass())) { - folders.add(((FolderTreeNode) lastPathComponent).getMailFolder()); - } - } - } - getContext().setExpandedFolders(folders); + List<MailFolder> folders = FaxToMailUIUtil.getExpandedFolders(tree); + getContext().setListExpandedFolders(folders); // remove refresh shortcut JRootPane rootPane = getContext().getMainUI().getRootPane(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2015-01-13 15:33:28 UTC (rev 750) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2015-01-19 10:15:03 UTC (rev 751) @@ -24,22 +24,6 @@ * #L% */ -import java.awt.*; -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import javax.swing.JComponent; -import javax.swing.JTree; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.DefaultMutableTreeNode; - -import jaxx.runtime.validator.swing.SwingValidator; - -import org.nuiton.jaxx.application.swing.util.Cancelable; - import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; @@ -47,7 +31,20 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode; +import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import javax.swing.*; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import java.awt.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * @author Kevin Morin (Code Lutin) * @@ -82,8 +79,9 @@ getRootMailFoldersWithMoveRights(getContext().getCurrentUser()); JTree navigationTree = ui.getNavigationTree(); + List<MailFolder> foldersToExpand = getContext().getTransmitExpandedFolders(); Map<MailFolder, FolderTreeNode> nodesByFolder = - FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, folders, false); + FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, folders, foldersToExpand, false); for (MailFolder folder : nodesByFolder.keySet()) { DefaultMutableTreeNode node = nodesByFolder.get(folder); @@ -120,6 +118,9 @@ @Override public void onCloseUI() { + JTree tree = getUI().getNavigationTree(); + List<MailFolder> folders = FaxToMailUIUtil.getExpandedFolders(tree); + getContext().setTransmitExpandedFolders(folders); } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2015-01-13 15:33:28 UTC (rev 750) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2015-01-19 10:15:03 UTC (rev 751) @@ -22,39 +22,25 @@ * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.Serializable; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import javax.swing.*; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; -import javax.swing.table.TableColumnModel; -import javax.swing.text.JTextComponent; - +import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.persistence.entities.Configuration; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.HasLabel; +import com.franciaflex.faxtomail.persistence.entities.MailAction; +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; +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; @@ -71,21 +57,28 @@ import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; -import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.Configuration; -import com.franciaflex.faxtomail.persistence.entities.WaitingState; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.HasLabel; -import com.franciaflex.faxtomail.persistence.entities.MailAction; -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.Sets; +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.*; +import java.awt.event.ActionEvent; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.Serializable; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import static org.nuiton.i18n.I18n.t; + /** * Contract of any UI handler. * @@ -417,6 +410,7 @@ } protected void closeFrame(JFrame frame, AbstractApplicationUIHandler handler) { + handler.onCloseUI(); if (frame != null) { boolean canClose = true; if (handler instanceof CloseableUI) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2015-01-13 15:33:28 UTC (rev 750) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2015-01-19 10:15:03 UTC (rev 751) @@ -103,6 +103,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -138,10 +139,10 @@ public static Map<MailFolder, FolderTreeNode> initFolderTree(final FaxToMailUIContext context, JTree navigationTree, Collection<MailFolder> folders, + List<MailFolder> foldersToExpand, final boolean colorNotAffectedFolders) { DefaultMutableTreeNode root = new DefaultMutableTreeNode("root"); - List<MailFolder> foldersToExpand = context.getExpandedFolders(); Map<MailFolder, FolderTreeNode> nodesByFolder = new HashMap<MailFolder, FolderTreeNode>(); List<MailFolder> orderedFolders = new ArrayList<MailFolder>(folders); Collections.sort(orderedFolders, Ordering.natural().onResultOf(new Function<MailFolder, Comparable>() { @@ -232,6 +233,22 @@ return nodesByFolder; } + public static List<MailFolder> getExpandedFolders(JTree tree) { + TreeModel treeModel = tree.getModel(); + Enumeration<TreePath> paths = tree.getExpandedDescendants(new TreePath(treeModel.getRoot())); + java.util.List<MailFolder> folders = new ArrayList<MailFolder>(); + if (paths != null) { + while (paths.hasMoreElements()) { + TreePath path = paths.nextElement(); + Object lastPathComponent = path.getLastPathComponent(); + if (FolderTreeNode.class.isAssignableFrom(lastPathComponent.getClass())) { + folders.add(((FolderTreeNode) lastPathComponent).getMailFolder()); + } + } + } + return folders; + } + /** * Creates the tree nodes and returns a map of the nodes by folder * @param parent the node parent

1 0

r750 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/demande content/demande/replies content/reply
by kmorin＠users.forge.codelutin.com 13 Jan '15

13 Jan '15

Author: kmorin Date: 2015-01-13 15:33:28 +0000 (Tue, 13 Jan 2015) New Revision: 750 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/750 Log: fix ldap loading in forward Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2015-01-12 11:25:22 UTC (rev 749) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2015-01-13 15:33:28 UTC (rev 750) @@ -24,13 +24,6 @@ * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.util.Collection; -import java.util.Date; - -import javax.swing.JOptionPane; - import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; @@ -39,6 +32,12 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import javax.swing.*; +import java.util.Collection; +import java.util.Date; + +import static org.nuiton.i18n.I18n.t; + /** * Action d'archivage d'un mail. * @@ -69,9 +68,6 @@ @Override public void doAction() throws Exception { DemandeUIModel model = getModel(); - model.setArchiveDate(new Date()); - model.setDemandStatus(DemandStatus.ARCHIVED); - model.setTakenBy(null); // déplacement du mail dans le dossier d'archive le plus proche // cela permet de déplacer les archives dans d'autre dossier pour leur appliquer @@ -103,6 +99,10 @@ model.setMailFolder(archiveChild); } + model.setArchiveDate(new Date()); + model.setDemandStatus(DemandStatus.ARCHIVED); + model.setTakenBy(null); + super.doAction(); } Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java (rev 0) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyAction.java 2015-01-13 15:33:28 UTC (rev 750) @@ -0,0 +1,108 @@ +package com.franciaflex.faxtomail.ui.swing.actions; + +import com.franciaflex.faxtomail.persistence.entities.Email; +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.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.replies.DemandRepliesUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.replies.DemandRepliesUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.replies.DemandReplyItem; +import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; +import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; +import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.mail.util.MimeMessageUtils; + +import javax.mail.Message; +import javax.mail.internet.MimeMessage; +import javax.swing.*; +import java.awt.*; +import java.nio.charset.Charset; + +import static org.nuiton.i18n.I18n.t; + +/** + * @author Kevin Morin (Code Lutin) + * @since 1.1 + */ +public class OpenReplyAction extends AbstractFaxToMailAction<DemandeUIModel, DemandRepliesUI, DemandRepliesUIHandler> { + + protected DemandReplyItem item; + protected ReplyFormUI frameContent; + protected JFrame frame; + + public OpenReplyAction(DemandRepliesUIHandler handler) { + super(handler, false); + } + + public void setItem(DemandReplyItem item) { + this.item = item; + } + + @Override + public void doAction() throws Exception { + + DemandeUIModel demand = getModel(); + FaxToMailServiceContext serviceContext = getContext().newServiceContext(); + Email email = serviceContext.getEmailService().getFullEmailById(demand.getTopiaId(), getContext().getCurrentUser()); + demand.fromEntity(email); + + Reply reply = item.getReply(); + FaxToMailUIUtil.forceReplyContentLoading(getContext(), reply); + boolean editable = item.isEditable(); + + frameContent = new ReplyFormUI(getUI()); + // TODO echatellier 20140804 : c'est très technique et très bas niveau, ca devrait se trouver dans les services + ReplyContent replyContent = reply.getReplyContent(); + Message message = MimeMessageUtils.createMimeMessage(null, replyContent.getSource()); + ReplyFormUIModel replyModel = frameContent.getModel(); + replyModel.setEditable(editable); + replyModel.setOriginalDemand(demand); + replyModel.setReadonly(true); + replyModel.setReadSentDate(reply.getSentDate()); + replyModel.setSubject(message.getSubject()); + replyModel.setTo(StringUtils.join(message.getRecipients(MimeMessage.RecipientType.TO), " ; ")); + replyModel.setFrom(message.getFrom()[0].toString()); + if (ArrayUtils.isNotEmpty(message.getRecipients(MimeMessage.RecipientType.CC))) { + replyModel.setCc(StringUtils.join(message.getRecipients(MimeMessage.RecipientType.CC), " ; ")); + } + if (ArrayUtils.isNotEmpty(message.getRecipients(MimeMessage.RecipientType.BCC))) { + replyModel.setCci(StringUtils.join(message.getRecipients(MimeMessage.RecipientType.BCC), " ; ")); + } + + if (message.isMimeType("multipart/*")) { + handler.decomposeMultipartEmail(message, replyModel, reply.getTopiaId()); + + } else { + Charset charset = FaxToMailServiceUtils.getCharset(message); + String content = IOUtils.toString(message.getInputStream(), charset); + replyModel.setMessage(content); + } + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + frame = getHandler().openModalFrame(frameContent, + t("faxtomail.reply.title", getModel().getTitle()), + new Dimension(800, 600)); + } + + @Override + protected void releaseAction() { + super.releaseAction(); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + if (frame != null) { + frame.toFront(); + frame = null; + } + } + }); + } +} Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java (rev 0) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenReplyFormAction.java 2015-01-13 15:33:28 UTC (rev 750) @@ -0,0 +1,80 @@ +package com.franciaflex.faxtomail.ui.swing.actions; + +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.content.demande.DemandeListUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; +import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; +import jaxx.runtime.JAXXUtil; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.*; + +import static org.nuiton.i18n.I18n.t; + +/** + * @author Kevin Morin (Code Lutin) + * @since 1.1 + */ +public class OpenReplyFormAction extends AbstractFaxToMailAction<DemandeListUIModel, DemandeListUI, DemandeListUIHandler> { + + protected ReplyFormUI frameContent; + protected JFrame frame; + + public OpenReplyFormAction(DemandeListUIHandler handler) { + super(handler, false); + } + + @Override + public void doAction() throws Exception { + DemandeUIModel demand = getModel().getSelectedEmails().get(0); + + if (StringUtils.isNotBlank(demand.getTopiaId())) { + FaxToMailServiceContext serviceContext = getContext().newServiceContext(); + Email email = serviceContext.getEmailService().getFullEmailById(demand.getTopiaId(), getContext().getCurrentUser()); + demand.fromEntity(email); + + getContext().setCurrentEmail(demand); + + frameContent = new ReplyFormUI(getUI()); + ReplyFormUIModel model = frameContent.getModel(); + + model.setOriginalDemand(demand); + + String sender = JAXXUtil.getStringValue(demand.getSender()); + if (demand.isFax()) { + MailFolder selectedFolder = getModel().getSelectedFolder(); + sender = FaxToMailServiceUtils.addFaxDomainToFaxNumber(sender, selectedFolder); + } + model.setTo(sender); + } + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + frame = getHandler().openModalFrame(frameContent, + t("faxtomail.reply.title", getContext().getCurrentEmail().getTitle()), + new Dimension(800, 600)); + } + + @Override + protected void releaseAction() { + super.releaseAction(); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + if (frame != null) { + frame.toFront(); + frame = null; + } + } + }); + } +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2015-01-12 11:25:22 UTC (rev 749) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css 2015-01-13 15:33:28 UTC (rev 750) @@ -105,6 +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 }; } #archiveMenu { @@ -112,6 +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 }; } #moveMenu { @@ -119,6 +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 }; } #totalDemandCountLabel { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx 2015-01-12 11:25:22 UTC (rev 749) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx 2015-01-13 15:33:28 UTC (rev 750) @@ -60,12 +60,9 @@ <JPopupMenu id='tablePopup'> <JMenuItem id='printMenu' onActionPerformed='handler.print()'/> - <JMenuItem id='replyMenu' - onActionPerformed='handler.reply()'/> - <JMenuItem id='archiveMenu' - onActionPerformed='handler.archive()'/> - <JMenuItem id='moveMenu' - onActionPerformed='handler.transmit()'/> + <JMenuItem id='replyMenu'/> + <JMenuItem id='archiveMenu'/> + <JMenuItem id='moveMenu'/> </JPopupMenu> <JSplitPane constraints='BorderLayout.CENTER' id="mainSplitPane"> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2015-01-12 11:25:22 UTC (rev 749) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2015-01-13 15:33:28 UTC (rev 750) @@ -36,16 +36,11 @@ 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.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.ArchiveFromListAction; import com.franciaflex.faxtomail.ui.swing.actions.ComputeQuantitiesByRangeAction; import com.franciaflex.faxtomail.ui.swing.actions.LoadFolderEmailsAction; -import com.franciaflex.faxtomail.ui.swing.actions.OpenMailFolderChooserFromListAction; import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeFromListAction; -import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; -import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; @@ -98,8 +93,6 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n.t; - /** * Handler of UI {@link com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler}. * @@ -775,39 +768,4 @@ getContext().getActionEngine().runAction(action); } - public void reply() { - DemandeUIModel demand = getModel().getSelectedEmails().get(0); - getContext().setCurrentEmail(demand); - - ReplyFormUI dialogContent = new ReplyFormUI(ui); - ReplyFormUIModel model = dialogContent.getModel(); - - model.setOriginalDemand(demand); - - String sender = JAXXUtil.getStringValue(demand.getSender()); - if (demand.isFax()) { - MailFolder selectedFolder = getModel().getSelectedFolder(); - sender = FaxToMailServiceUtils.addFaxDomainToFaxNumber(sender, selectedFolder); - } - model.setTo(sender); - - openModalFrame(dialogContent, t("faxtomail.reply.title", demand.getTitle()), new Dimension(800, 600)); - } - - public void archive() { - ArchiveFromListAction action = - getContext().getActionFactory().createLogicAction(this, - ArchiveFromListAction.class); - getContext().getActionEngine().runAction(action); - } - - /** - * Display move popup for user to chose where to move all selected demands. - */ - public void transmit() { - OpenMailFolderChooserFromListAction action = - getContext().getActionFactory().createLogicAction(this, - OpenMailFolderChooserFromListAction.class); - getContext().getActionEngine().runAction(action); - } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2015-01-12 11:25:22 UTC (rev 749) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2015-01-13 15:33:28 UTC (rev 750) @@ -32,6 +32,8 @@ 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.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyAttachmentModel; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; @@ -42,8 +44,6 @@ import jaxx.runtime.JAXXUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.mail.util.MimeMessageUtils; @@ -55,7 +55,6 @@ import javax.mail.BodyPart; import javax.mail.Message; import javax.mail.Part; -import javax.mail.internet.MimeMessage.RecipientType; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; import javax.swing.*; @@ -184,45 +183,10 @@ public void openReply(DemandReplyItem item) { closeEditor(); - Reply reply = item.getReply(); - FaxToMailUIUtil.forceReplyContentLoading(getContext(), reply); - boolean editable = item.isEditable(); - - try { - ReplyFormUI dialogContent = new ReplyFormUI(ui); - // TODO echatellier 20140804 : c'est très technique et très bas niveau, ca devrait se trouver dans les services - ReplyContent replyContent = reply.getReplyContent(); - Message message = MimeMessageUtils.createMimeMessage(null, replyContent.getSource()); - ReplyFormUIModel replyModel = dialogContent.getModel(); - replyModel.setEditable(editable); - replyModel.setReadonly(true); - replyModel.setReadSentDate(reply.getSentDate()); - replyModel.setSubject(message.getSubject()); - replyModel.setTo(StringUtils.join(message.getRecipients(RecipientType.TO), " ; ")); - replyModel.setFrom(message.getFrom()[0].toString()); - if (ArrayUtils.isNotEmpty(message.getRecipients(RecipientType.CC))) { - replyModel.setCc(StringUtils.join(message.getRecipients(RecipientType.CC), " ; ")); - } - if (ArrayUtils.isNotEmpty(message.getRecipients(RecipientType.BCC))) { - replyModel.setCci(StringUtils.join(message.getRecipients(RecipientType.BCC), " ; ")); - } - - if (message.isMimeType("multipart/*")) { - decomposeMultipartEmail(message, replyModel, reply.getTopiaId()); - - } else { - Charset charset = FaxToMailServiceUtils.getCharset(message); - String content = IOUtils.toString(message.getInputStream(), charset); - replyModel.setMessage(content); - } - log.info(replyModel.getMessage()); - - openFrame(dialogContent, replyModel.getSubject(), new Dimension(800, 600)); - - } catch (Exception e) { - getContext().getErrorHelper().showErrorDialog(t("faxtomail.demandReplies.error"), e); - } - + FaxToMailUIContext context = getContext(); + OpenReplyAction action = context.getActionFactory().createLogicAction(this, OpenReplyAction.class); + action.setItem(item); + context.getActionEngine().runActionAndWait(action); } public void openForward(DemandReplyItem item) { @@ -239,7 +203,7 @@ Message message = MimeMessageUtils.createMimeMessage(null, replyContent.getSource()); ReplyFormUIModel replyModel = dialogContent.getModel(); replyModel.setEditable(editable); -// replyModel.setOriginalDemand(ui.getModel()); + replyModel.setOriginalDemand(ui.getModel()); replyModel.setReadSentDate(reply.getSentDate()); replyModel.setSubject(t("faxtomail.reply.forwardsubject", message.getSubject())); @@ -275,7 +239,7 @@ * @param part the part to decompose * @throws Exception */ - protected void decomposeMultipartEmail(Part part, ReplyFormUIModel reply, String topiaId) throws Exception { + public void decomposeMultipartEmail(Part part, ReplyFormUIModel reply, String topiaId) throws Exception { DataSource dataSource = part.getDataHandler().getDataSource(); MimeMultipart mimeMultipart = new MimeMultipart(dataSource); int multiPartCount = mimeMultipart.getCount(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2015-01-12 11:25:22 UTC (rev 749) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2015-01-13 15:33:28 UTC (rev 750) @@ -428,6 +428,7 @@ // clear fields that need to be filled by hand replyModel.setReadonly(false); + replyModel.setOriginalDemand(getModel().getOriginalDemand()); replyModel.setReadSentDate(null); replyModel.setTo(null); replyModel.setCc(null);

1 0

r749 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 12 Jan '15

12 Jan '15

Author: kmorin Date: 2015-01-12 11:25:22 +0000 (Mon, 12 Jan 2015) New Revision: 749 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/749 Log: fixes #6426 Erreur Nimbus Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2015-01-09 14:44:21 UTC (rev 748) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2015-01-12 11:25:22 UTC (rev 749) @@ -206,7 +206,6 @@ protected void browseFolderParent(MailFolder folder, FaxToMailUser user, MailFolderService mailFolderService) { Hibernate.initialize(folder); - Hibernate.initialize(folder.getChildren()); mailFolderService.fetchFolderAttributes(folder); MailFolder parent = folder.getParent(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2015-01-09 14:44:21 UTC (rev 748) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2015-01-12 11:25:22 UTC (rev 749) @@ -29,26 +29,23 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; -import org.nuiton.jaxx.application.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.franciaflex.faxtomail.ui.swing.util.RemoveablePropertyChangeListener; import com.google.common.base.Preconditions; - import jaxx.runtime.JAXXBinding; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.session.SwingSession; import jaxx.runtime.validator.swing.SwingValidator; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import javax.swing.*; - -import java.awt.Cursor; +import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; @@ -343,13 +340,33 @@ Icon icon; switch (screen) { case SEARCH: - screenUI = new SearchUI(ui); + // cf #6426, if a Nimbus ClassCastException, then retry to create the ui + // TODO remove this when we use the ng actions + try { + screenUI = new SearchUI(ui); + + } catch (ClassCastException e) { + if (log.isErrorEnabled()) { + log.error("ClassCastException caught", e); + } + screenUI = new SearchUI(ui); + } screenTitle = t("faxtomail.search.title"); icon = ui.getSearchButton().getIcon(); break; case DEMANDE: - screenUI = new DemandesUI(ui); + // cf #6426, if a Nimbus ClassCastException, then retry to create the ui + // TODO remove this when we use the ng actions + try { + screenUI = new DemandesUI(ui); + + } catch (ClassCastException e) { + if (log.isErrorEnabled()) { + log.error("ClassCastException caught", e); + } + screenUI = new DemandesUI(ui); + } screenTitle = t("faxtomail.demand.title"); icon = JAXXWidgetUtil.createActionIcon("email-group"); rightDecoration = ((DemandesUI) screenUI).getTopToolBar(); @@ -358,7 +375,17 @@ default: case LIST: - screenUI = new DemandeListUI(ui); + // cf #6426, if a Nimbus ClassCastException, then retry to create the ui + // TODO remove this when we use the ng actions + try { + screenUI = new DemandeListUI(ui); + + } catch (ClassCastException e) { + if (log.isErrorEnabled()) { + log.error("ClassCastException caught", e); + } + screenUI = new DemandeListUI(ui); + } screenTitle = t("faxtomail.demandeList.title"); icon = ui.getDemandListButton().getIcon(); break; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java 2015-01-09 14:44:21 UTC (rev 748) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java 2015-01-12 11:25:22 UTC (rev 749) @@ -22,8 +22,6 @@ * #L% */ -import com.franciaflex.faxtomail.ui.swing.actions.AbstractChangeScreenAction; -import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.action.ApplicationActionException; @@ -56,23 +54,13 @@ log.error("Global application exception [" + tname + "] : " + (cause != null ? cause.getMessage() : ""), ex); } - // FIXME 20141218 kmorin - // catch ClassCastException to avoid errors like these : - // java.lang.ClassCastException: javax.swing.plaf.FontUIResource cannot be cast to java.awt.Color - if (cause instanceof ClassCastException) { - if (log.isErrorEnabled()) { - log.error("ClassCastException caught", cause); - } - return; - } - // boolean backToScreen = false; // // AbstractFaxToMailAction action = null; // if (cause instanceof ApplicationActionException) { - ApplicationActionException actionException = (ApplicationActionException) cause; +// ApplicationActionException actionException = (ApplicationActionException) cause; cause = cause.getCause(); if (log.isDebugEnabled()) { @@ -86,6 +74,17 @@ // } } + // FIXME 20141218 kmorin + // TODO remove this when we use the ng actions + // catch ClassCastException to avoid errors like these : + // java.lang.ClassCastException: javax.swing.plaf.FontUIResource cannot be cast to java.awt.Color + if (cause instanceof ClassCastException) { + if (log.isErrorEnabled()) { + log.error("ClassCastException caught", cause); + } + return; + } + showErrorDialog(cause != null ? cause.getMessage() : "", cause); // if (backToScreen) {

1 0

r748 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content: demande search
by kmorin＠users.forge.codelutin.com 09 Jan '15

09 Jan '15

Author: kmorin Date: 2015-01-09 14:44:21 +0000 (Fri, 09 Jan 2015) New Revision: 748 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/748 Log: fixes #6421 Erreur lors du groupage Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2015-01-09 13:27:16 UTC (rev 747) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2015-01-09 14:44:21 UTC (rev 748) @@ -287,6 +287,7 @@ currentRow = null; } else { int rowIndex = source.getLeadSelectionIndex(); + rowIndex = table.convertRowIndexToModel(rowIndex); currentRow = rangeTableModel.getEntry(rowIndex); currentRow.addPropertyChangeListener(rangeRowListener); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2015-01-09 13:27:16 UTC (rev 747) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2015-01-09 14:44:21 UTC (rev 748) @@ -24,10 +24,34 @@ * #L% */ -import static org.nuiton.i18n.I18n.t; +import com.franciaflex.faxtomail.persistence.entities.DemandStatus; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +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.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; +import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; +import com.franciaflex.faxtomail.ui.swing.util.PaginationComboModel; +import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXDatePicker; +import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.ColorHighlighter; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import org.nuiton.util.pagination.PaginationParameter; -import java.awt.Color; -import java.awt.Component; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -44,37 +68,8 @@ import java.util.Date; import java.util.List; -import javax.swing.*; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; +import static org.nuiton.i18n.I18n.t; -import com.franciaflex.faxtomail.persistence.entities.HasLabel; -import com.franciaflex.faxtomail.persistence.entities.SearchFilter; -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.validator.swing.SwingValidator; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXDatePicker; -import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ColorHighlighter; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.nuiton.jaxx.application.swing.util.Cancelable; - -import com.franciaflex.faxtomail.persistence.entities.DemandStatus; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.MailField; -import com.franciaflex.faxtomail.ui.swing.actions.GroupAction; -import com.franciaflex.faxtomail.ui.swing.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.PaginationComboModel; -import org.nuiton.util.pagination.PaginationParameter; - /** * @author Kevin Morin (Code Lutin) * @@ -187,6 +182,7 @@ ListSelectionModel selectionModel = (ListSelectionModel) e.getSource(); SearchUIModel model = getModel(); int selectedIndex = selectionModel.getLeadSelectionIndex(); + selectedIndex = dataTable.convertRowIndexToModel(selectedIndex); DemandeTableModel dataTableModel = (DemandeTableModel) dataTable.getModel(); DemandeUIModel selectedModel = selectedIndex < 0 ? null : dataTableModel.getEntry(selectedIndex); model.setGroupEnabled(!selectionModel.isSelectionEmpty() && isDemandSelectable(selectedModel));

1 0

r747 - trunk/faxtomail-ui-swing
by kmorin＠users.forge.codelutin.com 09 Jan '15

09 Jan '15

Author: kmorin Date: 2015-01-09 13:27:16 +0000 (Fri, 09 Jan 2015) New Revision: 747 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/747 Log: fixes #6418 Erreur ?\195?\160 l'ouverture de certains pdf Modified: trunk/faxtomail-ui-swing/pom.xml Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2015-01-09 11:38:00 UTC (rev 746) +++ trunk/faxtomail-ui-swing/pom.xml 2015-01-09 13:27:16 UTC (rev 747) @@ -258,16 +258,19 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk15on</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> + <scope>runtime</scope> </dependency> </dependencies>

1 0

r746 - in trunk: . faxtomail-ui-swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 09 Jan '15

09 Jan '15

Author: kmorin Date: 2015-01-09 11:38:00 +0000 (Fri, 09 Jan 2015) New Revision: 746 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/746 Log: fixes #6418 Erreur ?\195?\160 l'ouverture de certains pdf Modified: trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/pom.xml Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2015-01-08 15:27:43 UTC (rev 745) +++ trunk/faxtomail-ui-swing/pom.xml 2015-01-09 11:38:00 UTC (rev 746) @@ -250,17 +250,26 @@ <artifactId>com.springsource.javax.media.jai.codec</artifactId> </dependency> -  -  -  -  -  - <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </dependency> + + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcmail-jdk15on</artifactId> + </dependency> + + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + </dependency> + </dependencies> <build> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2015-01-08 15:27:43 UTC (rev 745) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2015-01-09 11:38:00 UTC (rev 746) @@ -24,24 +24,8 @@ * #L% */ -import java.awt.*; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; - -import javax.swing.JTextArea; - -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import com.itextpdf.text.DocumentException; -import com.itextpdf.text.Element; -import com.itextpdf.text.ExceptionConverter; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXUtil; - import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.services.FaxToMailServiceContext; 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; @@ -50,19 +34,30 @@ import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIModel; +import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.itextpdf.text.BaseColor; -import com.itextpdf.text.Document; +import com.itextpdf.text.DocumentException; +import com.itextpdf.text.Element; +import com.itextpdf.text.ExceptionConverter; import com.itextpdf.text.Font; import com.itextpdf.text.Phrase; import com.itextpdf.text.pdf.BaseFont; import com.itextpdf.text.pdf.ColumnText; -import com.itextpdf.text.pdf.PdfAction; import com.itextpdf.text.pdf.PdfContentByte; import com.itextpdf.text.pdf.PdfGState; import com.itextpdf.text.pdf.PdfReader; import com.itextpdf.text.pdf.PdfStamper; -import com.itextpdf.text.pdf.PdfWriter; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.JAXXUtil; +import javax.swing.*; +import java.awt.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; + import static org.nuiton.i18n.I18n.t; /** @@ -85,6 +80,8 @@ InputStream inputStream = new FileInputStream(file); + // to save protected pdfs + PdfReader.unethicalreading = true; PdfReader pdfReader = new PdfReader(inputStream); //File target = new File(FileUtils.getTempDirectory(), getModel().getOriginalFile().getName() + "-annoté.pdf"); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2015-01-08 15:27:43 UTC (rev 745) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2015-01-09 11:38:00 UTC (rev 746) @@ -178,6 +178,9 @@ if (FaxToMailUIUtil.isFileAPDF(attachmentFile)) { try { pdDocument = PDDocument.loadLegacy(file); + if (pdDocument.isEncrypted()) { + pdDocument.decrypt(""); + } model.setPageNumber(pdDocument.getNumberOfPages()); model.setCurrentPageIndex(1); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2015-01-08 15:27:43 UTC (rev 745) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2015-01-09 11:38:00 UTC (rev 746) @@ -515,6 +515,9 @@ if (result) { pdDocument = PDDocument.loadLegacy(fis); + if (pdDocument.isEncrypted()) { + pdDocument.decrypt(""); + } final PDFRenderer renderer = new PDFRenderer(pdDocument); final int numOfPages = pdDocument.getNumberOfPages(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2015-01-08 15:27:43 UTC (rev 745) +++ trunk/pom.xml 2015-01-09 11:38:00 UTC (rev 746) @@ -680,6 +680,24 @@ <version>2.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>1.51</version> + </dependency> + + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcmail-jdk15on</artifactId> + <version>1.51</version> + </dependency> + + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>1.51</version> + </dependency> + </dependencies> </dependencyManagement>

1 0

r745 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 08 Jan '15

08 Jan '15

Author: kmorin Date: 2015-01-08 15:27:43 +0000 (Thu, 08 Jan 2015) New Revision: 745 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/745 Log: fixes #6416 Erreur lors du retour sur la liste Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2015-01-08 14:38:42 UTC (rev 744) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2015-01-08 15:27:43 UTC (rev 745) @@ -22,88 +22,84 @@ * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.awt.*; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.MouseEvent; -import java.beans.IntrospectionException; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.Enumeration; -import java.util.List; -import java.util.Map; - -import javax.swing.*; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.table.TableCellEditor; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - -import com.franciaflex.faxtomail.persistence.entities.Configuration; -import com.franciaflex.faxtomail.persistence.entities.EmailFilter; -import com.franciaflex.faxtomail.persistence.entities.MailAction; -import com.franciaflex.faxtomail.persistence.entities.OriginalEmail; -import com.franciaflex.faxtomail.persistence.entities.OriginalEmailImpl; -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.OpenMailFolderChooserFromListAction; -import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; -import com.franciaflex.faxtomail.ui.swing.util.RemoveablePropertyChangeListener; -import com.google.common.collect.Lists; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.table.filter.TableFilter; -import jaxx.runtime.swing.table.filter.TableRowFilterSupport; -import jaxx.runtime.validator.swing.SwingValidator; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ColorHighlighter; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.nuiton.decorator.Decorator; -import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; -import org.nuiton.jaxx.application.swing.util.CloseableUI; - import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.HistoryImpl; import com.franciaflex.faxtomail.persistence.entities.HistoryType; +import com.franciaflex.faxtomail.persistence.entities.MailAction; 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.services.FaxToMailServiceUtils; +import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.ArchiveFromListAction; import com.franciaflex.faxtomail.ui.swing.actions.ComputeQuantitiesByRangeAction; import com.franciaflex.faxtomail.ui.swing.actions.LoadFolderEmailsAction; +import com.franciaflex.faxtomail.ui.swing.actions.OpenMailFolderChooserFromListAction; import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeFromListAction; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; +import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode; import com.franciaflex.faxtomail.ui.swing.util.PaginationComboModel; +import com.franciaflex.faxtomail.ui.swing.util.RemoveablePropertyChangeListener; import com.google.common.collect.HashMultimap; +import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.swing.table.filter.TableFilter; +import jaxx.runtime.swing.table.filter.TableRowFilterSupport; +import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.ColorHighlighter; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.table.TableCellEditor; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreePath; +import java.awt.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.MouseEvent; +import java.beans.IntrospectionException; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyDescriptor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n.t; + /** * Handler of UI {@link com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler}. * @@ -493,16 +489,18 @@ MailFolder folder = getModel().getSelectedFolder(); if (folder != null) { FolderTreeNode folderNode = nodesByFolder.get(folder); - boolean readable = folderNode.isCanRead(); + if (folderNode != null) { + boolean readable = folderNode.isCanRead(); - while (folder.getAllowCreateDemandIntoFolder() == null - && folder.getParent() != null) { - folder = folder.getParent(); - } + while (folder.getAllowCreateDemandIntoFolder() == null + && folder.getParent() != null) { + folder = folder.getParent(); + } - DemandeListUIModel model = getModel(); - model.setComputeQuantitiesByRangeEnabled(readable); - model.setNewDemandEnabled(readable && folder != null && Boolean.TRUE.equals(folder.getAllowCreateDemandIntoFolder())); + DemandeListUIModel model = getModel(); + model.setComputeQuantitiesByRangeEnabled(readable); + model.setNewDemandEnabled(readable && folder != null && Boolean.TRUE.equals(folder.getAllowCreateDemandIntoFolder())); + } } tableFilter.executeFilter();

1 0