Author: mgrigorov
Date: Thu Jun 16 09:38:12 2011
New Revision: 1136344
URL: http://svn.apache.org/viewvc?rev=1136344&view=rev
Log:
Make Args.notEmpty() smarter.
Improve its javadocs.
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java?rev=1136344&r1=1136343&r2=1136344&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
Thu Jun 16 09:38:12 2011
@@ -44,17 +44,22 @@ public class Args
/**
* Checks argument is not empty (not null and has a non-whitespace
character)
*
+ * @param <T>
+ * the type of the argument to check for emptiness
+ *
* @param argument
+ * the argument to check for emptiness
* @param name
- * @return The 'argument' parameter
+ * the name to use in the error message
+ * @return The {@code argument} parameter if not empty
* @throws IllegalArgumentException
+ * when the passed {@code argument} is empty
*/
- public static CharSequence notEmpty(final CharSequence argument, final
String name)
+ public static <T extends CharSequence> T notEmpty(final T argument,
final String name)
{
if (Strings.isEmpty(argument))
{
- throw new IllegalArgumentException("Argument '" + name +
- "' may not be null or empty string.");
+ throw new IllegalArgumentException("Argument '" + name
+ "' may not be null or empty.");
}
return argument;
}