Author: ivaynberg
Date: Mon Mar 15 16:56:47 2010
New Revision: 923336
URL: http://svn.apache.org/viewvc?rev=923336&view=rev
Log:
move helper method from webapp to app
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=923336&r1=923335&r2=923336&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Mon
Mar 15 16:56:47 2010
@@ -49,11 +49,13 @@ import org.apache.wicket.markup.resolver
import org.apache.wicket.markup.resolver.WicketMessageResolver;
import org.apache.wicket.ng.DefaultExceptionMapper;
import org.apache.wicket.ng.ThreadContext;
+import org.apache.wicket.ng.request.ICompoundRequestMapper;
import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.cycle.RequestCycleContext;
+import org.apache.wicket.ng.request.mapper.CompoundRequestMapper;
import org.apache.wicket.ng.request.mapper.IMapperContext;
import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
import org.apache.wicket.pageStore.DefaultPageManagerContext;
@@ -1199,6 +1201,23 @@ public abstract class Application implem
}
/**
+ * Converts the root mapper to a {...@link ICompoundRequestMapper} if
necessary and returns the
+ * converted instance.
+ *
+ * @return compound instance of the root mapper
+ */
+ public ICompoundRequestMapper getRootRequestMapperAsCompound()
+ {
+ IRequestMapper root = getRootRequestMapper();
+ if (!(root instanceof ICompoundRequestMapper))
+ {
+ root = new CompoundRequestMapper().add(root);
+ }
+ return (ICompoundRequestMapper)root;
+ }
+
+
+ /**
* @return The root request mapper
*/
public final IRequestMapper getRootRequestMapper()
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=923336&r1=923335&r2=923336&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Mon Mar 15 16:56:47 2010
@@ -37,13 +37,11 @@ import org.apache.wicket.markup.html.pag
import org.apache.wicket.markup.html.pages.PageExpiredErrorPage;
import org.apache.wicket.markup.resolver.AutoLinkResolver;
import org.apache.wicket.ng.ThreadContext;
-import org.apache.wicket.ng.request.ICompoundRequestMapper;
import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.render.PageRenderer;
import org.apache.wicket.ng.request.handler.impl.render.WebPageRenderer;
-import org.apache.wicket.ng.request.mapper.CompoundRequestMapper;
import org.apache.wicket.ng.request.mapper.MountedMapper;
import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.session.HttpSessionStore;
@@ -292,23 +290,6 @@ public abstract class WebApplication ext
}
/**
- * Converts the root mapper to a {...@link ICompoundRequestMapper} if
necessary and returns the
- * converted instance.
- *
- * @return compound instance of the root mapper
- */
- public ICompoundRequestMapper getRootRequestMapperAsCompound()
- {
- IRequestMapper root = getRootRequestMapper();
- if (!(root instanceof ICompoundRequestMapper))
- {
- root = new CompoundRequestMapper().add(root);
- }
- return (ICompoundRequestMapper)root;
- }
-
-
- /**
* Mounts a bookmarkable page class to the given path.
*
* @param <T>
