Author: ivaynberg
Date: Sun Oct 11 00:40:57 2009
New Revision: 823991
URL: http://svn.apache.org/viewvc?rev=823991&view=rev
Log:
rename Check to Checks and move into core package
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Checks.java
- copied, changed from r823990,
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkablePageRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/RenderPageRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BookmarkableMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/BufferedWebResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/ServletWebResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/Resource.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/page/persistent/disk/DiskDataStoreTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/Application.java Sun
Oct 11 00:40:57 2009
@@ -31,7 +31,7 @@
import org.apache.wicket.ng.session.SessionStore.UnboundListener;
import org.apache.wicket.ng.settings.ApplicationSettings;
import org.apache.wicket.ng.settings.RequestCycleSettings;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Generic application that is environment (servlet, portlet, test) agnostic.
@@ -85,7 +85,7 @@
*/
public final void setName(String name)
{
- Check.argumentNotEmpty(name, "name");
+ Checks.argumentNotEmpty(name, "name");
if (this.name != null)
{
@@ -316,7 +316,7 @@
Session fetchCreateAndSetSession(RequestCycle requestCycle)
{
- Check.argumentNotNull(requestCycle, "requestCycle");
+ Checks.argumentNotNull(requestCycle, "requestCycle");
Session session = getSessionStore().lookup(requestCycle.getRequest());
if (session == null)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
Sun Oct 11 00:40:57 2009
@@ -8,8 +8,8 @@
import org.apache.wicket.ng.Page;
import org.apache.wicket.ng.page.ManageablePage;
-import org.apache.wicket.ng.util.lang.Check;
import org.apache.wicket.ng.util.lang.Objects;
+import org.apache.wicket.util.lang.Checks;
public class DefaultPageStore implements PageStore
{
@@ -21,8 +21,8 @@
public DefaultPageStore(String applicationName, DataStore dataStore,
int cacheSize)
{
- Check.argumentNotNull(applicationName, "applicationName");
- Check.argumentNotNull(dataStore, "DataStore");
+ Checks.argumentNotNull(applicationName, "applicationName");
+ Checks.argumentNotNull(dataStore, "DataStore");
this.applicationName = applicationName;
this.pageDataStore = dataStore;
@@ -279,8 +279,8 @@
protected SerializedPage serializePage(String sessionId, ManageablePage
page)
{
- Check.argumentNotNull(sessionId, "sessionId");
- Check.argumentNotNull(page, "page");
+ Checks.argumentNotNull(sessionId, "sessionId");
+ Checks.argumentNotNull(page, "page");
byte data[] = Objects.objectToByteArray(page, applicationName);
return new SerializedPage(sessionId, page.getPageId(), data);
@@ -320,7 +320,7 @@
public SerializedPage removePage(String sessionId, int id)
{
- Check.argumentNotNull(sessionId, "sessionId");
+ Checks.argumentNotNull(sessionId, "sessionId");
if (size > 0)
{
@@ -343,7 +343,7 @@
public void removePages(String sessionId)
{
- Check.argumentNotNull(sessionId, "sessionId");
+ Checks.argumentNotNull(sessionId, "sessionId");
if (size > 0)
{
@@ -364,7 +364,7 @@
public SerializedPage getPage(String sessionId, int id)
{
- Check.argumentNotNull(sessionId, "sessionId");
+ Checks.argumentNotNull(sessionId, "sessionId");
SerializedPage result = null;
if (size > 0)
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/protocol/http/ServletWebRequest.java
Sun Oct 11 00:40:57 2009
@@ -33,8 +33,8 @@
import org.apache.wicket.ng.request.RequestParameters;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.Url.QueryParameter;
-import org.apache.wicket.ng.util.lang.Check;
import org.apache.wicket.util.io.Streams;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
@@ -61,8 +61,8 @@
*/
public ServletWebRequest(HttpServletRequest httpServletRequest, String
filterPrefix)
{
- Check.argumentNotNull(httpServletRequest, "httpServletRequest");
- Check.argumentNotNull(filterPrefix, "filterPrefix");
+ Checks.argumentNotNull(httpServletRequest,
"httpServletRequest");
+ Checks.argumentNotNull(filterPrefix, "filterPrefix");
this.url = getUrl(httpServletRequest, filterPrefix);
this.httpServletRequest = httpServletRequest;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java Sun
Oct 11 00:40:57 2009
@@ -23,8 +23,8 @@
import org.apache.wicket.ng.protocol.http.WicketURLDecoder;
import org.apache.wicket.ng.protocol.http.WicketURLEncoder;
-import org.apache.wicket.ng.util.lang.Check;
import org.apache.wicket.ng.util.lang.Objects;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
@@ -74,7 +74,7 @@
*/
public Url(Url url)
{
- Check.argumentNotNull(url, "url");
+ Checks.argumentNotNull(url, "url");
segments.addAll(url.getSegments());
parameters.addAll(url.getQueryParameters());
@@ -88,8 +88,8 @@
*/
public Url(List<String> segments, List<QueryParameter> parameters)
{
- Check.argumentNotNull(segments, "segments");
- Check.argumentNotNull(parameters, "parameters");
+ Checks.argumentNotNull(segments, "segments");
+ Checks.argumentNotNull(parameters, "parameters");
this.segments.addAll(segments);
this.parameters.addAll(parameters);
@@ -150,7 +150,7 @@
*/
public void removeLeadingSegments(int count)
{
- Check.argumentWithinRange(0, segments.size(), count, "count");
+ Checks.argumentWithinRange(0, segments.size(), count, "count");
for (int i = 0; i < count; i++)
{
segments.remove(0);
@@ -164,7 +164,7 @@
*/
public void prependLeadingSegments(List<String> newSegments)
{
- Check.argumentNotNull(newSegments, "segments");
+ Checks.argumentNotNull(newSegments, "segments");
segments.addAll(0, newSegments);
}
@@ -247,8 +247,8 @@
*/
public QueryParameter(String name, String value)
{
- Check.argumentNotNull(name, "name");
- Check.argumentNotNull(value, "value");
+ Checks.argumentNotNull(name, "name");
+ Checks.argumentNotNull(value, "value");
this.name = name;
this.value = value;
@@ -416,7 +416,7 @@
*/
public static Url parse(String url)
{
- Check.argumentNotNull(url, "url");
+ Checks.argumentNotNull(url, "url");
Url result = new Url();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
Sun Oct 11 00:40:57 2009
@@ -9,8 +9,8 @@
import java.util.TreeSet;
import org.apache.wicket.ng.request.RequestMapper;
-import org.apache.wicket.ng.util.lang.Check;
import org.apache.wicket.ng.util.lang.Objects;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.StringValue;
/**
@@ -42,7 +42,7 @@
*/
public PageParameters(PageParameters copy)
{
- Check.argumentNotNull(copy, "copy");
+ Checks.argumentNotNull(copy, "copy");
if (copy.indexedParameters != null)
this.indexedParameters = new
ArrayList<String>(copy.indexedParameters);
@@ -149,7 +149,7 @@
*/
public StringValue getNamedParameter(String name)
{
- Check.argumentNotNull(name, "name");
+ Checks.argumentNotNull(name, "name");
if (namedParameters != null)
{
@@ -172,7 +172,7 @@
*/
public List<StringValue> getNamedParameters(String name)
{
- Check.argumentNotNull(name, "name");
+ Checks.argumentNotNull(name, "name");
if (namedParameters != null)
{
@@ -199,7 +199,7 @@
*/
public void removeNamedParameter(String name)
{
- Check.argumentNotNull(name, "name");
+ Checks.argumentNotNull(name, "name");
if (namedParameters != null)
{
@@ -235,8 +235,8 @@
*/
public void addNamedParameter(String name, Object value, int index)
{
- Check.argumentNotNull(name, "name");
- Check.argumentNotNull(value, "value");
+ Checks.argumentNotNull(name, "name");
+ Checks.argumentNotNull(value, "value");
if (namedParameters == null)
namedParameters = new ArrayList<Entry>(1);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycle.java
Sun Oct 11 00:40:57 2009
@@ -31,7 +31,7 @@
import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.ng.request.response.Response;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,12 +71,12 @@
{
super(context.getResponse());
- Check.argumentNotNull(context, "context");
+ Checks.argumentNotNull(context, "context");
- Check.argumentNotNull(context.getRequest(), "context.request");
- Check.argumentNotNull(context.getResponse(), "context.response");
- Check.argumentNotNull(context.getRequestMapper(),
"context.requestMapper");
- Check.argumentNotNull(context.getExceptionMapper(),
"context.exceptionMapper");
+ Checks.argumentNotNull(context.getRequest(), "context.request");
+ Checks.argumentNotNull(context.getResponse(), "context.response");
+ Checks.argumentNotNull(context.getRequestMapper(),
"context.requestMapper");
+ Checks.argumentNotNull(context.getExceptionMapper(),
"context.exceptionMapper");
this.request = context.getRequest();
this.originalResponse = context.getResponse();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java
Sun Oct 11 00:40:57 2009
@@ -20,7 +20,7 @@
import java.util.List;
import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Takes care of rendering relative (or in future possibly absolute -
depending on configuration)
@@ -42,7 +42,7 @@
*/
public UrlRenderer(Url base)
{
- Check.argumentNotNull(base, "base");
+ Checks.argumentNotNull(base, "base");
this.baseUrl = base;
}
@@ -55,7 +55,7 @@
*/
public Url setBaseUrl(Url base)
{
- Check.argumentNotNull(base, "base");
+ Checks.argumentNotNull(base, "base");
Url original = this.baseUrl;
this.baseUrl = base;
@@ -82,7 +82,7 @@
*/
public String renderUrl(Url url)
{
- Check.argumentNotNull(url, "url");
+ Checks.argumentNotNull(url, "url");
if (url.isAbsolute())
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageAndComponentProvider.java
Sun Oct 11 00:40:57 2009
@@ -3,7 +3,7 @@
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.component.RequestableComponent;
import org.apache.wicket.ng.request.component.RequestablePage;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Extension of {...@link PageProvider} that is also capable of providing a
Component belonging to the
@@ -40,7 +40,7 @@
{
super(page);
- Check.argumentNotNull(component, "component");
+ Checks.argumentNotNull(component, "component");
this.component = component;
}
@@ -160,7 +160,7 @@
private void setComponentPath(String componentPath)
{
- Check.argumentNotNull(componentPath, "componentPath");
+ Checks.argumentNotNull(componentPath, "componentPath");
this.componentPath = componentPath;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
Sun Oct 11 00:40:57 2009
@@ -10,7 +10,7 @@
import org.apache.wicket.ng.request.component.RequestablePage;
import org.apache.wicket.ng.request.mapper.PageSource;
import org.apache.wicket.ng.request.mapper.StalePageException;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Provides page instance for request handlers. Each of the constructors has
just enough information
@@ -118,7 +118,7 @@
*/
public PageProvider(RequestablePage page)
{
- Check.argumentNotNull(page, "page");
+ Checks.argumentNotNull(page, "page");
this.pageInstance = page;
}
@@ -272,14 +272,14 @@
private void setPageClass(Class<? extends RequestablePage> pageClass)
{
- Check.argumentNotNull(pageClass, "pageClass");
+ Checks.argumentNotNull(pageClass, "pageClass");
this.pageClass = pageClass;
}
private void setPageParameters(PageParameters pageParameters)
{
- Check.argumentNotNull(pageParameters, "pageParameters");
+ Checks.argumentNotNull(pageParameters, "pageParameters");
this.pageParameters = pageParameters;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
Sun Oct 11 00:40:57 2009
@@ -24,7 +24,7 @@
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.PageRequestHandler;
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Request handler for bookmarkable pages with listener interface. This
handler is only used to
@@ -51,8 +51,8 @@
public
BookmarkableListenerInterfaceRequestHandler(PageAndComponentProvider
pageComponentProvider,
RequestListenerInterface listenerInterface, Integer
behaviorIndex)
{
- Check.argumentNotNull(pageComponentProvider,
"pageComponentProvider");
- Check.argumentNotNull(listenerInterface, "listenerInterface");
+ Checks.argumentNotNull(pageComponentProvider,
"pageComponentProvider");
+ Checks.argumentNotNull(listenerInterface, "listenerInterface");
this.pageComponentProvider = pageComponentProvider;
this.listenerInterface = listenerInterface;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkablePageRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkablePageRequestHandler.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkablePageRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BookmarkablePageRequestHandler.java
Sun Oct 11 00:40:57 2009
@@ -21,7 +21,7 @@
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.handler.PageClassRequestHandler;
import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Request handler for bookmarkable pages. This handler is only used to
generate URLs. Rendering is
@@ -41,7 +41,7 @@
public BookmarkablePageRequestHandler(PageProvider pageProvider)
{
- Check.argumentNotNull(pageProvider, "pageProvider");
+ Checks.argumentNotNull(pageProvider, "pageProvider");
this.pageProvider = pageProvider;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/ListenerInterfaceRequestHandler.java
Sun Oct 11 00:40:57 2009
@@ -28,7 +28,7 @@
import org.apache.wicket.ng.request.handler.PageRequestHandler;
import
org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Request handler that invokes the listener interface on component and
renders page afterwards.
@@ -51,8 +51,8 @@
public ListenerInterfaceRequestHandler(PageAndComponentProvider
pageComponentProvider,
RequestListenerInterface listenerInterface, Integer
behaviorIndex)
{
- Check.argumentNotNull(pageComponentProvider,
"pageComponentProvider");
- Check.argumentNotNull(listenerInterface, "listenerInterface");
+ Checks.argumentNotNull(pageComponentProvider,
"pageComponentProvider");
+ Checks.argumentNotNull(listenerInterface, "listenerInterface");
this.pageComponentProvider = pageComponentProvider;
this.listenerInterface = listenerInterface;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/RenderPageRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/RenderPageRequestHandler.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/RenderPageRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/RenderPageRequestHandler.java
Sun Oct 11 00:40:57 2009
@@ -25,7 +25,7 @@
import org.apache.wicket.ng.request.handler.PageProvider;
import org.apache.wicket.ng.request.handler.PageRequestHandler;
import
org.apache.wicket.ng.request.handler.impl.render.RenderPageRequestHandlerDelegate;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* {...@link RequestHandler} that renders page instance. Depending on the
<code>redirectPolicy</code>
@@ -87,8 +87,8 @@
*/
public RenderPageRequestHandler(PageProvider pageProvider,
RedirectPolicy redirectPolicy)
{
- Check.argumentNotNull(pageProvider, "pageProvider");
- Check.argumentNotNull(redirectPolicy, "redirectPolicy");
+ Checks.argumentNotNull(pageProvider, "pageProvider");
+ Checks.argumentNotNull(redirectPolicy, "redirectPolicy");
this.redirectPolicy = redirectPolicy;
this.pageProvider = pageProvider;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
Sun Oct 11 00:40:57 2009
@@ -20,7 +20,7 @@
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.resource.ResourceReference;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Request handler for {...@link ResourceReference}. This handler is only used
to generate URLs.
@@ -40,7 +40,7 @@
*/
public ResourceReferenceRequestHandler(ResourceReference
resourceReference, PageParameters pageParameters)
{
- Check.argumentNotNull(resourceReference, "resourceReference");
+ Checks.argumentNotNull(resourceReference, "resourceReference");
this.resourceReference = resourceReference;
this.pageParameters = pageParameters;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceRequestHandler.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceRequestHandler.java
Sun Oct 11 00:40:57 2009
@@ -22,7 +22,7 @@
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.resource.Resource;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Request handler that renders a resource.
@@ -47,7 +47,7 @@
public ResourceRequestHandler(Resource resource, Locale locale, String
style,
PageParameters pageParameters)
{
- Check.argumentNotNull(resource, "resource");
+ Checks.argumentNotNull(resource, "resource");
this.resource = resource;
this.locale = locale;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
Sun Oct 11 00:40:57 2009
@@ -32,7 +32,7 @@
import org.apache.wicket.ng.request.mapper.info.ComponentInfo;
import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
import org.apache.wicket.ng.request.mapper.info.PageInfo;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@
public UrlInfo(PageComponentInfo pageComponentInfo, Class<?
extends RequestablePage> pageClass,
PageParameters pageParameters)
{
- Check.argumentNotNull(pageClass, "pageClass");
+ Checks.argumentNotNull(pageClass, "pageClass");
this.pageComponentInfo = pageComponentInfo;
this.pageParameters = pageParameters != null ?
pageParameters : null;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
Sun Oct 11 00:40:57 2009
@@ -26,8 +26,8 @@
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
import org.apache.wicket.ng.request.mapper.parameters.PageParametersEncoder;
-import org.apache.wicket.ng.util.lang.Check;
import org.apache.wicket.ng.util.lang.Classes;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.Strings;
/**
@@ -50,7 +50,7 @@
*/
protected String requestListenerInterfaceToString(RequestListenerInterface
listenerInterface)
{
- Check.argumentNotNull(listenerInterface, "listenerInterface");
+ Checks.argumentNotNull(listenerInterface, "listenerInterface");
return
getContext().requestListenerInterfaceToString(listenerInterface);
}
@@ -63,7 +63,7 @@
*/
protected RequestListenerInterface
requestListenerInterfaceFromString(String interfaceName)
{
- Check.argumentNotEmpty(interfaceName, "interfaceName");
+ Checks.argumentNotEmpty(interfaceName, "interfaceName");
return getContext().requestListenerInterfaceFromString(interfaceName);
}
@@ -187,7 +187,7 @@
*/
protected Class< ? extends RequestablePage> getPageClass(String name)
{
- Check.argumentNotEmpty(name, "name");
+ Checks.argumentNotEmpty(name, "name");
return Classes.resolveClass(name);
}
@@ -205,8 +205,8 @@
protected PageParameters extractPageParameters(Request request, int
segmentsToSkip,
PageParametersEncoder encoder)
{
- Check.argumentNotNull(request, "request");
- Check.argumentNotNull(encoder, "encoder");
+ Checks.argumentNotNull(request, "request");
+ Checks.argumentNotNull(encoder, "encoder");
// strip the segments and first query parameter from URL
Url urlCopy = new Url(request.getUrl());
@@ -238,8 +238,8 @@
protected Url encodePageParameters(Url url, PageParameters pageParameters,
PageParametersEncoder encoder)
{
- Check.argumentNotNull(url, "url");
- Check.argumentNotNull(encoder, "encoder");
+ Checks.argumentNotNull(url, "url");
+ Checks.argumentNotNull(encoder, "encoder");
if (pageParameters == null)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BookmarkableMapper.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BookmarkableMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BookmarkableMapper.java
Sun Oct 11 00:40:57 2009
@@ -23,7 +23,7 @@
import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
import org.apache.wicket.ng.request.mapper.parameters.PageParametersEncoder;
import
org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Decodes and encodes the following URLs:
@@ -60,7 +60,7 @@
*/
public BookmarkableMapper(PageParametersEncoder pageParametersEncoder)
{
- Check.argumentNotNull(pageParametersEncoder,
"pageParametersEncoder");
+ Checks.argumentNotNull(pageParametersEncoder,
"pageParametersEncoder");
this.pageParametersEncoder = pageParametersEncoder;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java
Sun Oct 11 00:40:57 2009
@@ -25,7 +25,7 @@
import org.apache.wicket.ng.request.mapper.info.PageComponentInfo;
import org.apache.wicket.ng.request.mapper.parameters.PageParametersEncoder;
import
org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Encoder for mounted URL. The mount path can contain parameter placeholders,
i.e.
@@ -69,9 +69,9 @@
public MountedMapper(String mountPath, Class<? extends RequestablePage>
pageClass,
PageParametersEncoder pageParametersEncoder)
{
- Check.argumentNotEmpty(mountPath, "mountPath");
- Check.argumentNotNull(pageClass, "pageClass");
- Check.argumentNotNull(pageParametersEncoder,
"pageParametersEncoder");
+ Checks.argumentNotEmpty(mountPath, "mountPath");
+ Checks.argumentNotNull(pageClass, "pageClass");
+ Checks.argumentNotNull(pageParametersEncoder,
"pageParametersEncoder");
this.pageParametersEncoder = pageParametersEncoder;
this.pageClass = new WeakReference<Class<? extends
RequestablePage>>(pageClass);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/ComponentInfo.java
Sun Oct 11 00:40:57 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ng.request.mapper.info;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.Strings;
/**
@@ -50,8 +50,8 @@
public ComponentInfo(Integer renderCount, String listenerInterface,
String componentPath,
Integer behaviorIndex)
{
- Check.argumentNotEmpty(listenerInterface, "listenerInterface");
- Check.argumentNotEmpty(componentPath, "componentPath");
+ Checks.argumentNotEmpty(listenerInterface, "listenerInterface");
+ Checks.argumentNotEmpty(componentPath, "componentPath");
this.listenerInterface = listenerInterface;
this.componentPath = componentPath;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageComponentInfo.java
Sun Oct 11 00:40:57 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ng.request.mapper.info;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.Strings;
/**
@@ -39,7 +39,7 @@
*/
public PageComponentInfo(PageInfo pageInfo, ComponentInfo componentInfo)
{
- Check.argumentNotNull(pageInfo, "pageInfo");
+ Checks.argumentNotNull(pageInfo, "pageInfo");
this.pageInfo = pageInfo;
this.componentInfo = componentInfo;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/info/PageInfo.java
Sun Oct 11 00:40:57 2009
@@ -17,7 +17,7 @@
package org.apache.wicket.ng.request.mapper.info;
import org.apache.wicket.ng.request.component.RequestablePage;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.Strings;
/**
@@ -57,7 +57,7 @@
*/
public PageInfo(RequestablePage page)
{
- Check.argumentNotNull(page, "page");
+ Checks.argumentNotNull(page, "page");
this.pageId = page.getPageId();
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/mount/MountMapper.java
Sun Oct 11 00:40:57 2009
@@ -5,7 +5,7 @@
import org.apache.wicket.ng.request.RequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.mapper.AbstractMapper;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.StringValue;
/**
@@ -20,8 +20,8 @@
public MountMapper(String mountPath, MountedRequestMapper mapper)
{
- Check.argumentNotEmpty(mountPath, "mountPath");
- Check.argumentNotNull(mapper, "mapper");
+ Checks.argumentNotEmpty(mountPath, "mountPath");
+ Checks.argumentNotNull(mapper, "mapper");
this.mountSegments = getMountSegments(mountPath);
this.mapper = mapper;
@@ -29,8 +29,8 @@
public MountMapper(String mountPath, RequestMapper mapper)
{
- Check.argumentNotEmpty(mountPath, "mountPath");
- Check.argumentNotNull(mapper, "mapper");
+ Checks.argumentNotEmpty(mountPath, "mountPath");
+ Checks.argumentNotNull(mapper, "mapper");
this.mountSegments = getMountSegments(mountPath);
this.mapper = new UnmountedMapperAdapter(mapper);
@@ -38,8 +38,8 @@
public MountMapper(String mountPath, RequestHandler handler)
{
- Check.argumentNotEmpty(mountPath, "mountPath");
- Check.argumentNotNull(handler, "handler");
+ Checks.argumentNotEmpty(mountPath, "mountPath");
+ Checks.argumentNotNull(handler, "handler");
this.mountSegments = getMountSegments(mountPath);
this.mapper = new UnmountedRequestHandlerAdapter(handler);
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
Sun Oct 11 00:40:57 2009
@@ -25,8 +25,8 @@
import org.apache.wicket.ng.request.RequestParameters;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.Url.QueryParameter;
-import org.apache.wicket.ng.util.lang.Check;
import org.apache.wicket.ng.util.lang.Objects;
+import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.string.StringValue;
/**
@@ -44,7 +44,7 @@
*/
public UrlRequestParametersAdapter(Url url)
{
- Check.argumentNotNull(url, "url");
+ Checks.argumentNotNull(url, "url");
this.url = url;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/BufferedWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/BufferedWebResponse.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/BufferedWebResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/BufferedWebResponse.java
Sun Oct 11 00:40:57 2009
@@ -27,7 +27,7 @@
import javax.servlet.http.Cookie;
import org.apache.wicket.ng.WicketRuntimeException;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Subclass of {...@link WebResponse} that buffers the actions and performs
those on another response.
@@ -170,7 +170,7 @@
*/
public void writeTo(final WebResponse response)
{
- Check.argumentNotNull(response, "response");
+ Checks.argumentNotNull(response, "response");
for (CookieEntry e : cookieEntries)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/ServletWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/ServletWebResponse.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/ServletWebResponse.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/response/ServletWebResponse.java
Sun Oct 11 00:40:57 2009
@@ -22,7 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.ng.WicketRuntimeException;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* WebResponse that wraps a {...@link ServletWebResponse}.
@@ -39,7 +39,7 @@
*/
public ServletWebResponse(HttpServletResponse httpServletResponse)
{
- Check.argumentNotNull(httpServletResponse,
"httpServletResponse");
+ Checks.argumentNotNull(httpServletResponse,
"httpServletResponse");
this.httpServletResponse = httpServletResponse;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/Resource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/Resource.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/Resource.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/Resource.java
Sun Oct 11 00:40:57 2009
@@ -23,7 +23,7 @@
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.handler.resource.ResourceRequestHandler;
import org.apache.wicket.ng.request.response.Response;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
/**
* Resource is an object capable of writing output to response.
@@ -59,9 +59,9 @@
public Attributes(Request request, Response response, Locale
locale, String style,
PageParameters parameters)
{
- Check.argumentNotNull(request, "request");
- Check.argumentNotNull(response, "response");
- Check.argumentNotNull(locale, "locale");
+ Checks.argumentNotNull(request, "request");
+ Checks.argumentNotNull(response, "response");
+ Checks.argumentNotNull(locale, "locale");
this.request = request;
this.response = response;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
Sun Oct 11 00:40:57 2009
@@ -19,9 +19,9 @@
import java.io.Serializable;
import java.util.Locale;
-import org.apache.wicket.ng.util.lang.Check;
import org.apache.wicket.ng.util.lang.Classes;
import org.apache.wicket.ng.util.lang.Objects;
+import org.apache.wicket.util.lang.Checks;
/**
* Reference to a resource. Can be used to reference global resources.
@@ -49,8 +49,8 @@
*/
public ResourceReference(Class<?> scope, String name, Locale locale,
String style)
{
- Check.argumentNotNull(scope, "scope");
- Check.argumentNotNull(name, "name");
+ Checks.argumentNotNull(scope, "scope");
+ Checks.argumentNotNull(name, "name");
this.scope = scope.getName();
this.name = name;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
Sun Oct 11 00:40:57 2009
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.wicket.ng.util.lang.Check;
import org.apache.wicket.ng.util.lang.Objects;
+import org.apache.wicket.util.lang.Checks;
/**
* Allows to register and lookup {...@link ResourceReference}s.
@@ -39,8 +39,8 @@
public Key(String scope, String name, Locale locale, String
style)
{
- Check.argumentNotNull(scope, "scope");
- Check.argumentNotNull(name, "name");
+ Checks.argumentNotNull(scope, "scope");
+ Checks.argumentNotNull(name, "name");
this.scope = scope;
this.name = name;
@@ -82,7 +82,7 @@
*/
public void registerResourceReference(ResourceReference reference)
{
- Check.argumentNotNull(reference, "reference");
+ Checks.argumentNotNull(reference, "reference");
Key key = new Key(reference.getScope().getName(),
reference.getName(),
reference.getLocale(), reference.getStyle());
@@ -96,7 +96,7 @@
*/
public void unregisterResourceReference(ResourceReference reference)
{
- Check.argumentNotNull(reference, "reference");
+ Checks.argumentNotNull(reference, "reference");
Key key = new Key(reference.getScope().getName(),
reference.getName(),
reference.getLocale(), reference.getStyle());
Copied:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Checks.java (from
r823990,
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Checks.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Checks.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java&r1=823990&r2=823991&rev=823991&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/Check.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Checks.java
Sun Oct 11 00:40:57 2009
@@ -1,8 +1,8 @@
-package org.apache.wicket.ng.util.lang;
+package org.apache.wicket.util.lang;
import org.apache.wicket.util.string.Strings;
-public class Check
+public class Checks
{
public static void argumentNotNull(Object argument, String name)
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/page/persistent/disk/DiskDataStoreTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/page/persistent/disk/DiskDataStoreTest.java?rev=823991&r1=823990&r2=823991&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/page/persistent/disk/DiskDataStoreTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/page/persistent/disk/DiskDataStoreTest.java
Sun Oct 11 00:40:57 2009
@@ -14,7 +14,7 @@
import org.apache.wicket.ng.page.persistent.AsynchronousDataStore;
import org.apache.wicket.ng.page.persistent.DataStore;
-import org.apache.wicket.ng.util.lang.Check;
+import org.apache.wicket.util.lang.Checks;
public class DiskDataStoreTest extends TestCase
{
@@ -72,7 +72,7 @@
public boolean checkData(byte data[])
{
- Check.argumentNotNull(data, "data");
+ Checks.argumentNotNull(data, "data");
if (data.length != length)
{
return false;
