This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 2bc31a1f07479e7a44985aa5b01bf9883f7fd32f Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:22:05 2017 +0100 refs #9106 modif partie cliente des actions inactives de la conf générale à l'arborescence --- .../swing/actions/PrintOnDefaultPrinterAction.java | 2 +- .../content/demande/DemandeListUIHandler.java | 2 +- .../swing/content/demande/DemandesUIHandler.java | 10 ++++---- .../demande/actions/ArchiveFromListAction.java | 2 +- .../OpenMailFolderChooserFromListAction.java | 2 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 27 ++++++++++++++++++---- 6 files changed, 31 insertions(+), 14 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java index 14c7c48..02e83ab 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java @@ -96,7 +96,7 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { }); for (DemandeUIModel demandeUIModel : orderedDemands) { - if(!handler.isActionEnabled(demandeUIModel, MailAction.PRINT, config)) { + if(!handler.isActionEnabled(demandeUIModel, MailAction.PRINT)) { notPrintableDemands.add(demandeUIModel); } else { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 85be89e..6804697 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -701,7 +701,7 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem model.setReplyEnabled(selectedRowCount == 1 && model.getSelectedEmails().get(0).isEditable() - && isActionEnabled(model.getSelectedEmails().get(0), MailAction.REPLY, config)); + && isActionEnabled(model.getSelectedEmails().get(0), MailAction.REPLY)); model.setArchiveEnabled(selectedRowCount > 0); model.setTransmitEnabled(selectedRowCount > 0); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java index fdebab4..e987300 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java @@ -167,19 +167,19 @@ public class DemandesUIHandler extends AbstractFaxToMailUIHandler<DemandesUIMode boolean editable = model.isEditable(); boolean archived = model.getArchiveDate() != null; - boolean transmitEnabled = editable && isActionEnabled(model, MailAction.TRANSMIT, config); + boolean transmitEnabled = editable && isActionEnabled(model, MailAction.TRANSMIT); getModel().setTransmitEnabled(transmitEnabled); - boolean archiveEnabled = editable && isActionEnabled(model, MailAction.ARCHIVE, config); + boolean archiveEnabled = editable && isActionEnabled(model, MailAction.ARCHIVE); getModel().setArchiveEnabled(archiveEnabled); - boolean groupEnabled = isActionEnabled(model, MailAction.GROUP, config); + boolean groupEnabled = isActionEnabled(model, MailAction.GROUP); getModel().setGroupEnabled(groupEnabled); - boolean printEnabled = isActionEnabled(model, MailAction.PRINT, config); + boolean printEnabled = isActionEnabled(model, MailAction.PRINT); getModel().setPrintEnabled(printEnabled); - boolean replyEnabled = (editable || archived) && isActionEnabled(model, MailAction.REPLY, config); + boolean replyEnabled = (editable || archived) && isActionEnabled(model, MailAction.REPLY); getModel().setReplyEnabled(replyEnabled); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java index 0bc0695..f52f524 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java @@ -65,7 +65,7 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { for (DemandeUIModel demandeUIModel : currentEmails) { // is the demand archivable? if (!demandeUIModel.isEditable() || - !handler.isActionEnabled(demandeUIModel, MailAction.ARCHIVE, handler.getConfiguration())) { + !handler.isActionEnabled(demandeUIModel, MailAction.ARCHIVE)) { notArchivableDemandTitles += "- " + demandeUIModel.getTitle() + "<br/>"; } else { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java index 953735f..14a88cd 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenMailFolderChooserFromListAction.java @@ -67,7 +67,7 @@ public class OpenMailFolderChooserFromListAction extends AbstractFaxToMailAction String notTransmitableDemandsTitle = ""; for (DemandeUIModel demandeUIModel : selectedEmails) { if (!demandeUIModel.isEditable() || - !handler.isActionEnabled(demandeUIModel, MailAction.TRANSMIT, handler.getConfiguration())) { + !handler.isActionEnabled(demandeUIModel, MailAction.TRANSMIT)) { notTransmitableDemandsTitle += "- " + demandeUIModel.getTitle() + "<br/>"; } else { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index 8898d99..b69fe3a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -23,10 +23,10 @@ package com.franciaflex.faxtomail.ui.swing.util; */ import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.franciaflex.faxtomail.persistence.entities.MailAction; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; @@ -56,10 +56,22 @@ import org.nuiton.jaxx.application.swing.util.CloseableUI; import org.nuiton.util.beans.BeanUtil; import org.nuiton.validator.bean.simple.SimpleBeanValidator; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ComboBoxModel; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.JRootPane; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import javax.swing.table.TableColumnModel; import javax.swing.text.JTextComponent; -import java.awt.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Frame; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -455,13 +467,18 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> }); } - public boolean isActionEnabled(DemandeUIModel model, MailAction action, Configuration config) { + public boolean isActionEnabled(DemandeUIModel model, MailAction action) { WaitingState waitingState = model.getWaitingState(); boolean valid = model.isValid(); + MailFolder folderWithInvalidFormDisabledActions = model.getMailFolder(); + while (folderWithInvalidFormDisabledActions.getParent() != null + && !folderWithInvalidFormDisabledActions.isUseCurrentLevelInvalidFormDisabledActions()) { + folderWithInvalidFormDisabledActions = folderWithInvalidFormDisabledActions.getParent(); + } boolean enabled = - waitingState == null && (valid || !FaxToMailServiceUtils.contains(config.getInvalidFormDisabledActions(), action)) + waitingState == null && (valid || !FaxToMailServiceUtils.contains(folderWithInvalidFormDisabledActions.getInvalidFormDisabledActions(), action)) || waitingState != null && (valid && !FaxToMailServiceUtils.contains(waitingState.getValidFormDisabledActions(), action) || !valid && !FaxToMailServiceUtils.contains(waitingState.getInvalidFormDisabledActions(), action)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.