[Faxtomail-commits] 02/02: fixes #6508 Les emails transférés en PJ ne sont pas extraits à la réception

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit a4c5b1c4c3350e55542412a50989a41b655571b9 Author: Kevin Morin <morin@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 --- .../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 +- .../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 ++-- .../src/license/THIRD-PARTY.properties | 2 +- .../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 +- .../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 | 25 +++-- 102 files changed, 642 insertions(+), 785 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java index 2c82134..f73df3b 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java @@ -24,20 +24,8 @@ package com.franciaflex.faxtomail; * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.awt.Color; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.swing.KeyStroke; - +import com.google.common.base.Charsets; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; @@ -51,8 +39,18 @@ import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.version.Version; -import com.google.common.base.Charsets; -import com.google.common.collect.Maps; +import javax.swing.*; +import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import static org.nuiton.i18n.I18n.t; public class FaxToMailConfiguration extends ApplicationConfiguration { diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java index adaa1eb..13a67d0 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java @@ -24,18 +24,17 @@ package com.franciaflex.faxtomail; * #L% */ -import static org.nuiton.i18n.I18n.n; +import org.nuiton.config.ConfigOptionDef; +import org.nuiton.util.version.Version; -import java.awt.Color; +import javax.swing.*; +import java.awt.*; import java.io.File; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Locale; -import javax.swing.KeyStroke; - -import org.nuiton.config.ConfigOptionDef; -import org.nuiton.util.version.Version; +import static org.nuiton.i18n.I18n.n; public enum FaxToMailConfigurationOption implements ConfigOptionDef { diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java index 08bd8ce..3e11a47 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java @@ -24,18 +24,17 @@ package com.franciaflex.faxtomail.persistence.entities; * #L% */ -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; import org.nuiton.util.pagination.PaginationParameter; -import com.google.gson.Gson; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public abstract class AbstractFaxToMailTopiaDao<E extends TopiaEntity> extends AbstractTopiaDao<E> { diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java index fc8b25b..00c679d 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java @@ -24,6 +24,12 @@ package com.franciaflex.faxtomail.persistence.entities; * #L% */ +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; @@ -32,12 +38,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URLEncoder; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; - public class AttachmentFileImpl extends AttachmentFileAbstract { private static final Log log = LogFactory.getLog(AttachmentFileImpl.class); diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java index 4ee3325..a1f7865 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientImpl.java @@ -24,11 +24,11 @@ package com.franciaflex.faxtomail.persistence.entities; * #L% */ +import com.google.gson.reflect.TypeToken; + import java.lang.reflect.Type; import java.util.List; -import com.google.gson.reflect.TypeToken; - public class ClientImpl extends ClientAbstract { /** serialVersionUID. */ diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java index 927049e..eea5560 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/ClientTopiaDao.java @@ -24,14 +24,13 @@ package com.franciaflex.faxtomail.persistence.entities; * #L% */ +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang3.StringUtils; - -import com.google.common.base.Preconditions; - public class ClientTopiaDao extends AbstractClientTopiaDao<Client> { protected List<Client> forPropertyJsonLike(String property, String value) { diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java index 2acba4c..c1d485b 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java @@ -26,9 +26,7 @@ package com.franciaflex.faxtomail.persistence.entities; import org.jdesktop.beans.AbstractSerializableBean; -import java.util.Collection; import java.util.Date; -import java.util.List; import java.util.Set; public class EmailFilter extends AbstractSerializableBean { diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java index 667e646..3e887fa 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/HistoryImpl.java @@ -24,11 +24,11 @@ package com.franciaflex.faxtomail.persistence.entities; * #L% */ +import com.google.gson.reflect.TypeToken; + import java.lang.reflect.Type; import java.util.Set; -import com.google.gson.reflect.TypeToken; - public class HistoryImpl extends HistoryAbstract { /** serialVersionUID. */ diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java index 4620967..f5d751a 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailFolderTopiaDao.java @@ -24,9 +24,7 @@ package com.franciaflex.faxtomail.persistence.entities; * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; -import org.apache.commons.lang3.StringUtils; import java.util.Collection; import java.util.HashMap; diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java index 057dbb7..9507e5d 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java @@ -24,11 +24,11 @@ package com.franciaflex.faxtomail.persistence.entities; * #L% */ +import org.jdesktop.beans.AbstractSerializableBean; + import java.util.Date; import java.util.List; -import org.jdesktop.beans.AbstractSerializableBean; - public class SearchFilter extends AbstractSerializableBean { /** serialVersionUID. */ diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java index c1e4572..127ad39 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumListUserType.java @@ -24,6 +24,10 @@ package com.franciaflex.faxtomail.persistence.hibernate; * #L% */ +import org.hibernate.HibernateException; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; + import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -32,10 +36,6 @@ import java.sql.Types; import java.util.ArrayList; import java.util.List; -import org.hibernate.HibernateException; -import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.usertype.UserType; - /** * See https://community.jboss.org/wiki/Java5EnumUserType. * and inspired by http://2lips.pl/blog/usertype-enumset-mysql-set-column. diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java index 1a84f8f..a1c2213 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/hibernate/EnumSetUserType.java @@ -24,6 +24,10 @@ package com.franciaflex.faxtomail.persistence.hibernate; * #L% */ +import org.hibernate.HibernateException; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; + import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -33,10 +37,6 @@ import java.util.EnumSet; import java.util.LinkedHashSet; import java.util.Set; -import org.hibernate.HibernateException; -import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.usertype.UserType; - /** * See https://community.jboss.org/wiki/Java5EnumUserType. * and inspired by http://2lips.pl/blog/usertype-enumset-mysql-set-column. diff --git a/faxtomail-service/src/license/THIRD-PARTY.properties b/faxtomail-service/src/license/THIRD-PARTY.properties index ee344b1..a3b853c 100644 --- a/faxtomail-service/src/license/THIRD-PARTY.properties +++ b/faxtomail-service/src/license/THIRD-PARTY.properties @@ -37,7 +37,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 17 16:20:10 CET 2014 +#Wed Jan 21 10:01:09 CET 2015 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License gui.ava--html2image--2.0.1=GNU Lesser General Public License, Version 2.1 diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java index 56a7ab9..b21ebb7 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java @@ -24,18 +24,17 @@ package com.franciaflex.faxtomail.services; * #L% */ -import java.text.DateFormat; -import java.util.Date; - -import com.franciaflex.faxtomail.services.service.ldap.Contact; -import org.nuiton.decorator.Decorator; -import org.nuiton.decorator.DecoratorProvider; - import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.franciaflex.faxtomail.persistence.entities.Reply; +import com.franciaflex.faxtomail.services.service.ldap.Contact; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorProvider; + +import java.text.DateFormat; +import java.util.Date; /** * FaxToMail decorator service. diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java index d3e15b3..108c022 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java @@ -24,33 +24,31 @@ package com.franciaflex.faxtomail.services; * #L% */ -import java.io.Closeable; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Proxy; -import java.util.Date; - +import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.service.ClientService; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.InitFaxToMailService; +import com.franciaflex.faxtomail.services.service.LdapService; import com.franciaflex.faxtomail.services.service.LdapServiceImpl; import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.services.service.ReferentielService; import com.franciaflex.faxtomail.services.service.UserService; import com.franciaflex.faxtomail.services.service.ValidationService; - +import com.franciaflex.faxtomail.services.service.ldap.LdapServiceMock; +import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.services.service.LdapService; -import com.franciaflex.faxtomail.services.service.ldap.LdapServiceMock; -import com.google.common.base.Preconditions; +import java.io.Closeable; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Proxy; +import java.util.Date; public class FaxToMailServiceContext implements Closeable { diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java index cd050f3..2f63743 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java @@ -24,17 +24,15 @@ package com.franciaflex.faxtomail.services; * #L% */ -import java.nio.charset.Charset; -import java.nio.charset.UnsupportedCharsetException; -import java.util.Collection; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import org.apache.commons.io.Charsets; import javax.mail.MessagingException; import javax.mail.Part; import javax.mail.internet.ContentType; - -import org.apache.commons.io.Charsets; - -import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import java.nio.charset.Charset; +import java.nio.charset.UnsupportedCharsetException; +import java.util.Collection; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java index e54cc45..677c154 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java @@ -24,25 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.map.MultiKeyMap; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; -import org.nuiton.topia.persistence.support.TopiaSqlWork; - import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.ClientImpl; import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; @@ -52,6 +33,22 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.persistence.entities.NewClient; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.base.Preconditions; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.map.MultiKeyMap; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; /** * Service de gestion des clients. diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java index 8f574d4..3139212 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java @@ -24,11 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; @@ -40,6 +35,11 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailService; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * @author Kevin Morin (Code Lutin) */ diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java index ea7eaf1..d2a7c85 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java @@ -24,27 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Store; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntities; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.ConfigurationImpl; import com.franciaflex.faxtomail.persistence.entities.ConfigurationTopiaDao; @@ -75,6 +54,25 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Store; +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; /** * @author kmorin - kmorin@codelutin.com diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java index 8146041..cf07f89 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java @@ -24,44 +24,42 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.mail.MessagingException; -import javax.mail.Part; -import javax.mail.internet.MimeMessage; - -import com.franciaflex.faxtomail.persistence.entities.EmailFilter; -import com.franciaflex.faxtomail.persistence.entities.ExtensionCommand; -import com.franciaflex.faxtomail.persistence.entities.OriginalEmail; -import com.franciaflex.faxtomail.persistence.entities.SearchFilter; -import com.franciaflex.faxtomail.services.service.imports.ArchiveImportResult; -import com.itextpdf.text.DocumentException; -import org.apache.commons.mail.EmailException; -import org.nuiton.util.pagination.PaginationParameter; -import org.nuiton.util.pagination.PaginationResult; - import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.EmailFilter; +import com.franciaflex.faxtomail.persistence.entities.ExtensionCommand; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailLock; +import com.franciaflex.faxtomail.persistence.entities.OriginalEmail; import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.persistence.entities.ReplyContent; +import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.franciaflex.faxtomail.services.FaxToMailService; import com.franciaflex.faxtomail.services.service.exceptions.AlreadyLockedMailException; import com.franciaflex.faxtomail.services.service.exceptions.FolderNotReadableException; import com.franciaflex.faxtomail.services.service.exceptions.InvalidClientException; +import com.franciaflex.faxtomail.services.service.imports.ArchiveImportResult; +import com.itextpdf.text.DocumentException; +import org.apache.commons.mail.EmailException; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; + +import javax.mail.MessagingException; +import javax.mail.Part; +import javax.mail.internet.MimeMessage; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 9bfdea3..8899f6f 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -86,6 +86,7 @@ import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; import org.xhtmlrenderer.pdf.ITextRenderer; +import org.xml.sax.SAXException; import javax.activation.DataHandler; import javax.activation.DataSource; @@ -96,7 +97,11 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import java.io.BufferedWriter; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -1660,7 +1665,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe if (StringUtils.isNotBlank(originalEmailContent)) { try { Attachment contentAttachment = convertTextToPdf(originalEmailContent, - t("faxtomail.email.content.attachment.plainfileName")); + t("faxtomail.email.content.attachment.plainFileName")); AttachmentFile contentAttachmentFile = contentAttachment.getOriginalFile(); contentAttachmentFile.setTopiaId(getTopiaId(AttachmentFile.class, contentAttachmentFile)); @@ -1814,8 +1819,11 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe @Override public String decomposeMultipartEmail(List<Attachment> attachments, Part part) throws Exception { - String result = null; + return decomposeMultipartEmail(attachments, part, 0); + } + protected String decomposeMultipartEmail(List<Attachment> attachments, Part part, int decomposingForwardedEmail) throws Exception { + String result = null; DataSource dataSource = part.getDataHandler().getDataSource(); MimeMultipart mimeMultipart = new MimeMultipart(dataSource); @@ -1833,7 +1841,13 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe if (bp.isMimeType("text/plain")) { if (StringUtils.isNotBlank(content)) { - Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); + String name; + if (decomposingForwardedEmail > 0) { + name = t("faxtomail.email.content.attachment.forwardedFileName", decomposingForwardedEmail); + } else { + name = t("faxtomail.email.content.attachment.plainFileName"); + } + Attachment attachment = convertTextToPdf(content, name); attachments.add(attachment); } @@ -1843,11 +1857,28 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe // if it is multipart part, decompose it } else if (bp.isMimeType("multipart/*")) { - String htmlContent = decomposeMultipartEmail(attachments, bp); + String htmlContent = decomposeMultipartEmail(attachments, bp, decomposingForwardedEmail); if (htmlContent != null) { result = htmlContent; } + } else if (bp.isMimeType("message/*")) { + decomposingForwardedEmail++; + String content = decomposeMultipartEmail(attachments, bp, decomposingForwardedEmail); + if (content != null) { + //remove tattachement if exists, to avoid having twice the mail content in the attachments + String fileName = t("faxtomail.email.content.attachment.forwardedFileName", decomposingForwardedEmail) + ".pdf"; + for (Attachment a : attachments) { + if (fileName.equals(a.getOriginalFileName())) { + attachments.remove(a); + break; + } + } + + Attachment attachment = convertHTMLToPdf(attachments, content, fileName); + attachments.add(attachment); + } + // else, this is an attachment } else { String fileName = bp.getFileName(); @@ -1863,7 +1894,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe // remove the guillemets between the id if (fileName == null && contentID == null) { - break; + fileName = t("faxtomail.email.content.attachment.unnamed", attachments.size()); + } else if (fileName == null) { fileName = contentID; } @@ -2073,15 +2105,11 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe result.setOriginalFileName(name + ".pdf"); result.setAddedByUser(false); - } catch (OutOfMemoryError er) { + } catch (OutOfMemoryError | DocumentException er) { // certains mails (spam) très compliqué ne peuvent pas être convertit en images if (log.isWarnEnabled()) { log.warn("Can't convert html content to pdf", er); } - } catch (DocumentException ex) { - if (log.isWarnEnabled()) { - log.warn("Can't convert html content to pdf", ex); - } } finally { // on supprime les fichiers avant le delete on exit pour eviter que le disque ne se remplissent trop vite for (File file : fileToDelete) { diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java index 7c8b8bc..4d39849 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java @@ -24,27 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; - import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; @@ -75,6 +54,26 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.services.service.exceptions.InvalidClientException; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import static org.nuiton.i18n.I18n.t; public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements InitFaxToMailService { diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java index f2f3f13..023992b 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java @@ -24,20 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.franciaflex.faxtomail.services.service.ldap.Contact; -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.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; @@ -45,11 +31,24 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.franciaflex.faxtomail.services.service.ldap.AuthenticationException; +import com.franciaflex.faxtomail.services.service.ldap.Contact; import com.unboundid.ldap.sdk.LDAPConnection; import com.unboundid.ldap.sdk.LDAPException; import com.unboundid.ldap.sdk.SearchResult; import com.unboundid.ldap.sdk.SearchResultEntry; import com.unboundid.ldap.sdk.SearchScope; +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.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class LdapServiceImpl extends FaxToMailServiceSupport implements LdapService { diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java index d22885c..94d126c 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java @@ -24,11 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; @@ -37,6 +32,10 @@ import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailService; import javax.mail.Address; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java index fbf1847..ce166c5 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java @@ -24,10 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.InputStream; -import java.util.List; -import java.util.Map; - import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; @@ -38,6 +34,10 @@ import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailService; +import java.io.InputStream; +import java.util.List; +import java.util.Map; + /** * @author Kevin Morin (Code Lutin) */ diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java index f478c5b..4058df3 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java @@ -24,23 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import org.apache.commons.collections4.map.MultiKeyMap; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.csv.Import; -import org.nuiton.csv.ImportRuntimeException; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.ClientImpl; import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; @@ -66,6 +49,21 @@ import com.franciaflex.faxtomail.services.service.imports.EmailFilterImportModel import com.franciaflex.faxtomail.services.service.imports.PriorityImportModel; import com.franciaflex.faxtomail.services.service.imports.RangeImportModel; import com.franciaflex.faxtomail.services.service.imports.WaitingStateImportModel; +import org.apache.commons.collections4.map.MultiKeyMap; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * @author kmorin - kmorin@codelutin.com diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java index 8318211..ab10244 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java @@ -24,15 +24,14 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.util.List; - -import org.hibernate.Hibernate; - import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; +import org.hibernate.Hibernate; + +import java.util.List; /** * @author kmorin - kmorin@codelutin.com diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java index 65dd871..2055561 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationServiceImpl.java @@ -24,13 +24,12 @@ package com.franciaflex.faxtomail.services.service; * #L% */ +import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorFactory; import org.nuiton.validator.NuitonValidatorResult; -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; - /** * To validate some incoming data using nuiton-validators. * diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java index 65d4d1f..d2558aa 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ArchiveImportExportModel.java @@ -24,22 +24,19 @@ package com.franciaflex.faxtomail.services.service.imports; * #L% */ -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; - +import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.HasLabel; -import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; +import com.franciaflex.faxtomail.persistence.entities.Priority; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; import org.nuiton.csv.Common; import org.nuiton.csv.ValueParserFormatter; import org.nuiton.csv.ext.AbstractImportExportModel; -import com.franciaflex.faxtomail.persistence.entities.DemandType; -import com.franciaflex.faxtomail.persistence.entities.WaitingState; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.Priority; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Map; /** * Modele d'import des archives, défini comme suit: diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java index 84da084..695b82c 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java @@ -25,7 +25,6 @@ package com.franciaflex.faxtomail.services.service.imports; */ import com.franciaflex.faxtomail.persistence.entities.Client; - import org.apache.commons.lang3.StringUtils; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java index df30b15..119fe81 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/DemandTypeImportModel.java @@ -24,10 +24,9 @@ package com.franciaflex.faxtomail.services.service.imports; * #L% */ -import org.nuiton.csv.ext.AbstractImportModel; - import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.DemandTypeImpl; +import org.nuiton.csv.ext.AbstractImportModel; /** * Modèle d'import des etat d'attente. diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java index 7c9c29b..00736df 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/EmailAccountImportModel.java @@ -24,15 +24,14 @@ package com.franciaflex.faxtomail.services.service.imports; * #L% */ -import java.text.ParseException; - import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountImpl; import com.franciaflex.faxtomail.persistence.entities.EmailProtocol; - import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; +import java.text.ParseException; + /** * @author Kevin Morin (Code Lutin) * diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java index f14bf0d..8844244 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/PriorityImportModel.java @@ -24,10 +24,9 @@ package com.franciaflex.faxtomail.services.service.imports; * #L% */ -import org.nuiton.csv.ext.AbstractImportModel; - import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.PriorityImpl; +import org.nuiton.csv.ext.AbstractImportModel; /** * Modèle d'import des etat d'attente. diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java index 9e7177c..792cb87 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/RangeImportModel.java @@ -24,10 +24,9 @@ package com.franciaflex.faxtomail.services.service.imports; * #L% */ -import org.nuiton.csv.ext.AbstractImportModel; - import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeImpl; +import org.nuiton.csv.ext.AbstractImportModel; /** * Modèle d'import des etat d'attente. diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java index 944908d..58891dc 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/WaitingStateImportModel.java @@ -24,10 +24,9 @@ package com.franciaflex.faxtomail.services.service.imports; * #L% */ -import org.nuiton.csv.ext.AbstractImportModel; - import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.persistence.entities.WaitingStateImpl; +import org.nuiton.csv.ext.AbstractImportModel; /** * Modèle d'import des etat d'attente. diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java index acf22db..11d70ea 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java @@ -24,17 +24,16 @@ package com.franciaflex.faxtomail.services.service.ldap; * #L% */ -import java.util.List; - -import com.franciaflex.faxtomail.services.service.LdapServiceImpl; -import org.apache.commons.collections4.CollectionUtils; - import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; +import com.franciaflex.faxtomail.services.service.LdapServiceImpl; +import org.apache.commons.collections4.CollectionUtils; + +import java.util.List; /** * Surcharge les methodes qui utilisent le serveur ldap pour pouvoir fonctionner sans serveur ldap. diff --git a/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties b/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties index 578909c..23962ee 100644 --- a/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties +++ b/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties @@ -3,7 +3,9 @@ faxtomail.archives.import.error.invalidFolder=Dossier %s non valide faxtomail.archives.import.error.persistence=Erreur technique de persistence faxtomail.archives.import.error.readingAttachmentFile=Erreur lors de la lecture de la PJ %s faxtomail.attachment.demand.filename=Détail de la demande -faxtomail.email.content.attachment.plainfileName= +faxtomail.email.content.attachment.forwardedFileName=Email transféré %s +faxtomail.email.content.attachment.plainFileName=Fichier texte +faxtomail.email.content.attachment.unnamed=Pièce-jointe %s faxtomail.email.projectReference.default=Votre demande du %s faxtomail.service.email.save.clientCode.error=Impossible de trouver le client %s \! faxtomail.validator.error.email.clientCode.required= diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java index db4c9cb..d4b4936 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java @@ -24,17 +24,13 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.File; -import java.io.IOException; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.UUID; - +import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; +import com.franciaflex.faxtomail.services.FaxToMailService; +import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; @@ -45,13 +41,16 @@ import org.junit.After; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.topia.persistence.support.TopiaSqlWork; -import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; -import com.franciaflex.faxtomail.services.FaxToMailService; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import java.io.File; +import java.io.IOException; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class AbstractFaxToMailServiceTest { diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java index d170a5c..6d0ba2f 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java @@ -24,21 +24,20 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.IOException; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.List; - +import com.franciaflex.faxtomail.persistence.entities.Client; +import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.NewClient; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.topia.persistence.support.TopiaSqlWork; -import com.franciaflex.faxtomail.persistence.entities.Client; -import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.NewClient; +import java.io.IOException; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.List; /** * Test de client service. diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 5a2b3e0..c1647c3 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -24,16 +24,20 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - +import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +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.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.mail.util.MimeMessageUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -41,14 +45,18 @@ import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.DemandStatus; -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Range; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; /** * Email service tests. diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java index 9cbccd3..0ad2dde 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java @@ -24,10 +24,10 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.IOException; - import com.franciaflex.faxtomail.services.FaxToMailService; +import java.io.IOException; + /** * @author Arnaud Thimel (Code Lutin) */ diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java index 4253ca1..504a70d 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java @@ -24,28 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.franciaflex.faxtomail.persistence.entities.OriginalEmail; -import com.franciaflex.faxtomail.persistence.entities.OriginalEmailTopiaDao; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; - import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; @@ -61,6 +39,8 @@ import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.OriginalEmail; +import com.franciaflex.faxtomail.persistence.entities.OriginalEmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; @@ -72,6 +52,25 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.services.service.exceptions.InvalidClientException; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n.t; /** * Test service to manage test data. diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java index 65e6867..3ea8303 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java @@ -24,13 +24,10 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.IOException; -import java.util.HashSet; -import java.util.List; - import com.franciaflex.faxtomail.persistence.entities.EmailImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,11 +35,12 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; - import javax.mail.Address; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; +import java.io.IOException; +import java.util.HashSet; +import java.util.List; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java index 0b4bdcd..4203e8d 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java @@ -24,14 +24,13 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.util.HashMap; -import java.util.Map; - +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; import org.hibernate.cfg.Environment; import org.junit.Ignore; import org.junit.Test; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; +import java.util.HashMap; +import java.util.Map; /** * Class utilitaire permettant de générer facilement les schemas pour différentes base de données. diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java index 607f4e3..fb81152 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java @@ -24,16 +24,8 @@ package com.franciaflex.faxtomail.services.service.migration; * #L% */ -import java.io.File; -import java.io.IOException; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; +import com.franciaflex.faxtomail.services.service.AbstractFaxToMailServiceTest; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; import org.hibernate.cfg.Environment; @@ -43,8 +35,15 @@ import org.nuiton.topia.flyway.TopiaFlywayService; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.util.FileUtil; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; -import com.franciaflex.faxtomail.services.service.AbstractFaxToMailServiceTest; +import java.io.File; +import java.io.IOException; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Restore la base de test dans src/test/resources/db et test que les migrations flyway fonctionnent bien. diff --git a/faxtomail-ui-swing/src/license/THIRD-PARTY.properties b/faxtomail-ui-swing/src/license/THIRD-PARTY.properties index 528f0a9..be2c45c 100644 --- a/faxtomail-ui-swing/src/license/THIRD-PARTY.properties +++ b/faxtomail-ui-swing/src/license/THIRD-PARTY.properties @@ -41,7 +41,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 19 15:24:41 CET 2015 +#Wed Jan 21 10:12:40 CET 2015 commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java index 05636d7..738d93f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java @@ -26,9 +26,7 @@ import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailExceptionHandler; - import jaxx.runtime.SwingUtil; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.extra.SplashScreen; @@ -36,9 +34,7 @@ import org.nuiton.jaxx.widgets.extra.SplashScreen; import javax.swing.*; import javax.swing.plaf.BorderUIResource; import javax.swing.plaf.FontUIResource; - import java.awt.*; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java index 4bd702b..a89892f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java @@ -25,7 +25,6 @@ package com.franciaflex.faxtomail.ui.swing.actions; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; 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.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java index 1d43f0e..0d611e5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java @@ -24,17 +24,18 @@ package com.franciaflex.faxtomail.ui.swing.actions; * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - -import com.franciaflex.faxtomail.persistence.entities.WaitingState; +import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailField; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; +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.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -44,15 +45,13 @@ import org.jdesktop.swingx.JXTable; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; -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.demande.RangeRowModel; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n.t; /** * Action de chargement des demandes d'un dossier lors de la selection d'un dossier dans l'arbre diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java index a085e2b..72d290a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java @@ -42,7 +42,6 @@ import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import javax.swing.*; - import java.util.ArrayList; import java.util.Collection; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java index e6baf7e..f782259 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java @@ -38,10 +38,7 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.base.Strings; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import org.apache.commons.io.Charsets; -import java.io.ByteArrayInputStream; -import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; import java.util.Date; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java index c319c01..9540b8f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenMailFolderChooserAction.java @@ -30,7 +30,7 @@ import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI; import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIModel; import java.awt.*; -import java.util.*; +import java.util.Collections; import java.util.List; import static org.nuiton.i18n.I18n.t; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java index 698a794..2f594b6 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java @@ -29,9 +29,6 @@ import org.nuiton.jaxx.application.swing.ApplicationUI; import javax.swing.*; import java.awt.*; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java index b4e6c11..ef980e5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenReplyFormAction.java @@ -24,7 +24,6 @@ package com.franciaflex.faxtomail.ui.swing.actions; * #L% */ -import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java index 2cbb749..cbe691f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java @@ -24,29 +24,27 @@ package com.franciaflex.faxtomail.ui.swing.actions; * #L% */ -import static org.nuiton.i18n.I18n.t; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; +import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; +import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; -import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIHandler; -import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n.t; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java index 9225431..5690660 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java @@ -35,18 +35,16 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUIHandler; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; import javax.swing.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n.t; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java index e5b5472..33b0d01 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowAboutAction.java @@ -27,6 +27,7 @@ import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import jaxx.runtime.swing.AboutPanel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import java.util.Calendar; import static org.nuiton.i18n.I18n.t; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index 8458a1c..351a6b3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -32,7 +32,6 @@ import com.franciaflex.faxtomail.services.service.exceptions.FolderNotReadableEx import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java index d7e4580..f03c88e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java @@ -22,11 +22,8 @@ package com.franciaflex.faxtomail.ui.swing.actions; * #L% */ -import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import static org.nuiton.i18n.I18n.t; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java index b514a48..44bf9b0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java @@ -24,11 +24,14 @@ package com.franciaflex.faxtomail.ui.swing.actions; * #L% */ -import static org.nuiton.i18n.I18n.t; - -import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI; +import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -36,18 +39,13 @@ import com.google.common.collect.Collections2; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI; -import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIHandler; -import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIModel; - import javax.swing.*; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import static org.nuiton.i18n.I18n.t; + /** * @author Kevin Morin (Code Lutin) * diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java index e50b401..21b53da 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java @@ -38,12 +38,8 @@ import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.LoadFolderEmailsAction; -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.table.filter.AbstractTableFilter; -import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -52,15 +48,12 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.util.pagination.PaginationParameter; import javax.swing.table.TableModel; -import java.text.DateFormat; import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.HashSet; import java.util.Set; -import static org.nuiton.i18n.I18n.t; - /** * @author Kevin Morin (Code Lutin) * @since x.x diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java index fd89b77..5469b49 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java @@ -22,16 +22,15 @@ package com.franciaflex.faxtomail.ui.swing.content.demande; * #L% */ -import java.util.ArrayList; -import java.util.List; - +import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import java.util.ArrayList; +import java.util.List; /** * @author kmorin - kmorin@codelutin.com diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java index 2472707..f15a041 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java @@ -24,14 +24,13 @@ package com.franciaflex.faxtomail.ui.swing.content.demande; * #L% */ +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import org.jdesktop.beans.AbstractBean; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.jdesktop.beans.AbstractBean; - -import com.franciaflex.faxtomail.persistence.entities.MailFolder; - /** * @author Kevin Morin (Code Lutin) * diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java index f2d11a9..98f7632 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java @@ -28,6 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.RangeRow; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; + import static org.nuiton.i18n.I18n.n; /** diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java index 898db84..6592524 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupCellRenderer.java @@ -24,11 +24,9 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup; * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import jaxx.runtime.SwingUtil; import org.apache.commons.collections4.CollectionUtils; -import org.nuiton.decorator.Decorator; import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java index 59eecaf..ea4ef1c 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java @@ -28,9 +28,7 @@ import com.franciaflex.faxtomail.ui.swing.actions.OpenGroupedDemandAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; import com.google.common.collect.Iterables; - import jaxx.runtime.validator.swing.SwingValidator; - import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.HighlighterFactory; @@ -44,7 +42,6 @@ import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; - import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java index 6d3e5f7..086f7b8 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java @@ -48,8 +48,11 @@ import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; +import java.util.Set; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java index 2287ab3..2935405 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java @@ -26,7 +26,6 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.replies; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.google.common.base.Preconditions; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java index 594c25a..8a4ff95 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java @@ -24,18 +24,16 @@ package com.franciaflex.faxtomail.ui.swing.content.pdfeditor; * #L% */ -import java.util.ArrayList; -import java.util.List; - -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; - -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.util.ArrayList; +import java.util.List; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java index 6b5076d..aafb86c 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java @@ -24,32 +24,26 @@ package com.franciaflex.faxtomail.ui.swing.content.print; * #L% */ -import java.awt.*; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; - -import javax.swing.JCheckBox; -import javax.swing.JComponent; - +import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; +import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import jaxx.runtime.validator.swing.SwingValidator; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import org.nuiton.jaxx.application.swing.util.Cancelable; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import static org.nuiton.i18n.I18n.t; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java index 9d9fdeb..009c962 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java @@ -22,8 +22,28 @@ package com.franciaflex.faxtomail.ui.swing.content.search; * #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.SearchAction; +import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeListAction; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; +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.nuiton.jaxx.application.swing.util.CloseableUI; +import org.nuiton.util.pagination.PaginationParameter; +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -37,32 +57,7 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import javax.swing.*; - -import com.franciaflex.faxtomail.persistence.entities.HasLabel; -import com.franciaflex.faxtomail.persistence.entities.SearchFilter; -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -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.nuiton.jaxx.application.swing.action.ApplicationActionEngine; -import org.nuiton.jaxx.application.swing.util.CloseableUI; - -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.SearchAction; -import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeListAction; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; -import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; -import com.franciaflex.faxtomail.ui.swing.util.PaginationComboModel; -import org.nuiton.util.pagination.PaginationParameter; +import static org.nuiton.i18n.I18n.t; /** * Handler of UI {@link SearchUIHandler}. diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java index 58c4f06..67be867 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java @@ -22,24 +22,23 @@ package com.franciaflex.faxtomail.ui.swing.content.search; * #L% */ -import java.util.Date; -import java.util.List; - -import com.franciaflex.faxtomail.persistence.entities.SearchFilter; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; -import org.nuiton.util.pagination.PaginationParameter; -import org.nuiton.util.pagination.PaginationResult; - import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.Range; +import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; + +import java.util.Date; +import java.util.List; /** * @author kmorin - kmorin@codelutin.com diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java index 2fa294e..1f9310f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIModel.java @@ -24,12 +24,11 @@ package com.franciaflex.faxtomail.ui.swing.content.transmit; * #L% */ -import java.util.List; - -import org.jdesktop.beans.AbstractBean; - import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import org.jdesktop.beans.AbstractBean; + +import java.util.List; /** * Model for mail folder chooser UI. diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java index 9221e26..336f0c9 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java @@ -24,44 +24,6 @@ package com.franciaflex.faxtomail.ui.swing.util; * #L% */ -import java.awt.Color; -import java.awt.Component; -import java.awt.Font; -import java.awt.Point; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; - -import javax.swing.JPopupMenu; -import javax.swing.JTable; -import javax.swing.SwingUtilities; -import javax.swing.event.ChangeListener; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableModel; - -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.EmailGroup; -import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupCellRenderer; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; -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.jdesktop.swingx.decorator.Highlighter; -import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import org.jdesktop.swingx.table.TableColumnModelExt; -import org.nuiton.decorator.Decorator; -import org.nuiton.validator.NuitonValidator; -import org.nuiton.validator.NuitonValidatorFactory; -import org.nuiton.validator.NuitonValidatorResult; - import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; @@ -76,10 +38,39 @@ import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentCellEditor; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentCellRenderer; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupCellRenderer; import com.franciaflex.faxtomail.ui.swing.content.demande.replies.RepliesCellEditor; import com.franciaflex.faxtomail.ui.swing.content.demande.replies.RepliesCellRenderer; import com.google.common.base.Function; import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; +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.jdesktop.swingx.decorator.Highlighter; +import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import org.jdesktop.swingx.table.TableColumnModelExt; +import org.nuiton.decorator.Decorator; +import org.nuiton.validator.NuitonValidator; +import org.nuiton.validator.NuitonValidatorFactory; +import org.nuiton.validator.NuitonValidatorResult; + +import javax.swing.*; +import javax.swing.event.ChangeListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableModel; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; /** * @author Kevin Morin (Code Lutin) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java index 1dd21ed..6d8aee9 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java @@ -24,18 +24,17 @@ package com.franciaflex.faxtomail.ui.swing.util; * #L% */ -import javax.swing.*; -import javax.swing.border.*; - -import java.awt.*; - -import java.io.Serializable; - import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.google.common.base.Function; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; +import javax.swing.*; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.io.Serializable; + import static org.nuiton.i18n.I18n.t; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java index d96fc41..5f84fc5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java @@ -40,7 +40,6 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; -import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java index dbe5cc3..f1c0c13 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/PaginationComboModel.java @@ -24,7 +24,7 @@ package com.franciaflex.faxtomail.ui.swing.util; * #L% */ -import javax.swing.DefaultComboBoxModel; +import javax.swing.*; /** * Combo box model contenant les nombres de resultats par page par defaut. diff --git a/faxtomail-ui-web/src/license/THIRD-PARTY.properties b/faxtomail-ui-web/src/license/THIRD-PARTY.properties index 9737b02..3c52d32 100644 --- a/faxtomail-ui-web/src/license/THIRD-PARTY.properties +++ b/faxtomail-ui-web/src/license/THIRD-PARTY.properties @@ -1,24 +1,3 @@ -### -# #%L -# FaxToMail :: Web -# %% -# Copyright (C) 2014 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% -### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : @@ -58,12 +37,13 @@ # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The MIT License # - UnboundID LDAP SDK Free Use License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jul 25 10:54:33 CEST 2014 +#Wed Jan 21 10:11:43 CET 2015 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License gui.ava--html2image--2.0.1=GNU Lesser General Public License, Version 2.1 diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java index 302056e..e7c8577 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java @@ -24,20 +24,18 @@ package com.franciaflex.faxtomail; * #L% */ -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.ServletContext; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.flyway.TopiaFlywayService; - import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.InitFaxToMailService; import com.franciaflex.faxtomail.services.service.migration.FaxtomailFlywayMigrationService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.flyway.TopiaFlywayService; + +import javax.servlet.ServletContext; +import java.util.HashMap; +import java.util.Map; public class FaxToMailApplicationContext { diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java index e6b2576..364d938 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java @@ -24,18 +24,10 @@ package com.franciaflex.faxtomail.web; * #L% */ -import java.util.Map; - -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserAbstract; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.convention.annotation.Result; -import org.apache.struts2.convention.annotation.Results; -import org.nuiton.topia.persistence.TopiaEntity; - import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailEntityEnum; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserAbstract; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderAbstract; import com.franciaflex.faxtomail.web.json.HibernateProxyTypeAdapter; @@ -48,6 +40,13 @@ import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.opensymphony.xwork2.ActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.Map; @Results({ @Result(name="login", type="redirectAction", params = { "actionName", "login-input", "namespace", "/authentication"}) diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java index c0ec20c..56bc5bc 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java @@ -24,10 +24,11 @@ package com.franciaflex.faxtomail.web; * #L% */ -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - +import com.franciaflex.faxtomail.FaxToMailApplicationContext; +import com.franciaflex.faxtomail.FaxToMailConfiguration; +import com.franciaflex.faxtomail.web.job.ClientUpdateJob; +import com.franciaflex.faxtomail.web.job.EDIManagementJob; +import com.franciaflex.faxtomail.web.job.MailFilterJob; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.CronScheduleBuilder; @@ -40,11 +41,9 @@ import org.quartz.Trigger; import org.quartz.TriggerBuilder; import org.quartz.impl.StdSchedulerFactory; -import com.franciaflex.faxtomail.FaxToMailApplicationContext; -import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.web.job.ClientUpdateJob; -import com.franciaflex.faxtomail.web.job.EDIManagementJob; -import com.franciaflex.faxtomail.web.job.MailFilterJob; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; public class FaxToMailApplicationListener implements ServletContextListener { diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java index e2ea061..cf10f9e 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java @@ -24,17 +24,6 @@ package com.franciaflex.faxtomail.web; * #L% */ -import java.beans.PropertyDescriptor; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.BeanUtil; - import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; @@ -47,6 +36,16 @@ import com.google.common.base.Preconditions; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.interceptor.Interceptor; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.beans.BeanUtil; + +import java.beans.PropertyDescriptor; +import java.util.List; +import java.util.Map; +import java.util.Set; public class FaxToMailInterceptor implements Interceptor { diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java index 77e61c6..1c64fa2 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java @@ -24,11 +24,10 @@ package com.franciaflex.faxtomail.web; * #L% */ +import com.opensymphony.xwork2.Action; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; -import com.opensymphony.xwork2.Action; - /** * Abstract action used to render custom objects as json string using gson directly in response output stream. diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java index 49b9293..67b7500 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java @@ -24,19 +24,17 @@ package com.franciaflex.faxtomail.web; * #L% */ -import java.io.IOException; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.google.common.base.Charsets; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.dispatcher.StrutsResultSupport; -import com.google.common.base.Charsets; -import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionInvocation; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; public class FaxToMailJsonResultSupport extends StrutsResultSupport { diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java index df2e9bb..0fbdb6f 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/IndexAction.java @@ -25,7 +25,6 @@ package com.franciaflex.faxtomail.web.action; */ import com.franciaflex.faxtomail.web.FaxToMailActionSupport; - import org.apache.struts2.convention.annotation.InterceptorRef; import org.apache.struts2.convention.annotation.InterceptorRefs; diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java index 509a162..6b8ba30 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LoginAction.java @@ -24,13 +24,12 @@ package com.franciaflex.faxtomail.web.action; * #L% */ -import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.convention.annotation.Result; - import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.services.service.LdapService; import com.franciaflex.faxtomail.services.service.ldap.AuthenticationException; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.Result; public class LoginAction extends FaxToMailActionSupport { diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java index dae1934..60fdae0 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java @@ -24,11 +24,10 @@ package com.franciaflex.faxtomail.web.action; * #L% */ +import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.franciaflex.faxtomail.web.FaxToMailActionSupport; - public class LogoutAction extends FaxToMailActionSupport { @Override diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java index bb3c8ab..de12103 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java @@ -24,21 +24,10 @@ package com.franciaflex.faxtomail.web.action.admin; * #L% */ -import java.lang.reflect.Type; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.convention.annotation.InterceptorRef; -import org.apache.struts2.convention.annotation.InterceptorRefs; -import org.apache.struts2.convention.annotation.Result; - import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailProtocol; -import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.MailAction; @@ -46,6 +35,7 @@ import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Range; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.services.service.ReferentielService; @@ -53,6 +43,15 @@ import com.franciaflex.faxtomail.services.service.UserService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.google.gson.reflect.TypeToken; import com.opensymphony.xwork2.Preparable; +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.InterceptorRef; +import org.apache.struts2.convention.annotation.InterceptorRefs; +import org.apache.struts2.convention.annotation.Result; + +import java.lang.reflect.Type; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @author kmorin - kmorin@codelutin.com diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java index 6d7e12e..475d0c0 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationJsonAction.java @@ -24,11 +24,10 @@ package com.franciaflex.faxtomail.web.action.admin; * #L% */ -import org.apache.struts2.convention.annotation.Action; - import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.web.FaxToMailJsonAction; +import org.apache.struts2.convention.annotation.Action; public class ConfigurationJsonAction extends FaxToMailJsonAction { diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java index 0053672..f69138c 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java @@ -24,18 +24,17 @@ package com.franciaflex.faxtomail.web.action.admin; * #L% */ -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; - +import com.franciaflex.faxtomail.services.service.ReferentielService; +import com.franciaflex.faxtomail.web.FaxToMailActionSupport; +import com.opensymphony.xwork2.Preparable; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.InterceptorRef; import org.apache.struts2.convention.annotation.InterceptorRefs; import org.apache.struts2.convention.annotation.Result; -import com.franciaflex.faxtomail.services.service.ReferentielService; -import com.franciaflex.faxtomail.web.FaxToMailActionSupport; -import com.opensymphony.xwork2.Preparable; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; @InterceptorRefs({ @InterceptorRef("faxToMailInterceptor"), diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java index eead853..c989d67 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportArchiveAction.java @@ -24,16 +24,14 @@ package com.franciaflex.faxtomail.web.action.admin; * #L% */ -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.nio.file.Files; - import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.imports.ArchiveImportResult; +import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.franciaflex.faxtomail.web.HasUploadedFile; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,9 +40,10 @@ import org.apache.struts2.convention.annotation.InterceptorRef; import org.apache.struts2.convention.annotation.InterceptorRefs; import org.apache.struts2.convention.annotation.Result; -import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.web.FaxToMailActionSupport; -import com.opensymphony.xwork2.Preparable; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.nio.file.Files; /** * Action de reprise des archives. diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java index 3c064c8..5de1eb6 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java @@ -24,11 +24,6 @@ package com.franciaflex.faxtomail.web.action.admin; * #L% */ -import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.convention.annotation.InterceptorRef; -import org.apache.struts2.convention.annotation.InterceptorRefs; -import org.apache.struts2.convention.annotation.Result; - import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; @@ -36,6 +31,10 @@ import com.franciaflex.faxtomail.services.service.LdapService; import com.franciaflex.faxtomail.services.service.UserService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.opensymphony.xwork2.Preparable; +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.InterceptorRef; +import org.apache.struts2.convention.annotation.InterceptorRefs; +import org.apache.struts2.convention.annotation.Result; @InterceptorRefs({ @InterceptorRef("faxToMailInterceptor"), diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java index 2b38c6b..07acf96 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java @@ -24,17 +24,16 @@ package com.franciaflex.faxtomail.web.action.admin; * #L% */ -import java.util.List; - +import com.franciaflex.faxtomail.persistence.entities.MailLock; +import com.franciaflex.faxtomail.services.service.EmailService; +import com.franciaflex.faxtomail.web.FaxToMailActionSupport; +import com.opensymphony.xwork2.Preparable; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.InterceptorRef; import org.apache.struts2.convention.annotation.InterceptorRefs; import org.apache.struts2.convention.annotation.Result; -import com.franciaflex.faxtomail.persistence.entities.MailLock; -import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.web.FaxToMailActionSupport; -import com.opensymphony.xwork2.Preparable; +import java.util.List; @InterceptorRefs({ @InterceptorRef("faxToMailInterceptor"), diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java index 392a0f0..9d835cf 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java @@ -24,25 +24,24 @@ package com.franciaflex.faxtomail.web.action.admin; * #L% */ -import java.lang.reflect.Type; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.convention.annotation.InterceptorRef; -import org.apache.struts2.convention.annotation.InterceptorRefs; -import org.apache.struts2.convention.annotation.Result; - import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.google.gson.reflect.TypeToken; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.InterceptorRef; +import org.apache.struts2.convention.annotation.InterceptorRefs; +import org.apache.struts2.convention.annotation.Result; + +import java.lang.reflect.Type; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; @InterceptorRefs({ @InterceptorRef("faxToMailInterceptor"), diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java index 361c980..9ef59d6 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java @@ -24,11 +24,10 @@ package com.franciaflex.faxtomail.web.job; * #L% */ +import com.franciaflex.faxtomail.FaxToMailApplicationContext; import org.quartz.Job; import org.quartz.JobExecutionContext; -import com.franciaflex.faxtomail.FaxToMailApplicationContext; - public abstract class AbstractFaxToMailJob implements Job { public static final String APPLICATION_CONTEXT = "applicationContext"; diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java index f6020bb..4e63239 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java @@ -24,17 +24,16 @@ package com.franciaflex.faxtomail.web.job; * #L% */ +import com.franciaflex.faxtomail.FaxToMailApplicationContext; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; +import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.service.ClientService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; -import com.franciaflex.faxtomail.FaxToMailApplicationContext; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.ClientService; - /** * @author Kevin Morin (Code Lutin) */ diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java index d17a384..c5dc2b9 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java @@ -28,7 +28,6 @@ import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.EmailService; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.DisallowConcurrentExecution; diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java index 36cc3ea..0375a0b 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java @@ -24,82 +24,19 @@ package com.franciaflex.faxtomail.web.job; * #L% */ -import static org.nuiton.i18n.I18n.t; - -import com.franciaflex.faxtomail.persistence.entities.OriginalEmail; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; -import gui.ava.html.Html2Image; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.nio.charset.Charset; -import java.text.DateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; -import java.util.Set; -import java.util.regex.Pattern; - -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.mail.Address; -import javax.mail.Flags; -import javax.mail.Folder; -import javax.mail.Header; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Part; -import javax.mail.Session; -import javax.mail.Store; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimeUtility; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; -import org.nuiton.util.StringUtil; -import org.quartz.DisallowConcurrentExecution; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.xhtmlrenderer.pdf.ITextRenderer; - import com.franciaflex.faxtomail.FaxToMailApplicationContext; import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; -import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailImpl; -import com.franciaflex.faxtomail.persistence.entities.ExtensionCommand; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.OriginalEmail; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; @@ -107,11 +44,40 @@ import com.franciaflex.faxtomail.services.service.ClientService; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.MailFolderService; -import com.itextpdf.text.Document; -import com.itextpdf.text.DocumentException; -import com.itextpdf.text.PageSize; -import com.itextpdf.text.Paragraph; -import com.itextpdf.text.pdf.PdfWriter; +import com.google.common.base.Function; +import com.google.common.collect.Collections2; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; +import org.quartz.DisallowConcurrentExecution; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import javax.mail.Address; +import javax.mail.Flags; +import javax.mail.Folder; +import javax.mail.Header; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Store; +import javax.mail.internet.MimeMessage; +import java.nio.charset.Charset; +import java.text.DateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; + +import static org.nuiton.i18n.I18n.t; /** * @author Kevin Morin (Code Lutin) @@ -502,10 +468,10 @@ public class MailFilterJob extends AbstractFaxToMailJob { if (log.isDebugEnabled()) { log.debug("Converting html content to pdf : " + message.getSubject()); } - Attachment attachment = emailService.convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.htmlfileName")); + Attachment attachment = emailService.convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.htmlFileName")); if (attachment != null) { //remove text plain attachement if exists, to avoid having twice the mail content in the attachments - String plainTextFileName = t("faxtomail.email.content.attachment.plainfileName") + ".pdf"; + String plainTextFileName = t("faxtomail.email.content.attachment.plainFileName") + ".pdf"; for (Attachment a : attachments) { if (plainTextFileName.equals(a.getOriginalFileName())) { attachments.remove(a); @@ -519,7 +485,7 @@ public class MailFilterJob extends AbstractFaxToMailJob { // convertit le contenu texte en PDF String content = IOUtils.toString(message.getInputStream(), charset); if (StringUtils.isNotBlank(content)) { - Attachment attachment = emailService.convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); + Attachment attachment = emailService.convertTextToPdf(content, t("faxtomail.email.content.attachment.plainFileName")); attachments.add(0, attachment); } } @@ -570,10 +536,4 @@ public class MailFilterJob extends AbstractFaxToMailJob { } } - public static void main(String[] args) { - String recipient = "- ftm_mailfx03 - <adv29@franciaflex.com>"; - recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); - recipient = recipient.toLowerCase(); - System.out.println(recipient); - } } diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java index 5b7159d..4db1733 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/HibernateProxyTypeAdapter.java @@ -24,17 +24,16 @@ package com.franciaflex.faxtomail.web.json; * #L% */ -import java.io.IOException; - -import org.hibernate.Hibernate; -import org.hibernate.proxy.HibernateProxy; - import com.google.gson.Gson; import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapterFactory; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import org.hibernate.Hibernate; +import org.hibernate.proxy.HibernateProxy; + +import java.io.IOException; /** * This TypeAdapter unproxies Hibernate proxied objects, and serializes them diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java index f5a3268..9948b29 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/json/TopiaEntityAdapter.java @@ -24,16 +24,15 @@ package com.franciaflex.faxtomail.web.json; * #L% */ -import java.lang.reflect.Type; - -import org.nuiton.topia.persistence.TopiaEntity; - import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.lang.reflect.Type; /** * Gson topia entity adaptor that use a specific implementationClass to deserialize a topia entity interface. diff --git a/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties b/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties index 38f27d5..8bdf333 100644 --- a/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties +++ b/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties @@ -37,8 +37,8 @@ com.franciaflex.faxtomail.persistence.entities.MailField.TAKEN_BY=Pris par com.franciaflex.faxtomail.persistence.entities.MailField.WAITING_STATE=État d'attente faxtomail.demandDetail.noAttachmentForId=Aucune pièce jointe ne correspond à l'identifiant %s. faxtomail.demandDetail.noDemandForId=Aucun élément ne correspond à l'identifiant %s. -faxtomail.email.content.attachment.htmlfileName=contenu html du mail -faxtomail.email.content.attachment.plainfileName=contenu texte du mail +faxtomail.email.content.attachment.htmlFileName=contenu html du mail +faxtomail.email.content.attachment.plainFileName=contenu texte du mail faxtomail.email.object.noClient=Client non trouvé faxtomail.email.projectReference.default=Votre demande du %s faxtomail.email.subject.re=Re \: %s diff --git a/pom.xml b/pom.xml index de9f740..ce01169 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>1.8</version> + <version>1.8.1</version> </parent> <groupId>com.franciaflex</groupId> @@ -144,7 +144,7 @@ <signatureVersion>1.0</signatureVersion> <!-- issues status to include in changelog --> - <redmine.statusIds>18,19,3,10,11</redmine.statusIds> + <!--<redmine.statusIds>18,19,3,10,11</redmine.statusIds>--> </properties> @@ -175,12 +175,6 @@ </releases> </repository> - <repository> - <id>com.springsource.repository.bundles.external</id> - <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name> - <url>http://repository.springsource.com/maven/bundles/external</url> - </repository> - </repositories> <pluginRepositories> @@ -684,7 +678,7 @@ </exclusion> </exclusions> </dependency> - + <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-pdf-itext5</artifactId> @@ -976,5 +970,18 @@ </build> </profile> + <profile> + <id>release-quality-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <helper.skipCheckAutocontainer>true</helper.skipCheckAutocontainer> + </properties> + </profile> + </profiles> </project> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.