Author: kmorin Date: 2014-06-17 19:01:10 +0200 (Tue, 17 Jun 2014) New Revision: 210 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/210 Log: use filename directly instead of file.name Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 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/attachment/AttachmentCellEditor.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/AttachmentItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 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-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentFileImpl.java 2014-06-17 17:01:10 UTC (rev 210) @@ -47,12 +47,18 @@ @Override public File getFile() { - if (tmpLocalFile == null && getContent() != null) { + + 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); @@ -70,10 +76,11 @@ 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 - InputStream is = new ByteArrayInputStream(getContent()); + InputStream is = new ByteArrayInputStream(content); OutputStream fos = new BufferedOutputStream(new FileOutputStream(tmpLocalFile)); IOUtils.copy(is, fos); fos.close(); 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-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java 2014-06-17 17:01:10 UTC (rev 210) @@ -145,7 +145,7 @@ if (bean == null) { return ""; } - return ((Attachment) bean).getOriginalFile().getFilename(); + return ((Attachment) bean).getOriginalFileName(); } }); registerDecorator(new Decorator<AttachmentFile>(AttachmentFile.class) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-06-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-06-17 17:01:10 UTC (rev 210) @@ -111,7 +111,7 @@ if (topiaId != null) { String filename; if (original) { - filename = attachment.getOriginalFile().getFilename(); + filename = attachment.getOriginalFileName(); } else { filename = FaxToMailUIUtil.getEditedFileName(attachment.getOriginalFile()); } 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-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-06-17 17:01:10 UTC (rev 210) @@ -37,6 +37,8 @@ import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.HighlighterFactory; import org.nuiton.util.DesktopUtil; @@ -81,6 +83,8 @@ */ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<AttachmentEditorUIModel, AttachmentEditorUI> { + private static final Log log = LogFactory.getLog(AttachmentEditorUIHandler.class); + public static final List<String> EDITABLE_EXTENSIONS = Lists.newArrayList("PDF", "PNG", "JPG", "JPEG", "GIF", "TIF", "BMP", "TXT"); @@ -167,6 +171,8 @@ InputStream is = new BufferedInputStream(new FileInputStream(file)); AttachmentFile attachmentFile = getContext().getEmailService().getAttachmentFileFromStream(is); attachmentFile.setFilename(file.getName()); + //TODO 20140612 put in the impl + attachment.setOriginalFileName(file.getName()); attachment.setOriginalFile(attachmentFile); } catch (Exception e) { getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.copy.file"), e); @@ -183,7 +189,9 @@ public void openAttachment(Attachment attachment) { getModel().fireAttachmentOpened(attachment, true); + log.info("before get file"); File file = attachment.getOriginalFile().getFile(); + log.info("after get file"); Desktop desktop = FaxToMailUIUtil.getDesktopForOpen(); try { @@ -245,7 +253,7 @@ } int answer = JOptionPane.showConfirmDialog(ui, t("faxtomail.attachmentEditor.deleteAttachment.message", - attachment.getOriginalFile().getFilename()), + attachment.getOriginalFileName()), t("faxtomail.attachmentEditor.deleteAttachment.title"), JOptionPane.YES_NO_OPTION ); @@ -264,7 +272,7 @@ } public boolean isAttachmentEditable(Attachment attachment) { - String extension = FileUtil.extension(attachment.getOriginalFile().getFilename()); + String extension = FileUtil.extension(attachment.getOriginalFileName()); return EDITABLE_EXTENSIONS.contains(extension.toUpperCase()); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-06-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-06-17 17:01:10 UTC (rev 210) @@ -26,7 +26,7 @@ } #attachmentNameLabel { - text: { attachment != null ? getAttachment().getOriginalFile().getFilename() : null }; + text: { attachment != null ? getAttachment().getOriginalFileName() : null }; } #toolbar { 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-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-06-17 17:01:10 UTC (rev 210) @@ -337,7 +337,7 @@ if (topiaId != null) { String filename; if (original) { - filename = attachment.getOriginalFile().getFilename(); + filename = attachment.getOriginalFileName(); } else { filename = FaxToMailUIUtil.getEditedFileName(attachment.getOriginalFile()); } 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-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-06-17 17:01:10 UTC (rev 210) @@ -201,17 +201,17 @@ public void fromEntity(Email entity, boolean full) { //super.fromEntity(entity); - fromBeanBinder.copyExcluding(entity, this, Email.PROPERTY_ATTACHMENT); + fromBeanBinder.copyExcluding(entity, this); // specific attachment copy Collection<Attachment> attachmentCopy = new ArrayList<Attachment>(); - if (entity.getAttachment() != null) { - for (Attachment attachment : entity.getAttachment()) { - Attachment clone = new AttachmentImpl(); - fromAttachmentBinder.copy(attachment, clone); - attachmentCopy.add(clone); - } - } - setAttachment(attachmentCopy); +// if (entity.getAttachment() != null) { +// for (Attachment attachment : entity.getAttachment()) { +// Attachment clone = new AttachmentImpl(); +// fromAttachmentBinder.copyExcluding(attachment, clone, Attachment.PROPERTY_ORIGINAL_FILE, Attachment.PROPERTY_EDITED_FILE_NAME); +// attachmentCopy.add(clone); +// } +// } +// setAttachment(attachmentCopy); } @Override 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-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-17 17:01:10 UTC (rev 210) @@ -381,6 +381,7 @@ AttachmentFile attachmentFile = emailService.getAttachmentFileFromStream(dh.getInputStream()); attachmentFile.setFilename(fileName); attachment.setOriginalFile(attachmentFile); + attachment.setOriginalFileName(fileName); //email.addAttachment(attachment); attachments.add(attachment); Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-17 08:05:56 UTC (rev 209) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-17 17:01:10 UTC (rev 210) @@ -104,7 +104,7 @@ function($scope, $window, ConfigurationData) { // initialisation de la configuration - if ($scope.configuration.invalidFormDisabledActions) { + if (!$scope.configuration.invalidFormDisabledActions) { $scope.configuration.invalidFormDisabledActions = []; }