r102 - 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-commits

27 May 2014

Author: echatellier
Date: 2014-05-27 11:00:44 +0200 (Tue, 27 May 2014)
New Revision: 102

Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/102

Log:
Fix ui and test data

Modified:
   trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java
   trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java

Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java
===================================================================

--- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java	2014-05-26 21:04:50 UTC (rev 101)
+++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java	2014-05-27 09:00:44 UTC (rev 102)
@@ -26,13 +26,10 @@
 
 import com.franciaflex.faxtomail.FaxToMailConfiguration;
 import com.franciaflex.faxtomail.persistence.entities.Client;
-import com.franciaflex.faxtomail.persistence.entities.Configuration;
-import com.franciaflex.faxtomail.persistence.entities.ConfigurationTopiaDao;
 import com.franciaflex.faxtomail.persistence.entities.DemandStatus;
 import com.franciaflex.faxtomail.persistence.entities.DemandType;
 import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao;
 import com.franciaflex.faxtomail.persistence.entities.Email;
-import com.franciaflex.faxtomail.persistence.entities.EmailAccount;
 import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao;
 import com.franciaflex.faxtomail.persistence.entities.EtatAttente;
 import com.franciaflex.faxtomail.persistence.entities.EtatAttenteTopiaDao;
@@ -43,7 +40,6 @@
 import com.franciaflex.faxtomail.persistence.entities.History;
 import com.franciaflex.faxtomail.persistence.entities.HistoryTopiaDao;
 import com.franciaflex.faxtomail.persistence.entities.HistoryType;
-import com.franciaflex.faxtomail.persistence.entities.MailFilter;
 import com.franciaflex.faxtomail.persistence.entities.MailFolder;
 import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao;
 import com.franciaflex.faxtomail.persistence.entities.Priority;
@@ -64,7 +60,6 @@
 
 import java.io.File;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -241,12 +236,14 @@
             MailFolder chargesClientelle = folderDao.create(MailFolder.PROPERTY_NAME, "Chargés de clientèle",
                                                             MailFolder.PROPERTY_PARENT, franciaflex,
                                                             MailFolder.PROPERTY_REPLY_ADDRESSES, Lists.newArrayList("no-reply@franciaflex.com"));
+            franciaflex.addChildren(chargesClientelle);
             folders.put("Chargés de clientèle", chargesClientelle);
 
             Collections.shuffle(etatAttentes);
             MailFolder sav = folderDao.create(MailFolder.PROPERTY_NAME, "SAV",
                                               MailFolder.PROPERTY_PARENT, franciaflex,
                                               MailFolder.PROPERTY_ETAT_ATTENTE, etatAttentes.subList(0, random.nextInt(etatAttenteSize - 8) + 2));
+            franciaflex.addChildren(sav);
             folders.put("SAV", sav);
 
             // user folders

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-26 21:04:50 UTC (rev 101)
+++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java	2014-05-27 09:00:44 UTC (rev 102)
@@ -45,7 +45,10 @@
 import com.franciaflex.faxtomail.ui.swing.util.FolderTreeNode;
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
+
 import jaxx.runtime.validator.swing.SwingValidator;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -286,7 +289,7 @@
     @Override
     protected Collection<String> getColumns() {
         MailFolder selectedFolder = getModel().getSelectedFolder();
-        return selectedFolder == null ? null :
+        return selectedFolder == null || selectedFolder.getFolderTableColumns() == null ? null :
                 Collections2.transform(selectedFolder.getFolderTableColumns(), new Function<Field, String>() {
                     @Override
                     public String apply(Field field) {

    

r102 - 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

echatellier＠users.forge.codelutin.com

tags

participants (1)