Author: kmorin Date: 2014-05-30 12:02:38 +0200 (Fri, 30 May 2014) New Revision: 111 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/111 Log: use configuration for the email max size and search columns 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/content/demande/DemandeListUIHandler.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/search/SearchToGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.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-05-30 09:39:12 UTC (rev 110) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-05-30 10:02:38 UTC (rev 111) @@ -31,6 +31,7 @@ import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.persistence.RessourceClassLoader; +import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.InitFaxToMailService; import com.franciaflex.faxtomail.services.service.MailFolderService; @@ -456,6 +457,9 @@ FaxToMailUser currentUser = getUserService().getUserByLogin("cbaillet"); setCurrentUser(currentUser); + Configuration config = getConfigurationService().getConfiguration(); + setFaxToMailConfiguration(config); + // //--------------------------------------------------------------------// // // init action UI // //--------------------------------------------------------------------// @@ -543,6 +547,10 @@ return serviceContext.newService(ReferentielService.class); } + public ConfigurationService getConfigurationService() { + return serviceContext.newService(ConfigurationService.class); + } + //------------------------------------------------------------------------// //-- DataContext methods --// //------------------------------------------------------------------------// Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-30 09:39:12 UTC (rev 110) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-30 10:02:38 UTC (rev 111) @@ -285,9 +285,9 @@ Collection<String> columns = null; MailFolder selectedFolder = getModel().getSelectedFolder(); if (selectedFolder != null) { - List<Field> folderTableColumns = selectedFolder.getFolderTableColumns(); - if (folderTableColumns != null) { - Collections2.transform(selectedFolder.getFolderTableColumns(), new Function<Field, String>() { + List<Field> tableColumns = selectedFolder.getFolderTableColumns(); + if (tableColumns != null) { + Collections2.transform(tableColumns, new Function<Field, String>() { @Override public String apply(Field field) { return field.toString(); 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-30 09:39:12 UTC (rev 110) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-05-30 10:02:38 UTC (rev 111) @@ -82,8 +82,8 @@ super.beforeInit(ui); ReplyFormUIModel model = new ReplyFormUIModel(); - // TODO kmorin 20140512 make it configurable - model.setMaxAttachmentLength(10485760); + long maxSize = getContext().getFaxToMailConfiguration().getEmailMaxSize(); + model.setMaxAttachmentLength(maxSize); this.ui.setContextValue(model); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-05-30 09:39:12 UTC (rev 110) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-05-30 10:02:38 UTC (rev 111) @@ -28,6 +28,8 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.Field; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.ReferentielService; import com.franciaflex.faxtomail.ui.swing.actions.GroupAction; @@ -38,6 +40,8 @@ import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailDemandListHandler; import com.franciaflex.faxtomail.ui.swing.util.Cancelable; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; +import com.google.common.base.Function; +import com.google.common.collect.Collections2; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; @@ -225,8 +229,17 @@ @Override protected Collection<String> getColumns() { - //TODO kmorin 20140521 get the real search columns - return null; + Collection<String> columns = null; + List<Field> tableColumns = getContext().getFaxToMailConfiguration().getSearchDisplayColumns(); + if (tableColumns != null) { + Collections2.transform(tableColumns, new Function<Field, String>() { + @Override + public String apply(Field field) { + return field.toString(); + } + }); + } + return columns; } protected boolean isDemandSelectable(DemandeUIModel demand) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-05-30 09:39:12 UTC (rev 110) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-05-30 10:02:38 UTC (rev 111) @@ -26,6 +26,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; +import com.franciaflex.faxtomail.persistence.entities.Field; import com.franciaflex.faxtomail.persistence.entities.HasLabel; import com.franciaflex.faxtomail.services.service.ReferentielService; import com.franciaflex.faxtomail.ui.swing.actions.SearchAction; @@ -36,6 +37,7 @@ import com.franciaflex.faxtomail.ui.swing.util.CloseableUI; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; import com.google.common.base.Function; +import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import jaxx.runtime.swing.editor.bean.BeanUIUtil; @@ -198,8 +200,17 @@ @Override protected Collection<String> getColumns() { - //TODO kmorin 20140521 get the real search columns - return null; + Collection<String> columns = null; + List<Field> tableColumns = getContext().getFaxToMailConfiguration().getSearchDisplayColumns(); + if (tableColumns != null) { + Collections2.transform(tableColumns, new Function<Field, String>() { + @Override + public String apply(Field field) { + return field.toString(); + } + }); + } + return columns; } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-05-30 09:39:12 UTC (rev 110) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-05-30 10:02:38 UTC (rev 111) @@ -32,6 +32,7 @@ import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -81,9 +82,7 @@ if (node.getClass().isAssignableFrom(FolderTreeNode.class)) { FolderTreeNode folderTreeNode = (FolderTreeNode) node; folderTreeNode.setCanSelect(!currentFolder.equals(folder) && - //TODO condition moche - (foldersWithEtatAttente == null || - foldersWithEtatAttente.isEmpty() + (CollectionUtils.isNotEmpty(foldersWithEtatAttente) || foldersWithEtatAttente.contains(folder))); } }