changed return type of Iterator.head() to return headers

darcs-hash:20041018052417-5007d-c7f894cf2b6d8e24ffcefb7d2303326822f8dbb9.gz

diff --git a/src/org/ibex/mail/protocol/GMail.java b/src/org/ibex/mail/protocol/GMail.java
index 0a1baa4..e97ef9e 100644 (file)
--- a/src/org/ibex/mail/protocol/GMail.java
+++ b/src/org/ibex/mail/protocol/GMail.java
@@ -125,7 +125,7 @@ public class GMail extends Account {
                 final int num = i;
                 if (q.match(new Mailbox.Iterator() {
                         public Message cur() { return m; }
-                        public Message head() { return m; }
+                        public MIME.Headers head() { return m.headers; }
                         public boolean next() { return false; }
                         public int     uid() { return num; }
                         public int     num() { return num; }

diff --git a/src/org/ibex/mail/protocol/NNTP.java b/src/org/ibex/mail/protocol/NNTP.java
index 3219fa9..e427b04 100644 (file)
--- a/src/org/ibex/mail/protocol/NNTP.java
+++ b/src/org/ibex/mail/protocol/NNTP.java
@@ -61,7 +61,8 @@ public class NNTP {
         private Article article(Query q, boolean head, boolean body) {
             Mailbox.Iterator it = current.iterator(q);
             if (!it.next()) return null;
-            Message m = body ? it.cur() : it.head();
+            //Message m = body ? it.cur() : it.head();
+            Message m = it.cur(); // FIXME
             return new Article(m.messageid, it.num(), m);
         }
         public Group[]  list() { return list(root, ""); }

diff --git a/src/org/ibex/mail/target/Mailbox.java b/src/org/ibex/mail/target/Mailbox.java
index b650006..e4266c3 100644 (file)
--- a/src/org/ibex/mail/target/Mailbox.java
+++ b/src/org/ibex/mail/target/Mailbox.java
@@ -61,6 +61,20 @@ public abstract class Mailbox extends Target {
             for(Mailbox.Iterator it = iterator(q);it.next();) { dest.add(it.cur()); it.delete(); }
         }
         public static abstract class Iterator implements Mailbox.Iterator {
+            public boolean seen() { return false; }
+            public boolean deleted() { return false; }
+            public boolean flagged() { return false; }
+            public boolean draft() { return false; }
+            public boolean answered() { return false; }
+            public boolean recent() { return false; }
+            public void    seen(boolean on) { }
+            public void    deleted(boolean on) { }
+            public void    flagged(boolean on) { }
+            public void    draft(boolean on) { }
+            public void    answered(boolean on) { }
+            public void    recent(boolean on) { }
+            public void    set(String key, String val) { throw new MailException("not supported"); }
+            public String  get(String key) { throw new MailException("not supported"); }
             public int flags() {
                 return 
                     (deleted() ? Flag.DELETED : 0) |
@@ -98,7 +112,7 @@ public abstract class Mailbox extends Target {
 
     public static interface Iterator {
         public abstract Message cur();
-        public abstract Message head();
+        public abstract MIME.Headers head();
         public abstract boolean next();
         public abstract int     uid();
         public abstract int     num();
@@ -130,7 +144,7 @@ public abstract class Mailbox extends Target {
             private Iterator it;
             public Wrapper(Iterator it) { this.it = it; }
             public Message cur() { return it.cur(); }
-            public Message head() { return it.head(); }
+            public MIME.Headers head() { return it.head(); }
             public boolean next() { return it.next(); }
             public int     uid() { return it.uid(); }
             public int     flags() { return it.flags(); }
@@ -166,7 +180,7 @@ public abstract class Mailbox extends Target {
         public static class NullIterator extends Mailbox.Default.Iterator {
             public NullIterator() { }
             public Message cur() { return null; }
-            public Message head() { return null; }
+            public MIME.Headers head() { return null; }
             public boolean next() { return false; }
             public int     uid() { return 0; }
             public int     flags() { return 0; }

diff --git a/src/org/ibex/mail/target/MailmanArchives.java b/src/org/ibex/mail/target/MailmanArchives.java
index 7f9bad5..1b0b4e1 100644 (file)
--- a/src/org/ibex/mail/target/MailmanArchives.java
+++ b/src/org/ibex/mail/target/MailmanArchives.java
@@ -55,7 +55,7 @@ public class MailmanArchives extends Mailbox.Default {
         public int     num() { return num; }
 
         public Message cur() { return messages[num]; }
-        public Message head() { return messages[num]; }
+        public MIME.Headers head() { return messages[num].headers; }
         public boolean next() { return (++num) < messages.length; }
         public void    delete() { }
 

diff --git a/src/org/ibex/mail/target/MessageArrayMailbox.java b/src/org/ibex/mail/target/MessageArrayMailbox.java
index b549d4c..1516465 100644 (file)
--- a/src/org/ibex/mail/target/MessageArrayMailbox.java
+++ b/src/org/ibex/mail/target/MessageArrayMailbox.java
@@ -22,7 +22,7 @@ public class MessageArrayMailbox extends Mailbox.Default {
         private int position = -1;
 
         public Message cur()  { return messages[position]; }
-        public Message head() { return messages[position]; }
+        public MIME.Headers head() { return messages[position].headers; }
         public boolean next() { return ++position < messages.length; }
         public int     uid()  { return position+1; }
         public int     num()  { return position+1; }