Author: rdonkin
Date: Thu Sep 17 09:43:17 2009
New Revision: 816112
URL: http://svn.apache.org/viewvc?rev=816112&view=rev
Log:
JAMES-922 Upgrade to Java 1.5 https://issues.apache.org/jira/browse/JAMES-922
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/DeleCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/ListCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/StatCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/UidlCmdHandler.java
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/DeleCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/DeleCmdHandler.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/DeleCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/DeleCmdHandler.java
Thu Sep 17 09:43:17 2009
@@ -55,10 +55,10 @@
return;
}
try {
- Mail mc = (Mail) session.getUserMailbox().get(num);
+ Mail mc = session.getUserMailbox().get(num);
if (mc == POP3Handler.DELETED) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
@@ -73,8 +73,8 @@
session.writeResponse(POP3Handler.OK_RESPONSE + " Message
deleted");
}
} catch (IndexOutOfBoundsException iob) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/ListCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/ListCmdHandler.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/ListCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/ListCmdHandler.java
Thu Sep 17 09:43:17 2009
@@ -21,11 +21,9 @@
package org.apache.james.pop3server;
-import org.apache.mailet.Mail;
-
import javax.mail.MessagingException;
-import java.util.Iterator;
+import org.apache.mailet.Mail;
/**
* Handles LIST command
@@ -53,15 +51,14 @@
long size = 0;
int count = 0;
try {
- for (Iterator i = session.getUserMailbox().iterator();
i.hasNext(); ) {
- Mail mc = (Mail) i.next();
+ for (Mail mc:session.getUserMailbox()) {
if (mc != POP3Handler.DELETED) {
size += mc.getMessageSize();
count++;
}
}
- StringBuffer responseBuffer =
- new StringBuffer(32)
+ StringBuilder responseBuffer =
+ new StringBuilder(32)
.append(POP3Handler.OK_RESPONSE)
.append(" ")
.append(count)
@@ -69,17 +66,16 @@
.append(size);
session.writeResponse(responseBuffer.toString());
count = 0;
- for (Iterator i = session.getUserMailbox().iterator();
i.hasNext(); count++) {
- Mail mc = (Mail) i.next();
-
+ for (Mail mc:session.getUserMailbox()) {
if (mc != POP3Handler.DELETED) {
responseBuffer =
- new StringBuffer(16)
+ new StringBuilder(16)
.append(count)
.append(" ")
.append(mc.getMessageSize());
session.writeResponse(responseBuffer.toString());
}
+ count++;
}
session.writeResponse(".");
} catch (MessagingException me) {
@@ -89,10 +85,10 @@
int num = 0;
try {
num = Integer.parseInt(argument);
- Mail mc = (Mail) session.getUserMailbox().get(num);
+ Mail mc = session.getUserMailbox().get(num);
if (mc != POP3Handler.DELETED) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.OK_RESPONSE)
.append(" ")
.append(num)
@@ -100,8 +96,8 @@
.append(mc.getMessageSize());
session.writeResponse(responseBuffer.toString());
} else {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
@@ -109,16 +105,16 @@
session.writeResponse(responseBuffer.toString());
}
} catch (IndexOutOfBoundsException npe) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
.append(") does not exist.");
session.writeResponse(responseBuffer.toString());
} catch (NumberFormatException nfe) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" ")
.append(argument)
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
Thu Sep 17 09:43:17 2009
@@ -102,7 +102,7 @@
* emails in the user's inbox at any given time
* during the POP3 transaction.
*/
- private List userMailbox = new ArrayList();
+ private List<Mail> userMailbox = new ArrayList<Mail>();
private List backupUserMailbox; // A snapshot list representing
the set of
// emails in the user's inbox
at the beginning
@@ -458,14 +458,14 @@
/**
* @see org.apache.james.pop3server.POP3Session#getUserMailbox()
*/
- public List getUserMailbox() {
+ public List<Mail> getUserMailbox() {
return userMailbox;
}
/**
- * @see
org.apache.james.pop3server.POP3Session#setUserMailbox(java.util.List)
+ * @see org.apache.james.pop3server.POP3Session#setUserMailbox(List)
*/
- public void setUserMailbox(List userMailbox) {
+ public void setUserMailbox(List<Mail> userMailbox) {
this.userMailbox = userMailbox;
}
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
Thu Sep 17 09:43:17 2009
@@ -24,6 +24,7 @@
import org.apache.james.services.MailRepository;
import org.apache.james.socket.Watchdog;
+import org.apache.mailet.Mail;
import java.io.IOException;
import java.io.OutputStream;
@@ -174,14 +175,14 @@
*
* @return mailbox content
*/
- List getUserMailbox();
+ List<Mail> getUserMailbox();
/**
* Sets a new mailbox content
*
* @param userMailbox mailbox
*/
- void setUserMailbox(List userMailbox);
+ void setUserMailbox(List<Mail> userMailbox);
/**
* Returns the backup mailbox
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RetrCmdHandler.java
Thu Sep 17 09:43:17 2009
@@ -61,7 +61,7 @@
return;
}
try {
- Mail mc = (Mail) session.getUserMailbox().get(num);
+ Mail mc = session.getUserMailbox().get(num);
if (mc != POP3Handler.DELETED) {
responseString = POP3Handler.OK_RESPONSE + " Message
follows";
session.writeResponse(responseString);
@@ -79,8 +79,8 @@
session.writeResponse(".");
}
} else {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
@@ -95,8 +95,8 @@
responseString = POP3Handler.ERR_RESPONSE + " Error while
retrieving message.";
session.writeResponse(responseString);
} catch (IndexOutOfBoundsException iob) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java
Thu Sep 17 09:43:17 2009
@@ -71,7 +71,7 @@
*
*/
public static void stat(POP3Session session, Logger logger) {
- ArrayList userMailbox = new ArrayList();
+ ArrayList<Mail> userMailbox = new ArrayList<Mail>();
userMailbox.add(POP3Handler.DELETED);
try {
for (Iterator it = session.getUserInbox().list(); it.hasNext(); ) {
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/StatCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/StatCmdHandler.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/StatCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/StatCmdHandler.java
Thu Sep 17 09:43:17 2009
@@ -21,11 +21,9 @@
package org.apache.james.pop3server;
-import org.apache.mailet.Mail;
-
import javax.mail.MessagingException;
-import java.util.Iterator;
+import org.apache.mailet.Mail;
/**
* Handles STAT command
@@ -52,15 +50,14 @@
long size = 0;
int count = 0;
try {
- for (Iterator i = session.getUserMailbox().iterator();
i.hasNext(); ) {
- Mail mc = (Mail) i.next();
+ for (Mail mc: session.getUserMailbox()) {
if (mc != POP3Handler.DELETED) {
size += mc.getMessageSize();
count++;
}
}
- StringBuffer responseBuffer =
- new StringBuffer(32)
+ StringBuilder responseBuffer =
+ new StringBuilder(32)
.append(POP3Handler.OK_RESPONSE)
.append(" ")
.append(count)
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/TopCmdHandler.java
Thu Sep 17 09:43:17 2009
@@ -21,19 +21,19 @@
package org.apache.james.pop3server;
-import org.apache.james.socket.BytesWrittenResetOutputStream;
-import org.apache.james.util.stream.ExtraDotOutputStream;
-import org.apache.mailet.Mail;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.Enumeration;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
+import org.apache.james.socket.BytesWrittenResetOutputStream;
+import org.apache.james.util.stream.ExtraDotOutputStream;
+import org.apache.mailet.Mail;
+
/**
* Handles TOP command
*/
@@ -85,7 +85,7 @@
return;
}
try {
- Mail mc = (Mail) session.getUserMailbox().get(num);
+ Mail mc = session.getUserMailbox().get(num);
if (mc != POP3Handler.DELETED) {
responseString = POP3Handler.OK_RESPONSE + " Message
follows";
session.writeResponse(responseString);
@@ -107,8 +107,8 @@
session.writeResponse(".");
}
} else {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
@@ -123,8 +123,8 @@
responseString = POP3Handler.ERR_RESPONSE + " Error while
retrieving message.";
session.writeResponse(responseString);
} catch (IndexOutOfBoundsException iob) {
- StringBuffer exceptionBuffer =
- new StringBuffer(64)
+ StringBuilder exceptionBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/UidlCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/UidlCmdHandler.java?rev=816112&r1=816111&r2=816112&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/UidlCmdHandler.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/UidlCmdHandler.java
Thu Sep 17 09:43:17 2009
@@ -23,8 +23,6 @@
import org.apache.mailet.Mail;
-import java.util.Iterator;
-
/**
* Handles UIDL command
*/
@@ -49,16 +47,16 @@
String responseString = POP3Handler.OK_RESPONSE + " unique-id
listing follows";
session.writeResponse(responseString);
int count = 0;
- for (Iterator i = session.getUserMailbox().iterator();
i.hasNext(); count++) {
- Mail mc = (Mail) i.next();
+ for (Mail mc:session.getUserMailbox()) {
if (mc != POP3Handler.DELETED) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(count)
.append(" ")
.append(mc.getName());
session.writeResponse(responseBuffer.toString());
}
+ count++;
}
session.writeResponse(".");
} else {
@@ -67,8 +65,8 @@
num = Integer.parseInt(argument);
Mail mc = (Mail) session.getUserMailbox().get(num);
if (mc != POP3Handler.DELETED) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.OK_RESPONSE)
.append(" ")
.append(num)
@@ -76,8 +74,8 @@
.append(mc.getName());
session.writeResponse(responseBuffer.toString());
} else {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
@@ -85,16 +83,16 @@
session.writeResponse(responseBuffer.toString());
}
} catch (IndexOutOfBoundsException npe) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" Message (")
.append(num)
.append(") does not exist.");
session.writeResponse(responseBuffer.toString());
} catch (NumberFormatException nfe) {
- StringBuffer responseBuffer =
- new StringBuffer(64)
+ StringBuilder responseBuffer =
+ new StringBuilder(64)
.append(POP3Handler.ERR_RESPONSE)
.append(" ")
.append(argument)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
