You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/12/19 12:27:18 UTC
svn commit: r892463 [2/4] - in /wicket/trunk:
wicket-examples/src/main/webapp/WEB-INF/
wicket-examples/src/test/java/org/apache/wicket/examples/repeater/
wicket/src/main/java/org/apache/wicket/
wicket/src/main/java/org/apache/wicket/ng/ wicket/src/main...
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/ICompoundRequestMapper.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/CompoundRequestMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/ICompoundRequestMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/ICompoundRequestMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/CompoundRequestMapper.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/CompoundRequestMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/ICompoundRequestMapper.java Sat Dec 19 11:27:15 2009
@@ -17,23 +17,21 @@
package org.apache.wicket.ng.request;
/**
- * Mapper that delegates the mapping to other {@link RequestMapper}s.
+ * Mapper that delegates the mapping to other {@link IRequestMapper}s.
*/
-public interface CompoundRequestMapper extends RequestMapper
+public interface ICompoundRequestMapper extends IRequestMapper
{
-
/**
- * Registers a {@link RequestMapper}
+ * Registers a {@link IRequestMapper}
*
* @param encoder
*/
- void register(RequestMapper encoder);
+ void register(IRequestMapper encoder);
/**
- * Unregisters {@link RequestMapper}
+ * Unregisters {@link IRequestMapper}
*
* @param encoder
*/
- void unregister(RequestMapper encoder);
-
+ void unregister(IRequestMapper encoder);
}
\ No newline at end of file
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestHandler.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestHandler.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestHandler.java Sat Dec 19 11:27:15 2009
@@ -27,7 +27,7 @@
* @author Eelco Hillenius
* @author Matej Knopp
*/
-public interface RequestHandler
+public interface IRequestHandler
{
/**
* Generates a response.
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestMapper.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestMapper.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestMapper.java Sat Dec 19 11:27:15 2009
@@ -20,17 +20,17 @@
/**
- * Encodes {@link RequestHandler}(s) into {@link Url}(s) and decodes {@link Request}(s) to
- * {@link RequestHandler}(s). For {@link RequestHandler}s and {@link Request}s the implementation
- * doesn't know the {@link #mapHandler(RequestHandler)} and {@link #mapRequest(Request)} methods
+ * Encodes {@link IRequestHandler}(s) into {@link Url}(s) and decodes {@link Request}(s) to
+ * {@link IRequestHandler}(s). For {@link IRequestHandler}s and {@link Request}s the implementation
+ * doesn't know the {@link #mapHandler(IRequestHandler)} and {@link #mapRequest(Request)} methods
* must return <code>null</code>.
*
* @author Matej Knopp
*/
-public interface RequestMapper
+public interface IRequestMapper
{
/**
- * Returns {@link RequestHandler} for the request or <code>null</code> if the encoder does not
+ * Returns {@link IRequestHandler} for the request or <code>null</code> if the encoder does not
* recognize the URL.
*
* @param request
@@ -38,7 +38,7 @@
*
* @return RequestHandler instance or <code>null</code>
*/
- RequestHandler mapRequest(Request request);
+ IRequestHandler mapRequest(Request request);
/**
* Returns the score representing how compatible this request mapper is to processing the given
@@ -60,11 +60,11 @@
int getCompatibilityScore(Request request);
/**
- * Returns the {@link Url} for given {@link RequestHandler} or <code>null</code> if the encoder
+ * Returns the {@link Url} for given {@link IRequestHandler} or <code>null</code> if the encoder
* does not recognize the request handler.
*
* @param requestHandler
* @return Url instance or <code>null</code>.
*/
- Url mapHandler(RequestHandler requestHandler);
+ Url mapHandler(IRequestHandler requestHandler);
}
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestParameters.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestParameters.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestParameters.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestParameters.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestParameters.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/RequestParameters.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/IRequestParameters.java Sat Dec 19 11:27:15 2009
@@ -26,7 +26,7 @@
*
* @author Matej Knopp
*/
-public interface RequestParameters
+public interface IRequestParameters
{
/**
* Returns immutable set of all available parameter names.
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/IRequestableComponent.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/RequestableComponent.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/IRequestableComponent.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/IRequestableComponent.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/RequestableComponent.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/RequestableComponent.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/IRequestableComponent.java Sat Dec 19 11:27:15 2009
@@ -28,7 +28,7 @@
*
* @author Matej Knopp
*/
-public interface RequestableComponent
+public interface IRequestableComponent
{
/**
* Gets this component's path.
@@ -49,7 +49,7 @@
*
* @return page instance or <code>null</code>
*/
- public RequestablePage getPage();
+ public IRequestablePage getPage();
/**
* Gets the component at the given path.
@@ -58,7 +58,7 @@
* Path to component
* @return The component at the path
*/
- public RequestableComponent get(String path);
+ public IRequestableComponent get(String path);
/**
* Returns true if the listener interface method can be called on this component. Normally this
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/IRequestablePage.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/RequestablePage.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/IRequestablePage.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/IRequestablePage.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/RequestablePage.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/RequestablePage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/IRequestablePage.java Sat Dec 19 11:27:15 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ng.request.component;
-import org.apache.wicket.ng.page.ManageablePage;
+import org.apache.wicket.ng.page.IManageablePage;
/**
@@ -25,50 +25,49 @@
*
* @author Matej Knopp
*/
-public interface RequestablePage extends RequestableComponent, ManageablePage
+public interface IRequestablePage extends IRequestableComponent, IManageablePage
{
-
- /**
- * Renders the page
- */
- public void renderPage();
-
- /**
- * Bookmarkable page can be instantiated using a bookmarkable URL.
- *
- * @return Returns true if the page is bookmarkable.
- */
- public boolean isBookmarkable();
-
- /**
- * Returns the number of times this page has been rendered. The number will be appended to
- * listener interface links in order to prevent invoking listeners from staled page version.
- * <p>
- * For example a same page might have been rendered in two separate tabs. Page render doesn't
- * change page id but it can modify component hierarchy. Listener interface links on such page
- * should only work in tab where the page was rendered most recently.
- *
- * @return render count
- */
- public int getRenderCount();
-
- /**
- * Returns whether the page instance was created by a bookmarkable URL. Non mounted pages have
- * to be created using bookmarkable URL in order to have hybrid URLs later. Otherwise it would
- * be a potential security risk.
- *
- * @return <code>true</code> if this page has been created by a bookmarkable URL,
- * <code>false</code> otherwise.
- */
- public boolean wasCreatedBookmarkable();
-
-
- /**
- * Returns the {@link PageParametersNg} for the page. Each bookmarkable page instance should have
- * {@link PageParametersNg} associated with it. The page parameters are initialized from URL when
- * page is created and are updated on every page render request.
- *
- * @return page parameters or <code>null</code>
- */
- public PageParametersNg getPageParametersNg();
+ /**
+ * Renders the page
+ */
+ public void renderPage();
+
+ /**
+ * Bookmarkable page can be instantiated using a bookmarkable URL.
+ *
+ * @return Returns true if the page is bookmarkable.
+ */
+ public boolean isBookmarkable();
+
+ /**
+ * Returns the number of times this page has been rendered. The number will be appended to
+ * listener interface links in order to prevent invoking listeners from staled page version.
+ * <p>
+ * For example a same page might have been rendered in two separate tabs. Page render doesn't
+ * change page id but it can modify component hierarchy. Listener interface links on such page
+ * should only work in tab where the page was rendered most recently.
+ *
+ * @return render count
+ */
+ public int getRenderCount();
+
+ /**
+ * Returns whether the page instance was created by a bookmarkable URL. Non mounted pages have
+ * to be created using bookmarkable URL in order to have hybrid URLs later. Otherwise it would
+ * be a potential security risk.
+ *
+ * @return <code>true</code> if this page has been created by a bookmarkable URL,
+ * <code>false</code> otherwise.
+ */
+ public boolean wasCreatedBookmarkable();
+
+
+ /**
+ * Returns the {@link PageParametersNg} for the page. Each bookmarkable page instance should
+ * have {@link PageParametersNg} associated with it. The page parameters are initialized from
+ * URL when page is created and are updated on every page render request.
+ *
+ * @return page parameters or <code>null</code>
+ */
+ public PageParametersNg getPageParametersNg();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParametersNg.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParametersNg.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParametersNg.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParametersNg.java Sat Dec 19 11:27:15 2009
@@ -24,7 +24,7 @@
import java.util.Set;
import java.util.TreeSet;
-import org.apache.wicket.ng.request.RequestMapper;
+import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
@@ -34,13 +34,12 @@
* named parameters. Indexed parameters are URL segments before the query string. Named parameters
* are usually represented as query string params (i.e. ?arg1=var1&arg2=val)
* <p>
- * How those parameters are populated depends on the {@link RequestMapper}s
+ * How those parameters are populated depends on the {@link IRequestMapper}s
*
* @author Matej Knopp
*/
public class PageParametersNg implements Serializable
{
-
private static final long serialVersionUID = 1L;
/**
@@ -48,7 +47,6 @@
*/
public PageParametersNg()
{
-
}
/**
@@ -242,7 +240,7 @@
}
/**
- * Adds named parameter to a specified position. The {@link RequestMapper}s may or may not take
+ * Adds named parameter to a specified position. The {@link IRequestMapper}s may or may not take
* the order into account.
*
* @param name
@@ -267,7 +265,7 @@
}
/**
- * Sets the named parameter on specified position. The {@link RequestMapper}s may or may not
+ * Sets the named parameter on specified position. The {@link IRequestMapper}s may or may not
* take the order into account.
*
* @param name
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/IExceptionMapper.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/ExceptionMapper.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/IExceptionMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/IExceptionMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/ExceptionMapper.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/ExceptionMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/IExceptionMapper.java Sat Dec 19 11:27:15 2009
@@ -16,17 +16,17 @@
*/
package org.apache.wicket.ng.request.cycle;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
/**
- * Maps exception to {@link RequestHandler}.
+ * Maps exception to {@link IRequestHandler}.
*/
-public interface ExceptionMapper
+public interface IExceptionMapper
{
/**
* @param e
*
- * @return {@link RequestHandler} for given exception
+ * @return {@link IRequestHandler} for given exception
*/
- RequestHandler map(Exception e);
+ IRequestHandler map(Exception e);
}
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -24,13 +24,13 @@
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.request.RequestHandler;
-import org.apache.wicket.ng.request.RequestMapper;
+import org.apache.wicket.ng.request.IRequestHandler;
+import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
-import org.apache.wicket.ng.request.handler.PageProvider;
+import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.util.lang.Checks;
import org.slf4j.Logger;
@@ -42,13 +42,13 @@
* <li>Resolve request handler
* <li>Execute request handler
* </ol>
- * During {@link RequestHandler} execution the handler can execute other {@link RequestHandler}s,
- * replace itself with another {@link RequestHandler} or replace all {@link RequestHandler}s on
- * stack with another {@link RequestHandler}.
+ * During {@link IRequestHandler} execution the handler can execute other {@link IRequestHandler}s,
+ * replace itself with another {@link IRequestHandler} or replace all {@link IRequestHandler}s on
+ * stack with another {@link IRequestHandler}.
*
- * @see #executeRequestHandler(RequestHandler)
- * @see #replaceCurrentRequestHandler(RequestHandler)
- * @see #replaceAllRequestHandlers(RequestHandler)
+ * @see #executeRequestHandler(IRequestHandler)
+ * @see #replaceCurrentRequestHandler(IRequestHandler)
+ * @see #replaceAllRequestHandlers(IRequestHandler)
*
* @author Matej Knopp
*/
@@ -60,8 +60,8 @@
private final Response originalResponse;
- private final RequestMapper requestMapper;
- private final ExceptionMapper exceptionMapper;
+ private final IRequestMapper requestMapper;
+ private final IExceptionMapper exceptionMapper;
/**
* Construct.
@@ -118,13 +118,13 @@
}
/**
- * Resolves current request to a {@link RequestHandler}.
+ * Resolves current request to a {@link IRequestHandler}.
*
* @return RequestHandler instance
*/
- protected RequestHandler resolveRequestHandler()
+ protected IRequestHandler resolveRequestHandler()
{
- RequestHandler handler = requestMapper.mapRequest(request);
+ IRequestHandler handler = requestMapper.mapRequest(request);
return handler;
}
@@ -148,7 +148,7 @@
try
{
set(this);
- RequestHandler handler = resolveRequestHandler();
+ IRequestHandler handler = resolveRequestHandler();
if (handler != null)
{
executeRequestHandler(handler);
@@ -158,7 +158,7 @@
}
catch (Exception e)
{
- RequestHandler handler = handleException(e);
+ IRequestHandler handler = handleException(e);
if (handler != null)
{
executeExceptionRequestHandler(handler, getExceptionRetryCount());
@@ -195,7 +195,7 @@
return result;
}
- private void executeExceptionRequestHandler(RequestHandler handler, int retryCount)
+ private void executeExceptionRequestHandler(IRequestHandler handler, int retryCount)
{
try
{
@@ -205,7 +205,7 @@
{
if (retryCount > 0)
{
- RequestHandler next = handleException(e);
+ IRequestHandler next = handleException(e);
if (handler != null)
{
executeExceptionRequestHandler(next, retryCount - 1);
@@ -217,12 +217,12 @@
}
/**
- * Return {@link RequestHandler} for the given exception.
+ * Return {@link IRequestHandler} for the given exception.
*
* @param e
* @return RequestHandler instance
*/
- protected RequestHandler handleException(Exception e)
+ protected IRequestHandler handleException(Exception e)
{
return exceptionMapper.map(e);
}
@@ -287,7 +287,7 @@
* @param handler
* @return Url instance or <code>null</code>
*/
- public Url urlFor(RequestHandler handler)
+ public Url urlFor(IRequestHandler handler)
{
return requestMapper.mapHandler(handler);
}
@@ -301,7 +301,7 @@
* @param handler
* @return Url String or <code>null</code>
*/
- public String renderUrlFor(RequestHandler handler)
+ public String renderUrlFor(IRequestHandler handler)
{
Url url = urlFor(handler);
if (url != null)
@@ -342,7 +342,7 @@
/**
* Registers a callback to be invoked on {@link RequestCycle} detach. The callback will be
- * invoked after all {@link RequestHandler}s are detached.
+ * invoked after all {@link IRequestHandler}s are detached.
*
* @param detachCallback
*/
@@ -355,7 +355,7 @@
/**
* Custom callback invoked on request cycle detach. Detach callbacks are invoked after all
- * {@link RequestHandler}s are detached.
+ * {@link IRequestHandler}s are detached.
*
* @author Matej Knopp
*/
@@ -390,7 +390,7 @@
*
* @param page
*/
- public void setResponsePage(RequestablePage page)
+ public void setResponsePage(IRequestablePage page)
{
scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(new DefaultPageProvider(
page), RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
@@ -402,10 +402,10 @@
* @param pageClass
* @param parameters
*/
- public void setResponsePage(Class<? extends RequestablePage> pageClass,
+ public void setResponsePage(Class<? extends IRequestablePage> pageClass,
PageParametersNg parameters)
{
- PageProvider provider = new DefaultPageProvider(pageClass, parameters);
+ IPageProvider provider = new DefaultPageProvider(pageClass, parameters);
scheduleRequestHandlerAfterCurrent(new RenderPageRequestHandler(provider,
RenderPageRequestHandler.RedirectPolicy.AUTO_REDIRECT));
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycleContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycleContext.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycleContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestCycleContext.java Sat Dec 19 11:27:15 2009
@@ -18,7 +18,7 @@
import org.apache.wicket.Request;
import org.apache.wicket.Response;
-import org.apache.wicket.ng.request.RequestMapper;
+import org.apache.wicket.ng.request.IRequestMapper;
/**
@@ -36,8 +36,8 @@
{
private Request request;
private Response response;
- private RequestMapper requestMapper;
- private ExceptionMapper exceptionMapper;
+ private IRequestMapper requestMapper;
+ private IExceptionMapper exceptionMapper;
/**
* Construct.
@@ -47,8 +47,8 @@
* @param requestMapper
* @param exceptionMapper
*/
- public RequestCycleContext(Request request, Response response, RequestMapper requestMapper,
- ExceptionMapper exceptionMapper)
+ public RequestCycleContext(Request request, Response response, IRequestMapper requestMapper,
+ IExceptionMapper exceptionMapper)
{
this.request = request;
this.response = response;
@@ -75,7 +75,7 @@
/**
* @return requst mapper
*/
- public RequestMapper getRequestMapper()
+ public IRequestMapper getRequestMapper()
{
return requestMapper;
}
@@ -84,7 +84,7 @@
/**
* @return exception mapper
*/
- public ExceptionMapper getExceptionMapper()
+ public IExceptionMapper getExceptionMapper()
{
return exceptionMapper;
}
@@ -108,7 +108,7 @@
/**
* @param requestMapper
*/
- public void setRequestMapper(RequestMapper requestMapper)
+ public void setRequestMapper(IRequestMapper requestMapper)
{
this.requestMapper = requestMapper;
}
@@ -116,7 +116,7 @@
/**
* @param exceptionMapper
*/
- public void setExceptionMapper(ExceptionMapper exceptionMapper)
+ public void setExceptionMapper(IExceptionMapper exceptionMapper)
{
this.exceptionMapper = exceptionMapper;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestHandlerStack.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestHandlerStack.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestHandlerStack.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/RequestHandlerStack.java Sat Dec 19 11:27:15 2009
@@ -21,12 +21,12 @@
import java.util.List;
import org.apache.wicket.Response;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Manages stack of {@link RequestHandler}s.
+ * Manages stack of {@link IRequestHandler}s.
*
* @author Matej Knopp
*/
@@ -45,35 +45,35 @@
}
// we need both Queue and List interfaces
- private final LinkedList<RequestHandler> requestHandlers = new LinkedList<RequestHandler>();
+ private final LinkedList<IRequestHandler> requestHandlers = new LinkedList<IRequestHandler>();
- private final List<RequestHandler> inactiveRequestHandlers = new ArrayList<RequestHandler>();
+ private final List<IRequestHandler> inactiveRequestHandlers = new ArrayList<IRequestHandler>();
- private RequestHandler scheduledAfterCurrent = null;
+ private IRequestHandler scheduledAfterCurrent = null;
/**
- * Returns currently active {@link RequestHandler}.
+ * Returns currently active {@link IRequestHandler}.
*
* @return Active RequestHandler or <code>null</code> if no handler is active.
*/
- public RequestHandler getActiveRequestHandler()
+ public IRequestHandler getActiveRequestHandler()
{
return requestHandlers.peek();
}
/**
- * Executes the specified {@link RequestHandler}. When the specified {@link RequestHandler}
- * finishes, the {@link RequestHandler} that invoked this method continues (unless the new
- * {@link RequestHandler} called {@link #replaceAllRequestHandlers(RequestHandler)}.
+ * Executes the specified {@link IRequestHandler}. When the specified {@link IRequestHandler}
+ * finishes, the {@link IRequestHandler} that invoked this method continues (unless the new
+ * {@link IRequestHandler} called {@link #replaceAllRequestHandlers(IRequestHandler)}.
*
* @param handler
*/
- public void executeRequestHandler(RequestHandler handler)
+ public void executeRequestHandler(IRequestHandler handler)
{
final boolean first = requestHandlers.isEmpty();
requestHandlers.add(handler);
- RequestHandler replacementHandler = null;
+ IRequestHandler replacementHandler = null;
Response originalResponse = response;
try
{
@@ -94,7 +94,7 @@
inactiveRequestHandlers.add(handler);
}
- RequestHandler scheduled = scheduledAfterCurrent;
+ IRequestHandler scheduled = scheduledAfterCurrent;
scheduledAfterCurrent = null;
if (replacementHandler != null)
@@ -110,21 +110,21 @@
/**
* Schedules the request handler to be executed after current request handler finishes. If there
* is already another request handler scheduled it will be discarded and overwritten by the new
- * one. If {@link #replaceCurrentRequestHandler(RequestHandler)} or
- * {@link #replaceAllRequestHandlers(RequestHandler)} is invoked during current request handler
+ * one. If {@link #replaceCurrentRequestHandler(IRequestHandler)} or
+ * {@link #replaceAllRequestHandlers(IRequestHandler)} is invoked during current request handler
* execution the scheduled handler will be also discarded.
*
* @param handler
* handler to be executed after current request handler finishes
*/
- public void scheduleRequestHandlerAfterCurrent(RequestHandler handler)
+ public void scheduleRequestHandlerAfterCurrent(IRequestHandler handler)
{
scheduledAfterCurrent = handler;
}
/**
- * Replaces the currently executed {@link RequestHandler} with new {@link RequestHandler}. The
- * currently executed {@link RequestHandler} is terminated and the new {@link RequestHandler} is
+ * Replaces the currently executed {@link IRequestHandler} with new {@link IRequestHandler}. The
+ * currently executed {@link IRequestHandler} is terminated and the new {@link IRequestHandler} is
* executed.
*
* @param handler
@@ -137,7 +137,7 @@
// To restart request processing #replaceAllRequestHandlers is better alternative because it
// unrolls
// entire stack and cancels all request handlers in stack
- public void replaceCurrentRequestHandler(RequestHandler handler)
+ public void replaceCurrentRequestHandler(IRequestHandler handler)
{
if (requestHandlers.isEmpty())
{
@@ -150,12 +150,12 @@
}
/**
- * Removes the whole {@link RequestHandler} stack, terminates currently running
- * {@link RequestHandler} and executes the new {@link RequestHandler}.
+ * Removes the whole {@link IRequestHandler} stack, terminates currently running
+ * {@link IRequestHandler} and executes the new {@link IRequestHandler}.
*
* @param handler
*/
- public void replaceAllRequestHandlers(RequestHandler handler)
+ public void replaceAllRequestHandlers(IRequestHandler handler)
{
if (requestHandlers.isEmpty())
{
@@ -177,7 +177,7 @@
private static final long serialVersionUID = 1L;
private final boolean removeAll;
- private final RequestHandler replacementRequestHandler;
+ private final IRequestHandler replacementRequestHandler;
/**
* Construct.
@@ -185,7 +185,7 @@
* @param replacementRequestHandler
* @param removeAll
*/
- public ReplaceHandlerException(RequestHandler replacementRequestHandler, boolean removeAll)
+ public ReplaceHandlerException(IRequestHandler replacementRequestHandler, boolean removeAll)
{
this.replacementRequestHandler = replacementRequestHandler;
this.removeAll = removeAll;
@@ -211,7 +211,7 @@
/**
* Replaces current {@link Response} with new {@link Response} instance. The original response
- * is always restored after the {@link RequestHandler#respond(RequestCycle)} method is finished.
+ * is always restored after the {@link IRequestHandler#respond(RequestCycle)} method is finished.
*
* @param response
* @return Response being replaced.
@@ -226,7 +226,7 @@
protected abstract RequestCycle getRequestCycle();
/**
- * Detaches all {@link RequestHandler}s.
+ * Detaches all {@link IRequestHandler}s.
*/
public void detach()
{
@@ -239,7 +239,7 @@
requestHandlers.clear();
}
- for (RequestHandler handler : inactiveRequestHandlers)
+ for (IRequestHandler handler : inactiveRequestHandlers)
{
try
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/DefaultPageProvider.java Sat Dec 19 11:27:15 2009
@@ -18,14 +18,14 @@
import org.apache.wicket.Page;
import org.apache.wicket.ng.Application;
-import org.apache.wicket.ng.page.PageManager;
-import org.apache.wicket.ng.request.RequestHandler;
-import org.apache.wicket.ng.request.RequestMapper;
+import org.apache.wicket.ng.request.IRequestHandler;
+import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.component.PageExpiredException;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
-import org.apache.wicket.ng.request.mapper.PageSource;
+import org.apache.wicket.ng.request.component.IRequestablePage;
+import org.apache.wicket.ng.request.mapper.IPageSource;
import org.apache.wicket.ng.request.mapper.StalePageException;
+import org.apache.wicket.pageManager.IPageManager;
import org.apache.wicket.util.lang.Checks;
/**
@@ -33,24 +33,24 @@
* to get existing or create new page instance. Requesting or creating page instance is deferred
* until {@link #getPageInstance()} is called.
* <p>
- * Purpose of this class is to reduce complexity of both {@link RequestMapper}s and
- * {@link RequestHandler}s. {@link RequestMapper} examines the URL, gathers all relevant information
+ * Purpose of this class is to reduce complexity of both {@link IRequestMapper}s and
+ * {@link IRequestHandler}s. {@link IRequestMapper} examines the URL, gathers all relevant information
* about the page in the URL (combination of page id, page class, page parameters and render count),
- * creates {@link DefaultPageProvider} object and creates a {@link RequestHandler} instance that can
+ * creates {@link DefaultPageProvider} object and creates a {@link IRequestHandler} instance that can
* use the {@link DefaultPageProvider} to access the page.
* <p>
- * Apart from simplifying {@link RequestMapper}s and {@link RequestHandler}s
+ * Apart from simplifying {@link IRequestMapper}s and {@link IRequestHandler}s
* {@link DefaultPageProvider} also helps performance because creating or obtaining page from
- * {@link PageManager} is delayed until the {@link RequestHandler} actually requires the page.
+ * {@link IPageManager} is delayed until the {@link IRequestHandler} actually requires the page.
*
* @author Matej Knopp
*/
-public class DefaultPageProvider implements PageProvider
+public class DefaultPageProvider implements IPageProvider
{
private Integer renderCount;
- private PageSource pageSource;
- private RequestablePage pageInstance;
- private Class<? extends RequestablePage> pageClass;
+ private IPageSource pageSource;
+ private IRequestablePage pageInstance;
+ private Class<? extends IRequestablePage> pageClass;
private Integer pageId;
private PageParametersNg pageParameters;
@@ -78,7 +78,7 @@
* @param renderCount
* optional argument
*/
- public DefaultPageProvider(int pageId, Class<? extends RequestablePage> pageClass,
+ public DefaultPageProvider(int pageId, Class<? extends IRequestablePage> pageClass,
Integer renderCount)
{
this(pageId, pageClass, new PageParametersNg(), renderCount);
@@ -95,7 +95,7 @@
* @param renderCount
* optional argument
*/
- public DefaultPageProvider(int pageId, Class<? extends RequestablePage> pageClass,
+ public DefaultPageProvider(int pageId, Class<? extends IRequestablePage> pageClass,
PageParametersNg pageParameters, Integer renderCount)
{
this.pageId = pageId;
@@ -111,7 +111,7 @@
* @param pageClass
* @param pageParameters
*/
- public DefaultPageProvider(Class<? extends RequestablePage> pageClass,
+ public DefaultPageProvider(Class<? extends IRequestablePage> pageClass,
PageParametersNg pageParameters)
{
setPageClass(pageClass);
@@ -127,7 +127,7 @@
*
* @param pageClass
*/
- public DefaultPageProvider(Class<? extends RequestablePage> pageClass)
+ public DefaultPageProvider(Class<? extends IRequestablePage> pageClass)
{
this(pageClass, new PageParametersNg());
}
@@ -138,7 +138,7 @@
*
* @param page
*/
- public DefaultPageProvider(RequestablePage page)
+ public DefaultPageProvider(IRequestablePage page)
{
Checks.argumentNotNull(page, "page");
@@ -146,9 +146,9 @@
}
/**
- * @see org.apache.wicket.ng.request.handler.PageProvider#getPageInstance()
+ * @see org.apache.wicket.ng.request.handler.IPageProvider#getPageInstance()
*/
- public RequestablePage getPageInstance()
+ public IRequestablePage getPageInstance()
{
if (pageInstance == null)
{
@@ -163,7 +163,7 @@
}
/**
- * @see org.apache.wicket.ng.request.handler.PageProvider#getPageParameters()
+ * @see org.apache.wicket.ng.request.handler.IPageProvider#getPageParameters()
*/
public PageParametersNg getPageParameters()
{
@@ -178,9 +178,9 @@
}
/**
- * @see org.apache.wicket.ng.request.handler.PageProvider#getPageClass()
+ * @see org.apache.wicket.ng.request.handler.IPageProvider#getPageClass()
*/
- public Class<? extends RequestablePage> getPageClass()
+ public Class<? extends IRequestablePage> getPageClass()
{
if (pageClass != null)
{
@@ -197,7 +197,7 @@
return false;
}
- protected PageSource getPageSource()
+ protected IPageSource getPageSource()
{
if (pageSource != null)
{
@@ -214,11 +214,11 @@
}
}
- private RequestablePage getPageInstance(Integer pageId,
- Class<? extends RequestablePage> pageClass, PageParametersNg pageParameters,
+ private IRequestablePage getPageInstance(Integer pageId,
+ Class<? extends IRequestablePage> pageClass, PageParametersNg pageParameters,
Integer renderCount)
{
- RequestablePage page = null;
+ IRequestablePage page = null;
boolean freshCreated = false;
@@ -260,7 +260,7 @@
/**
* Detaches the page if it has been loaded (that means either
- * {@link #PageProvider(RequestablePage)} constructor has been used or
+ * {@link #PageProvider(IRequestablePage)} constructor has been used or
* {@link #getPageInstance()} has been called).
*/
public void detach()
@@ -273,17 +273,17 @@
/**
* If the {@link DefaultPageProvider} is used outside request thread (thread that does not have
- * application instance assigned) it is necessary to specify a {@link PageSource} instance so
+ * application instance assigned) it is necessary to specify a {@link IPageSource} instance so
* that {@link DefaultPageProvider} knows how to get a page instance.
*
* @param pageSource
*/
- public void setPageSource(PageSource pageSource)
+ public void setPageSource(IPageSource pageSource)
{
this.pageSource = pageSource;
}
- private void setPageClass(Class<? extends RequestablePage> pageClass)
+ private void setPageClass(Class<? extends IRequestablePage> pageClass)
{
Checks.argumentNotNull(pageClass, "pageClass");
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IComponentRequestHandler.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IComponentRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IComponentRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentRequestHandler.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/ComponentRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IComponentRequestHandler.java Sat Dec 19 11:27:15 2009
@@ -16,20 +16,20 @@
*/
package org.apache.wicket.ng.request.handler;
-import org.apache.wicket.ng.request.RequestHandler;
-import org.apache.wicket.ng.request.component.RequestableComponent;
+import org.apache.wicket.ng.request.IRequestHandler;
+import org.apache.wicket.ng.request.component.IRequestableComponent;
/**
* Request handler that works with a component.
*
* @author Matje Knopp
*/
-public interface ComponentRequestHandler extends RequestHandler
+public interface IComponentRequestHandler extends IRequestHandler
{
/**
* Returns the component instance.
*
* @return component instance
*/
- public RequestableComponent getComponent();
+ public IRequestableComponent getComponent();
}
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageClassRequestHandler.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageClassRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageClassRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageClassRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageClassRequestHandler.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageClassRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageClassRequestHandler.java Sat Dec 19 11:27:15 2009
@@ -16,23 +16,23 @@
*/
package org.apache.wicket.ng.request.handler;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
/**
* Request handler that works with page class.
*
* @author Matej Knopp
*/
-public interface PageClassRequestHandler extends RequestHandler
+public interface IPageClassRequestHandler extends IRequestHandler
{
/**
* Returns the page class
*
* @return page class
*/
- public Class<? extends RequestablePage> getPageClass();
+ public Class<? extends IRequestablePage> getPageClass();
/**
* @return page parameters
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageProvider.java (from r892307, 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/IPageProvider.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageProvider.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java&r1=892307&r2=892463&rev=892463&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/IPageProvider.java Sat Dec 19 11:27:15 2009
@@ -18,7 +18,7 @@
import org.apache.wicket.ng.request.component.PageExpiredException;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.mapper.StalePageException;
@@ -30,7 +30,7 @@
*
* @author Matej Knopp
*/
-public interface PageProvider
+public interface IPageProvider
{
/**
* Returns page instance specified by the constructor.
@@ -42,7 +42,7 @@
* @throw {@link PageExpiredException} if the specified page could not have been found and the
* constructor used did not provide enough information to create new page instance
*/
- public abstract RequestablePage getPageInstance();
+ public abstract IRequestablePage getPageInstance();
/**
* Returns {@link PageParametersNg} of the page.
@@ -56,7 +56,7 @@
*
* @return page class
*/
- public abstract Class<? extends RequestablePage> getPageClass();
+ public abstract Class<? extends IRequestablePage> getPageClass();
/**
* Detaches the page if it has been loaded.
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageRequestHandler.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageRequestHandler.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageRequestHandler.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageRequestHandler.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageRequestHandler.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/IPageRequestHandler.java Sat Dec 19 11:27:15 2009
@@ -16,19 +16,19 @@
*/
package org.apache.wicket.ng.request.handler;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
/**
* Request handler that works with a page instance.
*
* @author Matej Knopp
*/
-public interface PageRequestHandler extends PageClassRequestHandler
+public interface IPageRequestHandler extends IPageClassRequestHandler
{
/**
* Returns the page
*
* @return page instance
*/
- public RequestablePage getPage();
+ public IRequestablePage getPage();
}
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -17,8 +17,8 @@
package org.apache.wicket.ng.request.handler;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestableComponent;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestableComponent;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.util.lang.Checks;
/**
@@ -31,28 +31,28 @@
*/
public class PageAndComponentProvider extends DefaultPageProvider
{
- private RequestableComponent component;
+ private IRequestableComponent component;
private String componentPath;
/**
- * @see DefaultPageProvider#PageProvider(RequestablePage)
+ * @see DefaultPageProvider#PageProvider(IRequestablePage)
*
* @param page
* @param componentPath
*/
- public PageAndComponentProvider(RequestablePage page, String componentPath)
+ public PageAndComponentProvider(IRequestablePage page, String componentPath)
{
super(page);
setComponentPath(componentPath);
}
/**
- * @see DefaultPageProvider#PageProvider(RequestablePage)
+ * @see DefaultPageProvider#PageProvider(IRequestablePage)
*
* @param page
* @param component
*/
- public PageAndComponentProvider(RequestablePage page, RequestableComponent component)
+ public PageAndComponentProvider(IRequestablePage page, IRequestableComponent component)
{
super(page);
@@ -68,7 +68,7 @@
* @param pageParameters
* @param componentPath
*/
- public PageAndComponentProvider(Class<? extends RequestablePage> pageClass,
+ public PageAndComponentProvider(Class<? extends IRequestablePage> pageClass,
PageParametersNg pageParameters, String componentPath)
{
super(pageClass, pageParameters);
@@ -81,7 +81,7 @@
* @param pageClass
* @param componentPath
*/
- public PageAndComponentProvider(Class<? extends RequestablePage> pageClass, String componentPath)
+ public PageAndComponentProvider(Class<? extends IRequestablePage> pageClass, String componentPath)
{
super(pageClass);
setComponentPath(componentPath);
@@ -95,7 +95,7 @@
* @param renderCount
* @param componentPath
*/
- public PageAndComponentProvider(int pageId, Class<? extends RequestablePage> pageClass,
+ public PageAndComponentProvider(int pageId, Class<? extends IRequestablePage> pageClass,
Integer renderCount, String componentPath)
{
super(pageId, pageClass, renderCount);
@@ -111,7 +111,7 @@
* @param renderCount
* @param componentPath
*/
- public PageAndComponentProvider(int pageId, Class<? extends RequestablePage> pageClass,
+ public PageAndComponentProvider(int pageId, Class<? extends IRequestablePage> pageClass,
PageParametersNg pageParameters, Integer renderCount, String componentPath)
{
super(pageId, pageClass, pageParameters, renderCount);
@@ -142,11 +142,11 @@
*
* @return component
*/
- public RequestableComponent getComponent()
+ public IRequestableComponent getComponent()
{
if (component == null)
{
- RequestablePage page = getPageInstance();
+ IRequestablePage page = getPageInstance();
component = page.get(componentPath);
}
if (component == null)
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -17,12 +17,12 @@
package org.apache.wicket.ng.request.handler.impl;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestableComponent;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestableComponent;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.ComponentRequestHandler;
+import org.apache.wicket.ng.request.handler.IComponentRequestHandler;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
-import org.apache.wicket.ng.request.handler.PageRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
import org.apache.wicket.util.lang.Checks;
@@ -34,8 +34,8 @@
*/
public class BookmarkableListenerInterfaceRequestHandler
implements
- PageRequestHandler,
- ComponentRequestHandler
+ IPageRequestHandler,
+ IComponentRequestHandler
{
private final PageAndComponentProvider pageComponentProvider;
private final RequestListenerInterface listenerInterface;
@@ -72,17 +72,17 @@
this(pageComponentProvider, listenerInterface, null);
}
- public RequestableComponent getComponent()
+ public IRequestableComponent getComponent()
{
return pageComponentProvider.getComponent();
}
- public RequestablePage getPage()
+ public IRequestablePage getPage()
{
return pageComponentProvider.getPageInstance();
}
- public Class<? extends RequestablePage> getPageClass()
+ public Class<? extends IRequestablePage> getPageClass()
{
return pageComponentProvider.getPageClass();
}
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -17,10 +17,10 @@
package org.apache.wicket.ng.request.handler.impl;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
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.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.util.lang.Checks;
/**
@@ -29,16 +29,16 @@
*
* @author Matej Knopp
*/
-public class BookmarkablePageRequestHandler implements PageClassRequestHandler
+public class BookmarkablePageRequestHandler implements IPageClassRequestHandler
{
- private final PageProvider pageProvider;
+ private final IPageProvider pageProvider;
/**
* Construct.
*
* @param pageProvider
*/
- public BookmarkablePageRequestHandler(PageProvider pageProvider)
+ public BookmarkablePageRequestHandler(IPageProvider pageProvider)
{
Checks.argumentNotNull(pageProvider, "pageProvider");
@@ -46,7 +46,7 @@
this.pageProvider = pageProvider;
}
- public Class<? extends RequestablePage> getPageClass()
+ public Class<? extends IRequestablePage> getPageClass()
{
return pageProvider.getPageClass();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BufferedResponseRequestHandler.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BufferedResponseRequestHandler.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BufferedResponseRequestHandler.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/BufferedResponseRequestHandler.java Sat Dec 19 11:27:15 2009
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.ng.request.handler.impl;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.protocol.http.BufferedWebResponse;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.protocol.http.BufferedWebResponse;
import org.apache.wicket.protocol.http.WebResponse;
/**
@@ -26,7 +26,7 @@
*
* @author Matej Knopp
*/
-public class BufferedResponseRequestHandler implements RequestHandler
+public class BufferedResponseRequestHandler implements IRequestHandler
{
private final BufferedWebResponse bufferedWebResponse;
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -19,13 +19,13 @@
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.ng.WicketRuntimeException;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestableComponent;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestableComponent;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.ComponentRequestHandler;
+import org.apache.wicket.ng.request.handler.IComponentRequestHandler;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
-import org.apache.wicket.ng.request.handler.PageRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
import org.apache.wicket.util.lang.Checks;
@@ -35,7 +35,7 @@
*
* @author Matej Knopp
*/
-public class ListenerInterfaceRequestHandler implements PageRequestHandler, ComponentRequestHandler
+public class ListenerInterfaceRequestHandler implements IPageRequestHandler, IComponentRequestHandler
{
private final PageAndComponentProvider pageComponentProvider;
private final RequestListenerInterface listenerInterface;
@@ -71,17 +71,17 @@
this(pageComponentProvider, listenerInterface, null);
}
- public RequestableComponent getComponent()
+ public IRequestableComponent getComponent()
{
return pageComponentProvider.getComponent();
}
- public RequestablePage getPage()
+ public IRequestablePage getPage()
{
return pageComponentProvider.getPageInstance();
}
- public Class<? extends RequestablePage> getPageClass()
+ public Class<? extends IRequestablePage> getPageClass()
{
return pageComponentProvider.getPageClass();
}
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -17,27 +17,27 @@
package org.apache.wicket.ng.request.handler.impl;
import org.apache.wicket.ng.Application;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
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.request.handler.PageRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageProvider;
+import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.render.RenderPageRequestHandlerDelegate;
import org.apache.wicket.util.lang.Checks;
/**
- * {@link RequestHandler} that renders page instance. Depending on the <code>redirectPolicy</code>
+ * {@link IRequestHandler} that renders page instance. Depending on the <code>redirectPolicy</code>
* flag and current request strategy the handler either just renders the page to the response, or
* redirects to render the page. <code>REDIRECT_TO_BUFFER</code> strategy is also supported.
* <p>
*
* @author Matej Knopp
*/
-public class RenderPageRequestHandler implements PageRequestHandler, PageClassRequestHandler
+public class RenderPageRequestHandler implements IPageRequestHandler, IPageClassRequestHandler
{
- private final PageProvider pageProvider;
+ private final IPageProvider pageProvider;
private final RedirectPolicy redirectPolicy;
/**
@@ -73,7 +73,7 @@
*
* @param pageProvider
*/
- public RenderPageRequestHandler(PageProvider pageProvider)
+ public RenderPageRequestHandler(IPageProvider pageProvider)
{
this(pageProvider, RedirectPolicy.AUTO_REDIRECT);
}
@@ -84,7 +84,7 @@
* @param pageProvider
* @param redirectPolicy
*/
- public RenderPageRequestHandler(PageProvider pageProvider, RedirectPolicy redirectPolicy)
+ public RenderPageRequestHandler(IPageProvider pageProvider, RedirectPolicy redirectPolicy)
{
Checks.argumentNotNull(pageProvider, "pageProvider");
Checks.argumentNotNull(redirectPolicy, "redirectPolicy");
@@ -96,7 +96,7 @@
/**
* @return page provider
*/
- public PageProvider getPageProvider()
+ public IPageProvider getPageProvider()
{
return pageProvider;
}
@@ -109,7 +109,7 @@
return redirectPolicy;
}
- public Class<? extends RequestablePage> getPageClass()
+ public Class<? extends IRequestablePage> getPageClass()
{
return pageProvider.getPageClass();
}
@@ -124,7 +124,7 @@
pageProvider.detach();
}
- public RequestablePage getPage()
+ public IRequestablePage getPage()
{
return pageProvider.getPageInstance();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/RenderPageRequestHandlerDelegate.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/RenderPageRequestHandlerDelegate.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/RenderPageRequestHandlerDelegate.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/RenderPageRequestHandlerDelegate.java Sat Dec 19 11:27:15 2009
@@ -17,7 +17,7 @@
package org.apache.wicket.ng.request.handler.impl.render;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.request.handler.PageProvider;
+import org.apache.wicket.ng.request.handler.IPageProvider;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
@@ -45,7 +45,7 @@
/**
* @return page provider
*/
- public PageProvider getPageProvider()
+ public IPageProvider getPageProvider()
{
return renderPageRequestHandler.getPageProvider();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/impl/render/WebRenderPageRequestHandlerDelegate.java Sat Dec 19 11:27:15 2009
@@ -19,14 +19,14 @@
import org.apache.wicket.Response;
import org.apache.wicket.ng.Application;
import org.apache.wicket.ng.Session;
+import org.apache.wicket.ng.protocol.http.BufferedWebResponse;
import org.apache.wicket.ng.protocol.http.WebApplication;
import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler.RedirectPolicy;
-import org.apache.wicket.ng.settings.RequestCycleSettings;
-import org.apache.wicket.protocol.http.BufferedWebResponse;
+import org.apache.wicket.ng.settings.IRequestCycleSettings;
import org.apache.wicket.protocol.http.WebResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +38,6 @@
*/
public class WebRenderPageRequestHandlerDelegate extends RenderPageRequestHandlerDelegate
{
-
/**
* Construct.
*
@@ -52,24 +51,24 @@
/**
* @return page instance
*/
- public RequestablePage getPage()
+ public IRequestablePage getPage()
{
return getPageProvider().getPageInstance();
}
private boolean isOnePassRender()
{
- return Application.get().getRequestCycleSettings().getRenderStrategy() == RequestCycleSettings.RenderStrategy.ONE_PASS_RENDER;
+ return Application.get().getRequestCycleSettings().getRenderStrategy() == IRequestCycleSettings.RenderStrategy.ONE_PASS_RENDER;
}
private boolean isRedirectToRender()
{
- return Application.get().getRequestCycleSettings().getRenderStrategy() == RequestCycleSettings.RenderStrategy.REDIRECT_TO_RENDER;
+ return Application.get().getRequestCycleSettings().getRenderStrategy() == IRequestCycleSettings.RenderStrategy.REDIRECT_TO_RENDER;
}
private boolean isRedirectToBuffer()
{
- return Application.get().getRequestCycleSettings().getRenderStrategy() == RequestCycleSettings.RenderStrategy.REDIRECT_TO_BUFFER;
+ return Application.get().getRequestCycleSettings().getRenderStrategy() == IRequestCycleSettings.RenderStrategy.REDIRECT_TO_BUFFER;
}
private void renderPage()
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ng.request.handler.resource;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.component.PageParametersNg;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.resource.ResourceReference;
@@ -27,7 +27,7 @@
*
* @author Matej Knopp
*/
-public class ResourceReferenceRequestHandler implements RequestHandler
+public class ResourceReferenceRequestHandler implements IRequestHandler
{
private final ResourceReference resourceReference;
private final PageParametersNg 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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -18,10 +18,10 @@
import java.util.Locale;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.component.PageParametersNg;
import org.apache.wicket.ng.request.cycle.RequestCycle;
-import org.apache.wicket.ng.resource.Resource;
+import org.apache.wicket.ng.resource.IResource;
import org.apache.wicket.util.lang.Checks;
/**
@@ -29,9 +29,9 @@
*
* @author Matej Knopp
*/
-public class ResourceRequestHandler implements RequestHandler
+public class ResourceRequestHandler implements IRequestHandler
{
- private final Resource resource;
+ private final IResource resource;
private final Locale locale;
private final String style;
private final String variation;
@@ -46,7 +46,7 @@
* @param variation
* @param pageParameters
*/
- public ResourceRequestHandler(Resource resource, Locale locale, String style, String variation,
+ public ResourceRequestHandler(IResource resource, Locale locale, String style, String variation,
PageParametersNg pageParameters)
{
Checks.argumentNotNull(resource, "resource");
@@ -93,14 +93,14 @@
/**
* @return resource
*/
- public Resource getResource()
+ public IResource getResource()
{
return resource;
}
public void respond(RequestCycle requestCycle)
{
- Resource.Attributes a = new Resource.Attributes(requestCycle.getRequest(),
+ IResource.Attributes a = new IResource.Attributes(requestCycle.getRequest(),
requestCycle.getResponse(), locale, style, variation, pageParameters);
resource.respond(a);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/listener/RequestListenerInterface.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/listener/RequestListenerInterface.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/listener/RequestListenerInterface.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/listener/RequestListenerInterface.java Sat Dec 19 11:27:15 2009
@@ -24,7 +24,7 @@
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.ng.WicketRuntimeException;
-import org.apache.wicket.ng.request.component.RequestableComponent;
+import org.apache.wicket.ng.request.component.IRequestableComponent;
import org.apache.wicket.ng.request.cycle.RequestHandlerStack.ReplaceHandlerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -130,7 +130,7 @@
* @param component
* The component
*/
- public final void invoke(final RequestableComponent component)
+ public final void invoke(final IRequestableComponent component)
{
if (!component.canCallListenerInterface())
{
@@ -175,7 +175,7 @@
* The component
* @param behavior
*/
- public final void invoke(final RequestableComponent component, final IBehavior behavior)
+ public final void invoke(final IRequestableComponent component, final IBehavior behavior)
{
if (!component.canCallListenerInterface())
{
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -17,11 +17,11 @@
package org.apache.wicket.ng.request.mapper;
import org.apache.wicket.Request;
-import org.apache.wicket.ng.request.RequestHandler;
-import org.apache.wicket.ng.request.RequestMapper;
+import org.apache.wicket.ng.request.IRequestHandler;
+import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
@@ -59,7 +59,7 @@
{
private final PageComponentInfo pageComponentInfo;
private final PageParametersNg pageParameters;
- private final Class<? extends RequestablePage> pageClass;
+ private final Class<? extends IRequestablePage> pageClass;
/**
* Construct.
@@ -72,7 +72,7 @@
* optional parameter providing pageParameters
*/
public UrlInfo(PageComponentInfo pageComponentInfo,
- Class<? extends RequestablePage> pageClass, PageParametersNg pageParameters)
+ Class<? extends IRequestablePage> pageClass, PageParametersNg pageParameters)
{
Checks.argumentNotNull(pageClass, "pageClass");
@@ -92,7 +92,7 @@
/**
* @return page class
*/
- public Class<? extends RequestablePage> getPageClass()
+ public Class<? extends IRequestablePage> getPageClass()
{
return pageClass;
}
@@ -136,11 +136,11 @@
protected abstract boolean pageMustHaveBeenCreatedBookmarkable();
/**
- * @see RequestMapper#getCompatibilityScore(Request)
+ * @see IRequestMapper#getCompatibilityScore(Request)
*/
public abstract int getCompatibilityScore(Request request);
- private RequestHandler processBookmarkable(Class<? extends RequestablePage> pageClass,
+ private IRequestHandler processBookmarkable(Class<? extends IRequestablePage> pageClass,
PageParametersNg pageParameters)
{
DefaultPageProvider provider = new DefaultPageProvider(pageClass, pageParameters);
@@ -148,8 +148,8 @@
return new RenderPageRequestHandler(provider);
}
- private RequestHandler processHybrid(PageInfo pageInfo,
- Class<? extends RequestablePage> pageClass, PageParametersNg pageParameters,
+ private IRequestHandler processHybrid(PageInfo pageInfo,
+ Class<? extends IRequestablePage> pageClass, PageParametersNg pageParameters,
Integer renderCount)
{
DefaultPageProvider provider = new DefaultPageProvider(pageInfo.getPageId(), pageClass,
@@ -158,8 +158,8 @@
return new RenderPageRequestHandler(provider);
}
- private RequestHandler processListener(PageComponentInfo pageComponentInfo,
- Class<? extends RequestablePage> pageClass, PageParametersNg pageParameters)
+ private IRequestHandler processListener(PageComponentInfo pageComponentInfo,
+ Class<? extends IRequestablePage> pageClass, PageParametersNg pageParameters)
{
PageInfo pageInfo = pageComponentInfo.getPageInfo();
ComponentInfo componentInfo = pageComponentInfo.getComponentInfo();
@@ -184,7 +184,7 @@
}
}
- public RequestHandler mapRequest(Request request)
+ public IRequestHandler mapRequest(Request request)
{
UrlInfo urlInfo = parseRequest(request);
@@ -192,7 +192,7 @@
if (urlInfo != null)
{
PageComponentInfo info = urlInfo.getPageComponentInfo();
- Class<? extends RequestablePage> pageClass = urlInfo.getPageClass();
+ Class<? extends IRequestablePage> pageClass = urlInfo.getPageClass();
PageParametersNg pageParameters = urlInfo.getPageParameters();
if (info == null || info.getPageInfo().getPageId() == null)
@@ -217,12 +217,12 @@
return null;
}
- protected boolean checkPageClass(Class<? extends RequestablePage> pageClass)
+ protected boolean checkPageClass(Class<? extends IRequestablePage> pageClass)
{
return true;
}
- public Url mapHandler(RequestHandler requestHandler)
+ public Url mapHandler(IRequestHandler requestHandler)
{
if (requestHandler instanceof BookmarkablePageRequestHandler)
{
@@ -246,7 +246,7 @@
// but only allowed if the page was created by bookamarkable URL
RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
- RequestablePage page = handler.getPage();
+ IRequestablePage page = handler.getPage();
if (!checkPageClass(page.getClass()))
{
@@ -277,7 +277,7 @@
{
// listener interface URL with page class information
BookmarkableListenerInterfaceRequestHandler handler = (BookmarkableListenerInterfaceRequestHandler)requestHandler;
- RequestablePage page = handler.getPage();
+ IRequestablePage page = handler.getPage();
if (!checkPageClass(page.getClass()))
{
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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -18,14 +18,14 @@
import org.apache.wicket.Request;
import org.apache.wicket.ng.Application;
-import org.apache.wicket.ng.request.RequestMapper;
+import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.Url.QueryParameter;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
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.request.mapper.parameters.IPageParametersEncoder;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.string.Strings;
@@ -35,9 +35,9 @@
*
* @author Matej Knopp
*/
-public abstract class AbstractMapper implements RequestMapper
+public abstract class AbstractMapper implements IRequestMapper
{
- protected MapperContext getContext()
+ protected IMapperContext getContext()
{
return Application.get().getEncoderContext();
}
@@ -185,7 +185,7 @@
* @param name
* @return class
*/
- protected Class<? extends RequestablePage> getPageClass(String name)
+ protected Class<? extends IRequestablePage> getPageClass(String name)
{
Checks.argumentNotEmpty(name, "name");
@@ -193,17 +193,17 @@
}
/**
- * Extracts {@link PageParametersNg} from the URL using the given {@link PageParametersEncoder}.
+ * Extracts {@link PageParametersNg} from the URL using the given {@link IPageParametersEncoder}.
*
* @param request
* @param segmentsToSkip
* how many URL segments should be skipped because they "belong" to the
- * {@link RequestMapper}
+ * {@link IRequestMapper}
* @param encoder
* @return PageParameters instance
*/
protected PageParametersNg extractPageParameters(Request request, int segmentsToSkip,
- PageParametersEncoder encoder)
+ IPageParametersEncoder encoder)
{
Checks.argumentNotNull(request, "request");
Checks.argumentNotNull(encoder, "encoder");
@@ -228,7 +228,7 @@
/**
* Encodes the given {@link PageParametersNg} to the URL using the given
- * {@link PageParametersEncoder}. The original URL object is unchanged.
+ * {@link IPageParametersEncoder}. The original URL object is unchanged.
*
* @param url
* @param pageParameters
@@ -236,7 +236,7 @@
* @return URL with encoded parameters
*/
protected Url encodePageParameters(Url url, PageParametersNg pageParameters,
- PageParametersEncoder encoder)
+ IPageParametersEncoder encoder)
{
Checks.argumentNotNull(url, "url");
Checks.argumentNotNull(encoder, "encoder");
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractResourceReferenceMapper.java Sat Dec 19 11:27:15 2009
@@ -30,14 +30,13 @@
*/
public abstract class AbstractResourceReferenceMapper extends AbstractMapper
{
-
protected static class ResourceReferenceAttributes
{
protected Locale locale;
protected String style;
protected String variation;
};
-
+
protected static String encodeResourceReferenceAttributes(ResourceReferenceAttributes attributes)
{
if (attributes == null ||
@@ -65,10 +64,10 @@
return res.toString();
}
};
-
+
protected static ResourceReferenceAttributes decodeResourceReferenceAttributes(String attributes)
{
- ResourceReferenceAttributes res = new ResourceReferenceAttributes();
+ ResourceReferenceAttributes res = new ResourceReferenceAttributes();
if (!Strings.isEmpty(attributes))
{
String split[] = attributes.split("-", 3);
@@ -76,16 +75,16 @@
if (split.length == 2)
{
res.style = split[1];
- }
+ }
else if (split.length == 3)
{
res.style = split[1];
res.variation = split[2];
- }
+ }
}
return res;
}
-
+
private static Locale parseLocale(String locale)
{
if (Strings.isEmpty(locale))
@@ -105,15 +104,15 @@
}
else if (parts.length == 3)
{
- return new Locale(parts[0], parts[1], parts[2]);
+ return new Locale(parts[0], parts[1], parts[2]);
}
else
{
return null;
}
}
- }
-
+ }
+
protected void encodeResourceReferenceAttributes(Url url, ResourceReference reference)
{
ResourceReferenceAttributes attributes = new ResourceReferenceAttributes();
@@ -126,7 +125,7 @@
url.getQueryParameters().add(new Url.QueryParameter(encoded, ""));
}
}
-
+
protected ResourceReferenceAttributes getResourceReferenceAttributes(Url url)
{
if (url == 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=892463&r1=892462&r2=892463&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 Sat Dec 19 11:27:15 2009
@@ -19,9 +19,9 @@
import org.apache.wicket.Request;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
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.IPageParametersEncoder;
import org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
import org.apache.wicket.util.lang.Checks;
@@ -51,14 +51,14 @@
*/
public class BookmarkableMapper extends AbstractBookmarkableMapper
{
- private final PageParametersEncoder pageParametersEncoder;
+ private final IPageParametersEncoder pageParametersEncoder;
/**
* Construct.
*
* @param pageParametersEncoder
*/
- public BookmarkableMapper(PageParametersEncoder pageParametersEncoder)
+ public BookmarkableMapper(IPageParametersEncoder pageParametersEncoder)
{
Checks.argumentNotNull(pageParametersEncoder, "pageParametersEncoder");
@@ -99,7 +99,7 @@
// load the page class
String className = url.getSegments().get(2);
- Class<? extends RequestablePage> pageClass = getPageClass(className);
+ Class<? extends IRequestablePage> pageClass = getPageClass(className);
// extract the PageParameters from URL if there are any
PageParametersNg pageParameters = extractPageParameters(request, 3,
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BufferedResponseMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BufferedResponseMapper.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BufferedResponseMapper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/BufferedResponseMapper.java Sat Dec 19 11:27:15 2009
@@ -18,22 +18,21 @@
import org.apache.wicket.Request;
import org.apache.wicket.ng.Session;
+import org.apache.wicket.ng.protocol.http.BufferedWebResponse;
import org.apache.wicket.ng.protocol.http.WebApplication;
-import org.apache.wicket.ng.request.RequestHandler;
-import org.apache.wicket.ng.request.RequestMapper;
+import org.apache.wicket.ng.request.IRequestHandler;
+import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.handler.impl.BufferedResponseRequestHandler;
-import org.apache.wicket.protocol.http.BufferedWebResponse;
/**
* Encoder that intercepts requests for which there is already stored buffer with rendered data.
*
* @author Matej Knopp
*/
-public class BufferedResponseMapper implements RequestMapper
+public class BufferedResponseMapper implements IRequestMapper
{
-
/**
* Construct.
*/
@@ -81,7 +80,7 @@
}
}
- public RequestHandler mapRequest(Request request)
+ public IRequestHandler mapRequest(Request request)
{
request = getRequest(request);
@@ -96,7 +95,7 @@
}
}
- public Url mapHandler(RequestHandler requestHandler)
+ public Url mapHandler(IRequestHandler requestHandler)
{
return null;
}
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IMapperContext.java (from r892307, wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MapperContext.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IMapperContext.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IMapperContext.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MapperContext.java&r1=892307&r2=892463&rev=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MapperContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/IMapperContext.java Sat Dec 19 11:27:15 2009
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.ng.request.mapper;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
@@ -25,7 +25,7 @@
*
* @author Matej Knopp
*/
-public interface MapperContext extends PageSource
+public interface IMapperContext extends IPageSource
{
/**
* @return the namespace for Wicket URLs.
@@ -73,5 +73,5 @@
*
* @return home page class
*/
- public Class<? extends RequestablePage> getHomePageClass();
+ public Class<? extends IRequestablePage> getHomePageClass();
}