Author: kmorin Date: 2014-08-08 16:25:57 +0200 (Fri, 08 Aug 2014) New Revision: 505 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/505 Log: integration des fetchs Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.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/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/AbstractFaxToMailDemandListHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-08 14:24:35 UTC (rev 504) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-08 14:25:57 UTC (rev 505) @@ -131,6 +131,7 @@ protected void browseFolderParent(MailFolder folder, FaxToMailUser user, MailFolderService mailFolderService) { Hibernate.initialize(folder); + Hibernate.initialize(folder.getChildren()); mailFolderService.fetchFolderAttributes(folder); MailFolder parent = folder.getParent(); @@ -139,11 +140,15 @@ } boolean writable = parent != null && parent.isFolderWritable(); - writable |= CollectionUtils.containsAny(folder.getWriteRightGroups(), user.getUserGroups()); + if (folder.getWriteRightGroups() != null && user.getUserGroups() != null) { + writable |= CollectionUtils.containsAny(folder.getWriteRightGroups(), user.getUserGroups()); + } writable |= folder.containsWriteRightUsers(user); boolean readable = parent != null && parent.isFolderReadable(); - readable |= CollectionUtils.containsAny(folder.getReadRightGroups(), user.getUserGroups()); + if (folder.getReadRightGroups() != null && user.getUserGroups() != null) { + readable |= CollectionUtils.containsAny(folder.getReadRightGroups(), user.getUserGroups()); + } readable |= folder.containsReadRightUsers(user); folder.setFolderWritable(writable); @@ -282,9 +287,13 @@ // sur celles en base if (attachment.getOriginalFile() != null) { originalFile = attachment.getOriginalFile(); + } else { + originalFile = currentAttachment.getOriginalFile(); } if (attachment.getEditedFile() != null) { editedFile = attachment.getEditedFile(); + } else { + editedFile = currentAttachment.getEditedFile(); } // copy new data @@ -592,7 +601,7 @@ @Override public Email addToHistory(String emailId, HistoryType type, FaxToMailUser user, Date date, String... fields) { EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); - Email email = getEmailById(emailId); + Email email = getEmailById(emailId, user); HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); History history = historyDao.create(History.PROPERTY_TYPE, type, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java 2014-08-08 14:24:35 UTC (rev 504) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeFromListAction.java 2014-08-08 14:25:57 UTC (rev 505) @@ -27,6 +27,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; @@ -53,16 +54,18 @@ public void doAction() throws Exception { FaxToMailUIContext context = getContext(); + FaxToMailServiceContext serviceContext = context.newServiceContext(); + EmailService emailService = serviceContext.getEmailService(); + for (DemandeUIModel model : getModel().getSelectedEmails()) { String topiaId = model.getTopiaId(); - FaxToMailServiceContext serviceContext = context.newServiceContext(); - Email persistedEmail = serviceContext.getEmailService().getEmailById(topiaId); + Email persistedEmail = emailService.getEmailById(topiaId); FaxToMailUser currentUser = context.getCurrentUser(); Email email = model.toEntity(persistedEmail); - email = serviceContext.getEmailService().saveEmail(email, currentUser, modifiedProperties); + email = emailService.saveEmail(email, currentUser, modifiedProperties); model.fromEntity(email); } } 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-08-08 14:24:35 UTC (rev 504) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-08-08 14:25:57 UTC (rev 505) @@ -24,6 +24,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.exceptions.AlreadyLockedMailException; @@ -37,6 +38,8 @@ import javax.swing.*; +import java.util.Date; + import static org.nuiton.i18n.I18n.t; /** @@ -84,7 +87,13 @@ DemandeUIModel currentEmail = getContext().getCurrentEmail(); if (StringUtils.isNotBlank(currentEmail.getTopiaId())) { FaxToMailServiceContext serviceContext = getContext().newServiceContext(); - Email email = serviceContext.getEmailService().getEmailById(currentEmail.getTopiaId(), getContext().getCurrentUser()); + + Email email = serviceContext.getEmailService().addToHistory(currentEmail.getTopiaId(), + HistoryType.OPENING, + getContext().getCurrentUser(), + new Date()); + + currentEmail.setEtatAttente(email.getEtatAttente()); currentEmail.setGroupedDemandes(email.getEmailGroup()); currentEmail.setMailFolder(email.getMailFolder()); } 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-08-08 14:24:35 UTC (rev 504) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-08-08 14:25:57 UTC (rev 505) @@ -267,9 +267,10 @@ protected void runSearchAction() { try { - SearchToGroupAction searchAction = getContext().getActionFactory().createLogicAction(this, SearchToGroupAction.class); - searchAction.doAction(); + SearchToGroupAction searchAction = new SearchToGroupAction(this); + getContext().getActionFactory().createUIAction(null, searchAction).actionPerformed(null); + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("error while searching", e); 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-08-08 14:24:35 UTC (rev 504) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-08-08 14:25:57 UTC (rev 505) @@ -227,8 +227,8 @@ protected void runSearchAction() { try { - SearchAction searchAction = getContext().getActionFactory().createLogicAction(this, SearchAction.class); - searchAction.doAction(); + SearchAction searchAction = new SearchAction(this); + getContext().getActionFactory().createUIAction(null, searchAction).actionPerformed(null); } catch (Exception e) { if (log.isErrorEnabled()) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-08 14:24:35 UTC (rev 504) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-08 14:25:57 UTC (rev 505) @@ -266,15 +266,8 @@ (AbstractApplicationTableModel<DemandeUIModel>) table.getModel(); DemandeUIModel selectedEmail = tableModel.getEntry(rowIndex); onDoubleClickOnDemande(selectedEmail); - FaxToMailUIContext context = getContext(); //TODO kmorin 02140806 put in action - FaxToMailServiceContext serviceContext = context.newServiceContext(); - Email email = serviceContext.getEmailService().addToHistory(selectedEmail.getTopiaId(), - HistoryType.OPENING, - context.getCurrentUser(), - new Date()); - selectedEmail.fromEntity(email); openDemand(selectedEmail); } } 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-08-08 14:24:35 UTC (rev 504) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-08-08 14:25:57 UTC (rev 505) @@ -329,6 +329,8 @@ JAXXUtil.destroy(ui); } }); + + result.setSize(dim); SwingUtil.center(getContext().getMainUI(), result); result.setVisible(true); }