Author: kmorin Date: 2014-05-30 10:31:12 +0200 (Fri, 30 May 2014) New Revision: 106 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/106 Log: fixes #5150 NPE au clic sur un noeud de l'arborescence Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 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-28 09:37:42 UTC (rev 105) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-30 08:31:12 UTC (rev 106) @@ -45,15 +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; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import javax.swing.*; @@ -65,7 +60,6 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; - import java.awt.*; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; @@ -288,14 +282,20 @@ @Override protected Collection<String> getColumns() { + Collection<String> columns = null; MailFolder selectedFolder = getModel().getSelectedFolder(); - return selectedFolder == null || selectedFolder.getFolderTableColumns() == null ? null : + if (selectedFolder != null) { + List<Field> folderTableColumns = selectedFolder.getFolderTableColumns(); + if (folderTableColumns != null) { Collections2.transform(selectedFolder.getFolderTableColumns(), new Function<Field, String>() { @Override public String apply(Field field) { return field.toString(); } }); + } + } + return columns; } @Override