You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/28 22:18:30 UTC
svn commit: r990438 - in /wicket/trunk:
wicket-request/src/main/java/org/apache/wicket/request/
wicket-request/src/main/java/org/apache/wicket/request/mapper/
wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/
wicket-request/src/main/...
Author: ivaynberg
Date: Sat Aug 28 20:18:29 2010
New Revision: 990438
URL: http://svn.apache.org/viewvc?rev=990438&view=rev
Log:
renamed some utils to minimize the noise
Added:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java
- copied, changed from r990401, wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java
Removed:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java
Modified:
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ComponentEventSender.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/DeepChildFirstVisitor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageManagerDecorator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PackageMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/Url.java Sat Aug 28 20:18:29 2010
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
@@ -116,7 +116,7 @@ public final class Url implements Serial
*/
public static Url parse(String url, Charset charset)
{
- Checks.argumentNotNull(url, "url");
+ Args.notNull(url, "url");
Url result = new Url(charset);
@@ -223,7 +223,7 @@ public final class Url implements Serial
*/
public Url(Url url)
{
- Checks.argumentNotNull(url, "url");
+ Args.notNull(url, "url");
segments.addAll(url.getSegments());
parameters.addAll(url.getQueryParameters());
@@ -249,8 +249,8 @@ public final class Url implements Serial
*/
public Url(List<String> segments, List<QueryParameter> parameters, Charset charset)
{
- Checks.argumentNotNull(segments, "segments");
- Checks.argumentNotNull(parameters, "parameters");
+ Args.notNull(segments, "segments");
+ Args.notNull(parameters, "parameters");
this.segments.addAll(segments);
this.parameters.addAll(parameters);
@@ -312,7 +312,7 @@ public final class Url implements Serial
*/
public void removeLeadingSegments(int count)
{
- Checks.argumentWithinRange(0, segments.size(), count, "count");
+ Args.withinRange(0, segments.size(), count, "count");
for (int i = 0; i < count; i++)
{
segments.remove(0);
@@ -326,7 +326,7 @@ public final class Url implements Serial
*/
public void prependLeadingSegments(List<String> newSegments)
{
- Checks.argumentNotNull(newSegments, "segments");
+ Args.notNull(newSegments, "segments");
segments.addAll(0, newSegments);
}
@@ -625,8 +625,8 @@ public final class Url implements Serial
*/
public QueryParameter(String name, String value)
{
- Checks.argumentNotNull(name, "name");
- Checks.argumentNotNull(value, "value");
+ Args.notNull(name, "name");
+ Args.notNull(value, "value");
this.name = name;
this.value = value;
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java Sat Aug 28 20:18:29 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.request;
import java.util.ArrayList;
import java.util.List;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.PrependingStringBuffer;
/**
@@ -44,7 +44,7 @@ public class UrlRenderer
*/
public UrlRenderer(final Url base)
{
- Checks.argumentNotNull(base, "base");
+ Args.notNull(base, "base");
baseUrl = base;
}
@@ -57,7 +57,7 @@ public class UrlRenderer
*/
public Url setBaseUrl(final Url base)
{
- Checks.argumentNotNull(base, "base");
+ Args.notNull(base, "base");
Url original = baseUrl;
baseUrl = base;
@@ -87,7 +87,7 @@ public class UrlRenderer
*/
public String renderUrl(final Url url)
{
- Checks.argumentNotNull(url, "url");
+ Args.notNull(url, "url");
if (url.isAbsolute())
{
@@ -143,7 +143,7 @@ public class UrlRenderer
*/
public String renderContextPathRelativeUrl(String url, final Request request)
{
- Checks.argumentNotNull(url, "url");
+ Args.notNull(url, "url");
if (url.startsWith("/"))
{
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/AbstractMapper.java Sat Aug 28 20:18:29 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
public class AbstractMapper
@@ -101,8 +101,8 @@ public class AbstractMapper
protected PageParameters extractPageParameters(Request request, int segmentsToSkip,
IPageParametersEncoder encoder)
{
- Checks.argumentNotNull(request, "request");
- Checks.argumentNotNull(encoder, "encoder");
+ Args.notNull(request, "request");
+ Args.notNull(encoder, "encoder");
// strip the segments and first query parameter from URL
Url urlCopy = new Url(request.getUrl());
@@ -134,8 +134,8 @@ public class AbstractMapper
protected Url encodePageParameters(Url url, PageParameters pageParameters,
IPageParametersEncoder encoder)
{
- Checks.argumentNotNull(url, "url");
- Checks.argumentNotNull(encoder, "encoder");
+ Args.notNull(url, "url");
+ Args.notNull(encoder, "encoder");
if (pageParameters == null)
{
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/ParentPathReferenceRewriter.java Sat Aug 28 20:18:29 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.request.Request
import org.apache.wicket.request.Url;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.NullProvider;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Mapper that rewrites parent path segments ({@code ../}) with the specified string and viceversa.
@@ -44,8 +44,8 @@ public class ParentPathReferenceRewriter
*/
public ParentPathReferenceRewriter(IRequestMapper chain, IProvider<String> escapeSequence)
{
- Checks.argumentNotNull(chain, "chain");
- Checks.argumentNotNull(escapeSequence, "relativePathPartEscapeSequence");
+ Args.notNull(chain, "chain");
+ Args.notNull(escapeSequence, "relativePathPartEscapeSequence");
this.escapeSequence = escapeSequence;
this.chain = chain;
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java Sat Aug 28 20:18:29 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.mapper.AbstractMapper;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.StringValue;
/**
@@ -42,8 +42,8 @@ public class MountMapper extends Abstrac
*/
public MountMapper(String mountPath, IMountedRequestMapper mapper)
{
- Checks.argumentNotEmpty(mountPath, "mountPath");
- Checks.argumentNotNull(mapper, "mapper");
+ Args.notEmpty(mountPath, "mountPath");
+ Args.notNull(mapper, "mapper");
mountSegments = getMountSegments(mountPath);
this.mapper = mapper;
@@ -57,8 +57,8 @@ public class MountMapper extends Abstrac
*/
public MountMapper(String mountPath, IRequestMapper mapper)
{
- Checks.argumentNotEmpty(mountPath, "mountPath");
- Checks.argumentNotNull(mapper, "mapper");
+ Args.notEmpty(mountPath, "mountPath");
+ Args.notNull(mapper, "mapper");
mountSegments = getMountSegments(mountPath);
this.mapper = new UnmountedMapperAdapter(mapper);
@@ -72,8 +72,8 @@ public class MountMapper extends Abstrac
*/
public MountMapper(String mountPath, IRequestHandler handler)
{
- Checks.argumentNotEmpty(mountPath, "mountPath");
- Checks.argumentNotNull(handler, "handler");
+ Args.notEmpty(mountPath, "mountPath");
+ Args.notNull(handler, "handler");
mountSegments = getMountSegments(mountPath);
mapper = new UnmountedRequestHandlerAdapter(handler);
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java Sat Aug 28 20:18:29 2010
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.wicket.request.IRequestMapper;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.IStringIterator;
import org.apache.wicket.util.string.StringList;
@@ -248,7 +248,7 @@ public class PageParameters implements S
*/
public StringValue getNamedParameter(final String name)
{
- Checks.argumentNotNull(name, "name");
+ Args.notNull(name, "name");
if (namedParameters != null)
{
@@ -271,7 +271,7 @@ public class PageParameters implements S
*/
public List<StringValue> getNamedParameters(final String name)
{
- Checks.argumentNotNull(name, "name");
+ Args.notNull(name, "name");
if (namedParameters != null)
{
@@ -349,7 +349,7 @@ public class PageParameters implements S
*/
public void removeNamedParameter(final String name)
{
- Checks.argumentNotNull(name, "name");
+ Args.notNull(name, "name");
if (namedParameters != null)
{
@@ -385,8 +385,8 @@ public class PageParameters implements S
*/
public void addNamedParameter(final String name, final Object value, final int index)
{
- Checks.argumentNotNull(name, "name");
- Checks.argumentNotNull(value, "value");
+ Args.notNull(name, "name");
+ Args.notNull(value, "value");
if (namedParameters == null)
{
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/parameter/UrlRequestParametersAdapter.java Sat Aug 28 20:18:29 2010
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
@@ -45,7 +45,7 @@ public class UrlRequestParametersAdapter
*/
public UrlRequestParametersAdapter(Url url)
{
- Checks.argumentNotNull(url, "url");
+ Args.notNull(url, "url");
this.url = url;
}
Copied: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java (from r990401, wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java?p2=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java&p1=wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java&r1=990401&r2=990438&rev=990438&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Checks.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Args.java Sat Aug 28 20:18:29 2010
@@ -21,14 +21,16 @@ import org.apache.wicket.util.string.Str
/**
*
*/
-public class Checks
+public class Args
{
/**
+ * Checks argument is not null
*
* @param argument
* @param name
+ * @throws IllegalargumentException
*/
- public static void argumentNotNull(final Object argument, final String name)
+ public static void notNull(final Object argument, final String name)
{
if (argument == null)
{
@@ -37,11 +39,13 @@ public class Checks
}
/**
+ * Checks argument is not empty (not null and has a non-whitespace character)
*
* @param argument
* @param name
+ * @throws IllegalargumentException
*/
- public static void argumentNotEmpty(final String argument, final String name)
+ public static void notEmpty(final String argument, final String name)
{
if (Strings.isEmpty(argument))
{
@@ -51,18 +55,19 @@ public class Checks
}
/**
- * TODO javadoc and unit test
+ * Checks if argument is within a range
*
* @param <T>
* @param min
* @param max
* @param value
* @param name
+ * @throws IllegalargumentException
*/
- public static <T extends Comparable<T>> void argumentWithinRange(T min, T max, T value,
- String name)
+ public static <T extends Comparable<T>> void withinRange(T min, T max, T value, String name)
{
- // TODO nullchecks
+ notNull(min, name);
+ notNull(max, name);
if (value.compareTo(min) < 0 || value.compareTo(max) > 0)
{
throw new IllegalArgumentException(
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Sat Aug 28 20:18:29 2010
@@ -93,7 +93,7 @@ import org.apache.wicket.settings.ISecur
import org.apache.wicket.settings.ISessionSettings;
import org.apache.wicket.settings.Settings;
import org.apache.wicket.util.IProvider;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.PropertyResolver;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.time.Duration;
@@ -1316,7 +1316,7 @@ public abstract class Application implem
public final void setPageRendererProvider(IPageRendererProvider pageRendererProvider)
{
- Checks.argumentNotNull(pageRendererProvider, "pageRendererProvider");
+ Args.notNull(pageRendererProvider, "pageRendererProvider");
this.pageRendererProvider = pageRendererProvider;
}
@@ -1454,7 +1454,7 @@ public abstract class Application implem
public Session fetchCreateAndSetSession(RequestCycle requestCycle)
{
- Checks.argumentNotNull(requestCycle, "requestCycle");
+ Args.notNull(requestCycle, "requestCycle");
Session session = getSessionStore().lookup(requestCycle.getRequest());
if (session == null)
@@ -1564,7 +1564,7 @@ public abstract class Application implem
*/
public final void setName(String name)
{
- Checks.argumentNotEmpty(name, "name");
+ Args.notEmpty(name, "name");
if (this.name != null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ComponentEventSender.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ComponentEventSender.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ComponentEventSender.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ComponentEventSender.java Sat Aug 28 20:18:29 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.event.Broadcast
import org.apache.wicket.event.IEventSink;
import org.apache.wicket.event.IEventSource;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.apache.wicket.util.visit.Visits;
@@ -49,7 +49,7 @@ final class ComponentEventSender impleme
public void send(IEventSink sink, Broadcast type, Object payload)
{
ComponentEvent event = new ComponentEvent(sink, source, type, payload);
- Checks.argumentNotNull(type, "type");
+ Args.notNull(type, "type");
switch (type)
{
case BUBBLE :
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java Sat Aug 28 20:18:29 2010
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.loader.D
import org.apache.wicket.markup.loader.IMarkupLoader;
import org.apache.wicket.markup.parser.IMarkupFilter;
import org.apache.wicket.markup.parser.XmlPullParser;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.slf4j.Logger;
@@ -177,8 +177,8 @@ public class MarkupFactory
public final Markup getMarkup(final MarkupContainer container, final Class<?> clazz,
final boolean enforceReload)
{
- Checks.argumentNotNull(container, "container");
- Checks.argumentNotNull(clazz, "clazz");
+ Args.notNull(container, "container");
+ Args.notNull(clazz, "clazz");
IMarkupCache cache = getMarkupCache();
if (cache != null)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupStream.java Sat Aug 28 20:18:29 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.markup;
import org.apache.wicket.Component;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.string.Strings;
@@ -62,7 +62,7 @@ public class MarkupStream
*/
public MarkupStream(final IMarkupFragment markup)
{
- Checks.argumentNotNull(markup, "markup");
+ Args.notNull(markup, "markup");
this.markup = markup;
if (markup.size() > 0)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java Sat Aug 28 20:18:29 2010
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.parser.X
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
import org.apache.wicket.markup.resolver.IComponentResolver;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* A border component has associated markup which is drawn and determines placement of markup and/or
@@ -510,7 +510,7 @@ public abstract class Border extends Web
*/
private final IMarkupFragment findByName(final IMarkupFragment markup, final String name)
{
- Checks.argumentNotEmpty(name, "name");
+ Args.notEmpty(name, "name");
MarkupStream stream = new MarkupStream(markup);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java Sat Aug 28 20:18:29 2010
@@ -24,7 +24,7 @@ import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* An abstract implementation of a header render strategy which is only missing the code to traverse
@@ -112,8 +112,8 @@ public abstract class AbstractHeaderRend
public void renderHeader(final HtmlHeaderContainer headerContainer,
final Component rootComponent)
{
- Checks.argumentNotNull(headerContainer, "headerContainer");
- Checks.argumentNotNull(rootComponent, "rootComponent");
+ Args.notNull(headerContainer, "headerContainer");
+ Args.notNull(rootComponent, "rootComponent");
// First the application level headers
renderApplicationLevelHeaders(headerContainer);
@@ -153,7 +153,7 @@ public abstract class AbstractHeaderRend
*/
protected final void renderApplicationLevelHeaders(final HtmlHeaderContainer headerContainer)
{
- Checks.argumentNotNull(headerContainer, "headerContainer");
+ Args.notNull(headerContainer, "headerContainer");
if (renderHeadListeners != null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java Sat Aug 28 20:18:29 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.renderS
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.visit.IVisit;
/**
@@ -53,8 +53,8 @@ public class ChildFirstHeaderRenderStrat
public void renderHeader(final HtmlHeaderContainer headerContainer,
final Component rootComponent)
{
- Checks.argumentNotNull(headerContainer, "headerContainer");
- Checks.argumentNotNull(rootComponent, "rootComponent");
+ Args.notNull(headerContainer, "headerContainer");
+ Args.notNull(rootComponent, "rootComponent");
// First the application level headers
renderApplicationLevelHeaders(headerContainer);
@@ -76,8 +76,8 @@ public class ChildFirstHeaderRenderStrat
protected void renderChildHeaders(final HtmlHeaderContainer headerContainer,
final Component rootComponent)
{
- Checks.argumentNotNull(headerContainer, "headerContainer");
- Checks.argumentNotNull(rootComponent, "rootComponent");
+ Args.notNull(headerContainer, "headerContainer");
+ Args.notNull(rootComponent, "rootComponent");
if (rootComponent instanceof MarkupContainer)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/DeepChildFirstVisitor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/DeepChildFirstVisitor.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/DeepChildFirstVisitor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/DeepChildFirstVisitor.java Sat Aug 28 20:18:29 2010
@@ -18,7 +18,7 @@ package org.apache.wicket.markup.renderS
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.apache.wicket.util.visit.Visit;
@@ -44,7 +44,7 @@ public abstract class DeepChildFirstVisi
*/
public final Object visit(final Component rootComponent)
{
- Checks.argumentNotNull(rootComponent, "rootComponent");
+ Args.notNull(rootComponent, "rootComponent");
if (rootComponent instanceof MarkupContainer)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java Sat Aug 28 20:18:29 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.markup.renderS
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
@@ -56,8 +56,8 @@ public class ParentFirstHeaderRenderStra
protected void renderChildHeaders(final HtmlHeaderContainer headerContainer,
final Component rootComponent)
{
- Checks.argumentNotNull(headerContainer, "headerContainer");
- Checks.argumentNotNull(rootComponent, "rootComponent");
+ Args.notNull(headerContainer, "headerContainer");
+ Args.notNull(rootComponent, "rootComponent");
if (rootComponent instanceof MarkupContainer)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java Sat Aug 28 20:18:29 2010
@@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHa
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.ValueProvider;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
@@ -65,7 +65,7 @@ public class PageAccessSynchronizer
*/
public PageAccessSynchronizer(IProvider<Duration> timeout)
{
- Checks.argumentNotNull(timeout, "timeout");
+ Args.notNull(timeout, "timeout");
this.timeout = timeout;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageManagerDecorator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageManagerDecorator.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageManagerDecorator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageManagerDecorator.java Sat Aug 28 20:18:29 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.page;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Decorator for {@link IPageManager}
@@ -34,7 +34,7 @@ public class PageManagerDecorator implem
*/
public PageManagerDecorator(IPageManager delegate)
{
- Checks.argumentNotNull(delegate, "delegate");
+ Args.notNull(delegate, "delegate");
this.delegate = delegate;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/pageStore/DefaultPageStore.java Sat Aug 28 20:18:29 2010
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.wicket.Page;
import org.apache.wicket.page.IManageablePage;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.lang.WicketObjects;
@@ -50,8 +50,8 @@ public class DefaultPageStore implements
public DefaultPageStore(final String applicationName, final IDataStore dataStore,
final int cacheSize)
{
- Checks.argumentNotNull(applicationName, "applicationName");
- Checks.argumentNotNull(dataStore, "DataStore");
+ Args.notNull(applicationName, "applicationName");
+ Args.notNull(dataStore, "DataStore");
this.applicationName = applicationName;
pageDataStore = dataStore;
@@ -358,8 +358,8 @@ public class DefaultPageStore implements
*/
protected SerializedPage serializePage(final String sessionId, final IManageablePage page)
{
- Checks.argumentNotNull(sessionId, "sessionId");
- Checks.argumentNotNull(page, "page");
+ Args.notNull(sessionId, "sessionId");
+ Args.notNull(page, "page");
byte data[] = WicketObjects.objectToByteArray(page, applicationName);
return new SerializedPage(sessionId, page.getPageId(), data);
@@ -410,7 +410,7 @@ public class DefaultPageStore implements
*/
public SerializedPage removePage(final String sessionId, final int id)
{
- Checks.argumentNotNull(sessionId, "sessionId");
+ Args.notNull(sessionId, "sessionId");
if (size > 0)
{
@@ -434,7 +434,7 @@ public class DefaultPageStore implements
public void removePages(String sessionId)
{
- Checks.argumentNotNull(sessionId, "sessionId");
+ Args.notNull(sessionId, "sessionId");
if (size > 0)
{
@@ -455,7 +455,7 @@ public class DefaultPageStore implements
public SerializedPage getPage(String sessionId, int id)
{
- Checks.argumentNotNull(sessionId, "sessionId");
+ Args.notNull(sessionId, "sessionId");
SerializedPage result = null;
if (size > 0)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java Sat Aug 28 20:18:29 2010
@@ -27,7 +27,7 @@ import javax.servlet.http.Cookie;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.request.Response;
import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Subclass of {@link WebResponse} that buffers the actions and performs those on another response.
@@ -432,7 +432,7 @@ public class BufferedWebResponse extends
*/
public void writeTo(final WebResponse response)
{
- Checks.argumentNotNull(response, "response");
+ Args.notNull(response, "response");
for (Action action : actions)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Sat Aug 28 20:18:29 2010
@@ -52,7 +52,7 @@ import org.apache.wicket.util.collection
import org.apache.wicket.util.file.FileCleaner;
import org.apache.wicket.util.file.IResourceFinder;
import org.apache.wicket.util.file.WebApplicationPath;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.watch.IModificationWatcher;
import org.slf4j.Logger;
@@ -286,7 +286,7 @@ public abstract class WebApplication ext
@Deprecated
public final void mount(IRequestMapper mapper)
{
- Checks.argumentNotNull(mapper, "mapper");
+ Args.notNull(mapper, "mapper");
getRootRequestMapperAsCompound().add(mapper);
}
@@ -383,7 +383,7 @@ public abstract class WebApplication ext
*/
public final void setWicketFilter(final WicketFilter wicketFilter)
{
- Checks.argumentNotNull(wicketFilter, "wicketFilter");
+ Args.notNull(wicketFilter, "wicketFilter");
this.wicketFilter = wicketFilter;
servletContext = wicketFilter.getFilterConfig().getServletContext();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Sat Aug 28 20:18:29 2010
@@ -41,7 +41,7 @@ import org.apache.wicket.request.Url.Que
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.PrependingStringBuffer;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
@@ -88,8 +88,8 @@ public class ServletWebRequest extends W
*/
public ServletWebRequest(HttpServletRequest httpServletRequest, String filterPrefix, Url url)
{
- Checks.argumentNotNull(httpServletRequest, "httpServletRequest");
- Checks.argumentNotNull(filterPrefix, "filterPrefix");
+ Args.notNull(httpServletRequest, "httpServletRequest");
+ Args.notNull(filterPrefix, "filterPrefix");
this.httpServletRequest = httpServletRequest;
this.filterPrefix = filterPrefix;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java Sat Aug 28 20:18:29 2010
@@ -27,7 +27,7 @@ import org.apache.wicket.WicketRuntimeEx
import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* WebResponse that wraps a {@link ServletWebResponse}.
@@ -48,8 +48,8 @@ public class ServletWebResponse extends
public ServletWebResponse(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse)
{
- Checks.argumentNotNull(httpServletRequest, "httpServletRequest");
- Checks.argumentNotNull(httpServletResponse, "httpServletResponse");
+ Args.notNull(httpServletRequest, "httpServletRequest");
+ Args.notNull(httpServletResponse, "httpServletResponse");
this.httpServletResponse = httpServletResponse;
this.httpServletRequest = httpServletRequest;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java Sat Aug 28 20:18:29 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* A {@link IRequestMapper} that will issue a redirect to secured communication (over https) if the
@@ -72,8 +72,8 @@ public class HttpsMapper implements IReq
*/
public HttpsMapper(final IRequestMapper delegate, final HttpsConfig httpsConfig)
{
- Checks.argumentNotNull(delegate, "delegate");
- Checks.argumentNotNull(httpsConfig, "httpsConfig");
+ Args.notNull(delegate, "delegate");
+ Args.notNull(httpsConfig, "httpsConfig");
this.delegate = delegate;
this.httpsConfig = httpsConfig;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/SwitchProtocolRequestHandler.java Sat Aug 28 20:18:29 2010
@@ -8,7 +8,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Request handler that performs redirects across http and https
@@ -62,8 +62,8 @@ class SwitchProtocolRequestHandler imple
SwitchProtocolRequestHandler(Protocol protocol, IRequestHandler handler,
final HttpsConfig httpsConfig)
{
- Checks.argumentNotNull(protocol, "protocol");
- Checks.argumentNotNull(httpsConfig, "httpsConfig");
+ Args.notNull(protocol, "protocol");
+ Args.notNull(httpsConfig, "httpsConfig");
if (protocol == Protocol.PRESERVE_CURRENT)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java Sat Aug 28 20:18:29 2010
@@ -43,7 +43,7 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -133,12 +133,12 @@ public class RequestCycle extends Reques
{
super(context.getResponse());
- Checks.argumentNotNull(context, "context");
+ Args.notNull(context, "context");
- Checks.argumentNotNull(context.getRequest(), "context.request");
- Checks.argumentNotNull(context.getResponse(), "context.response");
- Checks.argumentNotNull(context.getRequestMapper(), "context.requestMapper");
- Checks.argumentNotNull(context.getExceptionMapper(), "context.exceptionMapper");
+ Args.notNull(context.getRequest(), "context.request");
+ Args.notNull(context.getResponse(), "context.response");
+ Args.notNull(context.getRequestMapper(), "context.requestMapper");
+ Args.notNull(context.getExceptionMapper(), "context.exceptionMapper");
request = context.getRequest();
originalResponse = context.getResponse();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkableListenerInterfaceRequestHandler.java Sat Aug 28 20:18:29 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Request handler for bookmarkable pages with listener interface. This handler is only used to
@@ -51,8 +51,8 @@ public class BookmarkableListenerInterfa
IPageAndComponentProvider pageComponentProvider,
RequestListenerInterface listenerInterface, Integer behaviorIndex)
{
- Checks.argumentNotNull(pageComponentProvider, "pageComponentProvider");
- Checks.argumentNotNull(listenerInterface, "listenerInterface");
+ Args.notNull(pageComponentProvider, "pageComponentProvider");
+ Args.notNull(listenerInterface, "listenerInterface");
this.pageComponentProvider = pageComponentProvider;
this.listenerInterface = listenerInterface;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/BookmarkablePageRequestHandler.java Sat Aug 28 20:18:29 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.request.handle
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Request handler for bookmarkable pages. This handler is only used to generate URLs. Rendering is
@@ -39,7 +39,7 @@ public class BookmarkablePageRequestHand
public BookmarkablePageRequestHandler(IPageProvider pageProvider)
{
- Checks.argumentNotNull(pageProvider, "pageProvider");
+ Args.notNull(pageProvider, "pageProvider");
this.pageProvider = pageProvider;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/ListenerInterfaceRequestHandler.java Sat Aug 28 20:18:29 2010
@@ -26,7 +26,7 @@ import org.apache.wicket.request.compone
import org.apache.wicket.request.handler.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Request handler that invokes the listener interface on component and renders page afterwards.
@@ -54,8 +54,8 @@ public class ListenerInterfaceRequestHan
public ListenerInterfaceRequestHandler(IPageAndComponentProvider pageComponentProvider,
RequestListenerInterface listenerInterface, Integer behaviorIndex)
{
- Checks.argumentNotNull(pageComponentProvider, "pageComponentProvider");
- Checks.argumentNotNull(listenerInterface, "listenerInterface");
+ Args.notNull(pageComponentProvider, "pageComponentProvider");
+ Args.notNull(listenerInterface, "listenerInterface");
this.pageComponentProvider = pageComponentProvider;
this.listenerInterface = listenerInterface;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageAndComponentProvider.java Sat Aug 28 20:18:29 2010
@@ -19,7 +19,7 @@ package org.apache.wicket.request.handle
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Extension of {@link PageProvider} that is also capable of providing a Component belonging
@@ -57,7 +57,7 @@ public class PageAndComponentProvider ex
{
super(page);
- Checks.argumentNotNull(component, "component");
+ Args.notNull(component, "component");
this.component = component;
}
@@ -181,7 +181,7 @@ public class PageAndComponentProvider ex
*/
private void setComponentPath(String componentPath)
{
- Checks.argumentNotNull(componentPath, "componentPath");
+ Args.notNull(componentPath, "componentPath");
this.componentPath = componentPath;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/PageProvider.java Sat Aug 28 20:18:29 2010
@@ -26,7 +26,7 @@ import org.apache.wicket.request.compone
import org.apache.wicket.request.mapper.IPageSource;
import org.apache.wicket.request.mapper.StalePageException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Provides page instance for request handlers. Each of the constructors has just enough information
@@ -145,7 +145,7 @@ public class PageProvider implements IPa
*/
public PageProvider(IRequestablePage page)
{
- Checks.argumentNotNull(page, "page");
+ Args.notNull(page, "page");
pageInstance = page;
}
@@ -307,7 +307,7 @@ public class PageProvider implements IPa
*/
private void setPageClass(Class<? extends IRequestablePage> pageClass)
{
- Checks.argumentNotNull(pageClass, "pageClass");
+ Args.notNull(pageClass, "pageClass");
this.pageClass = pageClass;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/RenderPageRequestHandler.java Sat Aug 28 20:18:29 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* {@link IRequestHandler} that renders page instance. Depending on the <code>redirectPolicy</code>
@@ -84,8 +84,8 @@ public class RenderPageRequestHandler im
*/
public RenderPageRequestHandler(IPageProvider pageProvider, RedirectPolicy redirectPolicy)
{
- Checks.argumentNotNull(pageProvider, "pageProvider");
- Checks.argumentNotNull(redirectPolicy, "redirectPolicy");
+ Args.notNull(pageProvider, "pageProvider");
+ Args.notNull(redirectPolicy, "redirectPolicy");
this.redirectPolicy = redirectPolicy;
this.pageProvider = pageProvider;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java Sat Aug 28 20:18:29 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Request handler for {@link ResourceReference}. This handler is only used to generate URLs.
@@ -55,7 +55,7 @@ public class ResourceReferenceRequestHan
public ResourceReferenceRequestHandler(ResourceReference resourceReference,
PageParameters pageParameters)
{
- Checks.argumentNotNull(resourceReference, "resourceReference");
+ Args.notNull(resourceReference, "resourceReference");
this.resourceReference = resourceReference;
this.pageParameters = pageParameters != null ? pageParameters : new PageParameters();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java Sat Aug 28 20:18:29 2010
@@ -20,7 +20,7 @@ import org.apache.wicket.request.IReques
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Request handler that renders a resource.
@@ -43,7 +43,7 @@ public class ResourceRequestHandler impl
*/
public ResourceRequestHandler(IResource resource, PageParameters pageParameters)
{
- Checks.argumentNotNull(resource, "resource");
+ Args.notNull(resource, "resource");
this.resource = resource;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java Sat Aug 28 20:18:29 2010
@@ -32,7 +32,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.info.PageInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@ public abstract class AbstractBookmarkab
public UrlInfo(PageComponentInfo pageComponentInfo,
Class<? extends IRequestablePage> pageClass, PageParameters pageParameters)
{
- Checks.argumentNotNull(pageClass, "pageClass");
+ Args.notNull(pageClass, "pageClass");
this.pageComponentInfo = pageComponentInfo;
this.pageParameters = pageParameters;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/AbstractComponentMapper.java Sat Aug 28 20:18:29 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.string.Strings;
@@ -54,7 +54,7 @@ public abstract class AbstractComponentM
*/
protected String requestListenerInterfaceToString(RequestListenerInterface listenerInterface)
{
- Checks.argumentNotNull(listenerInterface, "listenerInterface");
+ Args.notNull(listenerInterface, "listenerInterface");
return getContext().requestListenerInterfaceToString(listenerInterface);
}
@@ -67,7 +67,7 @@ public abstract class AbstractComponentM
*/
protected RequestListenerInterface requestListenerInterfaceFromString(String interfaceName)
{
- Checks.argumentNotEmpty(interfaceName, "interfaceName");
+ Args.notEmpty(interfaceName, "interfaceName");
return getContext().requestListenerInterfaceFromString(interfaceName);
}
@@ -129,7 +129,7 @@ public abstract class AbstractComponentM
*/
protected Class<? extends IRequestablePage> getPageClass(String name)
{
- Checks.argumentNotEmpty(name, "name");
+ Args.notEmpty(name, "name");
return WicketObjects.resolveClass(name);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java Sat Aug 28 20:18:29 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Decodes and encodes the following URLs:
@@ -55,7 +55,7 @@ public class BookmarkableMapper extends
*/
public BookmarkableMapper(IPageParametersEncoder pageParametersEncoder)
{
- Checks.argumentNotNull(pageParametersEncoder, "pageParametersEncoder");
+ Args.notNull(pageParametersEncoder, "pageParametersEncoder");
this.pageParametersEncoder = pageParametersEncoder;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java Sat Aug 28 20:18:29 2010
@@ -25,7 +25,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Encoder for mounted URL. The mount path can contain parameter placeholders, i.e.
@@ -70,9 +70,9 @@ public class MountedMapper extends Abstr
public MountedMapper(String mountPath, Class<? extends IRequestablePage> pageClass,
IPageParametersEncoder pageParametersEncoder)
{
- Checks.argumentNotEmpty(mountPath, "mountPath");
- Checks.argumentNotNull(pageClass, "pageClass");
- Checks.argumentNotNull(pageParametersEncoder, "pageParametersEncoder");
+ Args.notEmpty(mountPath, "mountPath");
+ Args.notNull(pageClass, "pageClass");
+ Args.notNull(pageParametersEncoder, "pageParametersEncoder");
this.pageParametersEncoder = pageParametersEncoder;
this.pageClass = new WeakReference<Class<? extends IRequestablePage>>(pageClass);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PackageMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PackageMapper.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PackageMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/PackageMapper.java Sat Aug 28 20:18:29 2010
@@ -23,7 +23,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.PackageName;
/**
@@ -77,9 +77,9 @@ public class PackageMapper extends Abstr
public PackageMapper(final String mountPath, final PackageName packageName,
final IPageParametersEncoder pageParametersEncoder)
{
- Checks.argumentNotNull(mountPath, "mountPath");
- Checks.argumentNotNull(packageName, "packageName");
- Checks.argumentNotNull(pageParametersEncoder, "pageParametersEncoder");
+ Args.notNull(mountPath, "mountPath");
+ Args.notNull(packageName, "packageName");
+ Args.notNull(pageParametersEncoder, "pageParametersEncoder");
this.mountPath = mountPath;
this.packageName = packageName;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java Sat Aug 28 20:18:29 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.request.mapper.info;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
/**
@@ -83,8 +83,8 @@ public class ComponentInfo
public ComponentInfo(Integer renderCount, String listenerInterface, String componentPath,
Integer behaviorIndex)
{
- Checks.argumentNotEmpty(listenerInterface, "listenerInterface");
- Checks.argumentNotNull(componentPath, "componentPath");
+ Args.notEmpty(listenerInterface, "listenerInterface");
+ Args.notNull(componentPath, "componentPath");
this.listenerInterface = listenerInterface;
this.componentPath = componentPath;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageComponentInfo.java Sat Aug 28 20:18:29 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.request.mapper.info;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
/**
@@ -41,7 +41,7 @@ public class PageComponentInfo
*/
public PageComponentInfo(PageInfo pageInfo, ComponentInfo componentInfo)
{
- Checks.argumentNotNull(pageInfo, "pageInfo");
+ Args.notNull(pageInfo, "pageInfo");
this.pageInfo = pageInfo;
this.componentInfo = componentInfo;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java Sat Aug 28 20:18:29 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.request.mapper.info;
import org.apache.wicket.request.component.IRequestablePage;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
/**
@@ -57,7 +57,7 @@ public class PageInfo
*/
public PageInfo(IRequestablePage page)
{
- Checks.argumentNotNull(page, "page");
+ Args.notNull(page, "page");
pageId = page.getPageId();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/AbstractResource.java Sat Aug 28 20:18:29 2010
@@ -30,7 +30,7 @@ import org.apache.wicket.request.http.We
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.settings.IResourceSettings;
import org.apache.wicket.util.io.Streams;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Convenience resource implementation. The subclass must implement
@@ -153,7 +153,7 @@ public abstract class AbstractResource i
*/
public void setContentDisposition(ContentDisposition contentDisposition)
{
- Checks.argumentNotNull(contentDisposition, "contentDisposition");
+ Args.notNull(contentDisposition, "contentDisposition");
this.contentDisposition = contentDisposition;
}
@@ -327,7 +327,7 @@ public abstract class AbstractResource i
*/
public void setWriteCallback(WriteCallback writeCallback)
{
- Checks.argumentNotNull(writeCallback, "writeCallback");
+ Args.notNull(writeCallback, "writeCallback");
this.writeCallback = writeCallback;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/IResource.java Sat Aug 28 20:18:29 2010
@@ -22,7 +22,7 @@ import org.apache.wicket.request.Request
import org.apache.wicket.request.Response;
import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
/**
* Resource is an object capable of writing output to response.
@@ -53,8 +53,8 @@ public interface IResource extends Seria
*/
public Attributes(Request request, Response response, PageParameters parameters)
{
- Checks.argumentNotNull(request, "request");
- Checks.argumentNotNull(response, "response");
+ Args.notNull(request, "request");
+ Args.notNull(response, "response");
this.request = request;
this.response = response;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReference.java Sat Aug 28 20:18:29 2010
@@ -20,7 +20,7 @@ import java.io.Serializable;
import java.util.Locale;
import org.apache.wicket.Application;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.lang.WicketObjects;
@@ -59,8 +59,8 @@ public abstract class ResourceReference
public ResourceReference(Class<?> scope, String name, Locale locale, String style,
String variation)
{
- Checks.argumentNotNull(scope, "scope");
- Checks.argumentNotNull(name, "name");
+ Args.notNull(scope, "scope");
+ Args.notNull(name, "name");
this.scope = scope.getName();
this.name = name;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java Sat Aug 28 20:18:29 2010
@@ -22,7 +22,7 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
/**
@@ -42,8 +42,8 @@ public class ResourceReferenceRegistry
public Key(String scope, String name, Locale locale, String style, String variation)
{
- Checks.argumentNotNull(scope, "scope");
- Checks.argumentNotNull(name, "name");
+ Args.notNull(scope, "scope");
+ Args.notNull(name, "name");
this.scope = scope.intern();
this.name = name.intern();
@@ -103,7 +103,7 @@ public class ResourceReferenceRegistry
*/
public void registerResourceReference(ResourceReference reference)
{
- Checks.argumentNotNull(reference, "reference");
+ Args.notNull(reference, "reference");
if (reference.canBeRegistered())
{
@@ -125,7 +125,7 @@ public class ResourceReferenceRegistry
*/
public void unregisterResourceReference(ResourceReference reference)
{
- Checks.argumentNotNull(reference, "reference");
+ Args.notNull(reference, "reference");
Key key = new Key(reference.getScope().getName(), reference.getName(),
reference.getLocale(), reference.getStyle(), reference.getVariation());
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java Sat Aug 28 20:18:29 2010
@@ -21,7 +21,7 @@ import java.io.InputStream;
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.IResourceStreamWriter;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
@@ -41,7 +41,7 @@ public class ResourceStreamResource exte
public ResourceStreamResource(IResourceStream stream)
{
- Checks.argumentNotNull(stream, "stream");
+ Args.notNull(stream, "stream");
this.stream = stream;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java?rev=990438&r1=990437&r2=990438&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/page/persistent/disk/DiskDataStoreTest.java Sat Aug 28 20:18:29 2010
@@ -31,7 +31,7 @@ import junit.framework.TestCase;
import org.apache.wicket.pageStore.AsynchronousDataStore;
import org.apache.wicket.pageStore.DiskDataStore;
import org.apache.wicket.pageStore.IDataStore;
-import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Args;
public class DiskDataStoreTest extends TestCase
{
@@ -89,7 +89,7 @@ public class DiskDataStoreTest extends T
public boolean checkData(byte data[])
{
- Checks.argumentNotNull(data, "data");
+ Args.notNull(data, "data");
if (data.length != length)
{
return false;