Author: kmorin Date: 2014-06-29 19:44:09 +0200 (Sun, 29 Jun 2014) New Revision: 287 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/287 Log: nettoyage Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-29 17:42:07 UTC (rev 286) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-29 17:44:09 UTC (rev 287) @@ -60,13 +60,10 @@ import javax.mail.Part; import javax.mail.Session; import javax.mail.Store; -import javax.mail.internet.ContentType; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; @@ -80,17 +77,12 @@ import com.itextpdf.text.pdf.PdfWriter; import gui.ava.html.image.generator.HtmlImageGenerator; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.htmlcleaner.CleanerProperties; -import org.htmlcleaner.HtmlCleaner; -import org.htmlcleaner.PrettyXmlSerializer; -import org.htmlcleaner.TagNode; import org.nuiton.decorator.Decorator; import org.nuiton.util.StringUtil; import org.quartz.JobExecutionContext; @@ -113,10 +105,7 @@ import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.MailFolderService; -import org.xhtmlrenderer.pdf.ITextRenderer; -import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; /** * @author Kevin Morin (Code Lutin) @@ -651,8 +640,6 @@ public Attachment convertHTMLToPdf(List<Attachment> attachments, String content, String name) throws IOException, ParserConfigurationException, SAXException, DocumentException { - File source = File.createTempFile("faxtomail-", ".html"); - source.deleteOnExit(); File target = File.createTempFile("faxtomail-", ".png"); target.deleteOnExit(); @@ -679,16 +666,7 @@ } } -// CleanerProperties props = new CleanerProperties(); - -// do parsing -// TagNode tagNode = new HtmlCleaner(props).clean(content); - -// serialize to xml file -// new PrettyXmlSerializer(props).writeToFile(tagNode, source.getAbsolutePath(), "utf-8"); - HtmlImageGenerator imageGenerator = new HtmlImageGenerator(); -// imageGenerator.loadUrl(source.toURI().toURL()); imageGenerator.loadHtml(content); imageGenerator.saveAsImage(target);