Author: echatellier Date: 2014-07-15 11:43:42 +0200 (Tue, 15 Jul 2014) New Revision: 390 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/390 Log: Correction d'une erreur. Ajout d'un commentaire (pas sur de la correction). Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-15 08:47:23 UTC (rev 389) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-15 09:43:42 UTC (rev 390) @@ -24,19 +24,20 @@ * #L% */ +import static org.nuiton.i18n.I18n.t; + +import java.util.Date; + +import javax.swing.JOptionPane; + import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import javax.swing.*; - -import java.util.Date; - -import static org.nuiton.i18n.I18n.t; - /** * @author Kevin Morin (Code Lutin) * @@ -72,12 +73,16 @@ MailFolder archiveChild = null; do { if (folder.getChildren() != null) { - archiveChild = Iterables.find(folder.getChildren(), new Predicate<MailFolder>() { + // TODO echatellier : ajout du tryFind car ca n'a pas l'air obligatoire, mais pas certains + Optional<MailFolder> optArchiveChild = Iterables.tryFind(folder.getChildren(), new Predicate<MailFolder>() { @Override public boolean apply(MailFolder mailFolder) { return mailFolder.isArchiveFolder(); } }); + if (optArchiveChild.isPresent()) { + archiveChild = optArchiveChild.get(); + } } folder = folder.getParent();