major simplifications to Iterator api

[org.ibex.mail.git] / src / org / ibex / mail / Query.java

diff --git a/src/org/ibex/mail/Query.java b/src/org/ibex/mail/Query.java
index 14f3e09..87837f9 100644 (file)
--- a/src/org/ibex/mail/Query.java
+++ b/src/org/ibex/mail/Query.java
@@ -105,12 +105,12 @@ public class Query {
                                     (earliest == null || it.cur().arrival.after(earliest));
             case HEADER:     return it.cur().headers.get(key) != null &&
                                  ((String)it.cur().headers.get(key)).toLowerCase().indexOf(text.toLowerCase()) != -1;
-            case DELETED:    return it.deleted();
-            case SEEN:       return it.seen();
-            case FLAGGED:    return it.flagged();
-            case DRAFT:      return it.draft();
-            case ANSWERED:   return it.answered();
-            case RECENT:     return it.recent();
+            case DELETED:    return it.getFlag(Mailbox.Flag.DELETED);
+            case SEEN:       return it.getFlag(Mailbox.Flag.SEEN);
+            case FLAGGED:    return it.getFlag(Mailbox.Flag.FLAGGED);
+            case DRAFT:      return it.getFlag(Mailbox.Flag.DRAFT);
+            case ANSWERED:   return it.getFlag(Mailbox.Flag.ANSWERED);
+            case RECENT:     return it.getFlag(Mailbox.Flag.RECENT);
 
             // FIXME: super inefficient
             case BODY:       throw new RuntimeException("BODY searches are not supported because they are slow");