Author: pedro
Date: Mon Jun 13 17:00:01 2011
New Revision: 1135175
URL: http://svn.apache.org/viewvc?rev=1135175&view=rev
Log:
Renaming PersistentPageManager
Issue: WICKET-3790
Added:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java
- copied, changed from r1133514,
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java
Removed:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java?rev=1135175&r1=1135174&r2=1135175&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
Mon Jun 13 17:00:01 2011
@@ -20,7 +20,7 @@ import java.io.File;
import org.apache.wicket.page.IPageManager;
import org.apache.wicket.page.IPageManagerContext;
-import org.apache.wicket.page.PersistentPageManager;
+import org.apache.wicket.page.PageStoreManager;
import org.apache.wicket.pageStore.DefaultPageStore;
import org.apache.wicket.pageStore.DiskDataStore;
import org.apache.wicket.pageStore.IDataStore;
@@ -51,7 +51,7 @@ public class DefaultPageManagerProvider
{
IDataStore dataStore = newDataStore();
IPageStore pageStore = newPageStore(dataStore);
- return new PersistentPageManager(application.getName(),
pageStore, pageManagerContext);
+ return new PageStoreManager(application.getName(), pageStore,
pageManagerContext);
}
Copied:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java
(from r1133514,
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java?p2=wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java&p1=wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java&r1=1133514&r2=1135175&rev=1135175&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PersistentPageManager.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java
Mon Jun 13 17:00:01 2011
@@ -30,13 +30,13 @@ import org.apache.wicket.pageStore.IPage
/**
*
*/
-public class PersistentPageManager extends AbstractPageManager
+public class PageStoreManager extends AbstractPageManager
{
/**
* A cache that holds all registered page managers. <br/>
* applicationName -> page manager
*/
- private static final ConcurrentMap<String, PersistentPageManager>
managers = new ConcurrentHashMap<String, PersistentPageManager>();
+ private static final ConcurrentMap<String, PageStoreManager> managers =
new ConcurrentHashMap<String, PageStoreManager>();
private final IPageStore pageStore;
@@ -49,7 +49,7 @@ public class PersistentPageManager exten
* @param pageStore
* @param context
*/
- public PersistentPageManager(final String applicationName, final
IPageStore pageStore,
+ public PageStoreManager(final String applicationName, final IPageStore
pageStore,
final IPageManagerContext context)
{
super(context);
@@ -79,7 +79,7 @@ public class PersistentPageManager exten
private final String sessionId;
- private transient List<IManageablePage> pages;
+ private transient List<IManageablePage> sessionCache;
private transient List<Object> afterReadObject;
/**
@@ -100,7 +100,7 @@ public class PersistentPageManager exten
*/
private IPageStore getPageStore()
{
- PersistentPageManager manager =
managers.get(applicationName);
+ PageStoreManager manager =
managers.get(applicationName);
if (manager == null)
{
@@ -117,7 +117,7 @@ public class PersistentPageManager exten
*/
private IManageablePage findPage(int id)
{
- for (IManageablePage p : pages)
+ for (IManageablePage p : sessionCache)
{
if (p.getPageId() == id)
{
@@ -141,7 +141,7 @@ public class PersistentPageManager exten
return;
}
- pages.add(page);
+ sessionCache.add(page);
}
}
@@ -151,9 +151,9 @@ public class PersistentPageManager exten
*/
private void convertAfterReadObjects()
{
- if (pages == null)
+ if (sessionCache == null)
{
- pages = new ArrayList<IManageablePage>();
+ sessionCache = new ArrayList<IManageablePage>();
}
for (Object o : afterReadObject)
@@ -179,7 +179,7 @@ public class PersistentPageManager exten
}
// try to find page with same id
- if (pages != null)
+ if (sessionCache != null)
{
IManageablePage page = findPage(id);
if (page != null)
@@ -197,9 +197,9 @@ public class PersistentPageManager exten
*
* @param pages
*/
- public synchronized void setPages(final List<IManageablePage>
pages)
+ public synchronized void setSessionCache(final
List<IManageablePage> pages)
{
- this.pages = new ArrayList<IManageablePage>(pages);
+ this.sessionCache = new
ArrayList<IManageablePage>(pages);
afterReadObject = null;
}
@@ -219,10 +219,10 @@ public class PersistentPageManager exten
// prepare for serialization and store the pages
List<Serializable> serializedPages = new
ArrayList<Serializable>();
- if (pages != null)
+ if (sessionCache != null)
{
IPageStore pageStore = getPageStore();
- for (IManageablePage p : pages)
+ for (IManageablePage p : sessionCache)
{
Serializable preparedPage;
if (pageStore != null)
@@ -284,7 +284,7 @@ public class PersistentPageManager exten
}
/**
- * {@link RequestAdapter} for {@link PersistentPageManager}
+ * {@link RequestAdapter} for {@link PageStoreManager}
*
* @author Matej Knopp
*/
@@ -371,7 +371,7 @@ public class PersistentPageManager exten
if (!touchedPages.isEmpty())
{
SessionEntry entry = getSessionEntry(true);
- entry.setPages(touchedPages);
+ entry.setSessionCache(touchedPages);
for (IManageablePage page : touchedPages)
{
pageStore.storePage(getSessionId(),
page);
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java?rev=1135175&r1=1135174&r2=1135175&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PersistentPageManagerTest.java
Mon Jun 13 17:00:01 2011
@@ -100,12 +100,12 @@ public class PersistentPageManagerTest
newPageManager.destroy();
}
- private PersistentPageManager newPersistentPageManager(String appName)
+ private PageStoreManager newPersistentPageManager(String appName)
{
IDataStore dataStore = new InMemoryPageStore();
IPageStore pageStore = new DefaultPageStore(new
JavaSerializer(appName), dataStore, 4);
IPageManagerContext pageManagerContext = new
DummyPageManagerContext();
- return new PersistentPageManager(appName, pageStore,
pageManagerContext);
+ return new PageStoreManager(appName, pageStore,
pageManagerContext);
}
private static class TestPage implements IManageablePage
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java?rev=1135175&r1=1135174&r2=1135175&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java
Mon Jun 13 17:00:01 2011
@@ -30,7 +30,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.page.IPageManager;
import org.apache.wicket.page.IPageManagerContext;
-import org.apache.wicket.page.PersistentPageManager;
+import org.apache.wicket.page.PageStoreManager;
import org.apache.wicket.pageStore.DefaultPageStore;
import org.apache.wicket.pageStore.IPageStore;
import org.apache.wicket.request.Url;
@@ -92,7 +92,7 @@ public class PageIdPoliticTest extends T
{
IPageStore pageStore = new
DefaultPageStore(new JavaSerializer(
application.getApplicationKey()), dataStore, 4);
- return new
PersistentPageManager(application.getName(), pageStore,
+ return new
PageStoreManager(application.getName(), pageStore,
pageManagerContext);
}
};
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java?rev=1135175&r1=1135174&r2=1135175&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
Mon Jun 13 17:00:01 2011
@@ -23,7 +23,7 @@ import org.apache.wicket.IPageManagerPro
import org.apache.wicket.Page;
import org.apache.wicket.page.IPageManager;
import org.apache.wicket.page.IPageManagerContext;
-import org.apache.wicket.page.PersistentPageManager;
+import org.apache.wicket.page.PageStoreManager;
import org.apache.wicket.pageStore.AsynchronousDataStore;
import org.apache.wicket.pageStore.DefaultPageStore;
import org.apache.wicket.pageStore.IDataStore;
@@ -68,7 +68,7 @@ public class PageVersioningTest
final AsynchronousDataStore
asyncDS = new AsynchronousDataStore(dataStore);
final DefaultPageStore
pageStore = new DefaultPageStore(new JavaSerializer(
application.getApplicationKey()), asyncDS, 40);
- return new
PersistentPageManager(application.getName(), pageStore,
+ return new
PageStoreManager(application.getName(), pageStore,
pageManagerContext);
}
};
