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

r234 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities 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/faxtomail/ui/swing/content faxtomail-ui-swing/src/
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 17:01:03 +0200 (Thu, 19 Jun 2014) New Revision: 234 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/234 Log: Fix imports Removed: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.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/ReferentielService.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/actions/ArchiveAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java 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/actions/GroupAction.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/content/MainUIHandler.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/AttachmentEditorUIModel.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/DemandeListUIModel.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/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.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/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/content/print/AttachmentToPrintChooserUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.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/AbstractToolbarPopupButton.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/FaxToMailUI.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/JImagePanel.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 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/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/resources/struts.xml 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,7 +24,6 @@ * #L% */ -import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.jaxx.application.type.ApplicationProgressionModel; import org.nuiton.updater.DownloadMonitor; Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,7 +24,6 @@ * #L% */ -import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.persistence.entities; +/* + * #%L + * FaxToMail :: Persistence + * $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% + */ + /** * @author Kevin Morin (Code Lutin) * @since x.x Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-19 15:01:03 UTC (rev 234) @@ -41,11 +41,8 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n.t; - /** * @author Kevin Morin (Code Lutin) * @since x.x 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-19 15:01:03 UTC (rev 234) @@ -35,7 +35,6 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.Store; -import javax.mail.URLName; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-06-19 15:01:03 UTC (rev 234) @@ -49,7 +49,6 @@ import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EmailAccount; import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.EtatAttenteImpl; import com.franciaflex.faxtomail.persistence.entities.EtatAttenteTopiaDao; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-19 15:01:03 UTC (rev 234) @@ -50,7 +50,6 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; import org.jdesktop.swingx.JXLoginPane; -import org.jdesktop.swingx.JXLoginPane.JXLoginDialog; import org.jdesktop.swingx.JXLoginPane.Status; import org.jdesktop.swingx.auth.LoginService; import org.nuiton.i18n.I18n; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -27,7 +27,6 @@ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import javax.swing.*; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ComputeQuantitiesByRangeAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -28,7 +28,6 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; -import com.franciaflex.faxtomail.persistence.entities.RangeRowImpl; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.QuantitiesByRangeUIModel; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,7 +1,30 @@ 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.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; @@ -11,9 +34,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.awt.*; -import java.io.IOException; - import static org.nuiton.i18n.I18n.t; /** 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -37,7 +37,6 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; @@ -48,10 +47,8 @@ import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIModel; -import com.franciaflex.faxtomail.ui.swing.util.JImagePanel; import com.itextpdf.text.BaseColor; import com.itextpdf.text.Document; -import com.itextpdf.text.Image; import com.itextpdf.text.Phrase; import com.itextpdf.text.pdf.BaseFont; import com.itextpdf.text.pdf.ColumnText; @@ -64,15 +61,8 @@ import com.itextpdf.text.pdf.PdfReader; import com.itextpdf.text.pdf.PdfStamper; import com.itextpdf.text.pdf.PdfWriter; -import com.sun.media.jai.codec.ByteArraySeekableStream; -import com.sun.media.jai.codec.ImageCodec; -import com.sun.media.jai.codec.ImageDecoder; -import com.sun.media.jai.codec.SeekableStream; -import com.sun.pdfview.PDFFile; -import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.w3c.dom.css.Rect; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GroupAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,21 +24,17 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUIHandler; -import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import org.jdesktop.swingx.JXTable; import javax.swing.*; -import java.util.Date; import static org.nuiton.i18n.I18n.t; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -32,9 +32,6 @@ import javax.swing.*; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - import static org.nuiton.i18n.I18n.t; /** 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -22,14 +22,11 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.RunFaxToMail; import com.franciaflex.faxtomail.ui.swing.content.config.FaxToMailConfigUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; @@ -40,8 +37,6 @@ import jaxx.runtime.JAXXBinding; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.TabInfo; -import jaxx.runtime.swing.TabInfoPropertyChangeListener; import jaxx.runtime.swing.session.SwingSession; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -28,10 +28,7 @@ import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.ui.swing.actions.EditAttachmentAction; import com.franciaflex.faxtomail.ui.swing.actions.OpenAttachmentAction; -import com.franciaflex.faxtomail.ui.swing.content.MainUI; -import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -43,18 +40,13 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.HighlighterFactory; -import org.nuiton.util.DesktopUtil; import org.nuiton.util.FileUtil; import java.awt.Component; -import java.awt.Cursor; -import java.awt.Desktop; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; import java.util.List; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -29,7 +29,6 @@ import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; -import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.List; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/config/FaxToMailConfigUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -25,7 +25,6 @@ import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.ReloadFaxToMailAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; -import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -26,7 +26,6 @@ import org.jdesktop.beans.AbstractSerializableBean; import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -23,8 +23,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,14 +24,11 @@ * #L% */ -import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Configuration; -import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.MailAction; import com.franciaflex.faxtomail.ui.swing.actions.ArchiveAction; -import com.franciaflex.faxtomail.ui.swing.actions.GoToPreviousScreenAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveAndOpenDialogAction; import com.franciaflex.faxtomail.ui.swing.actions.SaveDemandeAndExitAction; import com.franciaflex.faxtomail.ui.swing.content.print.AttachmentToPrintChooserUI; @@ -51,14 +48,11 @@ import org.nuiton.jaxx.application.swing.tab.TabContainerHandler; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.jaxx.application.swing.tab.TabHandler; -import org.nuiton.util.beans.BeanMonitor; import javax.swing.*; import java.awt.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.Objects; -import java.util.Set; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -29,10 +29,7 @@ import org.jdesktop.beans.AbstractBean; import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; /** * @author Kevin Morin (Code Lutin) Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -25,7 +25,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Range; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import jaxx.runtime.validator.swing.SwingValidator; import org.jdesktop.swingx.JXTable; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/QuantitiesByRangeUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -25,8 +25,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; -import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import org.jdesktop.beans.AbstractSerializableBean; import java.util.ArrayList; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeRowModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,9 +24,6 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.EmailImpl; -import com.franciaflex.faxtomail.persistence.entities.History; import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.RangeRowImpl; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/RangeTableModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -25,15 +25,9 @@ */ import com.franciaflex.faxtomail.persistence.entities.RangeRow; -import com.franciaflex.faxtomail.persistence.entities.RangeRowImpl; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; - -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - import static org.nuiton.i18n.I18n.n; /** Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -26,10 +26,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeAction; -import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,19 +24,16 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupButton; import org.apache.commons.collections4.CollectionUtils; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collection; -import java.util.List; import static org.nuiton.i18n.I18n.t; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,11 +24,7 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; -import com.franciaflex.faxtomail.ui.swing.content.attachment.ButtonAttachment; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; @@ -43,7 +39,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; import java.awt.*; -import java.util.Date; import java.util.EventObject; /** 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,7 +24,6 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.Reply; import jaxx.runtime.SwingUtil; import org.apache.commons.collections.CollectionUtils; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -27,8 +27,6 @@ import java.util.ArrayList; import java.util.List; -import javax.swing.JPanel; - import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -36,7 +34,6 @@ import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; -import com.franciaflex.faxtomail.ui.swing.util.JImagePanel; /** * @author Kevin Morin (Code Lutin) 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -35,12 +35,8 @@ import org.apache.commons.logging.LogFactory; import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.List; import static org.nuiton.i18n.I18n.t; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -30,11 +30,8 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; -import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import java.util.List; -import java.util.Set; /** * @author Kevin Morin (Code Lutin) Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -33,8 +33,6 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.Cancelable; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,7 +54,6 @@ import java.beans.PropertyChangeListener; import java.util.Arrays; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.List; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -23,7 +23,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; -import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.services.service.ReferentielService; @@ -33,8 +32,6 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,7 +43,6 @@ import java.beans.PropertyChangeListener; import java.util.Arrays; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.List; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-06-19 15:01:03 UTC (rev 234) @@ -42,7 +42,6 @@ import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import org.nuiton.jaxx.application.swing.ApplicationUI; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; -import org.nuiton.jaxx.application.swing.util.*; import org.nuiton.validator.bean.simple.SimpleBeanValidator; import javax.swing.*; @@ -50,13 +49,10 @@ import javax.swing.event.TableModelListener; import javax.swing.text.JTextComponent; import java.awt.*; -import java.awt.List; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractToolbarPopupButton.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,25 +24,17 @@ * #L% */ -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import jaxx.runtime.SwingUtil; -import org.jdesktop.beans.AbstractSerializableBean; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; -import java.awt.List; import java.awt.event.HierarchyBoundsAdapter; import java.awt.event.HierarchyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.*; -import static org.nuiton.i18n.I18n.t; - /** * @author Kevin Morin (Code Lutin) * @since x.x 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -23,7 +23,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.EmailImpl; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import org.apache.commons.logging.Log; 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUI.java 2014-06-19 15:01:03 UTC (rev 234) @@ -22,12 +22,8 @@ * #L% */ -import jaxx.runtime.JAXXObject; import org.nuiton.jaxx.application.swing.ApplicationUI; -import javax.swing.UIManager; -import java.awt.Font; - /** * Contract to place on each generated jaxx ui. * 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-06-19 15:01:03 UTC (rev 234) @@ -23,7 +23,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import org.apache.commons.logging.LogFactory; import javax.swing.tree.DefaultMutableTreeNode; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,27 +24,17 @@ * #L% */ -import com.sun.media.jai.codec.ByteArraySeekableStream; -import com.sun.media.jai.codec.ImageCodec; -import com.sun.media.jai.codec.ImageDecoder; -import com.sun.media.jai.codec.SeekableStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.imageio.ImageIO; -import javax.media.jai.PlanarImage; import javax.swing.*; -import javax.swing.border.BevelBorder; import java.awt.*; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.image.BufferedImage; -import java.awt.image.RenderedImage; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; /** * @author Kevin Morin (Code Lutin) Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-06-19 15:01:03 UTC (rev 234) @@ -38,8 +38,6 @@ import java.io.File; -import javassist.expr.NewArray; - public class FaxToMailApplicationContext { private static Log log = LogFactory.getLog(FaxToMailApplicationContext.class); Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailEntityNotFoundException.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,33 +0,0 @@ -package com.franciaflex.faxtomail.web; - -/* - * #%L - * FaxToMail :: Web - * $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% - */ - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.5 - */ -public class FaxToMailEntityNotFoundException extends RuntimeException { - -} Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailIllegalAccessException.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,32 +0,0 @@ -package com.franciaflex.faxtomail.web; - -/* - * #%L - * FaxToMail :: Web - * $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% - */ - -/** - * @author kmorin <morin(a)codelutin.com> - */ -public class FaxToMailIllegalAccessException extends RuntimeException { - -} Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailNoIdException.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,33 +0,0 @@ -package com.franciaflex.faxtomail.web; - -/* - * #%L - * FaxToMail :: Web - * $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% - */ - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since 0.1 - */ -public class FaxToMailNoIdException extends RuntimeException { - -} Deleted: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailStrutsObjectFactory.java 2014-06-19 15:01:03 UTC (rev 234) @@ -1,62 +0,0 @@ -package com.franciaflex.faxtomail.web; - -/* - * #%L - * FaxToMail :: Web - * $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 org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.struts2.impl.StrutsObjectFactory; - -public class FaxToMailStrutsObjectFactory extends StrutsObjectFactory { - - private static final Log log = LogFactory.getLog(FaxToMailStrutsObjectFactory.class); - -// @Override -// public Object buildBean(Class clazz, Map<String, Object> extraContext) throws Exception { -// -// Object instance; -// -// if (TopiaEntity.class.isAssignableFrom(clazz)) { -// -// if (log.isTraceEnabled()) { -// log.trace(" new instance of " + clazz.getCanonicalName()); -// } - -// ExtranetEncAhiEntityEnum extranetEncAhiEntityEnum = -// ExtranetEncAhiEntityEnum.valueOf(clazz); - -// Class<? extends TopiaEntity> implementation = extranetEncAhiEntityEnum.getImplementation(); - -// instance = implementation.newInstance(); - -// } else { -// -// instance = clazz.newInstance(); -// -// } -// -// return instance; -// } - -} Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/LogoutAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -29,9 +29,6 @@ import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.services.service.LdapService; -import com.franciaflex.faxtomail.services.service.ldap.AuthenticationException; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; public class LogoutAction extends FaxToMailActionSupport { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -24,13 +24,8 @@ * #L% */ -import java.lang.reflect.Type; -import java.util.Collection; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Action; @@ -39,13 +34,8 @@ import org.apache.struts2.convention.annotation.Result; import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; -import com.google.gson.reflect.TypeToken; import com.opensymphony.xwork2.Preparable; @InterceptorRefs({ 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-06-19 15:01:03 UTC (rev 234) @@ -44,7 +44,6 @@ import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.google.gson.reflect.TypeToken; -import com.opensymphony.xwork2.Preparable; @InterceptorRefs({ @InterceptorRef("faxToMailInterceptor"), 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-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 15:01:03 UTC (rev 234) @@ -26,8 +26,6 @@ import static org.nuiton.i18n.I18n.t; -import java.io.File; -import java.io.FileOutputStream; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.text.DateFormat; @@ -59,7 +57,6 @@ import com.franciaflex.faxtomail.services.service.ClientService; import org.apache.commons.io.Charsets; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/faxtomail-ui-web/src/main/resources/struts.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/struts.xml 2014-06-19 14:55:43 UTC (rev 233) +++ trunk/faxtomail-ui-web/src/main/resources/struts.xml 2014-06-19 15:01:03 UTC (rev 234) @@ -29,7 +29,6 @@ <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider" /> <constant name="struts.convention.default.parent.package" value="faxtomail" /> - <constant name="struts.objectFactory" value="com.franciaflex.faxtomail.web.FaxToMailStrutsObjectFactory" /> <constant name="struts.xworkTextProvider" value="i18nTextProvider" /> <constant name="struts.multipart.maxSize" value="10485760" />

1 0

r233 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 16:55:43 +0200 (Thu, 19 Jun 2014) New Revision: 233 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/233 Log: Readd sortable module 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-06-19 14:23:33 UTC (rev 232) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-19 14:55:43 UTC (rev 233) @@ -22,7 +22,7 @@ * #L% */ -var ConfigurationModule = angular.module('ConfigurationModule', ['FaxToMail', 'ui.tree', 'localytics.directives', 'ui.select2.sortable']); +var ConfigurationModule = angular.module('ConfigurationModule', ['FaxToMail', 'ui.tree', 'ui.sortable', 'localytics.directives', 'ui.select2.sortable']); /** * Global configuration controller.

1 0

r232 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 16:23:33 +0200 (Thu, 19 Jun 2014) New Revision: 232 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/232 Log: Ajout d'une fenetre de login si vraiment l'utilisateur ne peut pas ?\195?\170tre authentifi?\195?\169. Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-19 13:08:44 UTC (rev 231) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-06-19 14:23:33 UTC (rev 232) @@ -49,9 +49,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; +import org.jdesktop.swingx.JXLoginPane; +import org.jdesktop.swingx.JXLoginPane.JXLoginDialog; +import org.jdesktop.swingx.JXLoginPane.Status; +import org.jdesktop.swingx.auth.LoginService; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.ApplicationUIContext; import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; @@ -348,28 +353,71 @@ I18n.init(new ClassPathI18nInitializer(), i18nLocale); - // try to get user from ldap + // try to autologin user from username of current X session + autologinUser(); + + Configuration config = getConfigurationService().getConfiguration(); + setFaxToMailConfiguration(config); + + //--------------------------------------------------------------------// + // init action UI + //--------------------------------------------------------------------// + setActionUI(new ApplicationActionUI(null, this)); + } + + /** + * Recupere l'utilisateur connecté ou demande les identifiants à l'utilisateur. + */ + protected void autologinUser() { + + String principal = getLoggedInUsername(); + + // l'authentification par defaut se fait par trigramme try { - String principal = getLoggedInUsername(); FaxToMailUser currentUser = getLdapService().getUserFromPrincipal(principal); if (log.isInfoEnabled()) { log.info("Connected as " + currentUser.getFirstName() + " " + currentUser.getLastName()); } setCurrentUser(currentUser); } catch (AuthenticationException ex) { - throw new RuntimeException(ex); + if (log.isWarnEnabled()) { + log.warn("Can't anthenticate user", ex); + } } - - Configuration config = getConfigurationService().getConfiguration(); - setFaxToMailConfiguration(config); + // si ca n'a pas fonctionné, on retente par login mot de passe + while (getCurrentUser() == null) { + JXLoginPane pane = new JXLoginPane(); + pane.setLoginService(new LoginService() { + @Override + public boolean authenticate(String name, char[] password, String server) throws Exception { + boolean result = false; + try { + FaxToMailUser user = getLdapService().authenticateUser(name, String.valueOf(password)); + setCurrentUser(user); + result = true; + } catch (AuthenticationException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't anthenticate user", ex); + } + } + return result; + } + }); -// //--------------------------------------------------------------------// -// // init action UI -// //--------------------------------------------------------------------// - setActionUI(new ApplicationActionUI(null, this)); + // show login dialog + Status loginStatus = JXLoginPane.showLoginDialog(null, pane); + if (loginStatus == Status.CANCELLED) { + throw new ApplicationTechnicalException("Authentication canceled"); + } + } } + /** + * Retourne l'utilsateur connecté sur la session utilsateur (ou a defaut un utilisateur de test). + * + * @return trigramme + */ protected String getLoggedInUsername() { String result = getConfig().getLdapTestPrincipal(); if (StringUtils.isBlank(result)) {

1 0

r231 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 15:08:44 +0200 (Thu, 19 Jun 2014) New Revision: 231 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/231 Log: Fix null tab title Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 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-06-19 12:40:38 UTC (rev 230) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-06-19 13:08:44 UTC (rev 231) @@ -113,30 +113,7 @@ return DateFormat.getDateInstance(DateFormat.MEDIUM).format(bean); } }); - /*registerDecorator(new Decorator<File>(File.class) { - private static final long serialVersionUID = 1L; - - @Override - public String toString(Object bean) { - if (bean == null) { - return ""; - } - return ((File) bean).getName(); - } - });*/ - /*registerDecorator(new Decorator<AttachmentFile>(AttachmentFile.class) { - private static final long serialVersionUID = 1L; - - @Override - public String toString(Object bean) { - if (bean == null) { - return ""; - } - return ((AttachmentFile) bean).getFilename(); - } - });*/ registerMultiJXPathDecorator(HasLabel.class, "${label}$s", SEPARATOR, " - "); - //registerMultiJXPathDecorator(Attachment.class, "${originalFile}$s", SEPARATOR, " - "); registerDecorator(new Decorator<Attachment>(Attachment.class) { private static final long serialVersionUID = 1L; 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-06-19 12:40:38 UTC (rev 230) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-19 13:08:44 UTC (rev 231) @@ -45,6 +45,7 @@ import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentModelAware; import com.google.common.base.Function; import com.google.common.base.Predicate; +import com.google.common.base.Strings; import com.google.common.collect.Collections2; import org.apache.commons.collections4.CollectionUtils; @@ -992,7 +993,7 @@ if (!ref.isEmpty()) { result = ref + " - " + result; } - return result; + return Strings.nullToEmpty(result); } @Override

1 0

r230 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 14:40:38 +0200 (Thu, 19 Jun 2014) New Revision: 230 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/230 Log: Fix new demande required fields Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-19 12:33:38 UTC (rev 229) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-19 12:40:38 UTC (rev 230) @@ -442,6 +442,7 @@ email.setTakenBy(currentUser); email.setHistory(histories); email.setDemandStatus(DemandStatus.UNTREATED); + email.setOriginalEmail(""); // can't be null openDemand(email); }

1 0

r229 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 14:33:38 +0200 (Thu, 19 Jun 2014) New Revision: 229 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/229 Log: Force loading before print Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-19 12:30:30 UTC (rev 228) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-19 12:33:38 UTC (rev 229) @@ -450,6 +450,10 @@ List<DemandeUIModel> currentEmails = getModel().getCurrentEmails(); for (DemandeUIModel demandeUIModel : currentEmails) { for (Attachment attachment : demandeUIModel.getAttachment()) { + + // force lasy loading + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); + AttachmentFile attachmentFile = attachment.getEditedFile(); if (attachmentFile == null) { attachmentFile = attachment.getOriginalFile();

1 0

r228 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 14:30:30 +0200 (Thu, 19 Jun 2014) New Revision: 228 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/228 Log: Correction de la sauvegarde des pi?\195?\168ces edit?\195?\169es Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 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-06-19 12:16:21 UTC (rev 227) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-19 12:30:30 UTC (rev 228) @@ -161,8 +161,12 @@ currentAttachment = new AttachmentImpl(); } - if (!attachment.isPersisted()) { + // dans tout les cas, les pieces jointes courante de l'attchent prévale + // sur celles en base + if (attachment.getOriginalFile() != null) { originalFile = attachment.getOriginalFile(); + } + if (attachment.getEditedFile() != null) { editedFile = attachment.getEditedFile(); }

1 0

r227 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/u
by echatellier＠users.forge.codelutin.com June 19, 2014

June 19, 2014

Author: echatellier Date: 2014-06-19 14:16:21 +0200 (Thu, 19 Jun 2014) New Revision: 227 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/227 Log: Gestion des content-id des pieces jointes. Gestion du chargement ?\195?\160 la demande des pi?\195?\168ces jointes. 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-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 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/OpenAttachmentAction.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/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-19 12:16:21 UTC (rev 227) @@ -235,10 +235,14 @@ return applicationConfig.getOption(FaxToMailConfigurationOption.SMTP_PASSWORD.getKey()); } - public boolean getSmtpUseSsl() { + public boolean isSmtpUseSsl() { return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.SMTP_SSL.getKey()); } + public boolean isMailDeleteRemote() { + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.MAIL_DELETE_REMOTE.getKey()); + } + public String getLdapHost() { return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_HOST.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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-19 12:16:21 UTC (rev 227) @@ -72,6 +72,11 @@ "Utilisation on non du mode ssl pour le stmp", "false", Boolean.class), + MAIL_DELETE_REMOTE( + "faxtomail.mail.deleteremote", + "Suppression automatique des mails sur le serveur distant (default : true)", + "true", Boolean.class), + DEV_MODE( "faxtomail.devMode", "Mode développement, court-circuite l'envoi de mail", Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-19 12:16:21 UTC (rev 227) @@ -48,17 +48,14 @@ @Override public File getFile() { - log.info("get content"); byte[] content = getContent(); if (tmpLocalFile == null && content != null) { try { - log.info("create temp file"); // create temp file File tempFolder = new File(FileUtils.getTempDirectory(), "faxtomail"); tempFolder.mkdir(); - log.info("new file"); String fileName = getFilename(); tmpLocalFile = new File(tempFolder, fileName); @@ -76,7 +73,6 @@ tmpLocalFile.deleteOnExit(); - log.info("copy blob content"); // copy blob content // be sure that "is" is not closed because is can be a local fileinputstream // that hibernate must read to put in database Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-19 12:16:21 UTC (rev 227) @@ -9,12 +9,16 @@ @Override public void setOriginalFile(AttachmentFile originalFile) { super.setOriginalFile(originalFile); - setOriginalFileName(originalFile != null ? originalFile.getFilename() : null); + if (originalFile != null) { + setOriginalFileName(originalFile.getFilename()); + } } @Override public void setEditedFile(AttachmentFile editedFile) { super.setEditedFile(editedFile); - setEditedFileName(editedFile != null ? editedFile.getFilename() : null); + if (editedFile != null) { + setEditedFileName(editedFile.getFilename()); + } } } Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-19 12:16:21 UTC (rev 227) @@ -167,7 +167,15 @@ } // copy new data - currentAttachment.setAddedByUser(attachment.isAddedByUser()); + attachmentBinder.copyExcluding(attachment, currentAttachment, + Attachment.PROPERTY_EDITED_FILE, + Attachment.PROPERTY_EDITED_FILE_NAME, + Attachment.PROPERTY_ORIGINAL_FILE, + Attachment.PROPERTY_ORIGINAL_FILE_NAME, + Attachment.PROPERTY_TOPIA_CREATE_DATE, + Attachment.PROPERTY_TOPIA_ID, + Attachment.PROPERTY_TOPIA_VERSION); + currentAttachment.setEditedFile(editedFile); currentAttachment.setOriginalFile(originalFile); @@ -532,7 +540,7 @@ final String smtpUser = getApplicationConfig().getSmtpUser(); final String password = getApplicationConfig().getSmtpPassword(); - final boolean useSsl = getApplicationConfig().getSmtpUseSsl(); + final boolean useSsl = getApplicationConfig().isSmtpUseSsl(); MultiPartEmail message = new MultiPartEmail(); message.setHostName(getApplicationConfig().getSmtpHost()); 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-19 12:16:21 UTC (rev 227) @@ -41,7 +41,8 @@ MainUI mainUI = getContext().getMainUI(); PDFEditorUI dialogContent = new PDFEditorUI(getUI()); - boolean editedNull = attachment.getEditedFileName() == null; + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); + /*boolean editedNull = attachment.getEditedFileName() == null; AttachmentFile attachmentFile = editedNull ? attachment.getOriginalFile() : attachment.getEditedFile(); if (attachmentFile == null) { attachmentFile = getContext().getEmailService().getAttachmentFile(attachment.getTopiaId(), editedNull); @@ -51,7 +52,7 @@ attachment.setOriginalFile(attachmentFile); } else { attachment.setEditedFile(attachmentFile); - } + }*/ dialogContent.getModel().fromEntity(attachment); getHandler().openDialog(dialogContent, attachment.getOriginalFileName(), mainUI.getSize()); dialogContent.getModel().toEntity(attachment); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java 2014-06-19 12:16:21 UTC (rev 227) @@ -1,10 +1,33 @@ package com.franciaflex.faxtomail.ui.swing.actions; +/* + * #%L + * FaxToMail :: UI + * %% + * Copyright (C) 2014 Franciaflex + * %% + * 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; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUI; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIHandler; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentEditorUIModel; +import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,16 +62,8 @@ @Override public void doAction() throws Exception { getModel().fireAttachmentOpened(attachment, original); + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); AttachmentFile attachmentFile = original ? attachment.getOriginalFile() : attachment.getEditedFile(); - if (attachmentFile == null) { - attachmentFile = getContext().getEmailService().getAttachmentFile(attachment.getTopiaId(), original); - if (original) { - attachment.setOriginalFile(attachmentFile); - } else { - attachment.setEditedFile(attachmentFile); - } - } - File file = attachmentFile.getFile(); DesktopUtil.browse(file.toURI()); } 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-19 12:16:21 UTC (rev 227) @@ -46,8 +46,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.Function; -import com.google.common.collect.Collections2; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -454,7 +452,6 @@ for (Attachment attachment : demandeUIModel.getAttachment()) { AttachmentFile attachmentFile = attachment.getEditedFile(); if (attachmentFile == null) { - // TODO kmorin 20140617 put it in action and check if file is null attachmentFile = attachment.getOriginalFile(); } FaxToMailUIUtil.print(attachmentFile, true); 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-06-19 12:16:21 UTC (rev 227) @@ -150,7 +150,7 @@ initBeanFilterableComboBox(ui.getEtatAttenteComboBox(), etatAttentes, model.getEtatAttente()); JTextPane editor = ui.getMailBodyField(); - FaxToMailUIUtil.setEmailContentInTextPane(editor, model); + FaxToMailUIUtil.setEmailContentInTextPane(this, editor, model); // init table final JXTable table = ui.getRangeTable(); 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-19 12:16:21 UTC (rev 227) @@ -22,23 +22,21 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; -import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; +import static org.nuiton.i18n.I18n.t; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.JAXXUtil; +import java.awt.Desktop; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; -import org.nuiton.util.FileUtil; - import javax.print.Doc; import javax.print.DocFlavor; import javax.print.DocPrintJob; @@ -49,7 +47,9 @@ import javax.print.SimpleDoc; import javax.print.attribute.HashPrintRequestAttributeSet; import javax.print.attribute.PrintRequestAttributeSet; -import javax.swing.*; +import javax.swing.Icon; +import javax.swing.JTextPane; +import javax.swing.JTree; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import javax.swing.text.html.HTMLEditorKit; @@ -59,19 +59,25 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import java.awt.*; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.JAXXUtil; -import static org.nuiton.i18n.I18n.t; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; +import org.nuiton.util.FileUtil; +import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.services.service.EmailService; +import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.1 @@ -181,18 +187,6 @@ return result; } - /*public static boolean isFileAPDF(File file) { - return FileUtil.extension(file).toUpperCase().equals("PDF"); - } - - public static boolean isFileATxt(File file) { - return FileUtil.extension(file).toUpperCase().equals("TXT"); - } - - public static boolean isFileATif(File file) { - return FileUtil.extension(file).toUpperCase().equals("TIF"); - }*/ - public static boolean isFileAPDF(AttachmentFile file) { return FileUtil.extension(file.getFilename()).toUpperCase().equals("PDF"); } @@ -205,7 +199,7 @@ return FileUtil.extension(file.getFilename()).toUpperCase().equals("TIF"); } - public static void setEmailContentInTextPane(JTextPane textPane, DemandeUIModel demandeUIModel) { + public static void setEmailContentInTextPane(DemandeUIHandler handler, JTextPane textPane, DemandeUIModel demandeUIModel) { String content = demandeUIModel.getHtmlContent(); if (content != null) { textPane.setContentType("text/html"); @@ -224,14 +218,36 @@ // the meta tag makes the content is not displayed content = content.replaceAll("<meta (.*?)>(</meta>)?", ""); + if (log.isTraceEnabled()) { + log.trace("Content before mail = " + content); + } + for (Attachment attachment : demandeUIModel.getAttachment()) { - String fileName = attachment.getOriginalFileName(); - log.info("file " + fileName); - String key = fileName; + String key = attachment.getContentId(); + if (key == null) { + key = attachment.getOriginalFileName(); + } + + // get file content + forceAttachmentFileLoading(handler.getContext(), attachment); + AttachmentFile attachmentFile = attachment.getOriginalFile(); + File file = attachmentFile.getFile(); + // replace the inline attachments with the extracted attachment file url - //content = content.replaceAll("<img src=\"cid:" + key + "\"(.*?>)", "<img src=\"file://" + file.getAbsolutePath() + "\"$1"); - throw new RuntimeException("Fix it"); + // match les patterns: + // <td background="cid:bg.gif" height="52"> + // <img border=0 src="cid:bg.gif" /> + // <img src='cid:5e9ef859-ea65-4f9b-a9fa-30d4a2c5837c' + content = content.replaceAll("(\\w+)=([\"'])cid:" + Pattern.quote(key) + "([\"'])", "$1=$2file://" + file.getAbsolutePath() + "$3"); + + if (log.isDebugEnabled()) { + log.debug("Mapping attachment id " + key + " to file " + file.getAbsolutePath()); + } } + + if (log.isTraceEnabled()) { + log.trace("Content after mail = " + content); + } } else { content = demandeUIModel.getPlainContent(); @@ -239,6 +255,27 @@ textPane.setText(content); } + /** + * Force le chargement des attachmentFile (edited and original) pour un attachment. + * + * @param context context + * @param attachment attachment + */ + public static void forceAttachmentFileLoading(FaxToMailUIContext context, Attachment attachment) { + if (log.isDebugEnabled()) { + log.debug("Force attachment loading " + attachment.getOriginalFileName()); + } + EmailService service = context.getEmailService(); + if (attachment.getOriginalFile() == null) { + AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(), true); + attachment.setOriginalFile(file); + } + if (attachment.getEditedFile() == null) { + AttachmentFile file = service.getAttachmentFile(attachment.getTopiaId(), false); + attachment.setEditedFile(file); + } + } + public static Desktop getDesktopForPrint() { if (!Desktop.isDesktopSupported()) { 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-06-18 17:13:29 UTC (rev 226) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-19 12:16:21 UTC (rev 227) @@ -299,7 +299,10 @@ null, modifiedProperties.toArray(new String[modifiedProperties.size()])); - message.setFlag(Flags.Flag.DELETED, true); + // suppression des mails sur le serveur distant (automatique par default) + if (serviceContext.getApplicationConfig().isMailDeleteRemote()) { + message.setFlag(Flags.Flag.DELETED, true); + } } log.debug("End of emails"); @@ -345,19 +348,25 @@ // else, this is an attachment } else { String fileName = bp.getFileName(); + + // parse Content-ID (content identifier in html mail content) + String[] headers = bp.getHeader("Content-ID"); + if (headers == null) { + break; + } + String contentID = headers[0]; + // remove the guillemets between the id + contentID = contentID.replaceFirst("^<(.*)>$", "$1"); + if (fileName == null) { - String[] headers = bp.getHeader("Content-ID"); - if (headers == null) { - break; - } - fileName = headers[0]; - // remove the guillemets between the id - fileName = fileName.replaceFirst("^<(.*)>$", "$1"); + fileName = contentID; } try { fileName = MimeUtility.decodeText(fileName); - log.debug("FileName : " + fileName); + if (log.isDebugEnabled()) { + log.debug("FileName : " + fileName + ", Content-ID : " + contentID); + } } catch (UnsupportedEncodingException ex) { // don't care, use filename raw value if (log.isWarnEnabled()) { @@ -372,6 +381,7 @@ AttachmentFile attachmentFile = emailService.getAttachmentFileFromStream(dh.getInputStream()); attachmentFile.setFilename(fileName); attachment.setOriginalFile(attachmentFile); + attachment.setContentId(contentID); //email.addAttachment(attachment); attachments.add(attachment);

1 0

r226 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com June 18, 2014

June 18, 2014

Author: echatellier Date: 2014-06-18 19:13:29 +0200 (Wed, 18 Jun 2014) New Revision: 226 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/226 Log: Allow to setup multiples admin groups 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-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.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-06-18 17:01:09 UTC (rev 225) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-06-18 17:13:29 UTC (rev 226) @@ -24,8 +24,20 @@ * #L% */ -import com.google.common.base.Charsets; -import com.google.common.collect.Maps; +import static org.nuiton.i18n.I18n.t; + +import java.awt.Color; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.swing.KeyStroke; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; @@ -39,18 +51,9 @@ import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.Version; -import javax.swing.*; -import java.awt.*; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import com.google.common.base.Charsets; +import com.google.common.collect.Maps; -import static org.nuiton.i18n.I18n.t; - public class FaxToMailConfiguration extends ApplicationConfiguration { private static final Log log = LogFactory.getLog(FaxToMailConfiguration.class); @@ -256,8 +259,8 @@ return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_BASEDN.getKey()); } - public String getLdapAdminGroup() { - return applicationConfig.getOption(FaxToMailConfigurationOption.LDAP_ADMIN_GROUP.getKey()); + public List<String> getLdapAdminGroups() { + return applicationConfig.getOptionAsList(FaxToMailConfigurationOption.LDAP_ADMIN_GROUPS.getKey()).getOption(); } public String getLdapPrincipalDomain() { Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 17:01:09 UTC (rev 225) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-06-18 17:13:29 UTC (rev 226) @@ -102,8 +102,8 @@ "faxtomail.ldap.basedn", "Mot de passe pour la connexion au serveur LDAP", "DC=mac-groupe,DC=net", String.class), - LDAP_ADMIN_GROUP( - "faxtomail.ldap.admin.group", + LDAP_ADMIN_GROUPS( + "faxtomail.ldap.admin.groups", "DN du groupe ldap ayant les autorisations d'accéder à la partie admin de l'interface web", null, String.class), LDAP_PRINCIPAL_DOMAIN( Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-18 17:01:09 UTC (rev 225) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-18 17:13:29 UTC (rev 226) @@ -25,6 +25,7 @@ */ import java.beans.PropertyDescriptor; +import java.util.List; import java.util.Map; import java.util.Set; @@ -142,10 +143,10 @@ faxToMailSession.setAuthenticatedFaxToMailUser(user); // test si l'utilisateur est admin - String adminGroup = serviceContext.getApplicationConfig().getLdapAdminGroup(); - if (StringUtils.isNotBlank(adminGroup) && user.getUserGroups() != null) { + List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); + if (CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { for (FaxToMailUserGroup group : user.getUserGroups()) { - if (adminGroup.equals(group.getFullPath())) { + if (adminGroups.contains(group.getFullPath())) { faxToMailSession.setAdmin(true); } }

1 0

r225 - trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com June 18, 2014

June 18, 2014

Author: echatellier Date: 2014-06-18 19:01:09 +0200 (Wed, 18 Jun 2014) New Revision: 225 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/225 Log: Fix tests Removed: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-06-18 16:56:41 UTC (rev 224) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestData.java 2014-06-18 17:01:09 UTC (rev 225) @@ -230,11 +230,17 @@ Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_DEMAND_STATUS), History.PROPERTY_MODIFICATION_DATE, now); String projectRef = t("faxtomail.email.projectReference.default", dateDecorator.toString(now)); - Email email = emailDao.create(Email.PROPERTY_SENDER, sender, Email.PROPERTY_FAX, fax, Email.PROPERTY_CLIENT, client, - Email.PROPERTY_PROJECT_REFERENCE, projectRef, Email.PROPERTY_OBJECT, client.getCaracteristic1() + " / " + client.getCode() + " / " - + client.getName() + " / " + client.getFaxNumber() + " / " + dateDecorator.toString(now), Email.PROPERTY_RECEPTION_DATE, now, - Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, - Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + Email email = emailDao.create(Email.PROPERTY_SENDER, sender, + Email.PROPERTY_FAX, fax, + Email.PROPERTY_CLIENT, client, + Email.PROPERTY_PROJECT_REFERENCE, projectRef, + Email.PROPERTY_OBJECT, client.getCaracteristic1() + " / " + client.getCode() + " / " + + client.getName() + " / " + client.getFaxNumber() + " / " + dateDecorator.toString(now), + Email.PROPERTY_RECEPTION_DATE, now, + Email.PROPERTY_MAIL_FOLDER, folder, + Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, + Email.PROPERTY_HISTORY, Lists.newArrayList(history), + Email.PROPERTY_ORIGINAL_EMAIL, "test"); if (opened) { @@ -264,11 +270,16 @@ Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_DEMAND_STATUS), History.PROPERTY_MODIFICATION_DATE, yesterday); projectRef = t("faxtomail.email.projectReference.default", dateDecorator.toString(yesterday)); - email = emailDao.create(Email.PROPERTY_SENDER, sender, Email.PROPERTY_FAX, fax, Email.PROPERTY_CLIENT, client, + email = emailDao.create(Email.PROPERTY_SENDER, sender, + Email.PROPERTY_FAX, fax, + Email.PROPERTY_CLIENT,client, Email.PROPERTY_PROJECT_REFERENCE, projectRef, Email.PROPERTY_OBJECT, client.getCaracteristic1() + " / " + client.getCode() + " / " + client.getName() + " / " + client.getFaxNumber() + " / " + dateDecorator.toString(yesterday), - Email.PROPERTY_RECEPTION_DATE, yesterday, Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, - opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, Email.PROPERTY_HISTORY, Lists.newArrayList(history)); + Email.PROPERTY_RECEPTION_DATE, yesterday, + Email.PROPERTY_MAIL_FOLDER, folder, + Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, + Email.PROPERTY_HISTORY, Lists.newArrayList(history), + Email.PROPERTY_ORIGINAL_EMAIL, "test"); if (opened) { getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); Deleted: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java 2014-06-18 16:56:41 UTC (rev 224) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ReferentielServiceTest.java 2014-06-18 17:01:09 UTC (rev 225) @@ -1,29 +0,0 @@ -package com.franciaflex.faxtomail.services.service; - -/* - * #%L - * FaxToMail :: Service - * $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% - */ - -public class ReferentielServiceTest extends AbstractFaxToMailServiceTest { - -}

1 0