svn commit: r1040712 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: DefaultMapperContext.java Page.java

[mgrigorov]

Author: mgrigorov
Date: Tue Nov 30 19:16:13 2010
New Revision: 1040712

URL: http://svn.apache.org/viewvc?rev=1040712&view=rev
Log:
Move the logic to get a page by id from Page to DefaultMapperContext

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/DefaultMapperContext.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/DefaultMapperContext.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/DefaultMapperContext.java?rev=1040712&r1=1040711&r2=1040712&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/DefaultMapperContext.java 
(original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/DefaultMapperContext.java 
Tue Nov 30 19:16:13 2010
@@ -17,6 +17,7 @@
 package org.apache.wicket;
 
 import org.apache.wicket.markup.MarkupParser;
+import org.apache.wicket.page.IManageablePage;
 import org.apache.wicket.request.component.IRequestablePage;
 import org.apache.wicket.request.mapper.IMapperContext;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -113,7 +114,13 @@ public class DefaultMapperContext implem
         */
        public IRequestablePage getPageInstance(final int pageId)
        {
-               return Page.getPage(pageId);
+               IManageablePage manageablePage = 
Application.get().getPageManager().getPage(pageId);
+               IRequestablePage requestablePage = null;
+               if (manageablePage instanceof IRequestablePage)
+               {
+                       requestablePage = (IRequestablePage)manageablePage;
+               }
+               return requestablePage;
        }
 
        /**

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java?rev=1040712&r1=1040711&r2=1040712&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java Tue Nov 30 
19:16:13 2010
@@ -1301,15 +1301,4 @@ public abstract class Page extends Marku
                        setFreezePageId(false);
                }
        }
-
-       /** TODO WICKET-NG is this really needed? can we remove? */
-       public static Page getPage(int id)
-       {
-               Session session = Session.get();
-               if (session == null)
-               {
-                       return null;
-               }
-               return (Page)session.getPageManager().getPage(id);
-       }
 }