svn commit: r562525 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java

[knopp]

Author: knopp
Date: Fri Aug  3 10:27:47 2007
New Revision: 562525

URL: http://svn.apache.org/viewvc?view=rev&rev=562525
Log:
Pagemap prefix made configurable

Modified:
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java?view=diff&rev=562525&r1=562524&r2=562525
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java 
(original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java 
Fri Aug  3 10:27:47 2007
@@ -16,6 +16,19 @@
  */
 package org.apache.wicket;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
 import org.apache.wicket.application.IClassResolver;
 import org.apache.wicket.authorization.IAuthorizationStrategy;
 import org.apache.wicket.feedback.FeedbackMessage;
@@ -31,10 +44,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.Serializable;
-import java.util.*;
-import java.util.Map.Entry;
-
 
 /**
  * Holds information about a user session, including some fixed number of most
@@ -372,7 +381,7 @@
         */
        public Session(Request request)
        {
-               this.locale = request.getLocale();
+               locale = request.getLocale();
                if (locale == null)
                {
                        throw new IllegalArgumentException("Parameter 'locale' 
must not be null");
@@ -421,7 +430,7 @@
                if (store.lookup(request) == null)
                {
                        // explicitly create a session
-                       this.id = store.getSessionId(request, true);
+                       id = store.getSessionId(request, true);
                        // bind it
                        store.bind(request, this);
 
@@ -499,18 +508,26 @@
         */
        public synchronized final String createAutoPageMapName()
        {
-               String name = "wicket-" + autoCreatePageMapCounter;
+               String name = getAutoPageMapNamePrefix() + 
autoCreatePageMapCounter;
                IPageMap pm = pageMapForName(name, false);
                while (pm != null)
                {
                        autoCreatePageMapCounter++;
-                       name = "wicket-" + autoCreatePageMapCounter;
+                       name = getAutoPageMapNamePrefix() + 
autoCreatePageMapCounter;
                        pm = pageMapForName(name, false);
                }
                return name;
        }
 
        /**
+        * @return
+        */
+       protected String getAutoPageMapNamePrefix()
+       {
+               return "wicket-";
+       }
+
+       /**
         * Registers an error feedback message for this session
         * 
         * @param message
@@ -562,7 +579,7 @@
        {
                if (clientInfo == null)
                {
-                       this.clientInfo = RequestCycle.get().newClientInfo();
+                       clientInfo = RequestCycle.get().newClientInfo();
                }
                return clientInfo;
        }
@@ -1120,7 +1137,7 @@
         */
        public final void dirty()
        {
-               this.dirty = true;
+               dirty = true;
        }
 
        /**
@@ -1348,7 +1365,7 @@
                if (dirty)
                {
                        // State is no longer dirty
-                       this.dirty = false;
+                       dirty = false;
 
                        // Set attribute.
                        setAttribute(SESSION_ATTRIBUTE_NAME, this);