change num() to imapNumber() and nntpNumber(), add comments about semantics

[org.ibex.mail.git] / src / org / ibex / mail / target / FileBasedMailbox.java

diff --git a/src/org/ibex/mail/target/FileBasedMailbox.java b/src/org/ibex/mail/target/FileBasedMailbox.java
index 4fc5176..0a8c013 100644 (file)
--- a/src/org/ibex/mail/target/FileBasedMailbox.java
+++ b/src/org/ibex/mail/target/FileBasedMailbox.java
@@ -152,7 +152,8 @@ public class FileBasedMailbox extends Mailbox.Default {
         public boolean next() { cur++; return !done(); }
         public boolean seen() { return false; }
         public boolean recent() { return false; }
-        public int num() { return cur+1; }  // EUDORA insists that message numbers start at 1, not 0
+        public int nntpNumber() { return cur+1; }  // FIXME: lame
+        public int imapNumber() { return cur+1; }  // EUDORA insists that message numbers start at 1, not 0
         public int uid() { return done() ? -1 : Integer.parseInt(files[cur].substring(0, files[cur].length()-1)); }
         public void delete() { File f = file(); if (f != null && f.exists()) f.delete(); }
         public void seen(boolean seen) { }
@@ -218,7 +219,7 @@ public class FileBasedMailbox extends Mailbox.Default {
                 s[0] = (m.from==null?"":m.from.toString(true));
                 s[1] = m.subject;
                 s[2] = (m.date + "").trim().replaceAll(" "," ");
-                s[3] = it.num() + "";
+                s[3] = it.imapNumber() + "";
                 msgs.addElement(s);
             }
             String[][] messages;
@@ -253,7 +254,7 @@ public class FileBasedMailbox extends Mailbox.Default {
                 int target = Integer.parseInt(request.getParameter("msgnum"));
                 Mailbox.Iterator it = mbox.iterator();
                 while(it.next())
-                    if (it.num() == target)
+                    if (it.imapNumber() == target)
                         break;
                 if (it.cur() != null) {
                     pw.println("    <table width=100% border=0 cellspacing=0 style='border: 1px black solid; background-color:#F0F0E0;'>");