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

r334 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 03 Jul '14

03 Jul '14

Author: echatellier Date: 2014-07-03 10:34:20 +0200 (Thu, 03 Jul 2014) New Revision: 334 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/334 Log: Empeche les executions multiples si les jobs ne sont pas termin?\195?\169s avant qu'une autre instance ne commence Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-07-03 08:12:52 UTC (rev 333) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-07-03 08:34:20 UTC (rev 334) @@ -26,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -36,8 +37,9 @@ /** * @author Kevin Morin (Code Lutin) - * @since x.x + * @since 0.3 */ +@DisallowConcurrentExecution public class ClientUpdateJob extends AbstractFaxToMailJob { private static final Log log = LogFactory.getLog(ClientUpdateJob.class); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-07-03 08:12:52 UTC (rev 333) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-07-03 08:34:20 UTC (rev 334) @@ -31,13 +31,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; /** * @author Kevin Morin (Code Lutin) - * @since x.x + * @since 0.3 */ +@DisallowConcurrentExecution public class EDIManagementJob extends AbstractFaxToMailJob { private static final Log log = LogFactory.getLog(EDIManagementJob.class); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-03 08:12:52 UTC (rev 333) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-03 08:34:20 UTC (rev 334) @@ -68,6 +68,7 @@ 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; @@ -102,8 +103,9 @@ /** * @author Kevin Morin (Code Lutin) - * @since x.x + * @since 0.3 */ +@DisallowConcurrentExecution public class MailFilterJob extends AbstractFaxToMailJob { private static final Log log = LogFactory.getLog(MailFilterJob.class);

1 0

r333 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxt
by echatellier＠users.forge.codelutin.com 03 Jul '14

03 Jul '14

Author: echatellier Date: 2014-07-03 10:12:52 +0200 (Thu, 03 Jul 2014) New Revision: 333 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/333 Log: Fix java 8 build Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/StartAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/Cancelable.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseableUI.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationProvider.java 2014-07-03 08:12:52 UTC (rev 333) @@ -36,7 +36,7 @@ * Tutti config provider (for site generation). * Created on 11/24/13. * - * @author Tony Chemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 3.0 */ public class FaxToMailConfigurationProvider implements ApplicationConfigProvider { Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java 2014-07-03 08:12:52 UTC (rev 333) @@ -30,7 +30,7 @@ /** * Simple model for a progression long task. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.0 */ public class ProgressionModel extends ApplicationProgressionModel implements DownloadMonitor { Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java 2014-07-03 08:12:52 UTC (rev 333) @@ -47,7 +47,7 @@ * A class loader that search first in a given directory before in parent * class loader. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.3 */ public class RessourceClassLoader extends ClassLoader { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-07-03 08:12:52 UTC (rev 333) @@ -39,7 +39,7 @@ /** * FaxToMail decorator service. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public class DecoratorService extends FaxToMailServiceSupport { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java 2014-07-03 08:12:52 UTC (rev 333) @@ -48,7 +48,7 @@ /** * Faxtomail decorator. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com */ public class FaxToMailDecorator<O> extends MultiJXPathDecorator<O> implements Cloneable { @@ -72,7 +72,6 @@ /** * List of tokens to sort using the {@link #sortOnlyOnSelectedContext} mode. - * * If the mode is not set, then won't use this. * * @since 2.8 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-03 08:12:52 UTC (rev 333) @@ -77,8 +77,8 @@ import com.google.common.collect.Maps; /** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @author kmorin - kmorin(a)codelutin.com + * @since 0.1 */ public class ConfigurationService extends FaxToMailServiceSupport { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-03 08:12:52 UTC (rev 333) @@ -106,8 +106,8 @@ import com.google.common.collect.Sets; /** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @author kmorin - kmorin(a)codelutin.com + * @since 0.1 */ public class EmailService extends FaxToMailServiceSupport { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-07-03 08:12:52 UTC (rev 333) @@ -46,7 +46,7 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; /** - * @author kmorin <kmorin(a)codelutin.com> + * @author kmorin - kmorin(a)codelutin.com * @since 0.1 */ public class MailFolderService extends FaxToMailServiceSupport { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-03 08:12:52 UTC (rev 333) @@ -70,8 +70,8 @@ import com.google.common.collect.Maps; /** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @author kmorin - kmorin(a)codelutin.com + * @since 0.1 */ public class ReferentielService extends FaxToMailServiceSupport { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-07-03 08:12:52 UTC (rev 333) @@ -34,8 +34,8 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; /** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @author kmorin - kmorin(a)codelutin.com + * @since 0.1 */ public class UserService extends FaxToMailServiceSupport { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ValidationService.java 2014-07-03 08:12:52 UTC (rev 333) @@ -34,7 +34,7 @@ /** * To validate some incoming data using nuiton-validators. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.3 */ public class ValidationService extends FaxToMailServiceSupport { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailActionFactory.java 2014-07-03 08:12:52 UTC (rev 333) @@ -34,8 +34,7 @@ /** * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since 3.0 + * @author Tony Chemit - chemit(a)codelutin.com */ public class FaxToMailActionFactory extends ApplicationActionFactory { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java 2014-07-03 08:12:52 UTC (rev 333) @@ -25,7 +25,7 @@ /** * Enumeration of any internal screen of application. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public enum FaxToMailScreen { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-07-03 08:12:52 UTC (rev 333) @@ -93,7 +93,7 @@ /** * UI application context. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public class FaxToMailUIContext extends AbstractBean implements Closeable, UIMessageNotifier, ApplicationUIContext { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java 2014-07-03 08:12:52 UTC (rev 333) @@ -38,7 +38,7 @@ import java.util.Arrays; /** - * @author kmorin <kmorin(a)codelutin.com> + * @author kmorin - kmorin(a)codelutin.com * @since 0.1 */ public class RunFaxToMail { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractChangeScreenAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -30,12 +30,11 @@ /** * Action to change the screen. - * + * * Will just check that the current screen can be quit via * the {@link com.franciaflex.faxtomail.ui.swing.content.MainUIHandler#quitCurrentScreen()}. - * * - * @author kmorin <kmorin(a)codelutin.com> + * @author kmorin - kmorin(a)codelutin.com * @since 1.0 */ public abstract class AbstractChangeScreenAction extends AbstractMainUIFaxToMailAction { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -36,7 +36,7 @@ /** * FaxToMail base action. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.0 */ public abstract class AbstractFaxToMailAction <M extends AbstractBean, UI extends FaxToMailUI<M, ?>, H extends AbstractFaxToMailUIHandler<M, UI>> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractMainUIFaxToMailAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -27,7 +27,7 @@ import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; /** - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.0 */ public abstract class AbstractMainUIFaxToMailAction extends AbstractFaxToMailAction<FaxToMailUIContext, MainUI, MainUIHandler> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -29,7 +29,7 @@ /** * To return on previous screen. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class GoToPreviousScreenAction extends AbstractChangeScreenAction { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReloadFaxToMailAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -30,7 +30,7 @@ /** * To reload FaxToMail application. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.0.3 */ public class ReloadFaxToMailAction extends AbstractChangeScreenAction { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -40,7 +40,7 @@ /** * To show demande screen. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class ShowDemandeAction extends AbstractChangeScreenAction { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeListAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -30,7 +30,7 @@ /** * To show demande screen. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class ShowDemandeListAction extends AbstractChangeScreenAction { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -30,7 +30,7 @@ /** * To show demande screen. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class ShowRechercheAction extends AbstractChangeScreenAction { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/StartAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/StartAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/StartAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -32,7 +32,7 @@ * Start action (when the start action file is present when * starting application). * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 2.4 */ public class StartAction extends AbstractMainUIFaxToMailAction { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-07-03 08:12:52 UTC (rev 333) @@ -56,7 +56,7 @@ import static org.nuiton.i18n.I18n.t; /** - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public class MainUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext, MainUI> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-07-03 08:12:52 UTC (rev 333) @@ -49,8 +49,8 @@ /** * To edit attachments from a table cell. * - * @author tchemit <chemit(a)codelutin.com> - * @author kmorin <morin(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com + * @author kmorin - morin(a)codelutin.com * @since 1.0.2 */ public class AttachmentCellEditor extends AbstractCellEditor implements TableCellEditor { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellRenderer.java 2014-07-03 08:12:52 UTC (rev 333) @@ -39,8 +39,8 @@ /** * Renderer of a attachement editor in a table cell. * - * @author kmorin <morin(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author kmorin - morin(a)codelutin.com + * @author tchemit - chemit(a)codelutin.com * @since 1.0.2 */ public class AttachmentCellRenderer extends DefaultTableCellRenderer { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-07-03 08:12:52 UTC (rev 333) @@ -72,8 +72,8 @@ import static org.nuiton.i18n.I18n.t; /** - * @author kmorin <morin(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author kmorin - morin(a)codelutin.com + * @author tchemit - chemit(a)codelutin.com * @since 0.2 */ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<AttachmentEditorUIModel, AttachmentEditorUI> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-07-03 08:12:52 UTC (rev 333) @@ -32,7 +32,7 @@ /** * To place on model wich supports attachments. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.0.2 */ public interface AttachmentModelAware extends Serializable { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java 2014-07-03 08:12:52 UTC (rev 333) @@ -40,7 +40,7 @@ /** * Button to edit attachments. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class ButtonAttachment extends AbstractToolbarPopupButton<AttachmentEditorUI> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java 2014-07-03 08:12:52 UTC (rev 333) @@ -32,7 +32,7 @@ import javax.swing.*; /** - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class FaxToMailConfigUIHandler extends AbstractFaxToMailUIHandler<FaxToMailUIContext, FaxToMailConfigUI> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-03 08:12:52 UTC (rev 333) @@ -97,7 +97,7 @@ /** * Handler of UI {@link com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler}. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<DemandeListUIModel, DemandeListUI> implements CloseableUI { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-07-03 08:12:52 UTC (rev 333) @@ -33,8 +33,8 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; /** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @author kmorin - kmorin(a)codelutin.com + * @since 0.1 */ public class DemandeListUIModel extends AbstractSerializableBean { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-07-03 08:12:52 UTC (rev 333) @@ -83,7 +83,7 @@ /** * Handler of UI {@link DemandeUIHandler}. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, DemandeUI> implements CloseableUI, TabHandler { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-07-03 08:12:52 UTC (rev 333) @@ -79,8 +79,8 @@ import static org.nuiton.i18n.I18n.t; /** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @author kmorin - kmorin(a)codelutin.com + * @since 0.1 */ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeUIModel> implements AttachmentModelAware, TabContentModel { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/ButtonEmailGroup.java 2014-07-03 08:12:52 UTC (rev 333) @@ -37,7 +37,7 @@ /** * Button to edit attachments. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class ButtonEmailGroup extends AbstractToolbarPopupButton<DemandGroupUI> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/ButtonHistory.java 2014-07-03 08:12:52 UTC (rev 333) @@ -38,7 +38,7 @@ /** * Button to edit attachments. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class ButtonHistory extends AbstractToolbarPopupButton<HistoryListUI> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-07-03 08:12:52 UTC (rev 333) @@ -41,7 +41,7 @@ /** * Button to edit attachments. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.1 */ public class ButtonDemandReplies extends AbstractToolbarPopupButton<DemandRepliesUI> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java 2014-07-03 08:12:52 UTC (rev 333) @@ -44,8 +44,8 @@ /** * To edit attachments from a table cell. * - * @author tchemit <chemit(a)codelutin.com> - * @author kmorin <morin(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com + * @author kmorin - morin(a)codelutin.com * @since 1.0.2 */ public class RepliesCellEditor extends AbstractCellEditor implements TableCellEditor { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-07-03 08:12:52 UTC (rev 333) @@ -39,8 +39,8 @@ /** * Renderer of a attachement editor in a table cell. * - * @author kmorin <morin(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author kmorin - morin(a)codelutin.com + * @author tchemit - chemit(a)codelutin.com * @since 1.0.2 */ public class RepliesCellRenderer extends DefaultTableCellRenderer { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-07-03 08:12:52 UTC (rev 333) @@ -54,7 +54,7 @@ /** * Handler of UI {@link SearchUIHandler}. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public class SearchUIHandler extends AbstractFaxToMailDemandListHandler<SearchUIModel, SearchUI> implements CloseableUI { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-07-03 08:12:52 UTC (rev 333) @@ -44,8 +44,8 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; /** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @author kmorin - kmorin(a)codelutin.com + * @since 0.1 */ public class SearchUIModel extends AbstractFaxToMailBeanUIModel<EmailFilter, SearchUIModel> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailBeanUIModel.java 2014-07-03 08:12:52 UTC (rev 333) @@ -33,7 +33,7 @@ /** * Abstract UI model to edit a bean. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public abstract class AbstractFaxToMailBeanUIModel<E, B extends AbstractFaxToMailBeanUIModel<E, B>> extends AbstractSerializableBean implements PropagatePropertyChangeListener.PropagatePropertyChange { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-07-03 08:12:52 UTC (rev 333) @@ -64,7 +64,7 @@ /** * Contract of any UI handler. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?>> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/Cancelable.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/Cancelable.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/Cancelable.java 2014-07-03 08:12:52 UTC (rev 333) @@ -25,7 +25,7 @@ /** * To cancel contract. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.3 */ public interface Cancelable { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java 2014-07-03 08:12:52 UTC (rev 333) @@ -68,7 +68,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeansTM + * of all JavaBeansTM * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -526,7 +526,7 @@ * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeansTM + * of all JavaBeansTM * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseableUI.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseableUI.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CloseableUI.java 2014-07-03 08:12:52 UTC (rev 333) @@ -25,7 +25,7 @@ /** * Contract to close an ui. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.0.2 */ public interface CloseableUI { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-07-03 08:12:52 UTC (rev 333) @@ -39,7 +39,7 @@ import static org.nuiton.i18n.I18n.n; /** - * @author kmorin <kmorin(a)codelutin.com> + * @author kmorin - kmorin(a)codelutin.com * @since x.x */ public class DemandeTableModel extends AbstractApplicationTableModel<DemandeUIModel> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailExceptionHandler.java 2014-07-03 08:12:52 UTC (rev 333) @@ -32,13 +32,13 @@ /** * FaxToMail global exception handler. - * + * * Catch all application uncaught and display it in a custom JoptionPane * or JXErrorPane. - * + * * See http://stackoverflow.com/a/4448569/1165234 for details. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.0 */ public class FaxToMailExceptionHandler extends ApplicationExceptionHandler { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java 2014-07-03 08:12:52 UTC (rev 333) @@ -27,7 +27,7 @@ /** * Contract to place on each generated jaxx ui. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public interface FaxToMailUI<M, H extends AbstractFaxToMailUIHandler<M, ?>> extends ApplicationUI<M, H> { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-03 08:12:52 UTC (rev 333) @@ -95,7 +95,7 @@ import com.google.common.collect.Lists; /** - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.1 */ public final class FaxToMailUIUtil extends ApplicationUIUtil { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-07-03 08:12:52 UTC (rev 333) @@ -27,7 +27,7 @@ import javax.swing.tree.DefaultMutableTreeNode; /** - * @author kmorin <kmorin(a)codelutin.com> + * @author kmorin - kmorin(a)codelutin.com * @since x.x */ public class FolderTreeNode extends DefaultMutableTreeNode { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/RemoveablePropertyChangeListener.java 2014-07-03 08:12:52 UTC (rev 333) @@ -26,9 +26,8 @@ /** * Use this contract when you want the listener to be removed when closing an ui. - * * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 1.0.3 */ public abstract class RemoveablePropertyChangeListener implements PropertyChangeListener { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/UIMessageNotifier.java 2014-07-03 08:12:52 UTC (rev 333) @@ -25,7 +25,7 @@ /** * To notify somemessage in ui. * - * @author tchemit <chemit(a)codelutin.com> + * @author tchemit - chemit(a)codelutin.com * @since 0.3 */ public interface UIMessageNotifier { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-07-03 07:47:05 UTC (rev 332) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-07-03 08:12:52 UTC (rev 333) @@ -56,8 +56,8 @@ import com.opensymphony.xwork2.Preparable; /** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x + * @author kmorin - kmorin(a)codelutin.com + * @since 0.1 */ @InterceptorRefs({ @InterceptorRef("faxToMailInterceptor"),

1 0

r332 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply faxtomail-ui-web faxtomail-ui-web/src/license faxtomail-ui-web/src/main/java/com/franci
by echatellier＠users.forge.codelutin.com 03 Jul '14

03 Jul '14

Author: echatellier Date: 2014-07-03 09:47:05 +0200 (Thu, 03 Jul 2014) New Revision: 332 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/332 Log: Fix build Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java 2014-07-03 06:59:26 UTC (rev 331) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java 2014-07-03 07:47:05 UTC (rev 332) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/NewClientType.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-07-03 06:59:26 UTC (rev 331) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java 2014-07-03 07:47:05 UTC (rev 332) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-07-03 06:59:26 UTC (rev 331) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/LdapServiceMock.java 2014-07-03 07:47:05 UTC (rev 332) @@ -26,7 +26,7 @@ import java.util.List; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java 2014-07-03 06:59:26 UTC (rev 331) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java 2014-07-03 07:47:05 UTC (rev 332) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java ___________________________________________________________________ Added: svn:eol-style + native Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java 2014-07-03 06:59:26 UTC (rev 331) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java 2014-07-03 07:47:05 UTC (rev 332) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.reply; +/* + * #%L + * FaxToMail :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-07-03 06:59:26 UTC (rev 331) +++ trunk/faxtomail-ui-web/pom.xml 2014-07-03 07:47:05 UTC (rev 332) @@ -304,10 +304,12 @@ </exclusions> </dependency> +  <dependency> <groupId>org.xhtmlrenderer</groupId> <artifactId>flying-saucer-core</artifactId> <version>9.0.6</version> + <scope>runtime</scope> </dependency> </dependencies> Modified: trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-07-03 06:59:26 UTC (rev 331) +++ trunk/faxtomail-ui-web/src/license/THIRD-PARTY.properties 2014-07-03 07:47:05 UTC (rev 332) @@ -9,10 +9,15 @@ # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License +# - Copyright 2012 Igor Vaynberg # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License, Version 1.0 +# - GNU Affero General Public License v3 +# - GNU General Public License version 2 (GPLv2) # - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License (LGPL), version 2.1 +# - GNU Lesser General Public License version 2.1 (LGPLv2.1) # - GNU Lesser General Public License, Version 2.1 # - GNU Library or Lesser General Public License # - GPLv2+CE @@ -25,15 +30,18 @@ # - MIT License # - MPL 1.1 # - Public Domain +# - SIL Open Font License (OFL) # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - UnboundID LDAP SDK Free Use License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Apr 25 11:50:25 CEST 2014 +#Thu Jul 03 09:32:32 CEST 2014 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 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-07-03 06:59:26 UTC (rev 331) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-07-03 07:47:05 UTC (rev 332) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Web - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r331 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/demande/replies content/reply util
by kmorin＠users.forge.codelutin.com 03 Jul '14

03 Jul '14

Author: kmorin Date: 2014-07-03 08:59:26 +0200 (Thu, 03 Jul 2014) New Revision: 331 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/331 Log: correction des pj sur les r?\195?\169ponses Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java 2014-07-02 23:38:38 UTC (rev 330) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ReplyAction.java 2014-07-03 06:59:26 UTC (rev 331) @@ -24,15 +24,21 @@ * #L% */ +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.content.reply.ReplyAttachmentModel; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUI; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIHandler; import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; +import com.google.common.base.Function; +import com.google.common.collect.Collections2; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Collection; + import static org.nuiton.i18n.I18n.t; /** @@ -57,11 +63,17 @@ emailService = getContext().getEmailService(); DemandeUIModel originalDemand = getModel().getOriginalDemand(); + Collection<AttachmentFile> attachmentFiles = Collections2.transform(model.getAttachments(), new Function<ReplyAttachmentModel, AttachmentFile>() { + @Override + public AttachmentFile apply(ReplyAttachmentModel replyAttachmentModel) { + return replyAttachmentModel.getAttachmentFile(); + } + }); Email email = emailService.reply(model.getFrom(), model.getTo(), model.getSubject(), model.getMessage(), - model.getAttachments(), + attachmentFiles, originalDemand.getTopiaId(), getContext().getCurrentUser()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-07-02 23:38:38 UTC (rev 330) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-07-03 06:59:26 UTC (rev 331) @@ -53,6 +53,9 @@ import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; +import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; +import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyAttachmentModel; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.io.IOUtils; @@ -257,9 +260,16 @@ dh.writeTo(fos); // copy content into an empty attachment - AttachmentFile attachment = new AttachmentFileImpl(); - attachment.setContent(fos.toByteArray()); - reply.addAttachment(attachment); + AttachmentFile attachmentFile = new AttachmentFileImpl(); + attachmentFile.setContent(fos.toByteArray()); + attachmentFile.setFilename(fileName); + + Attachment attachment = new AttachmentImpl(); + attachment.setOriginalFile(attachmentFile); + + ReplyAttachmentModel replyAttachmentModel = new ReplyAttachmentModel(attachment, true, fileName); + + reply.addAttachment(replyAttachmentModel); } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.css 2014-07-02 23:38:38 UTC (rev 330) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.css 2014-07-03 06:59:26 UTC (rev 331) @@ -27,7 +27,7 @@ #attachmentNameLabel { actionIcon: "attachment"; - text: { t("faxtomail.reply.attachment.label", getAttachmentFile().getFilename(), getAttachmentFile().getLength() / 1024) }; + text: { t("faxtomail.reply.attachment.label", getReplyAttachmentModel().getLabel(), getReplyAttachmentModel().getLength() / 1024) }; border: { BorderFactory.createEmptyBorder(3, 3, 3, 3) }; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx 2014-07-02 23:38:38 UTC (rev 330) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/AttachmentItem.jaxx 2014-07-03 06:59:26 UTC (rev 331) @@ -24,7 +24,6 @@ <JPanel id='attachmentPanel' layout='{new BorderLayout()}'> <import> - com.franciaflex.faxtomail.persistence.entities.AttachmentFile java.awt.Color java.io.File @@ -32,9 +31,10 @@ static org.nuiton.i18n.I18n.t static jaxx.runtime.JAXXUtil.getStringValue + </import> - <AttachmentFile id='attachmentFile' javaBean='null'/> + <ReplyAttachmentModel id='replyAttachmentModel' javaBean='null'/> <ReplyFormUIHandler id='handler' javaBean='null'/> @@ -42,9 +42,9 @@ <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <JButton id='openAttachmentButton' - onActionPerformed='handler.openAttachment(attachmentFile)'/> + onActionPerformed='handler.openAttachment(replyAttachmentModel)'/> <JButton id='removeAttachmentButton' - onActionPerformed='handler.removeAttachment(attachmentFile)'/> + onActionPerformed='handler.removeAttachment(replyAttachmentModel)'/> </JToolBar> </JPanel> \ No newline at end of file Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java (rev 0) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyAttachmentModel.java 2014-07-03 06:59:26 UTC (rev 331) @@ -0,0 +1,58 @@ +package com.franciaflex.faxtomail.ui.swing.content.reply; + +import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; + +/** +* @author Kevin Morin (Code Lutin) +* @since x.x +*/ +public class ReplyAttachmentModel { + + protected Attachment attachment; + protected boolean original; + protected String label; + + public ReplyAttachmentModel(Attachment attachment, boolean original, String label) { + this.attachment = attachment; + this.original = original; + this.label = label; + } + + public Attachment getAttachment() { + return attachment; + } + + public void setAttachment(Attachment attachment) { + this.attachment = attachment; + } + + public boolean isOriginal() { + return original; + } + + public void setOriginal(boolean original) { + this.original = original; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public AttachmentFile getAttachmentFile() { + return original ? attachment.getOriginalFile() : attachment.getEditedFile(); + } + + public long getLength() { + return getAttachmentFile() != null ? getAttachmentFile().getLength() : 0; + } + + @Override + public String toString() { + return label; + } +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-07-02 23:38:38 UTC (rev 330) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-07-03 06:59:26 UTC (rev 331) @@ -28,8 +28,11 @@ import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; +import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; +import com.franciaflex.faxtomail.services.service.EmailService; +import com.google.common.base.Strings; import org.apache.commons.io.FileUtils; -import org.nuiton.util.DesktopUtil; +import org.apache.commons.lang3.StringUtils; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import java.awt.Component; @@ -106,12 +109,20 @@ models.addAll(demand.getGroupedDemandes()); for (DemandeUIModel demandeUIModel : models) { + String prefix = demandeUIModel.getObject() + " - "; + if (StringUtils.isNotBlank(demandeUIModel.getCompanyReference())) { + prefix = demandeUIModel.getCompanyReference() + " - " + prefix; + } for (Attachment attachment : demandeUIModel.getAttachment()) { - AttachmentFile originalFile = attachment.getOriginalFile(); - model.addAvailableAttachment(originalFile); - AttachmentFile file = attachment.getEditedFile(); - if (file != null) { - model.addAvailableAttachment(file); + + ReplyAttachmentModel replyOriginalAttachmentModel = + new ReplyAttachmentModel(attachment, true, prefix + attachment.getOriginalFileName()); + model.addAvailableAttachment(replyOriginalAttachmentModel); + + if (!Strings.isNullOrEmpty(attachment.getEditedFileName())) { + ReplyAttachmentModel replyEditedAttachmentModel = + new ReplyAttachmentModel(attachment, false, prefix + attachment.getEditedFileName()); + model.addAvailableAttachment(replyEditedAttachmentModel); } } } @@ -153,7 +164,7 @@ model.addPropertyChangeListener(ReplyFormUIModel.PROPERTY_ATTACHMENT, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - updateAttachmentPanel((Collection<AttachmentFile>) evt.getNewValue()); + updateAttachmentPanel((Collection<ReplyAttachmentModel>) evt.getNewValue()); } }); @@ -165,7 +176,6 @@ }); JComboBox addAttachmentFile = ui.getAddAttachmentFile(); - addAttachmentFile.setRenderer(new DecoratorListCellRenderer(getDecorator(AttachmentFile.class, null))); addAttachmentFile.setEditor(new FileComboBoxEditor()); getValidator().addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, new PropertyChangeListener() { @@ -202,7 +212,7 @@ return getUI().getMessage(); } - public void removeAttachment(AttachmentFile attachment) { + public void removeAttachment(ReplyAttachmentModel attachment) { ReplyFormUIModel model = getModel(); model.removeAttachment(attachment); @@ -212,43 +222,67 @@ } public void addAttachment() { + ReplyFormUIModel model = getModel(); + JComboBox addAttachmentFile = ui.getAddAttachmentFile(); - AttachmentFile attachmentFile = null; + ReplyAttachmentModel replyAttachmentModel = null; Object selectedItem = addAttachmentFile.getSelectedItem(); - if (AttachmentFile.class.isAssignableFrom(selectedItem.getClass())) { - attachmentFile = (AttachmentFile) selectedItem; + if (ReplyAttachmentModel.class.isAssignableFrom(selectedItem.getClass())) { + replyAttachmentModel = (ReplyAttachmentModel) selectedItem; + + Attachment attachment = replyAttachmentModel.getAttachment(); + if (replyAttachmentModel.getAttachmentFile() == null && attachment.isPersisted()) { + // TODO action ? + EmailService service = getContext().getEmailService(); + boolean original = replyAttachmentModel.isOriginal(); + AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(), + original); + if (original) { + attachment.setOriginalFile(file); + } else { + attachment.setEditedFile(file); + } + } + } else if (File.class.isAssignableFrom(selectedItem.getClass())) { File file = (File) selectedItem; - attachmentFile = new AttachmentFileImpl(); - attachmentFile.setFilename(file.getName()); + + AttachmentFile attachmentFile = new AttachmentFileImpl(); + String fileName = file.getName(); + attachmentFile.setFilename(fileName); + try { attachmentFile.setContent(FileUtils.readFileToByteArray(file)); } catch (IOException e) { if (log.isErrorEnabled()) { - log.error("Error while converting the file " + file.getName() + " into a byte[]", e); + log.error("Error while converting the file " + fileName + " into a byte[]", e); } } + + Attachment attachment = new AttachmentImpl(); + attachment.setOriginalFile(attachmentFile); + replyAttachmentModel = new ReplyAttachmentModel(attachment, true, fileName); + } - if (attachmentFile != null) { - ReplyFormUIModel model = getModel(); - model.addAttachment(attachmentFile); + if (replyAttachmentModel != null) { + model.addAttachment(replyAttachmentModel); - model.removeAvailableAttachment(attachmentFile); - ui.getAddAttachmentFile().removeItem(attachmentFile); + model.removeAvailableAttachment(replyAttachmentModel); + ui.getAddAttachmentFile().removeItem(replyAttachmentModel); addAttachmentFile.setSelectedItem(null); } } - protected void updateAttachmentPanel(Collection<AttachmentFile> attachments) { + protected void updateAttachmentPanel(Collection<ReplyAttachmentModel> attachments) { JPanel attachmentsPanel = ui.getAttachmentsPanel(); attachmentsPanel.removeAll(); - for (AttachmentFile attachment : attachments) { + for (ReplyAttachmentModel attachment : attachments) { AttachmentItem item = new AttachmentItem(); item.setHandler(this); - item.setAttachmentFile(attachment); + item.setReplyAttachmentModel(attachment); attachmentsPanel.add(item); } attachmentsPanel.updateUI(); @@ -278,15 +312,15 @@ } } - public void openAttachment(AttachmentFile attachment) { + public void openAttachment(ReplyAttachmentModel attachment) { - FaxToMailUIUtil.openFile(getContext(), attachment); + FaxToMailUIUtil.openFile(getContext(), attachment.getAttachmentFile()); } protected class FileComboBoxEditor implements ComboBoxEditor { - protected AttachmentFile oldValue; + protected ReplyAttachmentModel oldValue; protected JTextField editorComponent = new JTextField(); @@ -298,21 +332,25 @@ @Override public void setItem(Object anObject) { String text; - AttachmentFile attachmentFile = null; + ReplyAttachmentModel replyAttachmentModel = null; if (anObject != null) { - if (AttachmentFile.class.isAssignableFrom(anObject.getClass())) { - attachmentFile = (AttachmentFile) anObject; + if (ReplyAttachmentModel.class.isAssignableFrom(anObject.getClass())) { + replyAttachmentModel = (ReplyAttachmentModel) anObject; } else if (File.class.isAssignableFrom(anObject.getClass())) { File file = (File) anObject; - attachmentFile = new AttachmentFileImpl(); - attachmentFile.setFilename(file.getName()); + + AttachmentFile attachmentFile = new AttachmentFileImpl(); + String fileName = file.getName(); + attachmentFile.setFilename(fileName); + + replyAttachmentModel = new ReplyAttachmentModel(new AttachmentImpl(), true, fileName); } } - if (attachmentFile != null) { - text = decorate(attachmentFile); - oldValue = attachmentFile; + if (replyAttachmentModel != null) { + text = replyAttachmentModel.getLabel(); + oldValue = replyAttachmentModel; } else { text = ""; @@ -329,7 +367,7 @@ if (oldValue != null) { // The original value is not a string. Should return the value in it's // original type. - if (newValue.equals(decorate(oldValue))) { + if (newValue.equals(oldValue.getLabel())) { return oldValue; } else { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-07-02 23:38:38 UTC (rev 330) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-07-03 06:59:26 UTC (rev 331) @@ -24,7 +24,6 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.google.common.base.Preconditions; @@ -69,8 +68,8 @@ protected boolean readonly = false; protected List<String> senderAllowedDomains; - protected Set<AttachmentFile> attachments = new HashSet<AttachmentFile>(); - protected Set<AttachmentFile> availableAttachments = new HashSet<AttachmentFile>(); + protected Set<ReplyAttachmentModel> attachments = new HashSet<ReplyAttachmentModel>(); + protected Set<ReplyAttachmentModel> availableAttachments = new HashSet<ReplyAttachmentModel>(); protected File lastVisitedDirectory = FileUtils.getUserDirectory(); @@ -124,33 +123,33 @@ firePropertyChange(PROPERTY_ORIGINAL_DEMAND, oldValue, originalDemand); } - public Set<AttachmentFile> getAttachments() { + public Set<ReplyAttachmentModel> getAttachments() { return attachments; } - public void addAttachment(AttachmentFile attachment) { + public void addAttachment(ReplyAttachmentModel attachment) { attachments.add(attachment); firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachments()); setTotalAttachmentLength(totalAttachmentLength + attachment.getLength()); } - public void removeAttachment(AttachmentFile attachment) { + public void removeAttachment(ReplyAttachmentModel attachment) { attachments.remove(attachment); firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachments()); setTotalAttachmentLength(totalAttachmentLength - attachment.getLength()); } - public Set<AttachmentFile> getAvailableAttachments() { + public Set<ReplyAttachmentModel> getAvailableAttachments() { return availableAttachments; } - public void addAvailableAttachment(AttachmentFile attachment) { + public void addAvailableAttachment(ReplyAttachmentModel attachment) { availableAttachments.add(attachment); } - public void removeAvailableAttachment(AttachmentFile attachment) { + public void removeAvailableAttachment(ReplyAttachmentModel attachment) { availableAttachments.remove(attachment); } @@ -205,13 +204,7 @@ // Do not remove the unused parameter, it is just for the validation // to bind the totalAttachmentLength property public boolean isAttachmentSizeValid(long totalAttachmentLength) { - if (log.isDebugEnabled()) { - log.debug(this.totalAttachmentLength + ", " + maxAttachmentLength + ", " + (this.totalAttachmentLength < maxAttachmentLength)); - } boolean valid = maxAttachmentLength == 0 || this.totalAttachmentLength < maxAttachmentLength; - if (log.isDebugEnabled()) { - log.debug(valid); - } return valid; } @@ -228,11 +221,11 @@ public boolean isDomainAllowed(String from) { Preconditions.checkNotNull(from); for (String domain : getSenderAllowedDomains()) { - log.info(domain + " " + from); if (from.endsWith(domain)) { return true; } } return getSenderAllowedDomains().isEmpty(); } + } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-02 23:38:38 UTC (rev 330) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-03 06:59:26 UTC (rev 331) @@ -64,6 +64,7 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; +import com.google.common.base.Strings; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; @@ -532,4 +533,5 @@ t("jaxx.application.error.cannot.mail"), e); } } + }

1 0

r330 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print
by kmorin＠users.forge.codelutin.com 02 Jul '14

02 Jul '14

Author: kmorin Date: 2014-07-03 01:38:38 +0200 (Thu, 03 Jul 2014) New Revision: 330 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/330 Log: - action d'impression Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-07-02 23:36:50 UTC (rev 329) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-07-02 23:38:38 UTC (rev 330) @@ -152,29 +152,6 @@ } public void print() { - // TODO 20140702 put in an action - List<String> printedFiles = new ArrayList<String>(); - - for (AttachmentFile attachmentFile : getModel().getAttachmentsToPrint()) { - try { - if (StringUtils.isNotBlank(attachmentFile.getFilename())) { - FaxToMailUIUtil.print(attachmentFile, true); - printedFiles.add(attachmentFile.getFilename()); - } - - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Could not print attachement.", e); - } - } - } - - getContext().getEmailService().addToHistory(getModel().getDemand().getTopiaId(), - HistoryType.PRINTING, - getContext().getCurrentUser(), - new Date(), - printedFiles.toArray(new String[printedFiles.size()])); - Multimap<DemandeUIModel, AttachmentFile> attachmentToPrints = HashMultimap.create(); attachmentToPrints.putAll(getModel().getDemand(), getModel().getAttachmentsToPrint());

1 0

r329 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/main/resources/i18n faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/java/com
by kmorin＠users.forge.codelutin.com 02 Jul '14

02 Jul '14

Author: kmorin Date: 2014-07-03 01:36:50 +0200 (Thu, 03 Jul 2014) New Revision: 329 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/329 Log: - action d'impression - ajout de l'historisation des impressions - correction de la rotation des pj - etat modifi?\195?\169 de la demande quand on edite un ?\195?\169l?\195?\169ment Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-02 23:36:50 UTC (rev 329) @@ -855,7 +855,7 @@ result = new AttachmentFileImpl(); result.setContent(out.toByteArray()); - result.setFilename("demand_details.pdf"); + result.setFilename(t("faxtomail.attachment.demand.filename") + ".pdf"); result.getFile(); } catch (Exception e) { Modified: trunk/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties =================================================================== --- trunk/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-service/src/main/resources/i18n/faxtomail-service_fr_FR.properties 2014-07-02 23:36:50 UTC (rev 329) @@ -1,3 +1,4 @@ +faxtomail.attachment.demand.filename=Détail de la demande faxtomail.email.projectReference.default=Votre demande du %s faxtomail.service.email.save.clientCode.error=Impossible de trouver le client %s \! faxtomail.service.referential.import.clients.error= Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-07-02 23:36:50 UTC (rev 329) @@ -30,6 +30,7 @@ import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; +import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -79,9 +80,12 @@ } else { attachment.setEditedFile(attachmentFile); }*/ - dialogContent.getModel().fromEntity(attachment); + PDFEditorUIModel pdfEditorUIModel = dialogContent.getModel(); + pdfEditorUIModel.fromEntity(attachment); + pdfEditorUIModel.setDemand(getContext().getCurrentEmail()); + getHandler().openDialog(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); - dialogContent.getModel().toEntity(attachment); + pdfEditorUIModel.toEntity(attachment); } } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-07-02 23:36:50 UTC (rev 329) @@ -24,8 +24,7 @@ * #L% */ -import java.awt.Insets; -import java.awt.Point; +import java.awt.*; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -35,6 +34,11 @@ import javax.swing.JTextArea; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; +import com.itextpdf.awt.geom.AffineTransform; +import com.itextpdf.text.DocumentException; +import com.itextpdf.text.Element; +import com.itextpdf.text.ExceptionConverter; +import com.itextpdf.text.pdf.PdfTemplate; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; @@ -49,6 +53,7 @@ import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIModel; import com.itextpdf.text.BaseColor; import com.itextpdf.text.Document; +import com.itextpdf.text.Font; import com.itextpdf.text.Phrase; import com.itextpdf.text.pdf.BaseFont; import com.itextpdf.text.pdf.ColumnText; @@ -84,21 +89,7 @@ PDFEditorUIModel model = getModel(); - //File file = model.getNotNullFile(); - -// InputStream inputStream; -// if (FaxToMailUIUtil.isFileAPDF(file)) { -// inputStream = new FileInputStream(file); - -// } else if (FaxToMailUIUtil.isFileATxt(file)) { -// File target = handler.convertTextToPdf(file); -// inputStream = new FileInputStream(target); -// -// } else { -// -// InputStream inputStream = new FileInputStream(file); -// } PdfReader pdfReader = new PdfReader(inputStream); @@ -117,18 +108,14 @@ for (int i = 0 ; i < pageNb ; i++) { PdfContentByte cb = pdfStamper.getOverContent(i + 1); -// PdfDictionary pageDict; -// pageDict = pdfReader.getPageN(i + 1); -// int pageRotation = pdfReader.getPageRotation(i + 1); -// pageDict.put(PdfName.ROTATE, new PdfNumber((360 + pageRotation + rotation) % 360)); - for (PDFEditorNoteUI note : model.getPages()[i].getNotes()) { - Point location = note.getLocation(); - int width = (int) (note.getWidth() / zoom); - int height = (int) (note.getHeight() / zoom); - int x = (int) (location.x / zoom); - int y = (int) ((getUI().getContainer().getHeight() - location.y) / zoom) - height; + int[] coordinates = computeCoordinates(note, rotation, zoom); + int width = coordinates[0]; + int height = coordinates[1]; + int x = coordinates[2]; + int y = coordinates[3]; + Insets insets = note.getInsets(); cb.saveState(); @@ -140,35 +127,63 @@ cb.saveState(); JTextArea textArea = note.getNoteText(); float fontSize = textArea.getFont().getSize2D() / zoom; - cb.setFontAndSize(BaseFont.createFont(BaseFont.HELVETICA_OBLIQUE, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED), fontSize * 1.3f); + BaseFont font = BaseFont.createFont(BaseFont.HELVETICA_OBLIQUE, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED); - ColumnText ct = new ColumnText(cb); - ct.setSimpleColumn(x + insets.left, y + insets.bottom, x + insets.left + width - insets.right, y + insets.bottom + height - insets.top); - ct.setLeading(fontSize + 3); + String text = note.getText(); + String[] rows = text.split("\n"); + int rowHeight = textArea.getHeight() / rows.length; - ct.addText(new Phrase(note.getTitle())); - ct.go(); + int xxx = x; + int yyy = y; + if (rotation == 0) { + xxx += insets.left; + yyy += height - rowHeight - insets.top; - String text = note.getText(); - String[] rows = text.split("\n"); + } else if (rotation == 90) { + xxx += rowHeight + insets.top; + yyy += insets.left; + + } else if (rotation == 180) { + xxx += width - insets.right; + yyy += rowHeight - insets.top; + + } else if (rotation == 270) { + xxx += width - rowHeight - insets.left; + yyy += height - insets.top; + } + + showTextAligned(cb, note.getTitle(), xxx, yyy, rotation, font, fontSize); + for (String s : rows) { if (s.isEmpty()) { s = " "; } - ct.addText(new Phrase(s)); - ct.go(); + if (rotation == 0) { + yyy -= rowHeight; + + } else if (rotation == 90) { + xxx += rowHeight; + + } else if (rotation == 180) { + yyy += rowHeight; + + } else if (rotation == 270) { + xxx -= rowHeight; + } + showTextAligned(cb, s, xxx, yyy, rotation, font, fontSize); } cb.restoreState(); + } for (PDFEditorCrossUI panel : model.getPages()[i].getCrosses()) { - Point location = panel.getLocation(); - int width = (int) (panel.getWidth() / zoom); - int height = (int) (panel.getHeight() / zoom); - int x = (int) (location.x / zoom); - int y = (int) ((getUI().getContainer().getHeight() - location.y) / zoom) - height; + int[] coordinates = computeCoordinates(panel, rotation, zoom); + int width = coordinates[0]; + int height = coordinates[1]; + int x = coordinates[2]; + int y = coordinates[3]; cb.saveState(); cb.setColorStroke(BaseColor.BLUE); @@ -183,13 +198,13 @@ for (PDFEditorLineUI panel : model.getPages()[i].getLines()) { - Point location = panel.getLocation(); - int width = (int) (panel.getWidth() / zoom); - int height = (int) (panel.getHeight() / zoom); - int x = (int) (location.x / zoom); - int y = (int) ((getUI().getContainer().getHeight() - location.y) / zoom) - height; + int[] coordinates = computeCoordinates(panel, rotation, zoom); + int width = coordinates[0]; + int height = coordinates[1]; + int x = coordinates[2]; + int y = coordinates[3]; - if (panel.isHorizontal()) { + if (rotation % 180 == 0 ^ !panel.isHorizontal()) { y += height / 2; } else { x += width / 2; @@ -198,7 +213,7 @@ cb.saveState(); cb.setColorStroke(BaseColor.BLUE); cb.moveTo(x, y); - if (panel.isHorizontal()) { + if (rotation % 180 == 0 ^ !panel.isHorizontal()) { cb.lineTo(x + width, y); } else { cb.lineTo(x, y + height); @@ -209,11 +224,11 @@ for (PDFEditorHighlighterUI panel : model.getPages()[i].getHighlighters()) { - Point location = panel.getLocation(); - int width = (int) (panel.getWidth() / zoom); - int height = (int) (panel.getHeight() / zoom); - int x = (int) (location.x / zoom); - int y = (int) ((getUI().getContainer().getHeight() - location.y) / zoom) - height; + int[] coordinates = computeCoordinates(panel, rotation, zoom); + int width = coordinates[0]; + int height = coordinates[1]; + int x = coordinates[2]; + int y = coordinates[3]; cb.saveState(); PdfGState gs1 = new PdfGState(); @@ -244,6 +259,75 @@ getModel().setEditedFile(attachmentFileNew); } + protected int[] computeCoordinates(Component panel, int rotation, float zoom) { + Point location = panel.getLocation(); + + int width = rotation % 180 == 0 ? panel.getWidth() : panel.getHeight(); + int height = rotation % 180 == 0 ? panel.getHeight() : panel.getWidth(); + + width = (int) (width / zoom); + height = (int) (height / zoom); + + int x = 0; + int y = 0; + + if (rotation == 0) { + x = (int) (location.x / zoom); + y = (int) ((getUI().getContainer().getHeight() - location.y) / zoom) - height; + + } else if (rotation == 180) { + x = (int) ((getUI().getContainer().getWidth() - location.x) / zoom) - width; + y = (int) (location.y / zoom); + + } else if (rotation == 90) { + x = (int) (location.y / zoom); + y = (int) (location.x / zoom); + + } else if (rotation == 270) { + x = (int) ((getUI().getContainer().getHeight() - location.y) / zoom) - width; + y = (int) ((getUI().getContainer().getWidth() - location.x) / zoom) - height; + } + + int[] result = new int[] { width, height, x, y }; + return result; + } + + protected void showTextAligned(PdfContentByte canvas, String text, float x, float y, float rotation, BaseFont baseFont, float fontSize) { + canvas.saveState(); + + ColumnText ct = new ColumnText(canvas); + + float lly = -1; + float ury = 2; + float llx = 0; + float urx = 20000; + + if (rotation == 0) { + llx += x; + lly += y; + urx += x; + ury += y; + + } else { + double alpha = rotation * Math.PI / 180.0; + float cos = (float)Math.cos(alpha); + float sin = (float)Math.sin(alpha); + canvas.concatCTM(cos, sin, -sin, cos, x, y); + } + + Font font = new Font(baseFont, fontSize); + ct.setSimpleColumn(new Phrase(text, font), llx, lly, urx, ury, 0, Element.ALIGN_LEFT); + ct.setAlignment(Element.ALIGN_LEFT); + + try { + ct.go(); + } + catch (DocumentException e) { + throw new ExceptionConverter(e); + } + canvas.restoreState(); + } + @Override public void postSuccessAction() { super.postSuccessAction(); Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java (rev 0) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java 2014-07-02 23:36:50 UTC (rev 329) @@ -0,0 +1,134 @@ +package com.franciaflex.faxtomail.ui.swing.actions; + +import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.HistoryType; +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 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 org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; + +import static org.nuiton.i18n.I18n.t; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { + + private static final Log log = LogFactory.getLog(PrintOnDefaultPrinterAction.class); + + protected Multimap<DemandeUIModel, AttachmentFile> attachmentsToPrintByDemand; + protected boolean take; + protected boolean printDemandDetails; + + public PrintOnDefaultPrinterAction(AbstractFaxToMailUIHandler handler, + Multimap<DemandeUIModel, AttachmentFile> attachmentsToPrintByDemand, + boolean take, + boolean printDemandDetails) { + + super(handler, false); + this.attachmentsToPrintByDemand = attachmentsToPrintByDemand; + this.take = take; + this.printDemandDetails = printDemandDetails; + + setActionDescription(t("faxtomail.action.print.tip")); + } + + @Override + public void doAction() throws Exception { + FaxToMailUser currentUser = getContext().getCurrentUser(); + + Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment = HashMultimap.create(); + + for (DemandeUIModel demandeUIModel : attachmentsToPrintByDemand.keySet()) { + + if (take) { + demandeUIModel.setTakenBy(currentUser); + } + + List<String> printedFiles = new ArrayList<String>(); + + if (printDemandDetails) { + // generate details as pdf + EmailService emailService = getContext().getEmailService(); + Email email = demandeUIModel.toEntity(); + final AttachmentFile demandDetailAttachment = emailService.getEmailDetailAsAttachment(email); + // print details + FaxToMailUIUtil.print(demandDetailAttachment, true); + printedFiles.add(demandDetailAttachment.getFilename()); + } + + for (AttachmentFile attachmentFile : attachmentsToPrintByDemand.get(demandeUIModel)) { + + boolean printable = FaxToMailUIUtil.isFileTypeEditable(attachmentFile.getFilename()); + if (printable) { + FaxToMailUIUtil.print(attachmentFile, true); + printedFiles.add(attachmentFile.getFilename()); + + } else { + nonPrintedAttachment.put(demandeUIModel, attachmentFile); + } + } + + Email email = getContext().getEmailService().addToHistory(demandeUIModel.getTopiaId(), + HistoryType.PRINTING, + getContext().getCurrentUser(), + new Date(), + printedFiles.toArray(new String[printedFiles.size()])); + demandeUIModel.setHistory(email.getHistory()); + } + + // print another page for non printed attachments + if (!nonPrintedAttachment.isEmpty()) { + InputStream errorPageStream = generateErrorPageStream(nonPrintedAttachment); + FaxToMailUIUtil.print(errorPageStream, true); + } + } + + /** + * Retourne un flux de données qui correspond à une page de récapitulatif des pièces jointes + * non imprimées. + * + * @param nonPrintedAttachment not printed attachment list + * @return input stream with content + */ + protected InputStream generateErrorPageStream(Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment) { + + // generate text content + StringBuilder builder = new StringBuilder(); + builder.append("\nLes pièces-jointes suivantes n'ont pas pu être imprimées:\n"); + + for (DemandeUIModel email : nonPrintedAttachment.keySet()) { + Collection<AttachmentFile> attachments = nonPrintedAttachment.get(email); + + builder.append(" * "); + if (!Strings.isNullOrEmpty(email.getCompanyReference())) { + builder.append(email.getCompanyReference() + " - "); + } + builder.append(Strings.nullToEmpty(email.getObject()) + " : \n"); + for (AttachmentFile attachmentFile : attachments) { + builder.append(" - " + attachmentFile.getFilename() + "\n"); + } + } + + // convert text content to inputstream + byte[] content = builder.toString().getBytes(Charsets.UTF_8); + InputStream is = new ByteArrayInputStream(content); + return is; + } +} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-07-02 23:36:50 UTC (rev 329) @@ -26,39 +26,41 @@ block:{model.isBusy()}; } */ +JSeparator { + border: { BorderFactory.createEmptyBorder(0, 5, 0, 5) }; +} #mainFrame { title: "faxtomail.main.title.applicationName"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; } -#menuFile { - text: "faxtomail.main.menu.file"; - toolTipText: "faxtomail.main.menu.file.tip"; - toolTipText: "faxtomail.main.menu.file.tip"; +#topBar { + floatable: false; + margin: {new java.awt.Insets(5, 5, 5, 5)}; + borderPainted: false; } -#menuFileDemandeList { +#demandListButton { actionIcon: list; text: "faxtomail.main.action.demandeList"; toolTipText: "faxtomail.main.action.demandeList.tip"; - enabled: true;//{model.getScreen() != TuttiScreen.LIST}; + selected: { model.getScreen() == FaxToMailScreen.LIST }; _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeListAction.class}; } -#menuFileRecherche { +#searchButton { actionIcon: search; text: "faxtomail.main.action.recherche"; toolTipText: "faxtomail.main.action.recherche.tip"; - enabled: true; + selected: { model.getScreen() == FaxToMailScreen.SEARCH }; _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.ShowRechercheAction.class}; } -#menuFileExit { +#exitButton { actionIcon: exit; text: "faxtomail.main.action.exit"; toolTipText: "faxtomail.main.action.exit.tip"; - _help: {"faxtomail.main.menu.action.exit.help"}; } #bottomBar { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-07-02 23:36:50 UTC (rev 329) @@ -24,6 +24,7 @@ width='1024' height='780'> <import> + com.franciaflex.faxtomail.ui.swing.FaxToMailScreen com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil com.franciaflex.faxtomail.ui.swing.actions.* @@ -33,6 +34,7 @@ org.jdesktop.swingx.JXTitledPanel javax.swing.JFrame + javax.swing.SwingConstants java.awt.BorderLayout </import> @@ -45,18 +47,13 @@ } ]]></script> -  - <JMenuBar id='menu'> - <JMenu id='menuFile'> - <JMenuItem id='menuFileDemandeList'/> - <JMenuItem id='menuFileRecherche'/> - <JMenuItem id='menuFileConfiguration'/> - <JSeparator/> - <JMenuItem id='menuFileExit' onActionPerformed="this.dispose()"/> - </JMenu> + <JToolBar id='topBar' constraints="BorderLayout.NORTH"> + <JToggleButton id='demandListButton'/> + <JToggleButton id='searchButton'/> + <JSeparator constructorParams="SwingConstants.VERTICAL"/> + <JButton id='exitButton'/> + </JToolBar> - </JMenuBar> - <JToolBar id='bottomBar'> <SwingValidatorMessageWidget id='validatorMessageWidget'/> </JToolBar> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-07-02 23:36:50 UTC (rev 329) @@ -323,7 +323,7 @@ case SEARCH: screenUI = new SearchUI(ui); screenTitle = t("faxtomail.search.title"); - icon = ui.getMenuFileRecherche().getIcon(); + icon = ui.getSearchButton().getIcon(); break; case DEMANDE: @@ -338,7 +338,7 @@ case LIST: screenUI = new DemandeListUI(ui); screenTitle = t("faxtomail.demandeList.title"); - icon = ui.getMenuFileDemandeList().getIcon(); + icon = ui.getDemandListButton().getIcon(); break; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-02 23:36:50 UTC (rev 329) @@ -30,15 +30,12 @@ import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.ByteArrayInputStream; -import java.io.InputStream; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Enumeration; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -57,12 +54,12 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; +import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import jaxx.runtime.JAXXUtil; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.io.Charsets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -86,7 +83,6 @@ import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; -import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.ui.swing.actions.ArchiveFromListAction; import com.franciaflex.faxtomail.ui.swing.actions.ComputeQuantitiesByRangeAction; import com.franciaflex.faxtomail.ui.swing.actions.LoadFolderEmailsAction; @@ -97,7 +93,6 @@ import com.franciaflex.faxtomail.ui.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode; -import com.google.common.base.Strings; /** * Handler of UI {@link com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler}. @@ -416,14 +411,6 @@ @Override public boolean quitUI() { -// boolean result = quitScreen( -// getModel().isValid(), -// getModel().isModify(), -// _("tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise"), -// _("tutti.editCruise.askSaveBeforeLeaving.saveCruise"), -// ui.getSaveButton().getAction() -// ); -// return result; return true; } @@ -511,24 +498,12 @@ selectedFolder = selectedFolder.getParent(); } boolean take = Boolean.TRUE.equals(selectedFolder.getPrintActionEqualTakeAction()); - FaxToMailUser currentUser = getContext().getCurrentUser(); - Map<Email, Collection<AttachmentFile>> nonPrintedAttachment = new HashMap<Email, Collection<AttachmentFile>>(); - List<DemandeUIModel> currentEmails = model.getCurrentEmails(); - for (DemandeUIModel demandeUIModel : currentEmails) { - if (take) { - demandeUIModel.setTakenBy(currentUser); - } + Multimap<DemandeUIModel, AttachmentFile> attachmentToPrints = HashMultimap.create(); - // generate details as pdf - EmailService emailService = getContext().getEmailService(); - Email email = demandeUIModel.toEntity(); - final AttachmentFile demandDetailAttachment = emailService.getEmailDetailAsAttachment(email); - // print details - FaxToMailUIUtil.print(demandDetailAttachment, true); + for (DemandeUIModel demandeUIModel : model.getCurrentEmails()) { for (Attachment attachment : demandeUIModel.getAttachment()) { - // force lazy loading FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); @@ -536,57 +511,17 @@ if (attachmentFile == null) { attachmentFile = attachment.getOriginalFile(); } - boolean printable = FaxToMailUIUtil.isFileTypeEditable(attachmentFile.getFilename()); - if (printable) { - FaxToMailUIUtil.print(attachmentFile, true); - } else { - - Collection<AttachmentFile> emailAttachments = nonPrintedAttachment.get(email); - if (emailAttachments == null) { - emailAttachments = new ArrayList<AttachmentFile>(); - nonPrintedAttachment.put(email, emailAttachments); - } - emailAttachments.add(attachmentFile); - } + attachmentToPrints.put(demandeUIModel, attachmentFile); } } - // print another page for non printed attachments - if (MapUtils.isNotEmpty(nonPrintedAttachment)) { - InputStream errorPageStream = generateErrorPageStream(nonPrintedAttachment); - FaxToMailUIUtil.print(errorPageStream, true); - } + PrintOnDefaultPrinterAction action = new PrintOnDefaultPrinterAction(this, + attachmentToPrints, + take, + true); + getContext().getActionFactory().createUIAction(null, action).actionPerformed(null); } - /** - * Retourne un flux de données qui correspond à une page de récapitulatif des pièces jointes - * non imprimées. - * - * @param nonPrintedAttachment not printed attachment list - * @return input stream with content - */ - protected InputStream generateErrorPageStream(Map<Email, Collection<AttachmentFile>> nonPrintedAttachment) { - - // generate text content - StringBuilder builder = new StringBuilder(); - builder.append("\nLes pièces-jointes suivantes n'ont pas pu être imprimées:\n"); - - for (Map.Entry<Email, Collection<AttachmentFile>> entry : nonPrintedAttachment.entrySet()) { - Email email = entry.getKey(); - Collection<AttachmentFile> attachments = entry.getValue(); - - builder.append(" * " + Strings.nullToEmpty(email.getCompanyReference()) + " - " + Strings.nullToEmpty(email.getObject()) + " : \n"); - for (AttachmentFile attachmentFile : attachments) { - builder.append(" - " + attachmentFile.getFilename() + "\n"); - } - } - - // convert text content to inputstream - byte[] content = builder.toString().getBytes(Charsets.UTF_8); - InputStream is = new ByteArrayInputStream(content); - return is; - } - public void reply() { DemandeUIModel demand = getModel().getCurrentEmails().get(0); getContext().setCurrentEmail(demand); @@ -594,7 +529,7 @@ ReplyFormUI dialogContent = new ReplyFormUI(ui); ReplyFormUIModel model = dialogContent.getModel(); - //TODO kmorin 20140626 test + //TODO kmorin 20140626 to test String sender = JAXXUtil.getStringValue(demand.getSender()); if (demand.isFax()) { MailFolder selectedFolder = getModel().getSelectedFolder(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-07-02 23:36:50 UTC (rev 329) @@ -365,6 +365,7 @@ FaxToMailUIUtil.getEditedFileName(attachment.getOriginalFileName())); getModel().setHistory(email.getHistory()); } + getModel().setModify(true); } @@ -401,6 +402,7 @@ result.add(Email.PROPERTY_HISTORY); result.add(DemandeUIModel.PROPERTY_GROUPED_DEMANDES); result.add(Email.PROPERTY_REPLIES); + result.add(Email.PROPERTY_LOCKED_BY); return result; } @@ -422,6 +424,7 @@ @Override public boolean quitUI() { BeanMonitor monitor = getMonitor(); + log.info(Arrays.toString(monitor.getModifiedProperties())); boolean result = quitScreen( true, monitor.wasModified(), Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-07-02 23:36:50 UTC (rev 329) @@ -302,6 +302,7 @@ } if (change) { getModel().setCurrentIndex(newIndex); + getContext().setCurrentEmail(getModel().getCurrentDemand()); } return change; } @@ -337,23 +338,6 @@ public void print() { closeButtonPopups(); -// for (Attachment attachment : getModel().getAttachment()) { -//// try { -// File editedFile = attachment.getEditedFile(); -// if (editedFile == null) { -// editedFile = attachment.getOriginalFile(); -// } -// log.info("print " + editedFile.getAbsolutePath()); -//// Desktop.getDesktop().print(editedFile); -// -// -//// } catch (IOException e) { -//// if (log.isErrorEnabled()) { -//// log.error("", e); -//// } -//// } -// } - DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent(); AttachmentToPrintChooserUI dialogContent = new AttachmentToPrintChooserUI(ui, demandeUI.getModel()); @@ -389,7 +373,7 @@ model.setOriginalDemand(currentDemand); - //TODO kmorin 20140626 test + //TODO kmorin 20140626 to test String sender = JAXXUtil.getStringValue(currentDemand.getSender()); if (currentDemand.isFax()) { MailFolder selectedFolder = getContext().getCurrentMailFolder(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-07-02 23:36:50 UTC (rev 329) @@ -53,6 +53,11 @@ import javax.swing.JComponent; import javax.swing.JPanel; +import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.HistoryType; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import jaxx.runtime.swing.ComponentMover; import jaxx.runtime.swing.ComponentResizer; import jaxx.runtime.validator.swing.SwingValidator; @@ -544,6 +549,21 @@ } public void print() { - FaxToMailUIUtil.print(getModel().getEditedFile(), false); + Multimap<DemandeUIModel, AttachmentFile> attachmentsToPrint = HashMultimap.create(); + PDFEditorUIModel model = getModel(); + AttachmentFile attachmentFile = model.getNotNullFile(); + boolean print = FaxToMailUIUtil.print(attachmentFile, false); + + // TODO kmorin 20140702 à mettre dans une action ou avec un loading ou qqchose + // j'ai essayé une action vite fait mais ca ferme l'éditeur à la fin de l'action + if (print) { + DemandeUIModel demand = model.getDemand(); + Email email = getContext().getEmailService().addToHistory(demand.getTopiaId(), + HistoryType.PRINTING, + getContext().getCurrentUser(), + new Date(), + attachmentFile.getFilename()); + demand.setHistory(email.getHistory()); + } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-07-02 23:36:50 UTC (rev 329) @@ -27,6 +27,7 @@ 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; @@ -48,6 +49,8 @@ protected final Attachment editObject = new AttachmentImpl(); + protected DemandeUIModel demand; + public class Page { protected List<PDFEditorNoteUI> notes = new ArrayList<PDFEditorNoteUI>(); @@ -233,6 +236,14 @@ firePropertyChanged(PROPERTY_ROTATION, oldValue, rotation); } + public DemandeUIModel getDemand() { + return demand; + } + + public void setDemand(DemandeUIModel demand) { + this.demand = demand; + } + @Override protected Attachment newEntity() { return new AttachmentImpl(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-07-02 23:36:50 UTC (rev 329) @@ -24,17 +24,19 @@ * #L% */ -import static org.nuiton.i18n.I18n.t; - import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.swing.JCheckBox; import javax.swing.JComponent; -import javax.swing.JOptionPane; -import jaxx.runtime.JAXXUtil; +import com.franciaflex.faxtomail.persistence.entities.HistoryType; +import com.franciaflex.faxtomail.ui.swing.actions.PrintOnDefaultPrinterAction; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; @@ -49,7 +51,6 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.Cancelable; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; -import com.google.common.collect.Lists; /** * @author Kevin Morin (Code Lutin) @@ -67,14 +68,14 @@ AttachmentToPrintChooserUIModel model = getModel(); DemandeUIModel demand = model.getDemand(); - JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), true); - ui.getAttachmentPanel().add(checkBox); - // add demand details EmailService emailService = getContext().getEmailService(); Email email = getModel().getDemand().toEntity(); final AttachmentFile demandDetailAttachment = emailService.getEmailDetailAsAttachment(email); + JCheckBox checkBox = new JCheckBox(demandDetailAttachment.getFilename(), true); + ui.getAttachmentPanel().add(checkBox); + // add attached files getModel().addAttachmentToPrint(demandDetailAttachment); checkBox.addItemListener(new ItemListener() { @@ -151,14 +152,16 @@ } public void print() { - List<AttachmentFile> attachmentsToPrint = Lists.newArrayList(getModel().getAttachmentsToPrint()); + // TODO 20140702 put in an action + List<String> printedFiles = new ArrayList<String>(); for (AttachmentFile attachmentFile : getModel().getAttachmentsToPrint()) { try { if (StringUtils.isNotBlank(attachmentFile.getFilename())) { FaxToMailUIUtil.print(attachmentFile, true); + printedFiles.add(attachmentFile.getFilename()); } - attachmentsToPrint.remove(attachmentFile); + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not print attachement.", e); @@ -166,21 +169,22 @@ } } - if (!attachmentsToPrint.isEmpty()) { + getContext().getEmailService().addToHistory(getModel().getDemand().getTopiaId(), + HistoryType.PRINTING, + getContext().getCurrentUser(), + new Date(), + printedFiles.toArray(new String[printedFiles.size()])); - StringBuilder fileNames = new StringBuilder(); - for (AttachmentFile attachmentFile : attachmentsToPrint) { - String fileName = JAXXUtil.getStringValue(attachmentFile.getFilename()); - fileNames.append("- ").append(fileName).append("\n"); - } - JOptionPane.showMessageDialog( - getTopestUI(), - t("faxtomail.demande.print.error.message.filesName", fileNames.toString()), - t("faxtomail.demande.print.error.message.title"), - JOptionPane.ERROR_MESSAGE); + Multimap<DemandeUIModel, AttachmentFile> attachmentToPrints = HashMultimap.create(); + attachmentToPrints.putAll(getModel().getDemand(), getModel().getAttachmentsToPrint()); - } else { - closeDialog(); - } + PrintOnDefaultPrinterAction action = new PrintOnDefaultPrinterAction(this, + attachmentToPrints, + false, + false); + getContext().getActionFactory().createUIAction(null, action).actionPerformed(null); + } + + } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-02 23:36:50 UTC (rev 329) @@ -382,20 +382,22 @@ * * @param attachmentFile * @param defaultPrinter if {@code true}, do not display print dialog and print with default printer + * @return true if file has been printed, false otherwise */ - public static void print(AttachmentFile attachmentFile, boolean defaultPrinter) { - + public static boolean print(AttachmentFile attachmentFile, boolean defaultPrinter) { + boolean result = false; FileInputStream textStream = null; try { textStream = new FileInputStream(attachmentFile.getFile()); - print(textStream, defaultPrinter); + result = print(textStream, defaultPrinter); } catch (IOException e) { throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.print"), e); } finally { IOUtils.closeQuietly(textStream); } + return result; } /** @@ -403,9 +405,10 @@ * * @param inputStream stream to print * @param defaultPrinter if {@code true}, do not display print dialog and print with default printer + * @return true if file has been printed, false otherwise */ - public static void print(InputStream inputStream, boolean defaultPrinter) { - + public static boolean print(InputStream inputStream, boolean defaultPrinter) { + boolean result = true; try { DocFlavor flavor = DocFlavor.INPUT_STREAM.AUTOSENSE; @@ -446,8 +449,8 @@ //built in UI for printing you may not use this PrintService service = ServiceUI.printDialog(null, 200, 200, services, defaultService, flavor, aset); - System.out.print("service " + service); - if (service != null) { + result = service != null; + if (result) { DocPrintJob job = service.createPrintJob(); job.print(mydoc, aset); } @@ -457,6 +460,8 @@ throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.print"), e); } + + return result; } public static String getEditedFileName(String originalFileName) { Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-07-02 17:08:07 UTC (rev 328) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-07-02 23:36:50 UTC (rev 329) @@ -15,6 +15,7 @@ faxtomail.action.goto.search.tip=Aller à l'écran de recherche faxtomail.action.group.tip=Grouper l'élément faxtomail.action.loadFolderEmails.tip=Chargement des demandes du dossier %s +faxtomail.action.print.tip=Impression faxtomail.action.reloadFaxToMail=Recharger FaxToMail faxtomail.action.reply.tip=Envoyer la réponse faxtomail.action.save.tip=Enregistrer @@ -269,6 +270,10 @@ faxtomail.validator.error.email.priority.required= faxtomail.validator.error.email.projectReference.required=Référence chantier requise faxtomail.validator.error.email.rangeRow.required=Tableau des gammes requis +faxtomail.validator.error.reply.from.invalidDomain= +faxtomail.validator.error.reply.from.required= +faxtomail.validator.error.reply.to.required= +faxtomail.validator.error.reply.totalAttachmentLength.required= jaxx.application.error.cannot.mail= jaxx.application.error.cannot.print= jaxx.application.error.desktop.not.supported=

1 0

r328 - in trunk/faxtomail-ui-web/src/main: java/com/franciaflex/faxtomail/web java/com/franciaflex/faxtomail/web/job resources
by echatellier＠users.forge.codelutin.com 02 Jul '14

02 Jul '14

Author: echatellier Date: 2014-07-02 19:08:07 +0200 (Wed, 02 Jul 2014) New Revision: 328 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/328 Log: Refactoring application context pour que chaque jobs ait sa propre transaction Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/resources/quartz.properties Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-07-02 16:04:19 UTC (rev 327) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-07-02 17:08:07 UTC (rev 328) @@ -73,14 +73,11 @@ FaxToMailApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); - FaxToMailConfiguration config = applicationContext.getApplicationConfig(); + FaxToMailConfiguration config = FaxToMailApplicationContext.getApplicationConfig(); JobDataMap data = new JobDataMap(); - - FaxToMailTopiaPersistenceContext persistenceContext = applicationContext.newPersistenceContext(); - FaxToMailServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext); - data.put(MailFilterJob.SERVICE_CONTEXT, serviceContext); + data.put(MailFilterJob.APPLICATION_CONTEXT, applicationContext); JobDetail mailFilteringJob = JobBuilder.newJob(MailFilterJob.class) .usingJobData(data) Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java 2014-07-02 16:04:19 UTC (rev 327) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/AbstractFaxToMailJob.java 2014-07-02 17:08:07 UTC (rev 328) @@ -27,14 +27,14 @@ import org.quartz.Job; import org.quartz.JobExecutionContext; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.FaxToMailApplicationContext; public abstract class AbstractFaxToMailJob implements Job { - public static final String SERVICE_CONTEXT = "serviceContext"; + public static final String APPLICATION_CONTEXT = "applicationContext"; - protected FaxToMailServiceContext getServiceContext(JobExecutionContext jobExecutionContext) { - FaxToMailServiceContext serviceContext = (FaxToMailServiceContext) jobExecutionContext.getMergedJobDataMap().get(SERVICE_CONTEXT); - return serviceContext; + protected FaxToMailApplicationContext getApplicationContext(JobExecutionContext jobExecutionContext) { + FaxToMailApplicationContext applicationContext = (FaxToMailApplicationContext) jobExecutionContext.getMergedJobDataMap().get(APPLICATION_CONTEXT); + return applicationContext; } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-07-02 16:04:19 UTC (rev 327) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-07-02 17:08:07 UTC (rev 328) @@ -24,14 +24,16 @@ * #L% */ -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.ClientService; -import com.franciaflex.faxtomail.services.service.EmailService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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) * @since x.x @@ -40,17 +42,32 @@ private static final Log log = LogFactory.getLog(ClientUpdateJob.class); - protected FaxToMailServiceContext serviceContext; + protected FaxToMailApplicationContext applicationContext; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - serviceContext = getServiceContext(jobExecutionContext); - if (log.isDebugEnabled()) { - log.debug("Running ClientUpdateJob at " + serviceContext.getNow()); + applicationContext = getApplicationContext(jobExecutionContext); + FaxToMailTopiaPersistenceContext persistenceContext = null; + + try { + persistenceContext = applicationContext.newPersistenceContext(); + FaxToMailServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext); + + if (log.isDebugEnabled()) { + log.debug("Running ClientUpdateJob at " + serviceContext.getNow()); + } + + ClientService clientService = serviceContext.newService(ClientService.class); + clientService.updateNewClients(); + + if (log.isDebugEnabled()) { + log.debug("ClientUpdateJob ended at " + serviceContext.getNow()); + } + } finally { + if (persistenceContext != null) { + persistenceContext.close(); + } } - - ClientService clientService = serviceContext.newService(ClientService.class); - clientService.updateNewClients(); } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-07-02 16:04:19 UTC (rev 327) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-07-02 17:08:07 UTC (rev 328) @@ -24,8 +24,11 @@ * #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.EmailService; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.JobExecutionContext; @@ -39,28 +42,37 @@ private static final Log log = LogFactory.getLog(EDIManagementJob.class); - protected FaxToMailServiceContext serviceContext; + protected FaxToMailApplicationContext applicationContext; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - serviceContext = getServiceContext(jobExecutionContext); + applicationContext = getApplicationContext(jobExecutionContext); + FaxToMailTopiaPersistenceContext persistenceContext = null; - if (log.isDebugEnabled()) { - log.debug("Running EDIManagementJob at " + serviceContext.getNow()); + try { + persistenceContext = applicationContext.newPersistenceContext(); + FaxToMailServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext); + if (log.isDebugEnabled()) { + log.debug("Running EDIManagementJob at " + serviceContext.getNow()); + } + + EmailService emailService = serviceContext.newService(EmailService.class); + emailService.transmitPendingDemandsToEdi(); + + if (log.isDebugEnabled()) { + log.debug("Transmission over"); + } + + emailService.updateRangeRowsWithEdiReturns(); + + if (log.isDebugEnabled()) { + log.debug("End of EDIManagementJob"); + } + } finally { + if (persistenceContext != null) { + persistenceContext.close(); + } } - - EmailService emailService = serviceContext.newService(EmailService.class); - emailService.transmitPendingDemandsToEdi(); - - if (log.isDebugEnabled()) { - log.debug("Transmission over"); - } - - emailService.updateRangeRowsWithEdiReturns(); - - if (log.isDebugEnabled()) { - log.debug("End of EDIManagementJob"); - } } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-02 16:04:19 UTC (rev 327) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-02 17:08:07 UTC (rev 328) @@ -71,6 +71,8 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +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; @@ -81,6 +83,7 @@ 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; @@ -105,22 +108,58 @@ private static final Log log = LogFactory.getLog(MailFilterJob.class); - protected FaxToMailServiceContext serviceContext; + protected FaxToMailApplicationContext applicationContext; + protected FaxToMailConfiguration config; + protected ConfigurationService configurationService; + + protected EmailService emailService; + + protected MailFolderService mailFolderService; + + protected ClientService clientService; + + protected DecoratorService decoratorService; + @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - serviceContext = getServiceContext(jobExecutionContext); + applicationContext = getApplicationContext(jobExecutionContext); + FaxToMailTopiaPersistenceContext persistenceContext = null; - if (log.isDebugEnabled()) { - log.debug("Running MailFilterJob at " + serviceContext.getNow()); - } - configurationService = serviceContext.newService(ConfigurationService.class); - Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts(); + try { + persistenceContext = applicationContext.newPersistenceContext(); + FaxToMailServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext); + config = serviceContext.getApplicationConfig(); + + if (log.isDebugEnabled()) { + log.debug("Running MailFilterJob at " + serviceContext.getNow()); + } - for (EmailAccount account : emailAccounts) { - checkEmails(account); + emailService = serviceContext.newService(EmailService.class); + mailFolderService = serviceContext.newService(MailFolderService.class); + configurationService = serviceContext.newService(ConfigurationService.class); + clientService = serviceContext.newService(ClientService.class); + decoratorService = serviceContext.newService(DecoratorService.class); + + Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts(); + + for (EmailAccount account : emailAccounts) { + checkEmails(account); + } + + if (log.isDebugEnabled()) { + log.debug("MailFilterJob ended at " + serviceContext.getNow()); + } + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't run quartz job", ex); + } + } finally { + if (persistenceContext != null) { + persistenceContext.close(); + } } } @@ -182,7 +221,7 @@ protected void close(Folder folder) { if (folder != null && folder.isOpen()) { try { - boolean expunge = serviceContext.getApplicationConfig().isMailExpunge(); + boolean expunge = config.isMailExpunge(); folder.close(expunge); } catch (Exception e) { log.error("Error while closing the folder", e); @@ -205,10 +244,8 @@ log.debug(count + " messages, " + unread + " unread"); } - EmailService emailService = serviceContext.newService(EmailService.class); - MailFolderService mailFolderService = serviceContext.newService(MailFolderService.class); - for (int i = 0 ; i < count ; i++) { + log.debug("### mail " + i); try { Email email = new EmailImpl(); @@ -276,8 +313,7 @@ sender = sender.replaceFirst("^.*<(.*)>$", "$1"); sender = sender.toLowerCase(); - Client client = serviceContext.newService(ClientService.class) - .getClientForEmailAddress(sender, email); + Client client = clientService.getClientForEmailAddress(sender, email); modifiedProperties.add(Email.PROPERTY_SENDER); if (client != null) { @@ -352,7 +388,7 @@ Date now = new Date(); - DecoratorService decoratorService = serviceContext.newService(DecoratorService.class); + Decorator<Date> dateDecorator = decoratorService.getDecoratorByType(Date.class, DecoratorService.DATE); String projectRef = t("faxtomail.email.projectReference.default", dateDecorator.toString(now)); email.setProjectReference(projectRef); @@ -403,7 +439,7 @@ log.debug("Message:" +message.getSubject() + " placé dans le dossier " + email.getMailFolder().getName()); } // suppression des mails sur le serveur distant (automatique par default) - if (serviceContext.getApplicationConfig().isMailDelete()) { + if (config.isMailDelete()) { message.setFlag(Flags.Flag.DELETED, true); } @@ -621,7 +657,6 @@ writer.close(); // convert content to blob - EmailService emailService = serviceContext.newService(EmailService.class); AttachmentFile attachmentFileNew = emailService.getAttachmentFileFromStream(new FileInputStream(target)); attachmentFileNew.setFilename(name + ".pdf"); @@ -679,7 +714,6 @@ imageRenderer.saveImage(target); // convert content to blob - EmailService emailService = serviceContext.newService(EmailService.class); AttachmentFile attachmentFileNew = emailService.getAttachmentFileFromStream(new FileInputStream(target)); attachmentFileNew.setFilename(name + ".png"); Modified: trunk/faxtomail-ui-web/src/main/resources/quartz.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/quartz.properties 2014-07-02 16:04:19 UTC (rev 327) +++ trunk/faxtomail-ui-web/src/main/resources/quartz.properties 2014-07-02 17:08:07 UTC (rev 328) @@ -23,8 +23,6 @@ ### org.quartz.scheduler.instanceName = FaxToMailScheduler -# Set job count to 1 to avoid two job to run at the same time and avoid -# org.hibernate.HibernateException: Found shared references to a collection: com.franciaflex.faxtomail.persistence.entities.MailFolderImpl.replyAddresses -org.quartz.threadPool.threadCount = 1 +org.quartz.threadPool.threadCount = 10 org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore \ No newline at end of file

1 0

r327 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-ui-swing/src/main/resources/i18n faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 02 Jul '14

02 Jul '14

Author: echatellier Date: 2014-07-02 18:04:19 +0200 (Wed, 02 Jul 2014) New Revision: 327 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/327 Log: Move cron expression to config Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-07-02 15:53:40 UTC (rev 326) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-07-02 16:04:19 UTC (rev 327) @@ -258,15 +258,15 @@ public int getLdapPort() { return applicationConfig.getOptionAsInt(FaxToMailConfigurationOption.LDAP_PORT.getKey()); } - + public String getLdapUser() { return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_USER.getKey()); } - + public String getLdapPassword() { return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_PASSWORD.getKey()); } - + public String getLdapBaseDn() { return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_BASEDN.getKey()); } @@ -279,6 +279,18 @@ return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_TEST_PRINCIPAL.getKey()); } + public String getJobEdiExpression() { + return applicationConfig.getOption(FaxToMailConfigurationOption.JOB_EDI_EXPRESSION.getKey()); + } + + public String getJobMailExpression() { + return applicationConfig.getOption(FaxToMailConfigurationOption.JOB_MAIL_EXPRESSION.getKey()); + } + + public String getJobCientExpression() { + return applicationConfig.getOption(FaxToMailConfigurationOption.JOB_CLIENT_EXPRESSION.getKey()); + } + public String getInstanceUrl() { return applicationConfig.getOption(FaxToMailConfigurationOption.INSTANCE_URL.getKey()); } Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-07-02 15:53:40 UTC (rev 326) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-07-02 16:04:19 UTC (rev 327) @@ -66,7 +66,7 @@ "faxtomail.smtp.password", "Mot de passe de l'utilisateur du smtp", null, String.class), - + SMTP_SSL( "faxtomail.smtp.ssl", "Utilisation on non du mode ssl pour le stmp", @@ -76,7 +76,7 @@ "faxtomail.mail.delete", "Marque les mails comme étant supprimé sur le serveur", "false", Boolean.class), - + MAIL_EXPUNGE( "faxtomail.mail.expunge", "Supprime définitivement les mails marqués comme supprimés", @@ -99,7 +99,7 @@ LDAP_HOST( "faxtomail.ldap.host", "Adresse du serveur LDAP", null, String.class), - + LDAP_PORT( "faxtomail.ldap.port", "Port du serveur LDAP", "389", Integer.class), @@ -124,6 +124,18 @@ "faxtomail.ldap.test.principal", "Principal de test pour forcer un utilsateur particulier", null, String.class), + JOB_EDI_EXPRESSION( + "faxtomail.job.edi.expression", + "Expression cron de lancement du job EDI", "0 */5 * * * ?", String.class), + + JOB_MAIL_EXPRESSION( + "faxtomail.job.mail.expression", + "Expression cron de lancement du job Mail", "0 */5 * * * ?", String.class), + + JOB_CLIENT_EXPRESSION( + "faxtomail.job.client.expression", + "Expression cron de lancement du job Client", "0 */15 * * * ?", String.class), + // TRANSIENT CONFIG VERSION( "faxtomail.version", Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-07-02 15:53:40 UTC (rev 326) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-07-02 16:04:19 UTC (rev 327) @@ -269,6 +269,7 @@ faxtomail.validator.error.email.priority.required= faxtomail.validator.error.email.projectReference.required=Référence chantier requise faxtomail.validator.error.email.rangeRow.required=Tableau des gammes requis +jaxx.application.error.cannot.mail= jaxx.application.error.cannot.print= jaxx.application.error.desktop.not.supported= jaxx.application.error.desktop.print.not.supported= Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-07-02 15:53:40 UTC (rev 326) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-07-02 16:04:19 UTC (rev 327) @@ -30,6 +30,7 @@ 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; @@ -43,6 +44,7 @@ import org.quartz.impl.StdSchedulerFactory; import com.franciaflex.faxtomail.FaxToMailApplicationContext; +import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; @@ -70,6 +72,8 @@ sce.getServletContext().setAttribute( FaxToMailApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); + + FaxToMailConfiguration config = applicationContext.getApplicationConfig(); JobDataMap data = new JobDataMap(); @@ -101,7 +105,7 @@ Trigger trigger = TriggerBuilder .newTrigger() .withIdentity("mailFiltering", "mailFilteringTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("0 */5 * * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule(config.getJobMailExpression())) .build(); scheduler.scheduleJob(mailFilteringJob, trigger); @@ -110,7 +114,7 @@ trigger = TriggerBuilder .newTrigger() .withIdentity("ediManagement", "ediManagementTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("0 */5 * * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule(config.getJobEdiExpression())) .build(); scheduler.scheduleJob(ediManagementJob, trigger); @@ -119,7 +123,7 @@ trigger = TriggerBuilder .newTrigger() .withIdentity("clientUpdates", "clientUpdatesTrigger") - .withSchedule(CronScheduleBuilder.cronSchedule("0 */15 * * * ?")) + .withSchedule(CronScheduleBuilder.cronSchedule(config.getJobCientExpression())) .build(); scheduler.scheduleJob(clientUpdateJob, trigger);

1 0

r326 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 02 Jul '14

02 Jul '14

Author: echatellier Date: 2014-07-02 17:53:40 +0200 (Wed, 02 Jul 2014) New Revision: 326 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/326 Log: Restore current tab using jquery Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 15:29:26 UTC (rev 325) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 15:53:40 UTC (rev 326) @@ -1224,3 +1224,34 @@ } }; }]); + + + + +function isLocalStorageAvailable() { + var result; + try { + result = 'localStorage' in window && window['localStorage'] !== null; + } catch (e) { + // can happen with IE 11 in desktop mode + result = false; + } + return result; +} + +$(function() { + if (isLocalStorageAvailable()) { + + // save tab hash in local storage + $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + var hash = e.target.hash; + localStorage.setItem("configuration-tab", hash); + }); + + // restore tab if present + var current = localStorage.getItem("configuration-tab"); + if (current) { + $('#tabs a[href="' + current + '"]').tab('show'); + } + } +}) \ No newline at end of file

1 0

r325 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin
by echatellier＠users.forge.codelutin.com 02 Jul '14

02 Jul '14

Author: echatellier Date: 2014-07-02 17:29:26 +0200 (Wed, 02 Jul 2014) New Revision: 325 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/325 Log: Suppression des doublons dans le cas ou un utilisateur appartient ?\195?\160 plusieurs groups d'un chef de groupe Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-02 15:25:54 UTC (rev 324) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-02 15:29:26 UTC (rev 325) @@ -28,9 +28,11 @@ 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; @@ -471,9 +473,9 @@ * @param user current user * @return all managed users */ - public List<FaxToMailUser> getUserManagedUsers(FaxToMailUser user) { + public Set<FaxToMailUser> getUserManagedUsers(FaxToMailUser user) { - List<FaxToMailUser> result = new ArrayList<>(); + Set<FaxToMailUser> result = new HashSet<>(); // s'il n'y a pas de group, il ne peut pas y avoir de droits if (user.getUserGroups() != null) { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-07-02 15:25:54 UTC (rev 324) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-07-02 15:29:26 UTC (rev 325) @@ -29,6 +29,7 @@ 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.commons.logging.Log; @@ -60,7 +61,7 @@ protected List<MailFolder> mailFolders; - protected List<FaxToMailUser> users; + protected Set<FaxToMailUser> users; protected Map<String, Collection<MailFolder>> userFolders; @@ -98,7 +99,7 @@ return mailFolders; } - public List<FaxToMailUser> getUsers() { + public Set<FaxToMailUser> getUsers() { return users; }

1 0