Author: kmorin Date: 2014-11-26 21:07:33 +0000 (Wed, 26 Nov 2014) New Revision: 702 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/702 Log: adresses par ordre alphab?\195?\169tique Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 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-11-26 19:03:23 UTC (rev 701) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-11-26 21:07:33 UTC (rev 702) @@ -36,6 +36,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import javax.swing.ComboBoxEditor; @@ -156,11 +157,15 @@ } model.setSenderAllowedDomains(folderReplyDomains); - List<String> replyToAddresses = Lists.newArrayList(demand.getRecipient()); + List<String> replyToAddresses = Lists.newArrayList(); + if (demand.getRecipient() != null) { + replyToAddresses.add(demand.getRecipient()); + } if (folderReplyAdresses != null) { replyToAddresses.addAll(folderReplyAdresses); } - + Collections.sort(replyToAddresses); + ui.getFromComboBox().setModel(SwingUtil.newComboModel(replyToAddresses.toArray())); model.setSenderAllowedAddresses(replyToAddresses); }