Author: mgrigorov
Date: Sat Sep 25 14:32:52 2010
New Revision: 1001218
URL: http://svn.apache.org/viewvc?rev=1001218&view=rev
Log:
Use providers to configure the Application.
Remove IPageManagerProvider. Use IProvider<IPageManager> instead.
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/IPageManagerProvider.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=1001218&r1=1001217&r2=1001218&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Sat
Sep 25 14:32:52 2010
@@ -1185,18 +1185,18 @@ public abstract class Application implem
//
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private volatile IPageManager pageManager;
- private IPageManagerProvider pageManagerProvider;
+ private IProvider<IPageManager> pageManagerProvider;
private final PageAccessSynchronizer pageAccessSynchronizer = new
PageAccessSynchronizer(
Duration.minutes(2)); // TODO WICKET-NG timeout configurable
- public final IPageManagerProvider getPageManagerProvider()
+ public final IProvider<IPageManager> getPageManagerProvider()
{
return pageManagerProvider;
}
- public synchronized final void setPageManagerProvider(final
IPageManagerProvider provider)
+ public synchronized final void setPageManagerProvider(final
IProvider<IPageManager> provider)
{
pageManagerProvider = provider;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.java?rev=1001218&r1=1001217&r2=1001218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/mock/MockApplication.java
Sat Sep 25 14:32:52 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.mock;
-import org.apache.wicket.IPageManagerProvider;
import org.apache.wicket.Page;
import org.apache.wicket.Session;
import org.apache.wicket.page.IPageManager;
@@ -73,7 +72,7 @@ public class MockApplication extends Web
}
}
- private static class MockPageManagerProvider implements
IPageManagerProvider
+ private static class MockPageManagerProvider implements
IProvider<IPageManager>
{
public IPageManager get()
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1001218&r1=1001217&r2=1001218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Sat Sep 25 14:32:52 2010
@@ -38,7 +38,6 @@ import javax.servlet.http.Cookie;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
-import org.apache.wicket.IPageManagerProvider;
import org.apache.wicket.IPageRendererProvider;
import org.apache.wicket.IRequestCycleProvider;
import org.apache.wicket.MarkupContainer;
@@ -283,7 +282,7 @@ public class BaseWicketTester
setupNextRequestCycle();
}
- protected IPageManagerProvider newTestPageManagerProvider()
+ protected IProvider<IPageManager> newTestPageManagerProvider()
{
return new TestPageManagerProvider();
}
@@ -2052,7 +2051,7 @@ public class BaseWicketTester
/**
*
*/
- private class TestPageManagerProvider implements IPageManagerProvider
+ private class TestPageManagerProvider implements IProvider<IPageManager>
{
public IPageManager get()
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java?rev=1001218&r1=1001217&r2=1001218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/versioning/PageVersioningTest.java
Sat Sep 25 14:32:52 2010
@@ -19,7 +19,6 @@ package org.apache.wicket.versioning;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.apache.wicket.IPageManagerProvider;
import org.apache.wicket.Page;
import org.apache.wicket.page.IPageManager;
import org.apache.wicket.page.IPageManagerContext;
@@ -28,6 +27,7 @@ import org.apache.wicket.pageStore.Async
import org.apache.wicket.pageStore.DefaultPageStore;
import org.apache.wicket.pageStore.IDataStore;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.Before;
import org.junit.Test;
@@ -53,9 +53,9 @@ public class PageVersioningTest
* @see
org.apache.wicket.util.tester.BaseWicketTester#newTestPageManagerProvider()
*/
@Override
- protected IPageManagerProvider
newTestPageManagerProvider()
+ protected IProvider<IPageManager>
newTestPageManagerProvider()
{
- return new IPageManagerProvider()
+ return new IProvider<IPageManager>()
{
public IPageManager get()
