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

r567 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment 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/demande/replies faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply
by echatellier＠users.forge.codelutin.com 18 Aug '14

18 Aug '14

Author: echatellier Date: 2014-08-18 12:48:40 +0200 (Mon, 18 Aug 2014) New Revision: 567 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/567 Log: Disable forward button for replies popup displayed from list 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/content/attachment/AttachmentEditorUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css 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/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-18 10:48:40 UTC (rev 567) @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; import java.io.Writer; import java.util.ArrayList; import java.util.Collection; @@ -42,7 +41,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -52,7 +50,6 @@ import javax.mail.MessagingException; import com.franciaflex.faxtomail.services.service.exceptions.FolderNotReadableException; -import com.google.common.collect.Collections2; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.io.FileUtils; @@ -75,7 +72,6 @@ import org.nuiton.csv.ImportRuntimeException; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.topia.persistence.TopiaEntities; -import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; @@ -92,7 +88,6 @@ import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.base.Strings; -import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -798,7 +793,7 @@ @Override public PaginationResult<Email> search(EmailFilter emailFilter, FaxToMailUser user, PaginationParameter pagination) { - + // compute rigths MailFolderTopiaDao mailFolderDao = getPersistenceContext().getMailFolderDao(); Set<MailFolder> readMailFolders = new HashSet<MailFolder>(); @@ -816,7 +811,6 @@ // compute search EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); PaginationResult<Email> result = emailDao.search(emailFilter, readMailFolders, pagination); - return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.jaxx 2014-08-18 10:48:40 UTC (rev 567) @@ -36,10 +36,6 @@ javax.swing.JComponent </import> -  - <Boolean id='editable' javaBean='true'/> - <AttachmentEditorUIModel id='model' initializer='new AttachmentEditorUIModel()'/> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-08-18 10:48:40 UTC (rev 567) @@ -30,7 +30,7 @@ _selectOnFocus: { true }; } -JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment { +JTextField, JXTable, BeanFilterableComboBox, #commentField, ButtonAttachment, ButtonDemandReplies { editable: { model.isEditable() && !DemandStatus.TRANSMITTED_TO_EDI.equals(model.getDemandStatus()) }; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-08-18 10:48:40 UTC (rev 567) @@ -39,7 +39,7 @@ import static org.nuiton.i18n.I18n.n; /** - * Button to edit attachments. + * Button to edit replies. * * @author kmorin - morin(a)codelutin.com */ @@ -88,11 +88,15 @@ @Override protected DemandRepliesUI createNewPopup() { - return new DemandRepliesUI(FaxToMailUIContext.getApplicationContext()); + DemandRepliesUI ui = new DemandRepliesUI(FaxToMailUIContext.getApplicationContext()); + return ui; } public DemandeUIModel getBean() { return popup.getModel(); } + public void setEditable(boolean editable) { + popup.setEditable(editable); + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUI.jaxx 2014-08-18 10:48:40 UTC (rev 567) @@ -32,6 +32,8 @@ org.jdesktop.swingx.JXTitledPanel </import> + <Boolean id='editable' javaBean='null' /> + <DemandeUIModel id='model' javaBean='null'/> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-08-18 10:48:40 UTC (rev 567) @@ -158,8 +158,10 @@ TableColumnModel columnModel = new DefaultTableColumnModel(); TableColumn column = new TableColumn(); - column.setCellRenderer(new DemandReplyItemRenderer()); - column.setCellEditor(new DemandReplyItemEditor()); + DemandReplyItemRenderer renderer = new DemandReplyItemRenderer(); + DemandReplyItemEditor editor = new DemandReplyItemEditor(); + column.setCellRenderer(renderer); + column.setCellEditor(editor); columnModel.addColumn(column); table.setModel(demandRepliesTableModel); @@ -181,16 +183,20 @@ return null; } - public void openReply(Reply reply) { + public void openReply(DemandReplyItem item) { closeEditor(); + Reply reply = item.getReply(); + boolean editable = item.isEditable(); + try { ReplyFormUI dialogContent = new ReplyFormUI(ui); // TODO echatellier 20140804 : c'est très technique et très bas niveau, ca devrait se trouver dans les services Message message = new MimeMessage(null, new ByteArrayInputStream(reply.getEmailSource().getBytes())); ReplyFormUIModel replyModel = dialogContent.getModel(); + replyModel.setEditable(editable); + replyModel.setReadonly(true); replyModel.setOriginalDemand(ui.getModel()); - replyModel.setReadonly(true); replyModel.setReadSentDate(reply.getSentDate()); replyModel.setSubject(message.getSubject()); replyModel.setTo(message.getRecipients(RecipientType.TO)[0].toString()); @@ -218,14 +224,18 @@ } - public void openForward(Reply reply) { + public void openForward(DemandReplyItem item) { closeEditor(); + Reply reply = item.getReply(); + boolean editable = item.isEditable(); + try { ReplyFormUI dialogContent = new ReplyFormUI(ui); // TODO echatellier 20140804 : c'est très technique et très bas niveau, ca devrait se trouver dans les services Message message = new MimeMessage(null, new ByteArrayInputStream(reply.getEmailSource().getBytes())); ReplyFormUIModel replyModel = dialogContent.getModel(); + replyModel.setEditable(editable); replyModel.setOriginalDemand(ui.getModel()); replyModel.setReadSentDate(reply.getSentDate()); replyModel.setSubject(t("faxtomail.reply.forwardsubject", message.getSubject())); @@ -327,6 +337,8 @@ boolean isSelected, boolean hasFocus, int row, int column) { Reply reply = (Reply) value; setReply(reply); + + setEditable(DemandRepliesUIHandler.this.getUI().isEditable()); return this; } } @@ -343,7 +355,7 @@ boolean isSelected, int row, int column) { Reply reply = (Reply) value; demandReplyItem.setReply(reply); - + demandReplyItem.setEditable(getUI().isEditable()); return demandReplyItem; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.css 2014-08-18 10:48:40 UTC (rev 567) @@ -42,6 +42,7 @@ #openForwardButton { actionIcon: "transmit"; toolTipText: "faxtomail.demandReplies.action.forward.tip"; + visible: { isEditable() }; } #openReplyButton { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandReplyItem.jaxx 2014-08-18 10:48:40 UTC (rev 567) @@ -30,6 +30,9 @@ static jaxx.runtime.JAXXUtil.getStringValue </import> +  + <Boolean id='editable' javaBean='true' /> + <Reply id='reply' javaBean='null'/> <DemandRepliesUIHandler id='handler' @@ -47,9 +50,9 @@ <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <JButton id='openForwardButton' - onActionPerformed='handler.openForward(reply)'/> + onActionPerformed='handler.openForward(this)'/> <JButton id='openReplyButton' - onActionPerformed='handler.openReply(reply)'/> + onActionPerformed='handler.openReply(this)'/> </JToolBar> </JPanel> \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellEditor.java 2014-08-18 10:48:40 UTC (rev 567) @@ -42,7 +42,7 @@ import java.util.EventObject; /** - * To edit attachments from a table cell. + * To edit replies from a table cell. * * @author kmorin - morin(a)codelutin.com */ @@ -54,7 +54,6 @@ private static final Log log = LogFactory.getLog(RepliesCellEditor.class); public static TableCellEditor newEditor(FaxToMailUI ui) { - return new RepliesCellEditor(FaxToMailUIContext.getApplicationContext()); } @@ -67,6 +66,7 @@ this.editorButton = new ButtonDemandReplies("faxtomail.demandRepliesCellRenderer.text", null); this.editorButton.setBorder(new LineBorder(Color.BLACK)); + this.editorButton.setEditable(false); addCellEditorListener(new CellEditorListener() { @Override public void editingStopped(ChangeEvent e) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/RepliesCellRenderer.java 2014-08-18 10:48:40 UTC (rev 567) @@ -51,10 +51,6 @@ private final Decorator<Reply> decorator; -// private Font defaulfFont; -// -// private Font selectedFont; - public static RepliesCellRenderer newRender(Decorator<Reply> decorator) { return new RepliesCellRenderer(decorator); } @@ -106,15 +102,7 @@ setEnabled(editable); setText(textValue); setToolTipText(toolTipTextValue); -// setBackground(null); -// setForeground(Color.BLACK); -// if (isSelected) { -// setFont(selectedFont); -// } else { -// setFont(defaulfFont); -// } - return this; } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css 2014-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css 2014-08-18 10:48:40 UTC (rev 567) @@ -124,6 +124,7 @@ actionIcon: transmit; text: "faxtomail.reply.action.forward"; toolTipText: "faxtomail.reply.action.forward.tip"; + visible: { getModel().isEditable() }; } #closeButton { 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-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-08-18 10:48:40 UTC (rev 567) @@ -26,26 +26,11 @@ import static org.nuiton.i18n.I18n.t; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; -import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; -import com.franciaflex.faxtomail.services.service.EmailService; -import com.franciaflex.faxtomail.ui.swing.actions.AddAttachmentToReplyAction; -import com.franciaflex.faxtomail.ui.swing.actions.OpenAttachmentAction; -import com.google.common.base.Strings; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.validator.bean.simple.SimpleBeanValidator; - import java.awt.Component; import java.awt.Dimension; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.lang.reflect.Method; @@ -53,14 +38,6 @@ import java.util.Collection; import java.util.List; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.mail.BodyPart; -import javax.mail.Message; -import javax.mail.Part; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.MimeMessage.RecipientType; import javax.swing.ComboBoxEditor; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -70,18 +47,25 @@ import javax.swing.JTextField; import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import org.nuiton.validator.bean.simple.SimpleBeanValidator; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.AttachmentFileImpl; +import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.ui.swing.actions.AddAttachmentToReplyAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; -import org.nuiton.jaxx.application.swing.util.Cancelable; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; +import com.google.common.base.Strings; import com.google.common.collect.Lists; /** @@ -143,10 +127,6 @@ } } - JComboBox<AttachmentFile> addAttachmentFile = ui.getAddAttachmentFile(); - addAttachmentFile.setModel(newComboModel(model.getAvailableAttachments().toArray())); - addAttachmentFile.setSelectedItem(null); - model.setFrom(demand.getRecipient()); model.setSubject(t("faxtomail.reply.subject", demand.getSubject())); @@ -158,23 +138,33 @@ plainContent.replaceAll("\n", "\n> ")); model.setMessage(quotedReply); - MailFolder folder = demand.getMailFolder(); - List<String> folderReplyAdresses = new ArrayList<String>(); - List<String> folderReplyDomains = new ArrayList<String>(); - while (folder != null) { - folderReplyAdresses.addAll(folder.getReplyAddresses()); - folderReplyDomains.addAll(folder.getReplyDomains()); - folder = folder.getParent(); - } - model.setSenderAllowedDomains(folderReplyDomains); + // this have to be disable for read only mode (useless) + if (!model.isReadonly()) { + + // attachment combo + JComboBox<AttachmentFile> addAttachmentFile = ui.getAddAttachmentFile(); + addAttachmentFile.setModel(SwingUtil.newComboModel(model.getAvailableAttachments().toArray())); + addAttachmentFile.setSelectedItem(null); - List<String> replyToAddresses = Lists.newArrayList(demand.getRecipient()); - if (folderReplyAdresses != null) { - replyToAddresses.addAll(folderReplyAdresses); + // sender combo + MailFolder folder = demand.getMailFolder(); + List<String> folderReplyAdresses = new ArrayList<String>(); + List<String> folderReplyDomains = new ArrayList<String>(); + while (folder != null) { + folderReplyAdresses.addAll(folder.getReplyAddresses()); + folderReplyDomains.addAll(folder.getReplyDomains()); + folder = folder.getParent(); + } + model.setSenderAllowedDomains(folderReplyDomains); + + List<String> replyToAddresses = Lists.newArrayList(demand.getRecipient()); + if (folderReplyAdresses != null) { + replyToAddresses.addAll(folderReplyAdresses); + } + + ui.getFromComboBox().setModel(SwingUtil.newComboModel(replyToAddresses.toArray())); + model.setSenderAllowedAddresses(replyToAddresses); } - - ui.getFromComboBox().setModel(newComboModel(replyToAddresses.toArray())); - model.setSenderAllowedAddresses(replyToAddresses); } }); 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-08-18 08:33:46 UTC (rev 566) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-08-18 10:48:40 UTC (rev 567) @@ -63,6 +63,7 @@ public static final String PROPERTY_SENDER_ALLOWED_DOMAINS = "senderAllowedDomains"; public static final String PROPERTY_SENDER_ALLOWED_ADDRESSES = "senderAllowedAddresses"; public static final String PROPERTY_READONLY = "readonly"; + public static final String PROPERTY_EDITABLE = "editable"; public static final String PROPERTY_READ_SENT_DATE = "readSentDate"; protected String to; @@ -75,9 +76,12 @@ protected long maxAttachmentLength = 0; protected long totalAttachmentLength = 0; protected boolean valid = true; - + /** Flag pour marquer les champs non editables dans le cas d'une lecture d'une réponse déjà envoyée. */ protected boolean readonly = false; + + /** Flag pour activer ou non la possibilité de transferer la demande. */ + protected boolean editable = false; /** Date d'envoi d'une réponse ouverte en lecture seule (peut être {@code null}). */ protected Date readSentDate; @@ -220,6 +224,16 @@ firePropertyChange(PROPERTY_READONLY, oldValue, readonly); } + public boolean isEditable() { + return editable; + } + + public void setEditable(boolean editable) { + Object oldValue = isEditable(); + this.editable = editable; + firePropertyChange(PROPERTY_EDITABLE, oldValue, editable); + } + public void setReadSentDate(Date readSentDate) { Object oldValue = this.readSentDate; this.readSentDate = readSentDate;

1 0

r566 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing
by echatellier＠users.forge.codelutin.com 18 Aug '14

18 Aug '14

Author: echatellier Date: 2014-08-18 10:33:46 +0200 (Mon, 18 Aug 2014) New Revision: 566 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/566 Log: Add log.error to not loose error stacktrace Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-08-18 08:24:08 UTC (rev 565) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-08-18 08:33:46 UTC (rev 566) @@ -252,6 +252,9 @@ @Override public void showErrorDialog(String message, Throwable cause) { + if (log.isErrorEnabled()) { + log.error(message, cause); + } super.showErrorDialog(message, cause); }

1 0

r565 - trunk
by echatellier＠users.forge.codelutin.com 18 Aug '14

18 Aug '14

Author: echatellier Date: 2014-08-18 10:24:08 +0200 (Mon, 18 Aug 2014) New Revision: 565 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/565 Log: Update jaxx & jquey-ui Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-14 15:25:29 UTC (rev 564) +++ trunk/pom.xml 2014-08-18 08:24:08 UTC (rev 565) @@ -110,7 +110,7 @@ <hibernateVersion>4.3.6.Final</hibernateVersion> <h2Version>1.3.176</h2Version> - <jaxxVersion>2.9.1</jaxxVersion> + <jaxxVersion>2.10</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion> @@ -529,7 +529,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery-ui</artifactId> - <version>1.11.0-1</version> + <version>1.11.1-1</version> <scope>runtime</scope> </dependency>

1 0

r564 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor faxtomail-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 14 Aug '14

14 Aug '14

Author: kmorin Date: 2014-08-14 17:25:29 +0200 (Thu, 14 Aug 2014) New Revision: 564 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/564 Log: fixes #5380 La taille de la police est mauvaise quand on g?\195?\169n?\195?\168re apr?\195?\168s un zoom fix lazy Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-14 15:25:29 UTC (rev 564) @@ -367,7 +367,7 @@ String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + query.toString(); String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( Email.PROPERTY_PRIORITY, - Email.PROPERTY_DEMAND_TYPE, + Email.PROPERTY_DEMAND_TYPE + "." + DemandType.PROPERTY_FIELDS, Email.PROPERTY_CLIENT, Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, Email.PROPERTY_ETAT_ATTENTE, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 15:25:29 UTC (rev 564) @@ -125,7 +125,8 @@ cb.saveState(); JTextArea textArea = note.getNoteText(); float fontSize = textArea.getFont().getSize2D() / zoom; - BaseFont font = BaseFont.createFont(BaseFont.HELVETICA_OBLIQUE, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED); + BaseFont titleFont = BaseFont.createFont(BaseFont.HELVETICA_OBLIQUE, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED); + BaseFont font = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED); String text = note.getText(); String[] rows = text.split("\n"); @@ -150,7 +151,7 @@ yyy += height - insets.top / zoom; } - showTextAligned(cb, note.getTitle(), xxx, yyy, rotation, font, fontSize); + showTextAligned(cb, note.getTitle(), xxx, yyy, rotation, titleFont, fontSize); for (String s : rows) { if (s.isEmpty()) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorCrossUI.css 2014-08-14 15:25:29 UTC (rev 564) @@ -30,9 +30,10 @@ } #removeButton { - text: "X"; - //borderPainted: { false }; - //border: { null }; - //opaque : { false }; - //background: { null }; + text: " X "; + border : { BorderFactory.createLineBorder(Color.BLACK, 1, false) }; + opaque: false; + background: { null }; + contentAreaFilled: false; + focusPainted: false; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorHighlighterUI.css 2014-08-14 15:25:29 UTC (rev 564) @@ -29,9 +29,10 @@ } #removeButton { - text: "X"; - //borderPainted: { false }; - //border: { null }; - //opaque : { false }; - //background: { null }; + text: " X "; + border : { BorderFactory.createLineBorder(Color.BLACK, 1, false) }; + opaque: false; + background: { null }; + contentAreaFilled: false; + focusPainted: false; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorLineUI.css 2014-08-14 15:25:29 UTC (rev 564) @@ -29,9 +29,10 @@ } #removeButton { - text: "X"; - //borderPainted: { false }; - //border: { null }; - //opaque : { false }; - //background: { null }; + text: " X "; + border : { BorderFactory.createLineBorder(Color.BLACK, 1, false) }; + opaque: false; + background: { null }; + contentAreaFilled: false; + focusPainted: false; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 15:25:29 UTC (rev 564) @@ -32,16 +32,17 @@ #noteTitle { font: { Font.decode(BaseFont.HELVETICA).deriveFont(Font.ITALIC) }; - font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom()) }; text: { getTitle() }; } #removeButton { - text: "X"; - /*borderPainted: { false }; - border: { null }; - opaque : { false }; - background: { null }; */ + text: " X "; + border : { BorderFactory.createLineBorder(Color.BLACK, 1, false) }; + opaque: false; + background: { null }; + contentAreaFilled: false; + focusPainted: false; } #noteText { @@ -49,7 +50,7 @@ opaque : { false }; background: { null }; font: { Font.decode(BaseFont.HELVETICA) }; - font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom()) }; lineWrap: { false }; wrapStyleWord: { false }; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 15:25:29 UTC (rev 564) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel id='notePanel' layout='{new BorderLayout()}'> +<JPanel id='notePanel' layout='{new BorderLayout()}' onComponentResized="pack()"> <import> java.awt.Color @@ -41,13 +41,18 @@ protected void textTyped() { setText(getNoteText().getText()); + pack(); + } + protected void pack() { JPanel container = getParentContainer(JPanel.class); Point location = getLocation(); - Insets insets = container.getInsets(); + Insets containerInsets = container.getInsets(); Dimension size = getPreferredSize(); - setBounds(location.x + insets.left, location.y + insets.top, - size.width, size.height); + setBounds(location.x + containerInsets.left, + location.y + containerInsets.top, + size.width + 10, // no real logical reason for 10, but otherwise, the text is sometimes cut in the end + size.height); } protected void removeNote() { @@ -60,7 +65,6 @@ <String id="title" javaBean="null"/> <String id="text" javaBean=""/> - <Float id="originalZoom" javaBean="1.0f"/> <Float id="zoom" javaBean="1.0f"/> <JPanel id="noteHeader" @@ -75,6 +79,6 @@ <JTextArea id="noteText" constraints="BorderLayout.CENTER" - onKeyTyped="textTyped()"/> + onKeyReleased="textTyped()"/> </JPanel> \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 15:25:29 UTC (rev 564) @@ -291,7 +291,6 @@ public void addNote(int x, int y) { PDFEditorNoteUI note = new PDFEditorNoteUI(); - note.setOriginalZoom(getModel().getZoom()); note.setZoom(getModel().getZoom()); String title = decorate(new Date()) + " - " + getContext().getCurrentUser().getTrigraph(); note.setTitle(title); @@ -587,13 +586,13 @@ public void zoomOut() { PDFEditorUIModel model = getModel(); float zoom = model.getZoom(); - model.setZoom(zoom - 0.25f); + model.setZoom(zoom - 0.5f); } public void zoomIn() { PDFEditorUIModel model = getModel(); float zoom = model.getZoom(); - model.setZoom(zoom + 0.25f); + model.setZoom(zoom + 0.5f); } public void rotateClockwise() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java 2014-08-14 15:25:29 UTC (rev 564) @@ -236,7 +236,7 @@ } public void setZoom(float zoom) { - if (zoom > 0) { + if (zoom >= 1f && zoom <= 15f) { Object oldValue = getZoom(); this.zoom = zoom; firePropertyChanged(PROPERTY_ZOOM, oldValue, zoom); 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-08-14 13:16:09 UTC (rev 563) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 15:25:29 UTC (rev 564) @@ -1,3 +1,4 @@ +\ X\ = \ |\ = /= \:=

1 0

r563 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 14 Aug '14

14 Aug '14

Author: kmorin Date: 2014-08-14 15:16:09 +0200 (Thu, 14 Aug 2014) New Revision: 563 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/563 Log: correction fermeture onglet appelle closeui Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 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-08-14 13:15:53 UTC (rev 562) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-14 13:16:09 UTC (rev 563) @@ -514,7 +514,6 @@ @Override public boolean onHideTab(int currentIndex, int newIndex) { closeButtonPopups(); - onCloseUI(); return true; } @@ -524,6 +523,10 @@ @Override public boolean onRemoveTab() { - return quitUI(); + boolean result = quitUI(); + if (result) { + onCloseUI(); + } + return result; } }

1 0

r562 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 14 Aug '14

14 Aug '14

Author: echatellier Date: 2014-08-14 15:15:53 +0200 (Thu, 14 Aug 2014) New Revision: 562 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/562 Log: Correction du d?\195?\169verrouillage des demandes non group?\195?\169es Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.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-14 12:28:57 UTC (rev 561) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-14 13:15:53 UTC (rev 562) @@ -722,19 +722,18 @@ // if no lock found, create new one if (mailLock == null) { - mailLock = new MailLockImpl(); - mailLock.setLockBy(currentUser); - mailLock.setLockOn(email); - mailLock = mailLockDao.create(mailLock); - - if (log.isDebugEnabled()) { - log.debug("[LOCK] " + emailId + " locked by " + currentUser.getLogin()); - } - + // dévérouillage automatique des mails qui ne font pas partit du même group que celui du mail // qui vient d'être locké - List<MailLock> mailLocksToRemove = mailLockDao.forLockByEquals(currentUser) - .addNotEquals(MailLock.PROPERTY_LOCK_ON + "." + Email.PROPERTY_EMAIL_GROUP, email.getEmailGroup()).findAll(); + List<MailLock> mailLocksToRemove; + if (email.getEmailGroup() != null) { + // si le mail courant à un group, ont déverrouilles tous les mails + // qui ne porte pas sur le même groupe + mailLocksToRemove = mailLockDao.forLockByEquals(currentUser) + .addNotEquals(MailLock.PROPERTY_LOCK_ON + "." + Email.PROPERTY_EMAIL_GROUP, email.getEmailGroup()).findAll(); + } else { + mailLocksToRemove = mailLockDao.forLockByEquals(currentUser).findAll(); + } if (log.isDebugEnabled()) { for (MailLock mailLockToRemove : mailLocksToRemove) { log.debug("[UNLOCK] " + mailLockToRemove.getLockOn().getTopiaId() + " unlocked (automatic)"); @@ -742,6 +741,16 @@ } mailLockDao.deleteAll(mailLocksToRemove); + // ajout d'un nouveau lock + mailLock = new MailLockImpl(); + mailLock.setLockBy(currentUser); + mailLock.setLockOn(email); + mailLock = mailLockDao.create(mailLock); + + if (log.isDebugEnabled()) { + log.debug("[LOCK] " + emailId + " locked by " + currentUser.getLogin()); + } + getPersistenceContext().commit(); } else if (!mailLock.getLockBy().equals(currentUser)) {

1 0

r561 - in trunk/faxtomail-ui-swing/src/main: java/com/franciaflex/faxtomail/ui/swing/content/attachment java/com/franciaflex/faxtomail/ui/swing/content/demande resources/i18n resources/icons
by echatellier＠users.forge.codelutin.com 14 Aug '14

14 Aug '14

Author: echatellier Date: 2014-08-14 14:28:57 +0200 (Thu, 14 Aug 2014) New Revision: 561 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/561 Log: Ajout d'une icone diff?\195?\169rente pour l'icone d'ouverture de la PJ edit?\195?\169e Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png 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.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.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/attachment/AttachmentItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css 2014-08-14 12:28:57 UTC (rev 561) @@ -43,9 +43,16 @@ actionIcon: "edit"; toolTipText: "faxtomail.attachmentEditor.action.edit.tip"; enabled: { handler != null && handler.isAttachmentEditable(getAttachment()) }; - // visible: { isEditable() }; + visible: { isEditable() }; } +#openEditedAttachmentButton { + actionIcon: "folder_edit"; + toolTipText: "faxtomail.attachmentEditor.action.openedited.tip"; + enabled: { handler != null && handler.isAttachmentEditable(getAttachment()) }; + visible: { !isEditable() }; +} + #removeAttachmentButton { actionIcon: "delete"; toolTipText: "faxtomail.attachmentEditor.action.remove.tip"; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx 2014-08-14 12:28:57 UTC (rev 561) @@ -40,6 +40,8 @@ <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <JButton id='openAttachmentButton' onActionPerformed='handler.openAttachment(attachment)'/> + <JButton id='openEditedAttachmentButton' + onActionPerformed='handler.editAttachment(attachment)'/> <JButton id='editAttachmentButton' onActionPerformed='handler.editAttachment(attachment)'/> <JButton id='removeAttachmentButton' Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentModelAware.java 2014-08-14 12:28:57 UTC (rev 561) @@ -27,7 +27,6 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import java.io.Serializable; -import java.util.Collection; import java.util.List; /** @@ -39,12 +38,6 @@ String PROPERTY_ATTACHMENT = "attachment"; - String PROPERTY_OBJECT_ID = "objectId"; - -// AttachementObjectTypeEnum getObjectType(); - -// Integer getObjectId(); - List<Attachment> getAttachment(); void addAllAttachment(List<Attachment> attachments); 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-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-14 12:28:57 UTC (rev 561) @@ -47,7 +47,6 @@ import com.google.common.base.Strings; import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -72,7 +71,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import java.util.HashSet; import java.util.List; import java.util.Set; 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-08-14 12:11:12 UTC (rev 560) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-14 12:28:57 UTC (rev 561) @@ -42,6 +42,7 @@ faxtomail.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes faxtomail.attachmentEditor.action.edit.tip=Editer la pièce jointe faxtomail.attachmentEditor.action.open.tip=Ouvrir la pièce jointe +faxtomail.attachmentEditor.action.openedited.tip=Ouvrir la pièce jointe éditée faxtomail.attachmentEditor.action.remove.tip=Supprimer la pièce jointe faxtomail.attachmentEditor.action.tip=Pièces jointes faxtomail.attachmentEditor.attachments.empty=Aucune pièce jointe Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-folder_edit.png ___________________________________________________________________ Added: svn:mime-type + image/png

1 0

r560 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 14 Aug '14

14 Aug '14

Author: kmorin Date: 2014-08-14 14:11:12 +0200 (Thu, 14 Aug 2014) New Revision: 560 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/560 Log: correction d?\195?\169tection de modif d'une pj Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 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-08-14 10:49:00 UTC (rev 559) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-08-14 12:11:12 UTC (rev 560) @@ -446,10 +446,9 @@ @Override public boolean quitUI() { - BeanMonitor monitor = getMonitor(); boolean result = quitScreen2( true, - monitor.wasModified(), + getModel().isModify(), t("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave"), t("faxtomail.demande.askSaveBeforeLeaving.save"), getContext().getActionFactory().createLogicAction(this, SaveDemandeAction.class)

1 0

r559 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/attachment content/pdfeditor
by kmorin＠users.forge.codelutin.com 14 Aug '14

14 Aug '14

Author: kmorin Date: 2014-08-14 12:49:00 +0200 (Thu, 14 Aug 2014) New Revision: 559 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/559 Log: refs #5380 La taille de la police est mauvaise quand on g?\195?\169n?\195?\168re apr?\195?\168s un zoom fix lazy Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.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/pdfeditor/PDFEditorNoteUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GenerateAnnotatedAttachmentAction.java 2014-08-14 10:49:00 UTC (rev 559) @@ -129,25 +129,25 @@ String text = note.getText(); String[] rows = text.split("\n"); - int rowHeight = textArea.getHeight() / rows.length; + int rowHeight = (int) ((textArea.getHeight() / rows.length) / zoom); int xxx = x; int yyy = y; if (rotation == 0) { xxx += insets.left; - yyy += height - rowHeight - insets.top; + yyy += height - rowHeight - insets.top / zoom; } else if (rotation == 90) { - xxx += rowHeight + insets.top; + xxx += rowHeight + insets.top / zoom; yyy += insets.left; } else if (rotation == 180) { - xxx += width - insets.right; - yyy += rowHeight - insets.top; + xxx += width - insets.right / zoom; + yyy += rowHeight - insets.top / zoom; } else if (rotation == 270) { - xxx += width - rowHeight - insets.left; - yyy += height - insets.top; + xxx += width - rowHeight - insets.left / zoom; + yyy += height - insets.top / zoom; } showTextAligned(cb, note.getTitle(), xxx, yyy, rotation, font, fontSize); 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-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-14 10:49:00 UTC (rev 559) @@ -30,13 +30,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Set; import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; import com.franciaflex.faxtomail.persistence.entities.MailField; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; 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-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-08-14 10:49:00 UTC (rev 559) @@ -34,6 +34,7 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; @@ -121,7 +122,7 @@ context.getCurrentUser(), new Date(), filename); - model.fromEntity(email); + model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); } } @@ -134,7 +135,7 @@ context.getCurrentUser(), new Date(), FaxToMailUIUtil.getEditedFileName(attachment.getOriginalFileName())); - model.fromEntity(email); + model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); } }; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.css 2014-08-14 10:49:00 UTC (rev 559) @@ -32,7 +32,7 @@ #noteTitle { font: { Font.decode(BaseFont.HELVETICA).deriveFont(Font.ITALIC) }; - font-size: { (int)(DEFAULT_FONT_SIZE * getZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; text: { getTitle() }; } @@ -49,7 +49,7 @@ opaque : { false }; background: { null }; font: { Font.decode(BaseFont.HELVETICA) }; - font-size: { (int)(DEFAULT_FONT_SIZE * getZoom()) }; + font-size: { (float)(DEFAULT_FONT_SIZE * getZoom() / getOriginalZoom()) }; lineWrap: { false }; wrapStyleWord: { false }; } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorNoteUI.jaxx 2014-08-14 10:49:00 UTC (rev 559) @@ -60,6 +60,7 @@ <String id="title" javaBean="null"/> <String id="text" javaBean=""/> + <Float id="originalZoom" javaBean="1.0f"/> <Float id="zoom" javaBean="1.0f"/> <JPanel id="noteHeader" Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 08:51:29 UTC (rev 558) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-08-14 10:49:00 UTC (rev 559) @@ -30,6 +30,8 @@ import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; import java.awt.geom.Rectangle2D; import java.awt.image.RenderedImage; import java.beans.PropertyChangeEvent; @@ -289,6 +291,8 @@ public void addNote(int x, int y) { PDFEditorNoteUI note = new PDFEditorNoteUI(); + note.setOriginalZoom(getModel().getZoom()); + note.setZoom(getModel().getZoom()); String title = decorate(new Date()) + " - " + getContext().getCurrentUser().getTrigraph(); note.setTitle(title); addPanel(note, x, y);

1 0

r558 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 14 Aug '14

14 Aug '14

Author: kmorin Date: 2014-08-14 10:51:29 +0200 (Thu, 14 Aug 2014) New Revision: 558 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/558 Log: correction validation 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/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.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-14 08:27:36 UTC (rev 557) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-14 08:51:29 UTC (rev 558) @@ -574,7 +574,7 @@ .addNull(Email.PROPERTY_ARCHIVE_DATE) .addNotEquals(Email.PROPERTY_DEMAND_STATUS, DemandStatus.ARCHIVED) .addAllFetches(Email.PROPERTY_PRIORITY, - Email.PROPERTY_DEMAND_TYPE, + Email.PROPERTY_DEMAND_TYPE + "." + DemandType.PROPERTY_FIELDS, Email.PROPERTY_CLIENT, Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, Email.PROPERTY_ETAT_ATTENTE, 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-08-14 08:27:36 UTC (rev 557) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-14 08:51:29 UTC (rev 558) @@ -880,38 +880,39 @@ * @return validity */ public boolean isValid(String field) { - boolean result = getDemandType() == null; + DemandType demandType = getDemandType(); + boolean result = demandType == null; if (!result) { if (PROPERTY_CLIENT_CODE.equals(field)) { - result = !getDemandType().containsFields(MailField.CLIENT) + result = !demandType.containsFields(MailField.CLIENT) || StringUtils.isNotBlank(getClientCode()); } else if (PROPERTY_VALID_RANGE_ROW_MODELS.equals(field)) { - result = !getDemandType().containsFields(MailField.RANGE_ROW) + result = !demandType.containsFields(MailField.RANGE_ROW) || CollectionUtils.isNotEmpty(getValidRangeRowModels()); } else if (Email.PROPERTY_PROJECT_REFERENCE.equals(field)) { - result = !getDemandType().containsFields(MailField.PROJECT_REFERENCE) + result = !demandType.containsFields(MailField.PROJECT_REFERENCE) || StringUtils.isNotBlank(getProjectReference()); } else if (Email.PROPERTY_OBJECT.equals(field)) { - result = !getDemandType().containsFields(MailField.OBJECT) + result = !demandType.containsFields(MailField.OBJECT) || StringUtils.isNotBlank(getObject()); } else if (Email.PROPERTY_COMMENT.equals(field)) { - result = !getDemandType().containsFields(MailField.COMMENT) + result = !demandType.containsFields(MailField.COMMENT) || StringUtils.isNotBlank(getComment()); } else if (Email.PROPERTY_COMPANY_REFERENCE.equals(field)) { - result = !getDemandType().containsFields(MailField.COMPANY_REFERENCE) + result = !demandType.containsFields(MailField.COMPANY_REFERENCE) || StringUtils.isNotBlank(getCompanyReference()); } else if (Email.PROPERTY_PRIORITY.equals(field)) { - result = !getDemandType().containsFields(MailField.PRIORITY) + result = !demandType.containsFields(MailField.PRIORITY) || getPriority() != null; } else if (Email.PROPERTY_ETAT_ATTENTE.equals(field)) { - result = !getDemandType().containsFields(MailField.ETAT_ATTENTE) + result = !demandType.containsFields(MailField.ETAT_ATTENTE) || getEtatAttente() != null; } } 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-14 08:27:36 UTC (rev 557) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-14 08:51:29 UTC (rev 558) @@ -59,6 +59,7 @@ import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorFactory; import org.nuiton.validator.NuitonValidatorResult; @@ -83,6 +84,8 @@ private static final Log log = LogFactory.getLog(AbstractFaxToMailDemandListHandler.class); + protected NuitonValidator<DemandeUIModel> demandeUIModelNuitonValidator = NuitonValidatorFactory.newValidator(DemandeUIModel.class);; + public void initDemandeTable(final JXTable table, boolean sortable) { // table.setAutoResizeMode(JTable.AUTO_RESIZE_NEXT_COLUMN); @@ -131,7 +134,7 @@ int viewRow = adapter.row; int modelRow = adapter.convertRowIndexToModel(viewRow); DemandeUIModel row = ((AbstractApplicationTableModel<DemandeUIModel>) table.getModel()).getEntry(modelRow); - return !row.isValid() && row.getTakenBy()!= null; + return !row.isValid() && row.getTakenBy() != null; } }; Color color = new Color(255, 51, 51); @@ -293,7 +296,7 @@ } public boolean isDemandeValid(DemandeUIModel d) { - NuitonValidatorResult result = NuitonValidatorFactory.newValidator(DemandeUIModel.class).validate(d); + NuitonValidatorResult result = demandeUIModelNuitonValidator.validate(d); return result.isValid(); }

1 0