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

[kn...@apache.org]

Author: knopp
Date: Tue Aug 14 16:42:31 2007
New Revision: 565975

URL: http://svn.apache.org/viewvc?view=rev&rev=565975
Log:
more flexibility for generating page Ids and auto pagemap numbers

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=565975&r1=565974&r2=565975
==============================================================================
--- 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 Tue Aug 14 16:42:31 2007
@@ -497,6 +497,16 @@
 		return newPageMap(createAutoPageMapName());
 	}
 
+	protected int currentCreateAutoPageMapCounter()
+	{
+		return autoCreatePageMapCounter;
+	}
+
+	protected void incrementCreateAutoPageMapCounter()
+	{
+		++autoCreatePageMapCounter;
+	}
+
 	/**
 	 * With this call you can create a pagemap name but not create the pagemap
 	 * itself already. It will give the first pagemap name where it couldn't
@@ -508,13 +518,13 @@
 	 */
 	public synchronized final String createAutoPageMapName()
 	{
-		String name = getAutoPageMapNamePrefix() + autoCreatePageMapCounter +
+		String name = getAutoPageMapNamePrefix() + currentCreateAutoPageMapCounter() +
 				getAutoPageMapNameSuffix();
 		IPageMap pm = pageMapForName(name, false);
 		while (pm != null)
 		{
-			autoCreatePageMapCounter++;
-			name = getAutoPageMapNamePrefix() + autoCreatePageMapCounter +
+			incrementCreateAutoPageMapCounter();
+			name = getAutoPageMapNamePrefix() + currentCreateAutoPageMapCounter() +
 					getAutoPageMapNameSuffix();
 			pm = pageMapForName(name, false);
 		}
@@ -1492,7 +1502,7 @@
 
 	private int pageIdCounter = 0;
 
-	synchronized int nextPageId()
+	synchronized protected int nextPageId()
 	{
 		return pageIdCounter++;
 	}