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

r261 - trunk/faxtomail-persistence/src/main/resources
by echatellier＠users.forge.codelutin.com June 24, 2014

June 24, 2014

Author: echatellier Date: 2014-06-24 21:07:48 +0200 (Tue, 24 Jun 2014) New Revision: 261 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/261 Log: Update config to not use production database Modified: trunk/faxtomail-persistence/src/main/resources/faxToMail.properties Modified: trunk/faxtomail-persistence/src/main/resources/faxToMail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/resources/faxToMail.properties 2014-06-24 17:39:19 UTC (rev 260) +++ trunk/faxtomail-persistence/src/main/resources/faxToMail.properties 2014-06-24 19:07:48 UTC (rev 261) @@ -30,7 +30,7 @@ #hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect #hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver -#hibernate.connection.url=jdbc:jtds:sqlserver://192.168.100.247:1433/faxtomail +#hibernate.connection.url=jdbc:jtds:sqlserver://192.168.100.247:1433/faxtomailtest #hibernate.connection.username=fx #hibernate.connection.password=FX2013!

1 0

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

June 24, 2014

Author: echatellier Date: 2014-06-24 19:39:19 +0200 (Tue, 24 Jun 2014) New Revision: 260 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/260 Log: fixes #5324: Affectation des droits utilisteur, les utilisateur sont r?\195?\169p?\195?\169t?\195?\169s dans les sous doss?\195?\169ier 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-24 12:14:28 UTC (rev 259) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-24 17:39:19 UTC (rev 260) @@ -520,32 +520,32 @@ $scope.parentScopeValues.rightUsers = []; $scope.parentScopeValues.rightGroups = []; angular.forEach($scope.parentScopeValues.readRightUsers, function(user) { - if ($scope.parentScopeValues.rightUsers.indexOf(user) == -1) { + if ($scope.parentScopeValues.rightUsers.indexOfByTopiaId(user) == -1) { $scope.parentScopeValues.rightUsers.push(user); } }); angular.forEach($scope.parentScopeValues.writeRightUsers, function(user) { - if ($scope.parentScopeValues.rightUsers.indexOf(user) == -1) { + if ($scope.parentScopeValues.rightUsers.indexOfByTopiaId(user) == -1) { $scope.parentScopeValues.rightUsers.push(user); } }); angular.forEach($scope.parentScopeValues.moveRightUsers, function(user) { - if ($scope.parentScopeValues.rightUsers.indexOf(user) == -1) { + if ($scope.parentScopeValues.rightUsers.indexOfByTopiaId(user) == -1) { $scope.parentScopeValues.rightUsers.push(user); } }); angular.forEach($scope.parentScopeValues.readRightGroups, function(group) { - if ($scope.parentScopeValues.rightGroups.indexOf(group) == -1) { + if ($scope.parentScopeValues.rightGroups.indexOfByTopiaId(group) == -1) { $scope.parentScopeValues.rightGroups.push(group); } }); angular.forEach($scope.parentScopeValues.writeRightGroups, function(group) { - if ($scope.parentScopeValues.rightGroups.indexOf(group) == -1) { + if ($scope.parentScopeValues.rightGroups.indexOfByTopiaId(group) == -1) { $scope.parentScopeValues.rightGroups.push(group); } }); angular.forEach($scope.parentScopeValues.moveRightGroups, function(group) { - if ($scope.parentScopeValues.rightGroups.indexOf(group) == -1) { + if ($scope.parentScopeValues.rightGroups.indexOfByTopiaId(group) == -1) { $scope.parentScopeValues.rightGroups.push(group); } });

1 0

r259 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by dcosse＠users.forge.codelutin.com June 24, 2014

June 24, 2014

Author: dcosse Date: 2014-06-24 14:14:28 +0200 (Tue, 24 Jun 2014) New Revision: 259 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/259 Log: correction NPE ?\195?\160 la fermeture de l'appli 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-23 19:28:15 UTC (rev 258) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-24 12:14:28 UTC (rev 259) @@ -347,13 +347,14 @@ JTree tree = getUI().getNavigationTree(); TreeModel treeModel = tree.getModel(); Enumeration<TreePath> paths = tree.getExpandedDescendants(new TreePath(treeModel.getRoot())); - List<MailFolder> folders = new ArrayList<MailFolder>(); - while (paths.hasMoreElements()) { - TreePath path = paths.nextElement(); - Object lastPathComponent = path.getLastPathComponent(); - if (FolderTreeNode.class.isAssignableFrom(lastPathComponent.getClass())) { - folders.add(((FolderTreeNode) lastPathComponent).getMailFolder()); + if (paths != null) { + while (paths.hasMoreElements()) { + TreePath path = paths.nextElement(); + Object lastPathComponent = path.getLastPathComponent(); + if (FolderTreeNode.class.isAssignableFrom(lastPathComponent.getClass())) { + folders.add(((FolderTreeNode) lastPathComponent).getMailFolder()); + } } } getContext().setExpandedFolders(folders);

1 0

r258 - in trunk: 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/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply
by kmorin＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: kmorin Date: 2014-06-23 21:28:15 +0200 (Mon, 23 Jun 2014) New Revision: 258 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/258 Log: - d?\195?\169sactivation de la popup de validation sur l'ecran d'accueil et la recherche - d?\195?\169but de la gestion des droits - correction des colonnes (h?\195?\169ritage) - suppression de la config swing - correction de la prise en compte de la taille des pj dans la r?\195?\169ponse Removed: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowConfigAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.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/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-23 19:28:15 UTC (rev 258) @@ -31,6 +31,8 @@ import java.util.List; import java.util.Map; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -89,6 +91,29 @@ return result; } + public List<MailFolder> getRootMailFoldersWithReadingRights(FaxToMailUser user) { + List<MailFolder> rootFolders = getRootMailFolders(); + List<MailFolder> result = new ArrayList<>(); + + for (MailFolder folder : rootFolders) { + findReadableFolders(folder, user, result); + } + + return result; + } + + protected void findReadableFolders(MailFolder folder, FaxToMailUser user, List<MailFolder> folders) { + if (folder.containsReadRightUsers(user) + || !CollectionUtils.intersection(folder.getReadRightGroups(), user.getUserGroups()).isEmpty()) { + folders.add(folder); + + } else if (folder.isChildrenNotEmpty()) { + for (MailFolder child : folder.getChildren()) { + findReadableFolders(child, user, folders); + } + } + } + public List<MailFolder> getMailFolders(Collection<String> ids) { MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); return new ArrayList<MailFolder>(dao.forTopiaIdIn(ids).findAll()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java 2014-06-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailScreen.java 2014-06-23 19:28:15 UTC (rev 258) @@ -30,13 +30,6 @@ */ public enum FaxToMailScreen { - /** - * To display config. - * - * @since 1.0 - */ - CONFIG, - SEARCH, DEMANDE, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-06-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-06-23 19:28:15 UTC (rev 258) @@ -55,7 +55,6 @@ RunFaxToMail.closeFaxToMail(getHandler(), exitCode); } - @Override public void releaseAction() { exitCode = RunFaxToMail.NORMAL_EXIT_CODE; Deleted: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowConfigAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowConfigAction.java 2014-06-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowConfigAction.java 2014-06-23 19:28:15 UTC (rev 258) @@ -1,39 +0,0 @@ -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.ui.swing.FaxToMailScreen; -import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; - -/** - * To show config screen. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.1 - */ -public class ShowConfigAction extends AbstractChangeScreenAction { - - public ShowConfigAction(MainUIHandler handler) { - super(handler, true, FaxToMailScreen.CONFIG); - } -} 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-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-06-23 19:28:15 UTC (rev 258) @@ -24,9 +24,11 @@ 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.ui.swing.FaxToMailScreen; import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; @@ -65,8 +67,17 @@ DemandeUIModel currentEmail = getContext().getCurrentEmail(); FaxToMailUser takenBy = currentEmail.getTakenBy(); FaxToMailUser currentUser = getContext().getCurrentUser(); + MailFolder folder = currentEmail.getMailFolder(); - if (currentEmail.getArchiveDate() != null) { + boolean canWrite = false; + while (!canWrite && folder.getParent() != null) { + canWrite = folder.containsWriteRightUsers(currentUser) + || !CollectionUtils.intersection(folder.getWriteRightGroups(), + currentUser.getUserGroups()).isEmpty(); + folder = folder.getParent(); + } + + if (currentEmail.getArchiveDate() != null || !canWrite) { currentEmail.setEditable(false); } else if (takenBy != null && !currentUser.equals(takenBy)) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-06-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-06-23 19:28:15 UTC (rev 258) @@ -55,16 +55,6 @@ _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.ShowRechercheAction.class}; } -#menuFileConfiguration { - actionIcon: config; - text: "faxtomail.main.action.configuration"; - toolTipText: "faxtomail.main.action.configuration.tip"; - i18nMnemonic: "faxtomail.main.action.configuration.mnemonic"; - enabled: true;//{model.getScreen() != TuttiScreen.CONFIG}; - _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.ShowConfigAction.class}; - _help: {"faxtomail.main.menu.action.configuration.help"}; -} - #menuFileExit { actionIcon: exit; text: "faxtomail.main.action.exit"; @@ -73,39 +63,6 @@ _help: {"faxtomail.main.menu.action.exit.help"}; } -/* -#menuHelp { - text: "tutti.main.menu.help"; - toolTipText: "tutti.main.menu.help.tip"; - i18nMnemonic: "tutti.main.menu.help.mnemonic"; -} - -#menuShowHelp { - actionIcon: help; - text: "tutti.main.action.showHelp"; - toolTipText: "tutti.main.action.showHelp.tip"; - i18nMnemonic: "tutti.main.action.showHelp.mnemonic"; - _help: {"tutti.index.help"}; -} - -#menuHelpSite { - actionIcon: site; - text: "tutti.main.action.site"; - toolTipText: "tutti.main.action.site.tip"; - i18nMnemonic: "tutti.main.action.site.mnemonic"; - _help: {"tutti.main.menu.action.site.help"}; -} - -#menuHelpAbout { - text: "tutti.main.action.about"; - toolTipText: "tutti.main.action.about.tip"; - actionIcon: about; - i18nMnemonic: "tutti.main.action.about.mnemonic"; - _tuttiAction: {ShowAboutAction.class}; - _help: {"tutti.main.menu.action.about.help"}; -} -*/ - #bottomBar { floatable: false; margin: {new java.awt.Insets(0, 0, 0, 5)}; @@ -119,15 +76,4 @@ #status { showClock: false; showMemoryStatus: false; -} -/* -#showHelp { - actionIcon:"show-help"; - toolTipText:"tutti.main.action.showHelp.tip"; - _help: {"tutti.main.menu.action.showHelp.help"}; -} - -#body { - _help: {"tutti.main.help"}; -} -*/ +} \ No newline at end of file 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-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-06-23 19:28:15 UTC (rev 258) @@ -331,15 +331,10 @@ JComponent screenUI; JToolBar rightDecoration = null; String screenTitle; + boolean validatorWidgetEnabled = false; Icon icon; switch (screen) { - case CONFIG: - screenUI = new FaxToMailConfigUI(ui); - screenTitle = t("faxtomail.config.title"); - icon = ui.getMenuFileConfiguration().getIcon(); - break; - case SEARCH: screenUI = new SearchUI(ui); screenTitle = t("faxtomail.search.title"); @@ -351,6 +346,7 @@ screenTitle = t("faxtomail.demand.title"); icon = JAXXWidgetUtil.createActionIcon("email-group"); rightDecoration = ((DemandesUI) screenUI).getTopToolBar(); + validatorWidgetEnabled = true; break; default: @@ -377,13 +373,14 @@ ui.getBody().setLeftDecoration(new JLabel(icon)); ui.getBody().setRightDecoration(rightDecoration); ui.getBody().add(currentBody); + ui.getValidatorMessageWidget().setEnabled(validatorWidgetEnabled); } } public void changeTitle() { - String title = getSelectedCruiseTitle(); + String title = getTitle(); ui.setTitle(t("faxtomail.main.title.application", getConfig().getVersion(), @@ -391,7 +388,7 @@ title)); } - protected String getSelectedCruiseTitle() { + protected String getTitle() { String title; 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-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-23 19:28:15 UTC (rev 258) @@ -47,6 +47,7 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode; 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; @@ -93,7 +94,8 @@ public void propertyChange(PropertyChangeEvent evt) { String propertyName = evt.getPropertyName(); - if (Email.PROPERTY_PRIORITY.equals(propertyName)) { + if (Email.PROPERTY_PRIORITY.equals(propertyName) + || Email.PROPERTY_TAKEN_BY.equals(propertyName)) { if (evt.getNewValue() != null || evt.getOldValue() != null) { SaveDemandeFromListAction saveAction = getContext().getActionFactory().createLogicAction(DemandeListUIHandler.this, @@ -112,7 +114,7 @@ super.beforeInit(ui); DemandeListUIModel model = new DemandeListUIModel(); - Collection<MailFolder> folders = getContext().getMailFolderService().getRootMailFolders(); + Collection<MailFolder> folders = getContext().getMailFolderService().getRootMailFoldersWithReadingRights(getContext().getCurrentUser()); model.setFolders(new ArrayList<MailFolder>(folders)); model.addPropertyChangeListener(DemandeListUIModel.PROPERTY_SELECTED_FOLDER, new PropertyChangeListener() { @@ -312,6 +314,9 @@ List<MailField> tableColumns = null; MailFolder selectedFolder = getModel().getSelectedFolder(); if (selectedFolder != null) { + while (!selectedFolder.isUseCurrentLevelTableColumns() && selectedFolder.getParent() != null) { + selectedFolder = selectedFolder.getParent(); + } tableColumns = selectedFolder.getFolderTableColumns(); } return tableColumns; @@ -447,9 +452,20 @@ } public void print() { + DemandeListUIModel model = getModel(); + MailFolder selectedFolder = model.getSelectedFolder(); + while (selectedFolder.getParent() != null && selectedFolder.getPrintActionEqualTakeAction() == null) { + selectedFolder = selectedFolder.getParent(); + } + boolean take = Boolean.TRUE.equals(selectedFolder.getPrintActionEqualTakeAction()); + FaxToMailUser currentUser = getContext().getCurrentUser(); + //TODO kmorin 20140606 print a result page and maybe a page to separate the demands - List<DemandeUIModel> currentEmails = getModel().getCurrentEmails(); + List<DemandeUIModel> currentEmails = model.getCurrentEmails(); for (DemandeUIModel demandeUIModel : currentEmails) { + if (take) { + demandeUIModel.setTakenBy(currentUser); + } for (Attachment attachment : demandeUIModel.getAttachment()) { // force lasy loading Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-06-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-06-23 19:28:15 UTC (rev 258) @@ -280,7 +280,7 @@ public void openAttachment(AttachmentFile attachment) { File file = attachment.getFile(); - DesktopUtil.open(file); + DesktopUtil.browse(file.toURI()); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-06-23 17:25:12 UTC (rev 257) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-06-23 19:28:15 UTC (rev 258) @@ -197,7 +197,9 @@ } public void setValid(boolean valid) { + log.info("set valid " + valid); Object oldValue = isValid(); + log.info("oldValue " + oldValue); this.valid = valid; firePropertyChange(PROPERTY_VALID, oldValue, valid); } @@ -205,7 +207,10 @@ // Do not remove the unused parameter, it is just for the validation // to bind the totalAttachmentLength property public boolean isAttachmentSizeValid(long totalAttachmentLength) { - return maxAttachmentLength == 0 || this.totalAttachmentLength < maxAttachmentLength; + log.info(this.totalAttachmentLength + ", " + maxAttachmentLength + ", " + (this.totalAttachmentLength < maxAttachmentLength)); + boolean valid = maxAttachmentLength == 0 || this.totalAttachmentLength < maxAttachmentLength; + log.info(valid); + return valid; } public List<String> getSenderAllowedDomains() {

1 0

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

June 23, 2014

Author: echatellier Date: 2014-06-23 19:25:12 +0200 (Mon, 23 Jun 2014) New Revision: 257 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/257 Log: Fix duplicated rigth display 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-23 15:46:08 UTC (rev 256) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-23 17:25:12 UTC (rev 257) @@ -444,32 +444,32 @@ $scope.selectedMailFolder.rightUsers = []; $scope.selectedMailFolder.rightGroups = []; angular.forEach($scope.selectedMailFolder.readRightUsers, function(user) { - if ($scope.selectedMailFolder.rightUsers.indexOf(user) == -1) { + if ($scope.selectedMailFolder.rightUsers.indexOfByTopiaId(user) == -1) { $scope.selectedMailFolder.rightUsers.push(user); } }); angular.forEach($scope.selectedMailFolder.writeRightUsers, function(user) { - if ($scope.selectedMailFolder.rightUsers.indexOf(user) == -1) { + if ($scope.selectedMailFolder.rightUsers.indexOfByTopiaId(user) == -1) { $scope.selectedMailFolder.rightUsers.push(user); } }); angular.forEach($scope.selectedMailFolder.moveRightUsers, function(user) { - if ($scope.selectedMailFolder.rightUsers.indexOf(user) == -1) { + if ($scope.selectedMailFolder.rightUsers.indexOfByTopiaId(user) == -1) { $scope.selectedMailFolder.rightUsers.push(user); } }); angular.forEach($scope.selectedMailFolder.readRightGroups, function(group) { - if ($scope.selectedMailFolder.rightGroups.indexOf(group) == -1) { + if ($scope.selectedMailFolder.rightGroups.indexOfByTopiaId(group) == -1) { $scope.selectedMailFolder.rightGroups.push(group); } }); angular.forEach($scope.selectedMailFolder.writeRightGroups, function(group) { - if ($scope.selectedMailFolder.rightGroups.indexOf(group) == -1) { + if ($scope.selectedMailFolder.rightGroups.indexOfByTopiaId(group) == -1) { $scope.selectedMailFolder.rightGroups.push(group); } }); angular.forEach($scope.selectedMailFolder.moveRightGroups, function(group) { - if ($scope.selectedMailFolder.rightGroups.indexOf(group) == -1) { + if ($scope.selectedMailFolder.rightGroups.indexOfByTopiaId(group) == -1) { $scope.selectedMailFolder.rightGroups.push(group); } });

1 0

r256 - in trunk/faxtomail-ui-swing/src/main: java/com/franciaflex/faxtomail/ui/swing/content/print resources/i18n
by dcosse＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: dcosse Date: 2014-06-23 17:46:08 +0200 (Mon, 23 Jun 2014) New Revision: 256 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/256 Log: refs #4656 ajout de la liste des pi?\195?\168ces jointes n'ayant pas pu ?\195?\170tre imprim?\195?\169es Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 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-23 14:36:36 UTC (rev 255) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-23 15:46:08 UTC (rev 256) @@ -168,20 +168,21 @@ } } } - // TODO DCossé 23/06/14 gérer les exceptions -// if (!attachmentsToPrint.isEmpty()) { - -// for (int i = 1; i < attachmentsToPrint.size(); i++) { -// AttachmentFile f = attachmentsToPrint.get(i); -// -// } -// t("faxtomail.demande.print.error.message",""); -// JOptionPane.showMessageDialog( -// getTopestUI(), -// "errorMessage", -// "errorMessageTitle", -// JOptionPane.ERROR_MESSAGE); -// } + // TODO DCossé 23/06/14 not sure it works + if (!attachmentsToPrint.isEmpty()) { + + AttachmentFile f = attachmentsToPrint.get(0); + String filesName = f.getFilename() == null ? "" : f.getFilename(); + for (int i = 1; i < attachmentsToPrint.size(); i++) { + String fileName= attachmentsToPrint.get(i).getFilename() == null ? "" : attachmentsToPrint.get(i).getFilename(); + filesName += ", " + fileName; + } + JOptionPane.showMessageDialog( + getTopestUI(), + t("faxtomail.demande.print.error.message.filesName", filesName), + t("faxtomail.demande.print.error.message.title"), + JOptionPane.ERROR_MESSAGE); + } } public byte[] getDocumentContent() { Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-23 14:36:36 UTC (rev 255) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-23 15:46:08 UTC (rev 256) @@ -121,7 +121,8 @@ faxtomail.demande.mailFolder.label=Dossier faxtomail.demande.object.label=Objet faxtomail.demande.print.button.label=Imprimer -faxtomail.demande.print.error.message=Les documents suivant n'ont pu être imprimé\: %s +faxtomail.demande.print.error.message.filesName=Les documents suivant n'ont pu être imprimé\: %s +faxtomail.demande.print.error.message.title=Échec d'impression de la demande faxtomail.demande.printedBy.label=Imprimé par faxtomail.demande.priority.label=Priorité faxtomail.demande.projectReference.label=Référence chantier

1 0

r255 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/resources/csv 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/ui/swing/content/print faxtomail-ui-swing/src/main/java/c
by dcosse＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: dcosse Date: 2014-06-23 16:36:36 +0200 (Mon, 23 Jun 2014) New Revision: 255 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/255 Log: refs #4656 svn propset 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/MailField.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/test/resources/csv/clients.csv trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv trunk/faxtomail-service/src/test/resources/csv/email_filters.csv trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv trunk/faxtomail-service/src/test/resources/csv/priorities.csv trunk/faxtomail-service/src/test/resources/csv/ranges.csv 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/LoadFolderEmailsAction.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/DemandesUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 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/print/AttachmentToPrintChooserUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/chosen.js trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js trunk/faxtomail-ui-web/src/main/webapp/js/select2sortable.js trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/csv/clients.csv ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/csv/email_filters.csv ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/csv/priorities.csv ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-service/src/test/resources/csv/ranges.csv ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/chosen.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/select2sortable.js ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js ___________________________________________________________________ Added: svn:eol-style + native

1 0

r254 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/resources/csv 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/ui/swing/content/print faxtomail-ui-swing/src/main/java/c
by dcosse＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: dcosse Date: 2014-06-23 16:35:43 +0200 (Mon, 23 Jun 2014) New Revision: 254 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/254 Log: refs #4656 traitement des PJ non imprim?\195?\169es, en cours 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/MailField.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/test/resources/csv/clients.csv trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv trunk/faxtomail-service/src/test/resources/csv/email_filters.csv trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv trunk/faxtomail-service/src/test/resources/csv/priorities.csv trunk/faxtomail-service/src/test/resources/csv/ranges.csv 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/LoadFolderEmailsAction.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/DemandesUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 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/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/odt/demande.odt trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties trunk/faxtomail-ui-swing/src/main/resources/icons/action-edit.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-email-group.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-highlighter.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-line.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-rotate-anticlockwise.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-rotate-clockwise.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-zoom-in.png trunk/faxtomail-ui-swing/src/main/resources/icons/action-zoom-out.png trunk/faxtomail-ui-swing/src/main/resources/pdf/demande.pdf trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp trunk/faxtomail-ui-web/src/main/webapp/css/spinner.gif trunk/faxtomail-ui-web/src/main/webapp/js/chosen.js trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js trunk/faxtomail-ui-web/src/main/webapp/js/select2sortable.js trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AttachmentImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Persistence - * $Id: MailField.java 145 2014-06-06 16:25:02Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-persistence/src/main/ja… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Service - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/clients.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/demandtypes.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/email_accounts.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/email_filters.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/etatattentes.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/priorities.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-service/src/test/resources/csv/ranges.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenAttachmentAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ <!-- #%L FaxToMail :: UI - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% Copyright (C) 2014 Franciaflex, Code Lutin %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUI.jaxx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-23 14:35:43 UTC (rev 254) @@ -77,7 +77,7 @@ AttachmentToPrintChooserUIModel model = getModel(); DemandeUIModel demand = model.getDemand(); - JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), false); + JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), true); ui.getAttachmentPanel().add(checkBox); // add demand details @@ -85,6 +85,7 @@ demandFile.setFilename("demand_details"); byte[] demandContent = getDocumentContent(); demandFile.setContent(demandContent); + getModel().addAttachmentToPrint(demandFile); // add attached files checkBox.addItemListener(new ItemListener() { @@ -153,11 +154,34 @@ } public void print() { + List<AttachmentFile> attachmentsToPrint = Lists.newArrayList(getModel().getAttachmentsToPrint()); + for (AttachmentFile attachmentFile : getModel().getAttachmentsToPrint()) { - if (StringUtils.isNotBlank(attachmentFile.getFilename())) { - FaxToMailUIUtil.print(attachmentFile, true); + try { + if (StringUtils.isNotBlank(attachmentFile.getFilename())) { + FaxToMailUIUtil.print(attachmentFile, true); + } + attachmentsToPrint.remove(attachmentFile); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not print attachement.", e); + } } } + // TODO DCossé 23/06/14 gérer les exceptions +// if (!attachmentsToPrint.isEmpty()) { + +// for (int i = 1; i < attachmentsToPrint.size(); i++) { +// AttachmentFile f = attachmentsToPrint.get(i); +// +// } +// t("faxtomail.demande.print.error.message",""); +// JOptionPane.showMessageDialog( +// getTopestUI(), +// "errorMessage", +// "errorMessageTitle", +// JOptionPane.ERROR_MESSAGE); +// } } public byte[] getDocumentContent() { 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-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/odt/demande.odt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: UI - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxListCellRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-06-23 14:35:43 UTC (rev 254) @@ -121,6 +121,7 @@ faxtomail.demande.mailFolder.label=Dossier faxtomail.demande.object.label=Objet faxtomail.demande.print.button.label=Imprimer +faxtomail.demande.print.error.message=Les documents suivant n'ont pu être imprimé\: %s faxtomail.demande.printedBy.label=Imprimé par faxtomail.demande.priority.label=Priorité faxtomail.demande.projectReference.label=Référence chantier Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-edit.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-email-group.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-highlighter.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-line.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-rotate-anticlockwise.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-rotate-clockwise.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-zoom-in.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-zoom-out.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-swing/src/main/resources/pdf/demande.pdf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Web - * $Id: UserFolderAction.java 121 2014-06-02 15:45:55Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/java/co… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-06-23 14:35:43 UTC (rev 254) @@ -3,8 +3,8 @@ /* * #%L * FaxToMail :: Web - * $Id: MailFilterJob.java 82 2014-05-20 14:25:32Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/java/co… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ <%-- #%L FaxToMail :: Web - $Id: user-folder-input.jsp 121 2014-06-02 15:45:55Z echatellier $ - $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/webapp/… $ + $Id$ + $HeadURL$ %% Copyright (C) 2014 Franciaflex, Code Lutin %% Property changes on: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-web/src/main/webapp/css/spinner.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/chosen.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ /* * #%L * FaxToMail :: Web - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/select2sortable.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-06-23 13:58:39 UTC (rev 253) +++ trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-06-23 14:35:43 UTC (rev 254) @@ -1,8 +1,8 @@ /* * #%L * FaxToMail :: Web - * $Id: configuration.js 107 2014-05-30 08:55:55Z echatellier $ - * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-ui-web/src/main/webapp/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2014 Franciaflex, Code Lutin * %% Property changes on: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r253 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: content/print util
by dcosse＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: dcosse Date: 2014-06-23 15:58:39 +0200 (Mon, 23 Jun 2014) New Revision: 253 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/253 Log: refs #4656 l'ensemble des PJ peuvent ?\195?\170tre s?\195?\169lectionn?\195?\169es 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/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-23 12:31:14 UTC (rev 252) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-23 13:58:39 UTC (rev 253) @@ -80,11 +80,13 @@ JCheckBox checkBox = new JCheckBox(t("faxtomail.chooseMailFolder.element"), false); ui.getAttachmentPanel().add(checkBox); + // add demand details final AttachmentFile demandFile = new AttachmentFileImpl(); demandFile.setFilename("demand_details"); byte[] demandContent = getDocumentContent(); demandFile.setContent(demandContent); + // add attached files checkBox.addItemListener(new ItemListener() { @Override public void itemStateChanged(ItemEvent e) { @@ -99,9 +101,11 @@ for (Attachment attachment : demand.getAttachment()) { - if (attachment.getOriginalFile() != null) { - createCheckBox(attachment.getOriginalFile()); + if (attachment.getOriginalFile() == null) { + FaxToMailUIUtil.forceAttachmentFileLoading(getContext(), attachment); + } + createCheckBox(attachment.getOriginalFile()); final AttachmentFile file = attachment.getEditedFile(); if (file != null) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-23 12:31:14 UTC (rev 252) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-23 13:58:39 UTC (rev 253) @@ -62,6 +62,7 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -296,8 +297,9 @@ public static void print(AttachmentFile attachmentFile, boolean defaultPrinter) { + FileInputStream textStream = null; try { - FileInputStream textStream = new FileInputStream(attachmentFile.getFile()); + textStream = new FileInputStream(attachmentFile.getFile()); DocFlavor flavor = DocFlavor.INPUT_STREAM.AUTOSENSE; Doc mydoc = new SimpleDoc(textStream, flavor, null); @@ -348,6 +350,8 @@ throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.print"), e); + } finally { + IOUtils.closeQuietly(textStream); } }

1 0

r252 - in trunk: faxtomail-service/src/test/resources/csv faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/odt faxtomail-ui-swing/src/main/resources/pdf
by dcosse＠users.forge.codelutin.com June 23, 2014

June 23, 2014

Author: dcosse Date: 2014-06-23 14:31:14 +0200 (Mon, 23 Jun 2014) New Revision: 252 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/252 Log: refs #4656 ajout de l'impression des details d'une demande Added: trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/odt/demande.odt trunk/faxtomail-ui-swing/src/main/resources/pdf/demande.pdf Added: trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv (rev 0) +++ trunk/faxtomail-service/src/test/resources/csv/fx_clients.csv 2014-06-23 12:31:14 UTC (rev 252) @@ -0,0 +1,5 @@ +Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Client_Top;Numero_Fax;Adresse_Mail;Code_Client;Objet_Message;Destination +253042;FX;John Doe;A;71 Allo;NULL;NULL;03 12 34 56 78;john(a)doe.fr;99153;NULL; +253142;FX;Gerard Menvussa;A+;40 Nabi;NULL;NULL;05 12 23 34 45;gerard.menvussa(a)code.com;99154;NULL; +253242;FX;Ella Elli;NULL;38 LA;NULL;NULL;04 98 87 76 65;NULL;99184;NULL; + Added: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/odt/demande.odt =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/odt/demande.odt ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/faxtomail-ui-swing/src/main/resources/pdf/demande.pdf =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/pdf/demande.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0