Author: jrthomerson
Date: Thu May 27 02:00:47 2010
New Revision: 948650
URL: http://svn.apache.org/viewvc?rev=948650&view=rev
Log:
fixes WICKET-2891
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java?rev=948650&r1=948649&r2=948650&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
Thu May 27 02:00:47 2010
@@ -152,7 +152,7 @@ public class SpringBeanLocator implement
}
StringBuilder msg = new StringBuilder();
- msg.append("more then one bean of type [");
+ msg.append("More than one bean of type [");
msg.append(clazz.getName());
msg.append("] found, you have to specify the name of
the bean ");
msg.append("(@SpringBean(name=\"foo\")) in order to
resolve this conflict. ");
@@ -248,7 +248,7 @@ public class SpringBeanLocator implement
}
/**
- * Looks up a bean by its class. Throws IllegalState exception if none
or more then one beans
+ * Looks up a bean by its class. Throws IllegalState exception if none
or more than one beans
* are found.
*
* @param ctx
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java?rev=948650&r1=948649&r2=948650&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
Thu May 27 02:00:47 2010
@@ -162,7 +162,7 @@ public class SpringWebApplicationFactory
}
if (beans.size() > 1)
{
- throw new IllegalStateException("more then one
bean of type [" +
+ throw new IllegalStateException("More than one
bean of type [" +
WebApplication.class.getName()
+ "] found, must have only one");
}
return (WebApplication)beans.values().iterator().next();
@@ -217,4 +217,4 @@ public class SpringWebApplicationFactory
additionalContext.close();
}
}
-}
\ No newline at end of file
+}
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java?rev=948650&r1=948649&r2=948650&view=diff
==============================================================================
---
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
(original)
+++
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
Thu May 27 02:00:47 2010
@@ -218,7 +218,7 @@ public class AnnotProxyFieldValueFactory
}
}
StringBuilder msg = new StringBuilder();
- msg.append("more then one bean of type [");
+ msg.append("More than one bean of type [");
msg.append(clazz.getName());
msg.append("] found, you have to specify the name of
the bean ");
msg.append("(@SpringBean(name=\"foo\")) in order to
resolve this conflict. ");
