moved flags into Mailbox

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

diff --git a/src/org/ibex/mail/protocol/IMAP.java b/src/org/ibex/mail/protocol/IMAP.java
index 02c2cbf..c8fd904 100644 (file)
--- a/src/org/ibex/mail/protocol/IMAP.java
+++ b/src/org/ibex/mail/protocol/IMAP.java
@@ -95,11 +95,7 @@ public class IMAP extends MessageProtocol {
         public void status(Mailbox m, Token[] attrs) {
             int[] list = m.list();
             int recent = 0, unseen = 0;
-            for(int i=0; i<list.length; i++) {
-                Message message = m.get(list[i]);
-                if (!message.seen) unseen++;
-                if (message.recent) recent++;
-            }
+            for(int i=0; i<list.length; i++) { if (!m.seen(i)) unseen++; if (m.recent(i)) recent++; }
             String response = "";
             for(int i=0; i<attrs.length; i++) {
                 String s = attrs[i].atom();
@@ -116,7 +112,7 @@ public class IMAP extends MessageProtocol {
             selected = getMailbox(mailbox, false);
             star(selected.list().length + " EXISTS");
             int recent = 0;
-            int[] list = selected.list(); for(int i=0; i<list.length; i++) if (selected.get(list[i]).recent) recent++;
+            int[] list = selected.list(); for(int i=0; i<list.length; i++) if (selected.recent(list[i])) recent++;
             star(recent + " RECENT");
             //star("OK [UNSEEN 12] Message 12 is first unseen");    FEATURE
             star("OK [UIDVALIDITY " + selected.uidvalidity + "] UIDs valid");
@@ -137,8 +133,8 @@ public class IMAP extends MessageProtocol {
             int[] messages = selected.list();
             for(int i=0; i<messages.length; i++) {
                 Message m = selected.get(messages[i]);
-                if (m.deleted) {
-                    if (!silent) star(m.uid + " EXPUNGE");
+                if (selected.deleted(messages[i])) {
+                    if (!silent) star(selected.uid(m) + " EXPUNGE");
                     if (!examineOnly) selected.delete(m);
                 }
             }
@@ -187,22 +183,22 @@ public class IMAP extends MessageProtocol {
                         start = Integer.parseInt(range);
                     }
                     if (s.equals("ENVELOPE") || all || full)          reply.append("ENVELOPE " + envelope(m) + " ");
-                    if (s.equals("FLAGS") || full || all || fast)  reply.append("FLAGS (" + flags(m) + ") ");
+                    if (s.equals("FLAGS") || full || all || fast)  reply.append("FLAGS (" + flags(selected, set[j]) + ") ");
                     if (s.equals("INTERNALDATE") || full || all || fast) reply.append("INTERNALDATE "+quotify(m.arrival)+" ");
                     if (s.equals("RFC822.SIZE") || full || all || fast) reply.append("RFC822.SIZE " + m.rfc822size() + " ");
                     if (s.equals("RFC822.HEADER") || s.equals("BODY[HEADER]"))
                         { reply.append("BODY[HEADER] {" + m.allHeaders.length() + "}\r\n"); reply.append(m.allHeaders); }
                     if (s.equals("RFC822")||s.equals("RFC822.TEXT")||s.equals("BODY")||s.equals("BODY[]")||s.equals("TEXT")||full)
                         { reply.append("BODY[TEXT] {" + m.body.length() + "}\r\n"); reply.append(m.body); }
-                    if (s.equals("UID"))                        reply.append("UID " + m.uid);
+                    if (s.equals("UID"))                        reply.append("UID " + selected.uid(set[j]));
                     if (s.equals("MIME"))                       throw new Exn.No("FETCH BODY.MIME not supported");
                     if (s.startsWith("BODY[HEADER.FIELDS"))     throw new Exn.No("partial headers not supported");
                     if (s.startsWith("BODY[HEADER.FIELDS.NOT")) throw new Exn.No("partial headers not supported");
                     if (s.equals("BODYSTRUCTURE"))
                         reply.append("(\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" " +
-                                     m.rfc822size()+" "+ m.numLines() +")");
+                                     m.rfc822size()+" "+ m.lines +")");
                 }
-                star(m.messageNum + " FETCH (" + reply.toString() + ")");
+                star(set[j] + " FETCH (" + reply.toString() + ")");
                 // FEATURE set seen flag if not BODY.PEEK
             }
         }
@@ -210,15 +206,22 @@ public class IMAP extends MessageProtocol {
         public void store(int[] messages, String what, Token[] flags) {
             for(int i=0; i<messages.length; i++) {
                 Message m = selected.get(messages[i]);
-                if (what.charAt(0) == 'F') m.deleted = m.seen = m.flagged = m.draft = m.answered = m.recent = false;
+                if (what.charAt(0) == 'F') {
+                    selected.setDeleted(messages[i], false);
+                    selected.setSeen(messages[i], false);
+                    selected.setFlagged(messages[i], false);
+                    selected.setDraft(messages[i], false);
+                    selected.setAnswered(messages[i], false);
+                    selected.setRecent(messages[i], false);
+                }
                 for(int j=0; j<flags.length; j++) {
                     String flag = flags[j].flag();
-                    if (flag.equals("Deleted"))  m.deleted  = what.charAt(0) != '-';
-                    if (flag.equals("Seen"))     m.seen     = what.charAt(0) != '-';
-                    if (flag.equals("Flagged"))  m.flagged  = what.charAt(0) != '-';
-                    if (flag.equals("Draft"))    m.draft    = what.charAt(0) != '-';
-                    if (flag.equals("Answered")) m.answered = what.charAt(0) != '-';
-                    if (flag.equals("Recent"))   m.recent   = what.charAt(0) != '-';
+                    if (flag.equals("Deleted"))  selected.setDeleted(messages[i], what.charAt(0) != '-');
+                    if (flag.equals("Seen"))     selected.setSeen(messages[i], what.charAt(0) != '-');
+                    if (flag.equals("Flagged"))  selected.setFlagged(messages[i], what.charAt(0) != '-');
+                    if (flag.equals("Draft"))    selected.setDraft(messages[i], what.charAt(0) != '-');
+                    if (flag.equals("Answered")) selected.setAnswered(messages[i], what.charAt(0) != '-');
+                    if (flag.equals("Recent"))   selected.setRecent(messages[i],  what.charAt(0) != '-');
                 }
                 selected.add(m);  // re-add
             }
@@ -268,14 +271,14 @@ public class IMAP extends MessageProtocol {
             ret.append(")");
             return ret.toString();
         }
-        static String flags(Message m) {
+        static String flags(Mailbox s, int i) {
             return 
-                (m.deleted  ? "\\Deleted "  : "") +
-                (m.seen     ? "\\Seen "     : "") +
-                (m.flagged  ? "\\Flagged "  : "") +
-                (m.draft    ? "\\Draft "    : "") +
-                (m.answered ? "\\Answered " : "") +
-                (m.recent   ? "\\Recent "   : "");
+                (s.deleted(i)  ? "\\Deleted "  : "") +
+                (s.seen(i)     ? "\\Seen "     : "") +
+                (s.flagged(i)  ? "\\Flagged "  : "") +
+                (s.draft(i)    ? "\\Draft "    : "") +
+                (s.answered(i) ? "\\Answered " : "") +
+                (s.recent(i)   ? "\\Recent "   : "");
         }
         static String envelope(Message m) {
             return