You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by se...@apache.org on 2011/05/31 17:13:01 UTC
svn commit: r1129747 - in
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring:
ServerBeanDefinitionParser.java UserManagerBeanDefinitionParser.java
Author: sebb
Date: Tue May 31 15:13:01 2011
New Revision: 1129747
URL: http://svn.apache.org/viewvc?rev=1129747&view=rev
Log:
Raw types
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java?rev=1129747&r1=1129746&r2=1129747&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java Tue May 31 15:13:01 2011
@@ -70,13 +70,13 @@ public class ServerBeanDefinitionParser
String childName = childElm.getLocalName();
if ("listeners".equals(childName)) {
- Map listeners = parseListeners(childElm, parserContext, builder);
+ Map<?, ?> listeners = parseListeners(childElm, parserContext, builder);
if (listeners.size() > 0) {
factoryBuilder.addPropertyValue("listeners", listeners);
}
} else if ("ftplets".equals(childName)) {
- Map ftplets = parseFtplets(childElm, parserContext, builder);
+ Map<?, ?> ftplets = parseFtplets(childElm, parserContext, builder);
factoryBuilder.addPropertyValue("ftplets", ftplets);
} else if ("file-user-manager".equals(childName)
|| "db-user-manager".equals(childName)) {
@@ -185,7 +185,7 @@ public class ServerBeanDefinitionParser
/**
* Parse the "ftplets" element
*/
- private Map parseFtplets(final Element childElm,
+ private Map<?, ?> parseFtplets(final Element childElm,
final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
@@ -193,7 +193,7 @@ public class ServerBeanDefinitionParser
if(childs.size() > 0 && childs.get(0).getLocalName().equals("map")) {
// using a beans:map element
- return (Map) parserContext.getDelegate().parseMapElement(
+ return parserContext.getDelegate().parseMapElement(
childs.get(0),
builder.getBeanDefinition());
} else {
@@ -213,7 +213,7 @@ public class ServerBeanDefinitionParser
* Parse listeners elements
*/
@SuppressWarnings("unchecked")
- private Map parseListeners(final Element listenersElm,
+ private Map<?, ?> parseListeners(final Element listenersElm,
final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
ManagedMap listeners = new ManagedMap();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java?rev=1129747&r1=1129746&r2=1129747&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java Tue May 31 15:13:01 2011
@@ -52,7 +52,7 @@ public class UserManagerBeanDefinitionPa
final BeanDefinitionBuilder builder) {
- Class factoryClass;
+ Class<?> factoryClass;
if (element.getLocalName().equals("file-user-manager")) {
factoryClass = PropertiesUserManagerFactory.class;
} else {