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 rd...@apache.org on 2009/09/17 12:00:56 UTC
svn commit: r816118 - in
/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server:
POP3Handler.java POP3Session.java QuitCmdHandler.java RsetCmdHandler.java
Author: rdonkin
Date: Thu Sep 17 10:00:56 2009
New Revision: 816118
URL: http://svn.apache.org/viewvc?rev=816118&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/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/QuitCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java
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=816118&r1=816117&r2=816118&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 10:00:56 2009
@@ -104,9 +104,12 @@
*/
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
- // of the transaction
+ /**
+ * A snapshot list representing the set of
+ * emails in the user's inbox at the beginning
+ * of the transaction
+ */
+ private List<Mail> backupUserMailbox;
/**
* The per-handler response buffer used to marshal responses.
@@ -278,7 +281,7 @@
authenticatedUser = null;
userInbox = null;
if (userMailbox != null) {
- Iterator i = userMailbox.iterator();
+ Iterator<Mail> i = userMailbox.iterator();
while (i.hasNext()) {
ContainerUtil.dispose(i.next());
}
@@ -287,7 +290,7 @@
}
if (backupUserMailbox != null) {
- Iterator i = backupUserMailbox.iterator();
+ Iterator<Mail> i = backupUserMailbox.iterator();
while (i.hasNext()) {
ContainerUtil.dispose(i.next());
}
@@ -472,7 +475,7 @@
/**
* @see org.apache.james.pop3server.POP3Session#getBackupUserMailbox()
*/
- public List getBackupUserMailbox() {
+ public List<Mail> getBackupUserMailbox() {
return backupUserMailbox;
}
@@ -480,7 +483,7 @@
/**
* @see org.apache.james.pop3server.POP3Session#setUserMailbox(List)
*/
- public void setBackupUserMailbox(List backupUserMailbox) {
+ public void setBackupUserMailbox(List<Mail> backupUserMailbox) {
this.backupUserMailbox = backupUserMailbox;
}
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=816118&r1=816117&r2=816118&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 10:00:56 2009
@@ -189,7 +189,7 @@
*
* @return list backup
*/
- List getBackupUserMailbox();
+ List<Mail> getBackupUserMailbox();
/**
@@ -197,7 +197,7 @@
*
* @param backupUserMailbox the mailbox backup
*/
- void setBackupUserMailbox(List backupUserMailbox);
+ void setBackupUserMailbox(List<Mail> backupUserMailbox);
/**
* Returns the raw output stream
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java?rev=816118&r1=816117&r2=816118&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java Thu Sep 17 10:00:56 2009
@@ -23,6 +23,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.commons.collections.ListUtils;
+import org.apache.mailet.Mail;
import java.util.List;
@@ -44,6 +45,7 @@
*
* @param argument the first argument parsed by the parseCommand method
*/
+ @SuppressWarnings("unchecked")
private void doQUIT(POP3Session session,String argument) {
String responseString = null;
if (session.getHandlerState() == POP3Handler.AUTHENTICATION_READY || session.getHandlerState() == POP3Handler.AUTHENTICATION_USERSET) {
@@ -52,7 +54,7 @@
session.endSession();
return;
}
- List toBeRemoved = ListUtils.subtract(session.getBackupUserMailbox(), session.getUserMailbox());
+ List<Mail> toBeRemoved = ListUtils.subtract(session.getBackupUserMailbox(), session.getUserMailbox());
try {
session.getUserInbox().remove(toBeRemoved);
// for (Iterator it = toBeRemoved.iterator(); it.hasNext(); ) {
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=816118&r1=816117&r2=816118&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 10:00:56 2009
@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
/**
@@ -70,6 +71,7 @@
* user inbox.
*
*/
+ @SuppressWarnings("unchecked")
public static void stat(POP3Session session, Logger logger) {
ArrayList<Mail> userMailbox = new ArrayList<Mail>();
userMailbox.add(POP3Handler.DELETED);
@@ -90,7 +92,7 @@
}
finally {
session.setUserMailbox(userMailbox);
- session.setBackupUserMailbox((ArrayList) userMailbox.clone());
+ session.setBackupUserMailbox((List<Mail>) userMailbox.clone());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org