Author: kmorin Date: 2014-05-14 15:43:25 +0200 (Wed, 14 May 2014) New Revision: 72 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/72 Log: - fix row color not updated when the user opens an attachment from the demand list - fix range panel shown if no type defined - fix transmission Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java 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/DemandeUIModel.java 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/reply/ReplyFormUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/TransmitAction.java 2014-05-14 13:43:25 UTC (rev 72) @@ -27,6 +27,7 @@ import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUI; import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIHandler; import jaxx.runtime.JAXXContext; @@ -49,8 +50,9 @@ model.setTakenBy(null); //TODO kmorin 20140306 - DemandeUI parentUI = (DemandeUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT); - SaveDemandeAction action = getContext().getActionFactory().createLogicAction(parentUI.getHandler(), + DemandesUI parentUI = (DemandesUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT); + DemandeUI demandeUI = (DemandeUI) parentUI.getDemandsTabPane().getSelectedComponent(); + SaveDemandeAction action = getContext().getActionFactory().createLogicAction(demandeUI.getHandler(), SaveDemandeAndExitAction.class); getContext().getActionEngine().runAction(action); 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-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-05-14 13:43:25 UTC (rev 72) @@ -25,6 +25,7 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; @@ -107,22 +108,24 @@ public void onAttachmentOpened(Attachment attachment) { String topiaId = model.getTopiaId(); if (topiaId != null) { - context.getEmailService().addToHistory(topiaId, - HistoryType.ATTACHMENT_OPENING, - context.getCurrentUser(), - new Date(), - attachment.getOriginalFile().getName()); + Email email = context.getEmailService().addToHistory(topiaId, + HistoryType.ATTACHMENT_OPENING, + context.getCurrentUser(), + new Date(), + attachment.getOriginalFile().getName()); + model.fromEntity(email); } } @Override public void onAttachmentEdited(Attachment attachment) { String topiaId = model.getTopiaId(); - context.getEmailService().addToHistory(topiaId, - HistoryType.ATTACHMENT_MODIFICATION, - context.getCurrentUser(), - new Date(), - attachment.getOriginalFile().getName()); + Email email = context.getEmailService().addToHistory(topiaId, + HistoryType.ATTACHMENT_MODIFICATION, + context.getCurrentUser(), + new Date(), + attachment.getOriginalFile().getName()); + model.fromEntity(email); } }; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-05-14 13:43:25 UTC (rev 72) @@ -26,6 +26,7 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; +import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.ui.swing.content.MainUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java 2014-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java 2014-05-14 13:43:25 UTC (rev 72) @@ -25,7 +25,9 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupButton; import org.apache.commons.collections4.CollectionUtils; 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-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-05-14 13:43:25 UTC (rev 72) @@ -268,11 +268,11 @@ } #leftVerticalSplitPanel { - dividerSize : { Boolean.TRUE.equals(model.getDemandType().getRangeNeeded()) ? 10 : 0 }; + dividerSize : { model.isRangePanelVisible() ? 10 : 0 }; } #rangePanel { - visible: { Boolean.TRUE.equals(model.getDemandType().getRangeNeeded()) }; + visible: { model.isRangePanelVisible() }; } #ediCodeNumberLabel { 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-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-05-14 13:43:25 UTC (rev 72) @@ -42,9 +42,7 @@ import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; -import jaxx.runtime.swing.JAXXWidgetUtil; import org.apache.commons.io.Charsets; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -53,7 +51,6 @@ import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; -import javax.activation.DataHandler; import javax.activation.DataSource; import javax.mail.Address; import javax.mail.BodyPart; @@ -66,8 +63,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileOutputStream; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; @@ -87,6 +82,7 @@ public static final String PROPERTY_QUOTATION_NB = "quotationNb"; public static final String PROPERTY_PF_NB = "pfNb"; public static final String PROPERTY_SAV_NB = "savNb"; + public static final String PROPERTY_RANGE_PANEL_VISIBLE = "rangePanelVisible"; public static final String PROPERTY_CLIENT_CODE = "clientCode"; public static final String PROPERTY_CLIENT_BRAND = "clientBrand"; public static final String PROPERTY_REFERENCE = "reference"; @@ -344,10 +340,17 @@ public void setDemandType(DemandType demandType) { Object oldValue = getDemandType(); + Object rangePanelVisibleOldValue = isRangePanelVisible(); editObject.setDemandType(demandType); firePropertyChanged(Email.PROPERTY_DEMAND_TYPE, oldValue, demandType); + firePropertyChanged(DemandeUIModel.PROPERTY_RANGE_PANEL_VISIBLE, rangePanelVisibleOldValue, isRangePanelVisible()); } + public boolean isRangePanelVisible() { + DemandType demandType = getDemandType(); + return demandType != null && Boolean.TRUE.equals(demandType.getRangeNeeded()); + } + public DemandStatus getDemandStatus() { return editObject.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-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/ButtonDemandReplies.java 2014-05-14 13:43:25 UTC (rev 72) @@ -28,7 +28,6 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; -import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentModelAware; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUI; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupButton; @@ -49,8 +48,6 @@ */ public class ButtonDemandReplies extends AbstractToolbarPopupButton<DemandRepliesUI> { -// protected DemandeUIModel currentDemand; - protected String textKey; private PropertyChangeListener listener = new PropertyChangeListener() { @@ -58,17 +55,6 @@ public void propertyChange(PropertyChangeEvent evt) { Collection<Reply> replies = (Collection<Reply>) evt.getNewValue(); setText(getButtonText(replies)); -// -// if (currentDemand != null) { -// List<Reply> oldValue = (List<Reply>) evt.getOldValue(); -// Collection<Reply> toAdd = CollectionUtils.subtract(replies, oldValue); -// currentDemand.addAllReplies(toAdd); -// -// Collection<Reply> toRemove = CollectionUtils.subtract(oldValue, replies); -// for (Reply reply : toRemove) { -// currentDemand.removeReply(reply); -// } -// } } }; @@ -83,8 +69,8 @@ } public String getButtonText(Collection<Reply> replies) { - int attachmentNb = CollectionUtils.size(replies); - return t(textKey, attachmentNb); + int replyNb = CollectionUtils.size(replies); + return t(textKey, replyNb); } public void init(DemandeUIModel model) { 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-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-05-14 13:43:25 UTC (rev 72) @@ -99,7 +99,8 @@ for (DemandeUIModel demandeUIModel : models) { for (Attachment attachment : demandeUIModel.getAttachment()) { - model.addAvailableAttachment(attachment.getOriginalFile()); + final File originalFile = attachment.getOriginalFile(); + model.addAvailableAttachment(originalFile); File file = attachment.getEditedFile(); if (file != null) { model.addAvailableAttachment(file); @@ -107,6 +108,10 @@ } } + JComboBox addAttachmentFile = ui.getAddAttachmentFile(); + addAttachmentFile.setModel(newComboModel(model.getAvailableAttachments().toArray())); + addAttachmentFile.setSelectedItem(null); + model.setFrom(demand.getRecipient()); model.setSubject(t("faxtomail.reply.subject", demand.getSubject())); @@ -151,8 +156,6 @@ JComboBox addAttachmentFile = ui.getAddAttachmentFile(); addAttachmentFile.setRenderer(new DecoratorListCellRenderer(getDecorator(File.class, null))); addAttachmentFile.setEditor(new FileComboBoxEditor()); - addAttachmentFile.setModel(newComboModel(model.getAvailableAttachments().toArray())); - addAttachmentFile.setSelectedItem(null); } @Override 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-05-13 17:18:45 UTC (rev 71) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIModel.java 2014-05-14 13:43:25 UTC (rev 72) @@ -24,17 +24,12 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentModelAware; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import org.apache.commons.io.FileUtils; import org.jdesktop.beans.AbstractSerializableBean; import java.io.File; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashSet; -import java.util.List; import java.util.Set; /**