Author: mgrigorov
Date: Thu Jun 16 09:31:01 2011
New Revision: 1136340
URL: http://svn.apache.org/viewvc?rev=1136340&view=rev
Log:
Make Args.notEmpty() more relaxed - can work with CharSequence now.
Use Args.notXyz() in AbstractDefaultAjaxBehavior.throttleScript().
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=1136340&r1=1136339&r2=1136340&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
Thu Jun 16 09:31:01 2011
@@ -30,6 +30,7 @@ import org.apache.wicket.request.resourc
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.settings.IDebugSettings;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
@@ -329,20 +330,9 @@ public abstract class AbstractDefaultAja
public static CharSequence throttleScript(CharSequence script, String
throttleId,
Duration throttleDelay)
{
- if (Strings.isEmpty(script))
- {
- throw new IllegalArgumentException("script cannot be
empty");
- }
-
- if (Strings.isEmpty(throttleId))
- {
- throw new IllegalArgumentException("throttleId cannot
be empty");
- }
-
- if (throttleDelay == null)
- {
- throw new IllegalArgumentException("throttleDelay
cannot be null");
- }
+ Args.notEmpty(script, "script");
+ Args.notEmpty(throttleId, "throttleId");
+ Args.notNull(throttleDelay, "throttleDelay");
return new AppendingStringBuffer("wicketThrottler.throttle(
'").append(throttleId)
.append("', ")
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=1136340&r1=1136339&r2=1136340&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:31:01 2011
@@ -49,7 +49,7 @@ public class Args
* @return The 'argument' parameter
* @throws IllegalArgumentException
*/
- public static String notEmpty(final String argument, final String name)
+ public static CharSequence notEmpty(final CharSequence argument, final
String name)
{
if (Strings.isEmpty(argument))
{
