svn commit: r1035843 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/settings/ISessionSettings.java main/java/org/apache/wicket/settings/Settings.java test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java

[pete]

Author: pete
Date: Tue Nov 16 22:25:00 2010
New Revision: 1035843

URL: http://svn.apache.org/viewvc?rev=1035843&view=rev
Log:
WICKET-3068:removed ISessionSettings#isPageIdUniquePerSession() as they are now 
always unique since pagemaps are gone

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java?rev=1035843&r1=1035842&r2=1035843&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/ISessionSettings.java
 Tue Nov 16 22:25:00 2010
@@ -48,20 +48,4 @@ public interface ISessionSettings
         *            The default factory
         */
        void setPageFactory(final IPageFactory pageFactory);
-
-       /**
-        * Sets whether the id of a page should be unique across the entire 
session. Default is true,
-        * which means that a page id is unique per session.
-        * 
-        * @param value
-        */
-       void setPageIdUniquePerSession(boolean value);
-
-       /**
-        * Returns whether the page id is unique per session. If the page id is 
not unique per session,
-        * it is only unique per pagemap.
-        * 
-        * @return true if he page id is unique per session
-        */
-       boolean isPageIdUniquePerSession();
 }
\ No newline at end of file

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=1035843&r1=1035842&r2=1035843&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java 
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java 
Tue Nov 16 22:25:00 2010
@@ -244,12 +244,6 @@ public final class Settings
        private boolean throwExceptionOnMissingResource = true;
 
        /**
-        * Whether the generated page id must be unique per session, or it's 
enough if it is unique per
-        * page map;
-        */
-       private boolean pageIdUniquePerSession = true;
-
-       /**
         * The time that a request will by default be waiting for the previous 
request to be handled
         * before giving up. Defaults to one minute.
         */
@@ -1200,24 +1194,6 @@ public final class Settings
 
        /**
         * 
-        * @see 
org.apache.wicket.settings.ISessionSettings#setPageIdUniquePerSession(boolean)
-        */
-       public void setPageIdUniquePerSession(boolean value)
-       {
-               pageIdUniquePerSession = value;
-       }
-
-       /**
-        * 
-        * @see 
org.apache.wicket.settings.ISessionSettings#isPageIdUniquePerSession()
-        */
-       public boolean isPageIdUniquePerSession()
-       {
-               return pageIdUniquePerSession;
-       }
-
-       /**
-        * 
         * @see 
org.apache.wicket.settings.IDebugSettings#isLinePreciseReportingOnAddComponentEnabled()
         */
        public boolean isLinePreciseReportingOnAddComponentEnabled()

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java?rev=1035843&r1=1035842&r2=1035843&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/WicketApplication.java
 Tue Nov 16 22:25:00 2010
@@ -21,7 +21,7 @@ import org.apache.wicket.protocol.http.W
 /**
  * Application object for your web application. If you want to run this 
application without
  * deploying, run the Start class.
- * 
+ *
  * @see com.mycompany.Start#main(String[])
  */
 public class WicketApplication extends WebApplication
@@ -41,10 +41,4 @@ public class WicketApplication extends W
        {
                return HomePage.class;
        }
-
-       @Override
-       protected void init()
-       {
-               getSessionSettings().setPageIdUniquePerSession(true);
-       }
 }