Author: knopp
Date: Fri Apr 3 09:00:31 2009
New Revision: 761575
URL: http://svn.apache.org/viewvc?rev=761575&view=rev
Log:
bitsnpieces
Modified:
wicket/sandbox/knopp/experimental/wicket-ng-webapp/src/main/java/org/apache/wicket/ngwebapp/TestPage1.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/PageParameters.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/page-management.txt
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/Url.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRenderer.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRequestParametersAdapter.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageComponentProvider.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/ServletWebRequest.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/BufferedWebResponse.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/ServletWebResponse.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReference.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReferenceRegistry.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/Streams.java
Modified:
wicket/sandbox/knopp/experimental/wicket-ng-webapp/src/main/java/org/apache/wicket/ngwebapp/TestPage1.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng-webapp/src/main/java/org/apache/wicket/ngwebapp/TestPage1.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng-webapp/src/main/java/org/apache/wicket/ngwebapp/TestPage1.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng-webapp/src/main/java/org/apache/wicket/ngwebapp/TestPage1.java
Fri Apr 3 09:00:31 2009
@@ -27,7 +27,7 @@
RequestCycle.get().setResponsePage(getPage());
}
};
- l1.setBookmarkable(true);
+ l1.setBookmarkable(isPageStateless());
l1.setLabel("Link 1 - Add Some Parameters");
add(l1);
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
Fri Apr 3 09:00:31 2009
@@ -7,6 +7,7 @@
import org.apache.wicket.application.DefaultClassResolver;
import org.apache.wicket.settings.ApplicationSettings;
import org.apache.wicket.settings.RequestCycleSettings;
+import org.apache.wicket.util.lang.Check;
public class Application
{
@@ -28,14 +29,8 @@
public void setName(String name)
{
- if (name == null)
- {
- throw new IllegalArgumentException("Argument 'name' can
not be null.");
- }
- if (this.name != null)
- {
- throw new IllegalStateException("Application name can
only be set once.");
- }
+ Check.argumentNotEmpty(name, "name");
+
this.name = name;
applications.put(name, this);
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/PageParameters.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/PageParameters.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/PageParameters.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/PageParameters.java
Fri Apr 3 09:00:31 2009
@@ -9,6 +9,7 @@
import java.util.TreeSet;
import org.apache.wicket.request.RequestHandlerEncoder;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
@@ -41,10 +42,8 @@
*/
public PageParameters(PageParameters copy)
{
- if (copy == null)
- {
- throw new IllegalArgumentException("Copy argument may
not be null.");
- }
+ Check.argumentNotNull(copy, "copy");
+
if (copy.indexedParameters != null)
this.indexedParameters = new
ArrayList<String>(copy.indexedParameters);
@@ -150,10 +149,8 @@
*/
public StringValue getNamedParameter(String name)
{
- if (name == null)
- {
- throw new IllegalArgumentException("Parameter name may
not be null.");
- }
+ Check.argumentNotNull(name, "name");
+
if (namedParameters != null)
{
for (Entry entry : namedParameters)
@@ -175,10 +172,8 @@
*/
public List<StringValue> getNamedParameters(String name)
{
- if (name == null)
- {
- throw new IllegalArgumentException("Parameter name may
not be null.");
- }
+ Check.argumentNotNull(name, "name");
+
if (namedParameters != null)
{
List<StringValue> result = new ArrayList<StringValue>();
@@ -204,10 +199,8 @@
*/
public void removeNamedParameter(String name)
{
- if (name == null)
- {
- throw new IllegalArgumentException("Parameter name may
not be null.");
- }
+ Check.argumentNotNull(name, "name");
+
if (namedParameters != null)
{
for (Iterator<Entry> i = namedParameters.iterator();
i.hasNext();)
@@ -242,16 +235,8 @@
*/
public void addNamedParameter(String name, Object value, int index)
{
-
- if (name == null)
- {
- throw new IllegalArgumentException("Parameter name may
not be null.");
- }
-
- if (value == null)
- {
- throw new IllegalArgumentException("Parameter value may
not be null.");
- }
+ Check.argumentNotNull(name, "name");
+ Check.argumentNotNull(value, "value");
if (namedParameters == null)
namedParameters = new ArrayList<Entry>(1);
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/page-management.txt
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/page-management.txt?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/page-management.txt
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/page-management.txt
Fri Apr 3 09:00:31 2009
@@ -15,14 +15,23 @@
How to detect this?
-Page has new variable - render-count. Every time page is rendered render-count
increases. Every listener-interface
-link contains the actual render-count. Every time listener interface request
handler is invoked there's a check
-in place that throw StalePageException when the link is stale.
+Page has new variable - render-count. Every time page is rendered and
component hierarchy changes render-count
+increases. The component hierarchy changes *before* render so we know whether
to increment render count or not
+before the rendering actually begins.
+
+Every listener-interface link contains the render-count. Every time listener
interface request handler is invoked
+there's a check in place that throw StalePageException when the link is stale.
Later in game we can have fancy detection that immediately (matter of seconds)
tells user that the page he sees
become stale (because same page was rendered in another tab/window). This can
be achieved by a cookie containing
last x page render counts. The cookie is updated on every page render and it's
periodically checked for changes.
+Basically the difference between render count and page version is that render
count can change during page render
+(well, actually in onBeforeRender - because during actual render hierarchy
must not change) and is only in
+listener interface links so it never makes it to URL that user sees. On the
other hand version changes during
+listener interface actions and is visible in URL. Also version change requires
underlying page manager to store
+page snapshot (whereas render is only a property on existing page version).
+
Q: Will this break master/detail page where each detail link is opened in new
window/tab?
A: No. The detail link either changes component hierarchy (before render) or
sets another page as response. So
when the link is clicked the original page never gets rendered thus the
links don't become stale.
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/Url.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/Url.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/Url.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/Url.java
Fri Apr 3 09:00:31 2009
@@ -23,6 +23,7 @@
import org.apache.wicket.protocol.http.WicketURLDecoder;
import org.apache.wicket.protocol.http.WicketURLEncoder;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
@@ -72,10 +73,8 @@
*/
public Url(Url url)
{
- if (url == null)
- {
- throw new IllegalArgumentException("Argument 'url' may
not be null.");
- }
+ Check.argumentNotNull(url, "url");
+
segments.addAll(url.getSegments());
parameters.addAll(url.getQueryParameters());
}
@@ -88,14 +87,9 @@
*/
public Url(List<String> segments, List<QueryParameter> parameters)
{
- if (segments == null)
- {
- throw new IllegalArgumentException("Argument 'segments'
may not be null.");
- }
- if (parameters == null)
- {
- throw new IllegalArgumentException("Argument
'parameters' may not be null.");
- }
+ Check.argumentNotNull(segments, "segments");
+ Check.argumentNotNull(parameters, "parameters");
+
this.segments.addAll(segments);
this.parameters.addAll(parameters);
}
@@ -228,14 +222,9 @@
*/
public QueryParameter(String name, String value)
{
- if (name == null)
- {
- throw new IllegalArgumentException("Argument
'name' can not be null.");
- }
- if (value == null)
- {
- throw new IllegalArgumentException("Argument
'value' can not be null.");
- }
+ Check.argumentNotNull(name, "name");
+ Check.argumentNotNull(value, "value");
+
this.name = name;
this.value = value;
}
@@ -402,10 +391,7 @@
*/
public static Url parse(String url)
{
- if (url == null)
- {
- throw new IllegalArgumentException("Argument 'url' may
not be null.");
- }
+ Check.argumentNotNull(url, "url");
Url result = new Url();
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRenderer.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRenderer.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRenderer.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRenderer.java
Fri Apr 3 09:00:31 2009
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.wicket.util.lang.Check;
+
/**
* Takes care of rendering relative (or in future possibly absolute -
depending on configuration)
* URLs.
@@ -39,10 +41,8 @@
*/
public UrlRenderer(Url base)
{
- if (base == null)
- {
- throw new IllegalArgumentException("Argument 'base' may
not be null.");
- }
+ Check.argumentNotNull(base, "base");
+
this.baseUrl = base;
}
@@ -54,10 +54,8 @@
*/
public Url setBaseUrl(Url base)
{
- if (base == null)
- {
- throw new IllegalArgumentException("Argument 'base' may
not be null.");
- }
+ Check.argumentNotNull(base, "base");
+
Url original = this.baseUrl;
this.baseUrl = base;
return original;
@@ -83,10 +81,7 @@
*/
public String renderUrl(Url url)
{
- if (url == null)
- {
- throw new IllegalArgumentException("Argument 'url' may
not be null.");
- }
+ Check.argumentNotNull(url, "url");
if (url.isAbsolute())
{
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRequestParametersAdapter.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRequestParametersAdapter.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRequestParametersAdapter.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/UrlRequestParametersAdapter.java
Fri Apr 3 09:00:31 2009
@@ -23,6 +23,7 @@
import java.util.Set;
import org.apache.wicket.request.Url.QueryParameter;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
@@ -41,10 +42,8 @@
*/
public UrlRequestParametersAdapter(Url url)
{
- if (url == null)
- {
- throw new IllegalArgumentException("Argument 'url' may
not be null.");
- }
+ Check.argumentNotNull(url, "url");
+
this.url = url;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageComponentProvider.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageComponentProvider.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageComponentProvider.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageComponentProvider.java
Fri Apr 3 09:00:31 2009
@@ -5,6 +5,7 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.request.encoder.PageSource;
+import org.apache.wicket.util.lang.Check;
/**
* Extension of {...@link PageProvider} that is also capable of providing a
Component belonging to the
@@ -39,11 +40,10 @@
*/
public PageComponentProvider(IPage page, IComponent component)
{
- super(page);
- if (component == null)
- {
- throw new IllegalArgumentException("Argument
'component' may not be null.");
- }
+ super(page);
+
+ Check.argumentNotNull(component, "component");
+
this.component = component;
}
@@ -167,10 +167,8 @@
private void setComponentPath(String componentPath)
{
- if (componentPath == null)
- {
- throw new IllegalArgumentException("Argument
'componentPath' may not be null.");
- }
+ Check.argumentNotNull(componentPath, "componentPath");
+
this.componentPath = componentPath;
}
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Fri Apr 3 09:00:31 2009
@@ -9,6 +9,7 @@
import org.apache.wicket.request.RequestHandlerEncoder;
import org.apache.wicket.request.encoder.PageSource;
import org.apache.wicket.request.encoder.StalePageException;
+import org.apache.wicket.util.lang.Check;
/**
* Provides page instance for request handlers. Each of the constructors has
just enough information
@@ -125,10 +126,8 @@
*/
public PageProvider(IPage page)
{
- if (page == null)
- {
- throw new IllegalArgumentException("Argument 'page' may
not be null.");
- }
+ Check.argumentNotNull(page, "page");
+
this.pageInstance = page;
}
@@ -248,28 +247,22 @@
private void setPageSource(PageSource pageSource)
{
- if (pageSource == null)
- {
- throw new IllegalArgumentException("Argument
'pageSource' may not be null.");
- }
+ Check.argumentNotNull(pageSource, "pageSource");
+
this.pageSource = pageSource;
}
private void setPageClass(Class<? extends IPage> pageClass)
{
- if (pageClass == null)
- {
- throw new IllegalArgumentException("Argument'
pageClass' may not be null.");
- }
+ Check.argumentNotNull(pageClass, "pageClass");
+
this.pageClass = pageClass;
}
private void setPageParameters(PageParameters pageParameters)
{
- if (pageParameters == null)
- {
- throw new IllegalArgumentException("Argument
'pageParameters' may not be null.");
- }
+ Check.argumentNotNull(pageParameters, "pageParameters");
+
this.pageParameters = pageParameters;
}
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkableListenerInterfaceRequestHandler.java
Fri Apr 3 09:00:31 2009
@@ -24,9 +24,10 @@
import org.apache.wicket.request.handler.ComponentRequestHandler;
import org.apache.wicket.request.handler.PageComponentProvider;
import org.apache.wicket.request.handler.PageRequestHandler;
+import org.apache.wicket.util.lang.Check;
/**
- * Request handler for bookmarkable pages with listener intreface. This
handler is only used to
+ * Request handler for bookmarkable pages with listener interface. This
handler is only used to
* generate URLs. Rendering is always handled by {...@link
ListenerInterfaceRequestHandler}.
*
* @author Matej Knopp
@@ -50,14 +51,9 @@
public
BookmarkableListenerInterfaceRequestHandler(PageComponentProvider
pageComponentProvider,
RequestListenerInterface listenerInterface, Integer
behaviorIndex)
{
- if (pageComponentProvider == null)
- {
- throw new IllegalArgumentException("Argument
'pageCompoenntProvider' may not be null.");
- }
- if (listenerInterface == null)
- {
- throw new IllegalArgumentException("Argument
'listenerInterface' may not be null.");
- }
+ Check.argumentNotNull(pageComponentProvider,
"pageComponentProvider");
+ Check.argumentNotNull(listenerInterface, "listenerInterface");
+
this.pageComponentProvider = pageComponentProvider;
this.listenerInterface = listenerInterface;
this.behaviorIndex = behaviorIndex;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/BookmarkablePageRequestHandler.java
Fri Apr 3 09:00:31 2009
@@ -21,6 +21,7 @@
import org.apache.wicket.RequestCycle;
import org.apache.wicket.request.handler.PageClassRequestHandler;
import org.apache.wicket.request.handler.PageProvider;
+import org.apache.wicket.util.lang.Check;
/**
* Request handler for bookmarkable pages. This handler is only used to
generate URLs. Rendering is
@@ -39,10 +40,9 @@
*/
public BookmarkablePageRequestHandler(PageProvider pageProvider)
{
- if (pageProvider == null)
- {
- throw new IllegalArgumentException("Argument
'pageProvider' may not be null.");
- }
+
+ Check.argumentNotNull(pageProvider, "pageProvider");
+
this.pageProvider = pageProvider;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/ListenerInterfaceRequestHandler.java
Fri Apr 3 09:00:31 2009
@@ -28,6 +28,7 @@
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.PageRequestHandler;
import
org.apache.wicket.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
+import org.apache.wicket.util.lang.Check;
/**
* Request handler that invokes the listener interface on component and
renders page afterwards.
@@ -50,14 +51,9 @@
public ListenerInterfaceRequestHandler(PageComponentProvider
pageComponentProvider,
RequestListenerInterface listenerInterface, Integer
behaviorIndex)
{
- if (pageComponentProvider == null)
- {
- throw new IllegalArgumentException("Argument
'pageComponentProvider' may not be null.");
- }
- if (listenerInterface == null)
- {
- throw new IllegalArgumentException("Argument
'listenerInterface' may not be null.");
- }
+ Check.argumentNotNull(pageComponentProvider,
"pageComponentProvider");
+ Check.argumentNotNull(listenerInterface, "listenerInterface");
+
this.pageComponentProvider = pageComponentProvider;
this.listenerInterface = listenerInterface;
this.behaviorIndex = behaviorIndex;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/impl/RenderPageRequestHandler.java
Fri Apr 3 09:00:31 2009
@@ -30,6 +30,7 @@
import org.apache.wicket.request.response.Response;
import org.apache.wicket.request.response.WebResponse;
import org.apache.wicket.settings.RequestCycleSettings;
+import org.apache.wicket.util.lang.Check;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,14 +93,9 @@
*/
public RenderPageRequestHandler(PageProvider pageProvider,
RedirectPolicy redirectPolicy)
{
- if (pageProvider == null)
- {
- throw new IllegalArgumentException("Argument
'pageProvider' may not be null.");
- }
- if (redirectPolicy == null)
- {
- throw new IllegalArgumentException("Argument
'redirectPolicy' may no be null.");
- }
+ Check.argumentNotNull(pageProvider, "pageProvider");
+ Check.argumentNotNull(redirectPolicy, "redirectPolicy");
+
this.redirectPolicy = redirectPolicy;
this.pageProvider = pageProvider;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
Fri Apr 3 09:00:31 2009
@@ -20,6 +20,7 @@
import org.apache.wicket.RequestCycle;
import org.apache.wicket.request.RequestHandler;
import org.apache.wicket.resource.ResourceReference;
+import org.apache.wicket.util.lang.Check;
/**
* Request handler for {...@link ResourceReference}. This handler is only used
to generate URLs.
@@ -39,10 +40,8 @@
*/
public ResourceReferenceRequestHandler(ResourceReference
resourceReference, PageParameters pageParameters)
{
- if (resourceReference == null)
- {
- throw new IllegalArgumentException("Argument
'resourceReference' may not be null.");
- }
+ Check.argumentNotNull(resourceReference, "resourceReference");
+
this.resourceReference = resourceReference;
this.pageParameters = pageParameters;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
Fri Apr 3 09:00:31 2009
@@ -22,6 +22,7 @@
import org.apache.wicket.RequestCycle;
import org.apache.wicket.request.RequestHandler;
import org.apache.wicket.resource.Resource;
+import org.apache.wicket.util.lang.Check;
/**
* Request handler that renders a resource.
@@ -46,10 +47,8 @@
public ResourceRequestHandler(Resource resource, Locale locale, String
style,
PageParameters pageParameters)
{
- if (resource == null)
- {
- throw new IllegalArgumentException("Argument 'resource'
may not be null.");
- }
+ Check.argumentNotNull(resource, "resource");
+
this.resource = resource;
this.locale = locale;
this.style = style;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/ServletWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/ServletWebRequest.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/ServletWebRequest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/request/ServletWebRequest.java
Fri Apr 3 09:00:31 2009
@@ -34,6 +34,7 @@
import org.apache.wicket.request.Url;
import org.apache.wicket.request.Url.QueryParameter;
import org.apache.wicket.util.io.Streams;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
@@ -58,14 +59,9 @@
*/
public ServletWebRequest(HttpServletRequest httpServletRequest, String
filterPrefix)
{
- if (httpServletRequest == null)
- {
- throw new IllegalArgumentException("Argument
'httpServletRequest' may not be null.");
- }
- if (filterPrefix == null)
- {
- throw new IllegalArgumentException("Argument
'filterPrefix' may not be null.");
- }
+ Check.argumentNotNull(httpServletRequest, "httpServletRequest");
+ Check.argumentNotNull(filterPrefix, "filterPrefix");
+
this.url = getUrl(httpServletRequest, filterPrefix);
this.httpServletRequest = httpServletRequest;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/BufferedWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/BufferedWebResponse.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/BufferedWebResponse.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/BufferedWebResponse.java
Fri Apr 3 09:00:31 2009
@@ -27,6 +27,7 @@
import javax.servlet.http.Cookie;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.util.lang.Check;
/**
* Subclass of {...@link WebResponse} that buffers the actions and performs
those on another response.
@@ -169,10 +170,8 @@
*/
public void writeTo(final WebResponse response)
{
- if (response == null)
- {
- throw new IllegalArgumentException("Argument 'response'
may not be null.");
- }
+ Check.argumentNotNull(response, "response");
+
for (CookieEntry e : cookieEntries)
{
if (e.add)
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/ServletWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/ServletWebResponse.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/ServletWebResponse.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/response/ServletWebResponse.java
Fri Apr 3 09:00:31 2009
@@ -22,6 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.util.lang.Check;
/**
* WebResponse that wraps a {...@link ServletWebResponse}.
@@ -38,10 +39,8 @@
*/
public ServletWebResponse(HttpServletResponse httpServletResponse)
{
- if (httpServletResponse == null)
- {
- throw new IllegalArgumentException("Argument
'httpServletResponse' may not be null.");
- }
+ Check.argumentNotNull(httpServletResponse,
"httpServletResponse");
+
this.httpServletResponse = httpServletResponse;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/Resource.java
Fri Apr 3 09:00:31 2009
@@ -23,6 +23,7 @@
import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
import org.apache.wicket.request.request.Request;
import org.apache.wicket.request.response.Response;
+import org.apache.wicket.util.lang.Check;
/**
* Resource is an object capable of writing output to response.
@@ -58,18 +59,10 @@
public Attributes(Request request, Response response, Locale
locale, String style,
PageParameters parameters)
{
- if (request == null)
- {
- throw new IllegalArgumentException("Argument
'request' may not be null.");
- }
- if (response == null)
- {
- throw new IllegalArgumentException("Argument
'response' may not be null.");
- }
- if (locale == null)
- {
- throw new IllegalArgumentException("Argument
'locale' may not be null.");
- }
+ Check.argumentNotNull(request, "resuest");
+ Check.argumentNotNull(response, "response");
+ Check.argumentNotNull(locale, "locale");
+
this.request = request;
this.response = response;
this.locale = locale;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReference.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReference.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReference.java
Fri Apr 3 09:00:31 2009
@@ -18,6 +18,7 @@
import java.util.Locale;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Objects;
@@ -45,16 +46,10 @@
*/
public ResourceReference(Class<?> scope, String name, Locale locale,
String style)
{
- if (scope == null)
- {
- throw new IllegalArgumentException("Argument 'scope'
can not be null.");
- }
- this.scope = scope.getName();
+ Check.argumentNotNull(scope, "scope");
+ Check.argumentNotNull(name, "name");
- if (name == null)
- {
- throw new IllegalArgumentException("Argument 'path' can
not be null.");
- }
+ this.scope = scope.getName();
this.name = name;
this.locale = locale;
this.style = style;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReferenceRegistry.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReferenceRegistry.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReferenceRegistry.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/resource/ResourceReferenceRegistry.java
Fri Apr 3 09:00:31 2009
@@ -20,6 +20,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.wicket.util.lang.Check;
import org.apache.wicket.util.lang.Objects;
/**
@@ -38,16 +39,10 @@
public Key(String scope, String name, Locale locale, String
style)
{
- if (scope == null)
- {
- throw new IllegalArgumentException("Argument
'scope' can not be null.");
- }
- this.scope = scope;
+ Check.argumentNotNull(scope, "scope");
+ Check.argumentNotNull(name, "name");
- if (name == null)
- {
- throw new IllegalArgumentException("Argument
'name' can not be null.");
- }
+ this.scope = scope;
this.name = name;
this.locale = locale;
this.style = style;
@@ -87,10 +82,8 @@
*/
public void registerResourceReference(ResourceReference reference)
{
- if (reference == null)
- {
- throw new IllegalArgumentException("Argument
'reference' may not be null.");
- }
+ Check.argumentNotNull(reference, "reference");
+
Key key = new Key(reference.getScope().getName(),
reference.getName(),
reference.getLocale(), reference.getStyle());
map.put(key, reference);
@@ -103,10 +96,8 @@
*/
public void unregisterResourceReference(ResourceReference reference)
{
- if (reference == null)
- {
- throw new IllegalArgumentException("Argument
'reference' may not be null.");
- }
+ Check.argumentNotNull(reference, "reference");
+
Key key = new Key(reference.getScope().getName(),
reference.getName(),
reference.getLocale(), reference.getStyle());
map.remove(key);
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/Streams.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/Streams.java?rev=761575&r1=761574&r2=761575&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/Streams.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/util/io/Streams.java
Fri Apr 3 09:00:31 2009
@@ -30,6 +30,7 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.util.lang.Check;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -93,14 +94,8 @@
public static void loadFromXml(Properties properties, InputStream
inputStream)
throws IOException
{
- if (properties == null)
- {
- throw new IllegalArgumentException("properties must not
be null");
- }
- if (inputStream == null)
- {
- throw new IllegalArgumentException("inputStream must
not be null");
- }
+ Check.argumentNotNull(properties, "properties");
+ Check.argumentNotNull(inputStream, "inputStream");
// TODO in a Wicket version that supports Java 5 (Wicket 2.0?),
we can
// just use the loadFromXml method on java.util.Properties
directly
