svn commit: r985761 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: Session.java protocol/http/WebSession.java

[mgrigorov]

Author: mgrigorov
Date: Sun Aug 15 21:10:53 2010
New Revision: 985761

URL: http://svn.apache.org/viewvc?rev=985761&view=rev
Log:
Move newBrowserInfoPage(String) from Session to WebSession because it is 
web-related.

discussed-with: juergen


Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java?rev=985761&r1=985760&r2=985761&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java Sun Aug 15 
21:10:53 2010
@@ -28,8 +28,6 @@ import org.apache.wicket.application.ICl
 import org.apache.wicket.authorization.IAuthorizationStrategy;
 import org.apache.wicket.feedback.FeedbackMessage;
 import org.apache.wicket.feedback.FeedbackMessages;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.pages.BrowserInfoPage;
 import org.apache.wicket.page.IPageManager;
 import org.apache.wicket.request.ClientInfo;
 import org.apache.wicket.request.Request;
@@ -325,17 +323,6 @@ public abstract class Session implements
        public abstract ClientInfo getClientInfo();
 
        /**
-        * Override this method if you want to use a custom page for gathering 
the client's browser
-        * information.<br/>
-        * The easiest way is just to extend {...@link BrowserInfoPage} and 
provide your own markup file
-        * 
-        * @param url
-        *            the url to redirect to when the browser info is handled
-        * @return the {...@link WebPage} which should be used while gathering 
browser info
-        */
-       public abstract Page newBrowserInfoPage(String url);
-
-       /**
         * Gets feedback messages stored in session
         * 
         * @return unmodifiable list of feedback messages

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java?rev=985761&r1=985760&r2=985761&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
 Sun Aug 15 21:10:53 2010
@@ -216,10 +216,15 @@ public class WebSession extends Session
        }
 
        /**
-        * {...@inheritdoc}
+        * Override this method if you want to use a custom page for gathering 
the client's browser
+        * information.<br/>
+        * The easiest way is just to extend {...@link BrowserInfoPage} and 
provide your own markup file
+        * 
+        * @param url
+        *            the url to redirect to when the browser info is handled
+        * @return the {...@link WebPage} which should be used while gathering 
browser info
         */
-       @Override
-       public WebPage newBrowserInfoPage(String url)
+       protected WebPage newBrowserInfoPage(String url)
        {
                return new BrowserInfoPage(url);
        }