You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2007/05/31 11:35:59 UTC
svn commit: r543096 - in
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket:
Page.java RequestCycle.java protocol/http/FilePageStore.java
protocol/http/SecondLevelCacheSessionStore.java
protocol/http/TestFilePageStore.java
Author: jcompagner
Date: Thu May 31 02:35:58 2007
New Revision: 543096
URL: http://svn.apache.org/viewvc?view=rev&rev=543096
Log:
getPageMapName() added to page
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java?view=diff&rev=543096&r1=543095&r2=543096
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java Thu May 31 02:35:58 2007
@@ -511,6 +511,14 @@
}
return pageMap;
}
+
+ /**
+ * @return
+ */
+ public final String getPageMapName()
+ {
+ return pageMapName;
+ }
/**
* @return Get a page map entry for this page. By default, this is the page
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java?view=diff&rev=543096&r1=543095&r2=543096
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java Thu May 31 02:35:58 2007
@@ -753,7 +753,7 @@
if (listener != IRedirectListener.INTERFACE && component.isStateless()
&& page.isBookmarkable())
{
- target = new BookmarkableListenerInterfaceRequestTarget(page.getPageMap().getName(),
+ target = new BookmarkableListenerInterfaceRequestTarget(page.getPageMapName(),
page.getClass(), new PageParameters(), component, listener);
}
else
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java?view=diff&rev=543096&r1=543095&r2=543096
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java Thu May 31 02:35:58 2007
@@ -311,7 +311,7 @@
SessionPageKey(String sessionId, Page page)
{
this(sessionId, page.getNumericId(), page.getCurrentVersionNumber(), page
- .getAjaxVersionNumber(), page.getPageMap().getName(), page.getClass(), page);
+ .getAjaxVersionNumber(), page.getPageMapName(), page.getClass(), page);
}
/**
@@ -901,7 +901,7 @@
PageHolder(Page page)
{
this.pageid = page.getNumericId();
- this.pagemap = page.getPageMap().getName();
+ this.pagemap = page.getPageMapName();
}
protected Object readResolve() throws ObjectStreamException
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java?view=diff&rev=543096&r1=543095&r2=543096
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java Thu May 31 02:35:58 2007
@@ -424,7 +424,7 @@
// current page version.
if (ajaxNumber >= numberOfVersions)
{
- return store.getPage(sessionId, page.getPageMap().getName(), page
+ return store.getPage(sessionId, page.getPageMapName(), page
.getNumericId(), versionNumber, ajaxNumber - numberOfVersions);
}
else
@@ -441,7 +441,7 @@
log.error("trying to rollback to many versions, jumping over 2 page versions is not supported yet.");
return null;
}
- return store.getPage(sessionId, page.getPageMap().getName(), page
+ return store.getPage(sessionId, page.getPageMapName(), page
.getNumericId(), versionNumber, ajaxNumber);
}
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java?view=diff&rev=543096&r1=543095&r2=543096
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java Thu May 31 02:35:58 2007
@@ -91,7 +91,7 @@
SessionPageKey(String sessionId, Page page)
{
this(sessionId, page.getNumericId(), page.getCurrentVersionNumber(), page
- .getAjaxVersionNumber(), page.getPageMap().getName(), page.getClass());
+ .getAjaxVersionNumber(), page.getPageMapName(), page.getClass());
}
SessionPageKey(String sessionId, int id, int versionNumber, int ajaxVersionNumber,