This is an automated email from the git hooks/post-receive script. New commit to branch feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit f15159062dab15dcd07f09af80c7634d38ec4740 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:11:47 2017 +0100 refs #9098 prise en compte de la conf displayOnlyUserTrigraphInTables dans la partie cliente --- .../franciaflex/faxtomail/services/DecoratorService.java | 1 + .../faxtomail/services/DecoratorServiceImpl.java | 1 + .../ui/swing/content/demande/DemandeListUIHandler.java | 5 +++++ .../ui/swing/content/demande/DemandeListUIModel.java | 16 ++++++++++++++++ .../ui/swing/content/search/SearchToGroupUIHandler.java | 5 +++++ .../ui/swing/content/search/SearchUIHandler.java | 5 +++++ .../swing/util/AbstractFaxToMailDemandListHandler.java | 9 ++++++++- 7 files changed, 41 insertions(+), 1 deletion(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java index 64b63c3..337bc50 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorService.java @@ -32,6 +32,7 @@ import org.nuiton.decorator.Decorator; public interface DecoratorService extends FaxToMailService { String SEPARATOR = "#"; String DATE = "date"; + String SHORT = "short"; <O> Decorator<O> getDecorator(O object); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java index a29f8a0..b7cc8aa 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java @@ -141,6 +141,7 @@ public class DecoratorServiceImpl extends FaxToMailServiceSupport implements Dec }); registerMultiJXPathDecorator(Reply.class, "${sentDate}$s#${subject}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(FaxToMailUser.class, "${lastName}$s#${firstName}$s#${trigraph}$s", SEPARATOR, " "); + registerMultiJXPathDecorator(FaxToMailUser.class, SHORT, "${trigraph}$s", SEPARATOR, " "); registerMultiJXPathDecorator(Client.class, "${code}$s#${name}$s#${brand}$s", SEPARATOR, " - "); } }; 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 6804697..25e0e72 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 @@ -522,6 +522,11 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem return super.populateColumnModel(table, sortable); } + @Override + protected boolean isDisplayOnlyUserTrigraphInTables() { + return getModel().isDisplayOnlyUserTrigraphInTables(); + } + protected void loadFolderDemands(Map<MailFolder, FolderTreeNode> nodesByFolder) { DemandeListUIModel model = getModel(); MailFolder folder = model.getSelectedFolder(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java index 3a58f60..2fdac33 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java @@ -94,6 +94,8 @@ public class DemandeListUIModel extends AbstractSerializableBean { protected int savNb; + protected Boolean displayOnlyUserTrigraphInTables; + public List<MailFolder> getFolders() { return folders; } @@ -187,6 +189,16 @@ public class DemandeListUIModel extends AbstractSerializableBean { public void setSelectedFolder(MailFolder selectedFolder) { Object oldValue = getSelectedFolder(); this.selectedFolder = selectedFolder; + + if (selectedFolder != null) { + MailFolder folderWithDisplayOnlyUserTrigraphInTables = selectedFolder; + while (folderWithDisplayOnlyUserTrigraphInTables.getParent() != null + && folderWithDisplayOnlyUserTrigraphInTables.getDisplayOnlyUserTrigraphInTables() == null) { + folderWithDisplayOnlyUserTrigraphInTables = folderWithDisplayOnlyUserTrigraphInTables.getParent(); + } + displayOnlyUserTrigraphInTables = folderWithDisplayOnlyUserTrigraphInTables.getDisplayOnlyUserTrigraphInTables(); + } + firePropertyChange(PROPERTY_SELECTED_FOLDER, oldValue, selectedFolder); } @@ -299,4 +311,8 @@ public class DemandeListUIModel extends AbstractSerializableBean { this.enableChangeResultPerPage = enableChangeResultPerPage; firePropertyChange(PROPERTY_ENABLE_CHANGE_RESULT_PER_PAGE, oldValue, enableChangeResultPerPage); } + + public boolean isDisplayOnlyUserTrigraphInTables() { + return Boolean.TRUE.equals(displayOnlyUserTrigraphInTables); + } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java index 19edf99..cc3a56d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java @@ -332,6 +332,11 @@ public class SearchToGroupUIHandler extends AbstractFaxToMailDemandListHandler<S return tableColumns; } + @Override + protected boolean isDisplayOnlyUserTrigraphInTables() { + return false; + } + protected boolean isDemandSelectable(DemandeUIModel demand) { DemandeUIModel currentDemand = getContext().getCurrentEmail(); return !currentDemand.equals(demand) && !currentDemand.getGroupedDemandes().contains(demand); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java index cd72c65..9ecbaf3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java @@ -303,6 +303,11 @@ public class SearchUIHandler extends AbstractFaxToMailDemandListHandler<SearchUI } @Override + protected boolean isDisplayOnlyUserTrigraphInTables() { + return false; + } + + @Override protected JComponent getComponentToFocus() { return getUI().getModifiedByComboBox(); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java index 982b57d..6c54e6d 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java @@ -33,6 +33,7 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.Priority; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.Reply; +import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.ShowDemandeAction; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentCellEditor; @@ -232,7 +233,11 @@ public abstract class AbstractFaxToMailDemandListHandler<M, UI extends FaxToMail case TAKEN_BY: case LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER: case LAST_PRINTING_USER: - tableCellRenderer = newTableCellRender(FaxToMailUser.class); + String name = null; + if (isDisplayOnlyUserTrigraphInTables()) { + name = DecoratorService.SHORT; + } + tableCellRenderer = newTableCellRender(FaxToMailUser.class, name); break; default: @@ -257,6 +262,8 @@ public abstract class AbstractFaxToMailDemandListHandler<M, UI extends FaxToMail return StringUtils.join(columns, "-"); } + protected abstract boolean isDisplayOnlyUserTrigraphInTables(); + protected MouseListener getDataTableMouseListener() { return new MouseAdapter() { public void mouseClicked(MouseEvent evt) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.