[Freemail] r10321 - in trunk/apps/Freemail/src/freemail: . imap

[d...@freenetproject.org]

Author: dbkr
Date: 2006-09-01 16:33:16 +0000 (Fri, 01 Sep 2006)
New Revision: 10321

Modified:
   trunk/apps/Freemail/src/freemail/Freemail.java
   trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java
Log:
Make usage clearer - bail on unknown options and make --password work the same 
as --passwd.
Remove local variable shadow in IMAPHandler (that netbeans doesn't warn you 
about)
Bump build number for recent bug fixes


Modified: trunk/apps/Freemail/src/freemail/Freemail.java
===================================================================
--- trunk/apps/Freemail/src/freemail/Freemail.java      2006-09-01 16:25:27 UTC 
(rev 10320)
+++ trunk/apps/Freemail/src/freemail/Freemail.java      2006-09-01 16:33:16 UTC 
(rev 10321)
@@ -14,7 +14,7 @@
        // version info
        public static final int VER_MAJOR = 0;
        public static final int VER_MINOR = 1;
-       public static final int BUILD_NO = 7;
+       public static final int BUILD_NO = 8;
        public static final String VERSION_TAG = "Pet Shop";

        private static final String TEMPDIRNAME = "temp";
@@ -57,8 +57,8 @@
                                }

                                account = args[i];
-                       } else if (args[i].equals("--passwd")) {
-                               action = args[i];
+                       } else if (args[i].equals("--passwd") || 
args[i].equals("--password")) {
+                               action = "--passwd";
                                i = i + 2;
                                if (args.length - 1 < i) {
                                        System.out.println("Usage: --passwd 
<account name> <password>");
@@ -82,6 +82,9 @@
                                        continue;
                                }
                                cfgfile = args[i];
+                       } else {
+                               System.out.println("Unknown option: 
'"+args[i]+"'");
+                               return;
                        }
                }


Modified: trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java
===================================================================
--- trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java      2006-09-01 
16:25:27 UTC (rev 10320)
+++ trunk/apps/Freemail/src/freemail/imap/IMAPHandler.java      2006-09-01 
16:33:16 UTC (rev 10321)
@@ -827,9 +827,9 @@

                String mbname = trimQuotes(msg.args[0]);

-                MessageBank mb = this.getMailboxFromPath(mbname);
+                MessageBank statmb = this.getMailboxFromPath(mbname);

-               SortedMap msgs = mb.listMessages();
+               SortedMap msgs = statmb.listMessages();

                // gather statistics
                int numrecent = 0;