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 13:28:10 UTC
svn commit: r816145 - in
/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server:
POP3Handler.java POP3HandlerChain.java
Author: rdonkin
Date: Thu Sep 17 11:28:09 2009
New Revision: 816145
URL: http://svn.apache.org/viewvc?rev=816145&view=rev
Log:
JAMES-922 Switch 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/POP3HandlerChain.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=816145&r1=816144&r2=816145&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 11:28:09 2009
@@ -189,11 +189,11 @@
context.writeLoggedFlushedResponse(responseString);
//Session started - RUN all connect handlers
- List connectHandlers = handlerChain.getConnectHandlers();
+ List<ConnectHandler> connectHandlers = handlerChain.getConnectHandlers();
if(connectHandlers != null) {
int count = connectHandlers.size();
for(int i = 0; i < count; i++) {
- ((ConnectHandler)connectHandlers.get(i)).onConnect(this);
+ connectHandlers.get(i).onConnect(this);
if(sessionEnded) {
break;
}
@@ -232,14 +232,14 @@
}
//fetch the command handlers registered to the command
- List commandHandlers = handlerChain.getCommandHandlers(curCommandName);
+ List<CommandHandler> commandHandlers = handlerChain.getCommandHandlers(curCommandName);
if(commandHandlers == null) {
//end the session
break;
} else {
int count = commandHandlers.size();
for(int i = 0; i < count; i++) {
- ((CommandHandler)commandHandlers.get(i)).onCommand(this);
+ commandHandlers.get(i).onCommand(this);
context.getWatchdog().reset();
//if the response is received, stop processing of command handlers
if(mode != COMMAND_MODE) {
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java?rev=816145&r1=816144&r2=816145&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java Thu Sep 17 11:28:09 2009
@@ -26,6 +26,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.Properties;
import org.apache.avalon.framework.configuration.Configurable;
@@ -51,9 +52,9 @@
/** Non context specific log should only be used when no context specific log is available */
private Log log = FALLBACK_LOG;
- private HashMap commandHandlerMap = new HashMap();
+ private Map<String, List<CommandHandler>> commandHandlerMap = new HashMap<String, List<CommandHandler>>();
private ArrayList messageHandlers = new ArrayList();
- private ArrayList connectHandlers = new ArrayList();
+ private List<ConnectHandler> connectHandlers = new ArrayList<ConnectHandler>();
private final CommandHandler unknownHandler = new UnknownCmdHandler();
private ServiceManager serviceManager;
@@ -194,9 +195,9 @@
* @param cmdHandler The commandhandler object
*/
private void addToMap(String commandName, CommandHandler cmdHandler) {
- ArrayList handlers = (ArrayList)commandHandlerMap.get(commandName);
+ List<CommandHandler> handlers = commandHandlerMap.get(commandName);
if(handlers == null) {
- handlers = new ArrayList();
+ handlers = new ArrayList<CommandHandler>();
commandHandlerMap.put(commandName, handlers);
}
handlers.add(cmdHandler);
@@ -208,16 +209,16 @@
* @param command the command name which will be key
* @return List of commandhandlers
*/
- List getCommandHandlers(String command) {
+ List<CommandHandler> getCommandHandlers(String command) {
if (command == null) {
return null;
}
if (log.isDebugEnabled()) {
log.debug("Lookup command handler for command: " + command);
}
- List handlers = (List)commandHandlerMap.get(command);
+ List<CommandHandler> handlers = commandHandlerMap.get(command);
if(handlers == null) {
- handlers = (List)commandHandlerMap.get(UnknownCmdHandler.UNKNOWN_COMMAND);
+ handlers = commandHandlerMap.get(UnknownCmdHandler.UNKNOWN_COMMAND);
}
return handlers;
@@ -237,7 +238,7 @@
*
* @return List of connect handlers
*/
- List getConnectHandlers() {
+ List<ConnectHandler> getConnectHandlers() {
return connectHandlers;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org