svn commit: r821193 - in /wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket: Application.java mock/MockApplication.java

[knopp]

Author: knopp
Date: Fri Oct  2 22:44:41 2009
New Revision: 821193

URL: http://svn.apache.org/viewvc?rev=821193&view=rev
Log:
rename

Modified:
    
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/mock/MockApplication.java

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=821193&r1=821192&r2=821193&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 Oct  2 22:44:41 2009
@@ -13,24 +13,23 @@
 import org.apache.wicket.page.persistent.PageStore;
 import org.apache.wicket.page.persistent.PersistentPageManager;
 import org.apache.wicket.page.persistent.disk.DiskDataStore;
-import org.apache.wicket.request.RequestMapper;
 import org.apache.wicket.request.Request;
-import org.apache.wicket.request.component.RequestablePage;
+import org.apache.wicket.request.RequestMapper;
 import org.apache.wicket.request.component.PageFactory;
 import org.apache.wicket.request.component.PageParameters;
+import org.apache.wicket.request.component.RequestablePage;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
 import 
org.apache.wicket.request.handler.impl.render.RenderPageRequestHandlerDelegate;
 import org.apache.wicket.request.listener.RequestListenerInterface;
-import org.apache.wicket.request.mapper.ThreadsafeCompoundRequestMapper;
 import org.apache.wicket.request.mapper.MapperContext;
+import org.apache.wicket.request.mapper.ThreadsafeCompoundRequestMapper;
 import org.apache.wicket.request.response.Response;
 import org.apache.wicket.resource.ResourceReferenceRegistry;
 import org.apache.wicket.session.SessionStore;
 import org.apache.wicket.session.SessionStore.UnboundListener;
 import org.apache.wicket.settings.ApplicationSettings;
 import org.apache.wicket.settings.RequestCycleSettings;
-import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy;
 import org.apache.wicket.util.lang.Check;
 
 /**
@@ -52,7 +51,7 @@
         this.sessionStore.registerUnboundListener(this);
         this.pageManager = newPageManager();
         this.pageManager.setContext(getPageManagerContext());
-        this.requestHandlerEncoderRegistry = 
newRequestHandlerEncoderRegistry();
+        this.rootRequestMapper = newRequestHandlerEncoderRegistry();
         this.resourceReferenceRegistry = newResourceReferenceRegistry();
         this.pageFactory = newPageFactory();
         registerDefaultEncoders();
@@ -257,7 +256,7 @@
      */
     protected RequestCycle newRequestCycle(Request request, Response response)
     {
-        return new RequestCycle(request, response, 
requestHandlerEncoderRegistry,
+        return new RequestCycle(request, response, rootRequestMapper,
                 new DefaultExceptionHandlerMapper());
     }
 
@@ -441,7 +440,7 @@
      */
     public abstract Class< ? extends RequestablePage> getHomePage();
 
-    private ThreadsafeCompoundRequestMapper requestHandlerEncoderRegistry;
+    private ThreadsafeCompoundRequestMapper rootRequestMapper;
 
     /**
      * Override to create custom {...@link ThreadsafeCompoundRequestMapper}.
@@ -458,9 +457,9 @@
      * 
      * @return
      */
-    public final ThreadsafeCompoundRequestMapper 
getRequestHandlerEncoderRegistry()
+    public final ThreadsafeCompoundRequestMapper getRootRequestMapper()
     {
-        return requestHandlerEncoderRegistry;
+        return rootRequestMapper;
     }
 
     private ResourceReferenceRegistry resourceReferenceRegistry;
@@ -575,7 +574,7 @@
 
     public void registerEncoder(RequestMapper encoder)
     {
-        getRequestHandlerEncoderRegistry().register(encoder);
+        getRootRequestMapper().register(encoder);
     }
 
     /**

Modified: 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/mock/MockApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/mock/MockApplication.java?rev=821193&r1=821192&r2=821193&view=diff
==============================================================================
--- 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/mock/MockApplication.java
 (original)
+++ 
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/mock/MockApplication.java
 Fri Oct  2 22:44:41 2009
@@ -37,7 +37,7 @@
     @Override
     protected MockRequestCycle newRequestCycle(Request request, Response 
response)
     {
-        return new MockRequestCycle(request, response, 
getRequestHandlerEncoderRegistry(),
+        return new MockRequestCycle(request, response, getRootRequestMapper(),
                 new DefaultExceptionHandlerMapper());
     }