Author: knopp
Date: Mon Apr 6 10:29:28 2009
New Revision: 762270
URL: http://svn.apache.org/viewvc?rev=762270&view=rev
Log: (empty)
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Page.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java?rev=762270&r1=762269&r2=762270&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Application.java
Mon Apr 6 10:29:28 2009
@@ -6,6 +6,7 @@
import org.apache.wicket.application.ClassResolver;
import org.apache.wicket.application.DefaultClassResolver;
+import org.apache.wicket.page.PageManagerContext;
import org.apache.wicket.page.PageManager;
import org.apache.wicket.page.persistent.DataStore;
import org.apache.wicket.page.persistent.DefaultPageStore;
@@ -30,6 +31,7 @@
{
this.sessionStore = newSessionStore();
this.pageManager = newPageManager();
+ this.pageManager.setContext(getPageManagerContext());
}
public void init()
@@ -176,7 +178,7 @@
{
session = newSession(requestCycle);
ThreadContext.setSession(session);
-
getPageManager().newSessionCreated(getPageManagerContext());
+ getPageManager().newSessionCreated();
}
else
{
@@ -198,7 +200,7 @@
private PageManager pageManager;
- private PageManager.Context pageManagerContext = new
PageManager.Context()
+ private PageManagerContext pageManagerContext = new PageManagerContext()
{
public void bind()
{
@@ -250,7 +252,7 @@
return pageManager;
}
- public PageManager.Context getPageManagerContext()
+ public PageManagerContext getPageManagerContext()
{
return pageManagerContext;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Page.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Page.java?rev=762270&r1=762269&r2=762270&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Page.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/Page.java
Mon Apr 6 10:29:28 2009
@@ -32,7 +32,7 @@
public static Page get(int id)
{
Application app = Application.get();
- return (Page)
app.getPageManager().getPage(app.getPageManagerContext(), id);
+ return (Page) app.getPageManager().getPage(id);
}
public int getPageId()
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java?rev=762270&r1=762269&r2=762270&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/page/persistent/PersistentPageManager.java
Mon Apr 6 10:29:28 2009
@@ -9,19 +9,20 @@
import org.apache.wicket.IPage;
import org.apache.wicket.page.AbstractPageManager;
+import org.apache.wicket.page.PageManagerContext;
public class PersistentPageManager extends AbstractPageManager
{
private final PageStore pageStore;
private final String applicationName;
-
+
public PersistentPageManager(String applicationName, PageStore
pageStore)
{
this.applicationName = applicationName;
this.pageStore = pageStore;
managers.put(applicationName, this);
}
-
+
private static Map<String, PersistentPageManager> managers = new
ConcurrentHashMap<String, PersistentPageManager>();
private static class SessionEntry implements Serializable
@@ -136,7 +137,7 @@
protected class PersitentRequestAdapter extends RequestAdapter
{
- public PersitentRequestAdapter(Context context)
+ public PersitentRequestAdapter(PageManagerContext context)
{
super(context);
}
@@ -202,7 +203,7 @@
};
@Override
- protected RequestAdapter newRequestAdapter(Context context)
+ protected RequestAdapter newRequestAdapter(PageManagerContext context)
{
return new PersitentRequestAdapter(context);
}
@@ -221,6 +222,6 @@
public void destroy()
{
managers.remove(applicationName);
- }
+ }
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=762270&r1=762269&r2=762270&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Mon Apr 6 10:29:28 2009
@@ -112,7 +112,7 @@
{
public void onDetach(RequestCycle requestCycle)
{
-
getPageManager().commitRequest(getPageManagerContext());
+ getPageManager().commitRequest();
}
});
return requestCycle;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=762270&r1=762269&r2=762270&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Mon Apr 6 10:29:28 2009
@@ -273,6 +273,6 @@
private void touchPageInstance()
{
-
Application.get().getPageManager().touchPage(Application.get().getPageManagerContext(),
pageInstance);
+ Application.get().getPageManager().touchPage(pageInstance);
}
}
