You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2003/05/19 04:31:26 UTC
cvs commit: jakarta-james/src/java/org/apache/james/pop3server POP3Handler.java
noel 2003/05/18 19:31:26
Modified: src/java/org/apache/james/pop3server Tag: branch_2_1_fcs
POP3Handler.java
Log:
Changed from internal representation from Vector to ArrayList
Revision Changes Path
No revision
No revision
1.18.4.3 +21 -20 jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java
Index: POP3Handler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.18.4.2
retrieving revision 1.18.4.3
diff -u -r1.18.4.2 -r1.18.4.3
--- POP3Handler.java 8 Mar 2003 21:54:06 -0000 1.18.4.2
+++ POP3Handler.java 19 May 2003 02:31:25 -0000 1.18.4.3
@@ -175,9 +175,9 @@
* emails in the user's inbox at any given time
* during the POP3 transaction.
*/
- private Vector userMailbox = new Vector();
+ private ArrayList userMailbox = new ArrayList();
- private Vector backupUserMailbox; // A snapshot list representing the set of
+ private ArrayList backupUserMailbox; // A snapshot list representing the set of
// emails in the user's inbox at the beginning
// of the transaction
@@ -423,8 +423,8 @@
*
*/
private void stat() {
- userMailbox = new Vector();
- userMailbox.addElement(DELETED);
+ userMailbox = new ArrayList();
+ userMailbox.add(DELETED);
for (Iterator it = userInbox.list(); it.hasNext(); ) {
String key = (String) it.next();
MailImpl mc = userInbox.retrieve(key);
@@ -433,9 +433,9 @@
if (mc == null) {
continue;
}
- userMailbox.addElement(mc);
+ userMailbox.add(mc);
}
- backupUserMailbox = (Vector) userMailbox.clone();
+ backupUserMailbox = (ArrayList) userMailbox.clone();
}
/**
@@ -579,8 +579,8 @@
long size = 0;
int count = 0;
try {
- for (Enumeration e = userMailbox.elements(); e.hasMoreElements(); ) {
- MailImpl mc = (MailImpl) e.nextElement();
+ for (Iterator i = userMailbox.iterator(); i.hasNext(); ) {
+ MailImpl mc = (MailImpl) i.next();
if (mc != DELETED) {
size += mc.getMessageSize();
count++;
@@ -622,8 +622,8 @@
long size = 0;
int count = 0;
try {
- for (Enumeration e = userMailbox.elements(); e.hasMoreElements(); ) {
- MailImpl mc = (MailImpl) e.nextElement();
+ for (Iterator i = userMailbox.iterator(); i.hasNext(); ) {
+ MailImpl mc = (MailImpl) i.next();
if (mc != DELETED) {
size += mc.getMessageSize();
count++;
@@ -639,8 +639,9 @@
responseString = responseBuffer.toString();
writeLoggedFlushedResponse(responseString);
count = 0;
- for (Enumeration e = userMailbox.elements(); e.hasMoreElements(); count++) {
- MailImpl mc = (MailImpl) e.nextElement();
+ for (Iterator i = userMailbox.iterator(); i.hasNext(); count++) {
+ MailImpl mc = (MailImpl) i.next();
+
if (mc != DELETED) {
responseBuffer =
new StringBuffer(16)
@@ -660,7 +661,7 @@
int num = 0;
try {
num = Integer.parseInt(argument);
- MailImpl mc = (MailImpl) userMailbox.elementAt(num);
+ MailImpl mc = (MailImpl) userMailbox.get(num);
if (mc != DELETED) {
StringBuffer responseBuffer =
new StringBuffer(64)
@@ -725,8 +726,8 @@
responseString = OK_RESPONSE + " unique-id listing follows";
writeLoggedFlushedResponse(responseString);
int count = 0;
- for (Enumeration e = userMailbox.elements(); e.hasMoreElements(); count++) {
- MailImpl mc = (MailImpl) e.nextElement();
+ for (Iterator i = userMailbox.iterator(); i.hasNext(); count++) {
+ MailImpl mc = (MailImpl) i.next();
if (mc != DELETED) {
StringBuffer responseBuffer =
new StringBuffer(64)
@@ -742,7 +743,7 @@
int num = 0;
try {
num = Integer.parseInt(argument);
- MailImpl mc = (MailImpl) userMailbox.elementAt(num);
+ MailImpl mc = (MailImpl) userMailbox.get(num);
if (mc != DELETED) {
StringBuffer responseBuffer =
new StringBuffer(64)
@@ -828,7 +829,7 @@
return;
}
try {
- MailImpl mc = (MailImpl) userMailbox.elementAt(num);
+ MailImpl mc = (MailImpl) userMailbox.get(num);
if (mc == DELETED) {
StringBuffer responseBuffer =
new StringBuffer(64)
@@ -839,7 +840,7 @@
responseString = responseBuffer.toString();
writeLoggedFlushedResponse(responseString);
} else {
- userMailbox.setElementAt(DELETED, num);
+ userMailbox.set(num, DELETED);
writeLoggedFlushedResponse(OK_RESPONSE + " Message removed");
}
} catch (ArrayIndexOutOfBoundsException iob) {
@@ -898,7 +899,7 @@
return;
}
try {
- MailImpl mc = (MailImpl) userMailbox.elementAt(num);
+ MailImpl mc = (MailImpl) userMailbox.get(num);
if (mc != DELETED) {
responseString = OK_RESPONSE + " Message follows";
writeLoggedFlushedResponse(responseString);
@@ -971,7 +972,7 @@
return;
}
try {
- MailImpl mc = (MailImpl) userMailbox.elementAt(num);
+ MailImpl mc = (MailImpl) userMailbox.get(num);
if (mc != DELETED) {
responseString = OK_RESPONSE + " Message follows";
writeLoggedFlushedResponse(responseString);
---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org