major simplifications to Iterator api

[org.ibex.mail.git] / src / org / ibex / mail / protocol / GMail.java

diff --git a/src/org/ibex/mail/protocol/GMail.java b/src/org/ibex/mail/protocol/GMail.java
index 02b85e4..1a5d4ef 100644 (file)
--- a/src/org/ibex/mail/protocol/GMail.java
+++ b/src/org/ibex/mail/protocol/GMail.java
@@ -6,7 +6,6 @@ package org.ibex.mail.protocol;
 import org.ibex.crypto.*;
 import org.ibex.mail.protocol.*;
 import org.ibex.jinetd.Listener;
-import org.ibex.jinetd.Worker;
 import org.ibex.mail.*;
 import org.ibex.util.*;
 import org.ibex.net.*;
@@ -128,12 +127,13 @@ public class GMail extends Account {
             for(int i=0; i<summaries.length; i++) try {
                 final Message m = summaries[i].getMessage();
                 final int num = i;
-                if (q.match(new Mailbox.Iterator() {
+                if (q.match(new Mailbox.Default.Iterator() {
                         public Message cur() { return m; }
                         public Headers head() { return m.headers; }
                         public boolean next() { return false; }
                         public int     uid() { return num; }
-                        public int     num() { return num; }
+                        public int     imapNumber() { return num; }
+                        public int     nntpNumber() { throw new RuntimeException("not supported"); }
                         public void    delete() { }
                         public void    set(String key, String val) { }
                         public String  get(String key) { return null; }