Changeset 699 for trunk/LogicMail/src/org/logicprobe

Timestamp:

09/05/10 20:46:53 (17 months ago)

Author:

octorian

Message:

Separation, unit test, and minor bugfix for IMAP line response tester

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap

Files:

• ImapProtocol.java (modified) (2 diffs)
• ImapResponseLineTester.java (added)

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapProtocol.java

@@ -55 +55 @@
     private Connection connection;
     private String idleCommandTag;
+    private static final ConnectionResponseTester executeResponseTester = new ImapResponseLineTester();    
 
     /**
@@ -1744 +1745 @@
         public String name;
     }
-    
-    private static ConnectionResponseTester executeResponseTester = new ConnectionResponseTester() {
-        private static final byte CR = (byte) 0x0D;
-        private static final byte LF = (byte) 0x0A;
-        private int trimCount;
-        private int lastLength = 0;
-        private int literalLength = 0;
-
-        public int checkForCompleteResponse(byte[] buf, int len) {
-            trimCount = 0;
-
-            if (literalLength > 0) {
-                if ((lastLength + literalLength) < len) {
-                    lastLength += literalLength;
-                    literalLength = 0;
-                } else {
-                    literalLength -= (len - lastLength);
-                    lastLength = len;
-
-                    return -1;
-                }
-            }
-
-            int p = StringArrays.indexOf(buf, LF, lastLength);
-
-            while ((p != -1) && (p < len)) {
-                if ((p > 0) && (buf[p - 1] == CR)) {
-                    if ((p > 3) && (buf[p - 2] == '}')) {
-                        int i = p - 3;
-
-                        while (i >= 0) {
-                            if ((buf[i] >= '0') && (buf[i] <= '9')) {
-                                i--;
-                            } else if (buf[i] == '{') {
-                                try {
-                                    literalLength = StringArrays.parseInt(buf, i + 1, p - i - 3);
-                                    break;
-                                } catch (NumberFormatException e) { }
-                            }
-                        }
-                    }
-
-                    trimCount = 2;
-                } else {
-                    trimCount = 1;
-                }
-
-                p++;
-
-                if (literalLength > 0) {
-                    if ((len - p) >= literalLength) {
-                        p += literalLength;
-                        literalLength = 0;
-                    } else {
-                        literalLength -= (len - p);
-                        lastLength = len;
-
-                        return -1;
-                    }
-                } else {
-                    lastLength = 0;
-                    literalLength = 0;
-
-                    return p;
-                }
-
-                p = StringArrays.indexOf(buf, LF, p);
-            }
-
-            lastLength = len;
-
-            return -1;
-        }
-
-        public int trimCount() {
-            return trimCount;
-        }
-
-        public String logString(byte[] result) {
-            return new String(result);
-        }
-    };
     
     // String constants