You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/05/04 02:58:13 UTC

svn commit: r653168 [2/2] - in /wicket/trunk: wicket-auth-roles/src/main/java/org/apache/wicket/authentication/ wicket-examples/src/main/java/org/apache/wicket/examples/ wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ wicket-exam...

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=653168&r1=653167&r2=653168&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 May  3 17:58:11 2008
@@ -143,7 +143,7 @@
 
 	/** */
 	private List<IComponentOnBeforeRenderListener> componentPreOnBeforeRenderListeners;
-	
+
 	/** */
 	private List<IComponentOnBeforeRenderListener> componentPostOnBeforeRenderListeners;
 
@@ -242,7 +242,7 @@
 	private final List<IInitializer> initializers = new ArrayList<IInitializer>();
 
 	/** Application level meta data. */
-	private MetaDataEntry[] metaData;
+	private MetaDataEntry< ? >[] metaData;
 
 	/** Name of application subclass. */
 	private final String name;
@@ -446,7 +446,7 @@
 	 * 
 	 * @return Home page class for this application
 	 */
-	public abstract Class< ? extends Page> getHomePage();
+	public abstract Class< ? extends Page< ? >> getHomePage();
 
 	/**
 	 * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT.
@@ -1102,7 +1102,7 @@
 			}
 		}
 	}
-	
+
 	/**
 	 * Adds an {@link IComponentOnAfterRenderListener}. This method should typically only be called
 	 * during application startup; it is not thread safe.

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=653168&r1=653167&r2=653168&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 May  3 17:58:11 2008
@@ -118,7 +118,7 @@
 	public static class DummyWebApplication extends WebApplication
 	{
 		@Override
-		public Class< ? extends Page> getHomePage()
+		public Class< ? extends Page< ? >> getHomePage()
 		{
 			return DummyHomePage.class;
 		}
@@ -153,7 +153,7 @@
 	 * @param homePage
 	 *            a home page <code>Class</code>
 	 */
-	public BaseWicketTester(final Class homePage)
+	public BaseWicketTester(final Class< ? extends Page< ? >> homePage)
 	{
 		this(new WebApplication()
 		{
@@ -161,7 +161,7 @@
 			 * @see org.apache.wicket.Application#getHomePage()
 			 */
 			@Override
-			public Class< ? extends Page> getHomePage()
+			public Class< ? extends Page< ? >> getHomePage()
 			{
 				return homePage;
 			}

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/DummyHomePage.java Sat May  3 17:58:11 2008
@@ -25,7 +25,7 @@
  * @author Ingram Chen
  * @since 1.2.6
  */
-public class DummyHomePage extends WebPage
+public class DummyHomePage extends WebPage<Object>
 {
 	private static final long serialVersionUID = 1L;
 
@@ -82,6 +82,7 @@
 			super(id);
 		}
 
+		@Override
 		public void onClick()
 		{
 			setResponsePage(testPageSource.getTestPage());

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java Sat May  3 17:58:11 2008
@@ -160,11 +160,13 @@
 		/**
 		 * @see org.apache.wicket.Application#getHomePage()
 		 */
-		public Class<? extends Page> getHomePage()
+		@Override
+		public Class< ? extends Page< ? >> getHomePage()
 		{
 			return DummyHomePage.class;
 		}
 
+		@Override
 		protected ISessionStore newSessionStore()
 		{
 			// Don't use a filestore, or we spawn lots of threads, which makes
@@ -175,11 +177,13 @@
 		/**
 		 * @see org.apache.wicket.protocol.http.WebApplication#newWebResponse(javax.servlet.http.HttpServletResponse)
 		 */
+		@Override
 		protected WebResponse newWebResponse(final HttpServletResponse servletResponse)
 		{
 			return new WebResponse(servletResponse);
 		}
 
+		@Override
 		protected void outputDevelopmentModeWarning()
 		{
 			// do nothing
@@ -192,6 +196,7 @@
 	 */
 	public static class NonPageCachingDummyWebApplication extends DummyWebApplication
 	{
+		@Override
 		protected ISessionStore newSessionStore()
 		{
 			return new SecondLevelCacheSessionStore(this, new IPageStore()
@@ -256,11 +261,13 @@
 			/**
 			 * @see org.apache.wicket.Application#getHomePage()
 			 */
-			public Class<? extends Page> getHomePage()
+			@Override
+			public Class< ? extends Page< ? >> getHomePage()
 			{
 				return homePage;
 			}
 
+			@Override
 			protected ISessionStore newSessionStore()
 			{
 				// Don't use a filestore, or we spawn lots of threads, which
@@ -268,11 +275,13 @@
 				return new HttpSessionStore(this);
 			}
 
+			@Override
 			protected WebResponse newWebResponse(final HttpServletResponse servletResponse)
 			{
 				return new WebResponse(servletResponse);
 			}
 
+			@Override
 			protected void outputDevelopmentModeWarning()
 			{
 				// Do nothing.
@@ -472,6 +481,7 @@
 	 * @param expectedList
 	 *            expected <code>List</code> in the model of the given {@link ListView}
 	 */
+	@Override
 	public void assertListView(String path, List expectedList)
 	{
 		ListView listView = (ListView)getComponentFromLastRenderedPage(path);
@@ -535,6 +545,7 @@
 	 *            expected output filename <code>String</code>
 	 * @throws Exception
 	 */
+	@Override
 	public void assertResultPage(final Class clazz, final String filename) throws Exception
 	{
 		String document = getServletResponse().getDocument();

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java Sat May  3 17:58:11 2008
@@ -30,7 +30,7 @@
  * @author Jonathan Locke
  * @author Eelco Hillenius
  */
-public final class Home extends WebPage
+public final class Home extends WebPage<Void>
 {
 	private static final long serialVersionUID = 1L;
 
@@ -50,6 +50,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(Locale.CANADA);
@@ -59,6 +60,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(Locale.US);
@@ -68,6 +70,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(new Locale("nl", "NL"));
@@ -77,6 +80,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(new Locale("de", "DE"));
@@ -86,6 +90,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(new Locale("zh", "CN"));
@@ -95,6 +100,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(new Locale("da", "DK"));

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java Sat May  3 17:58:11 2008
@@ -36,7 +36,8 @@
 	/**
 	 * @see org.apache.wicket.Application#getHomePage()
 	 */
-	public Class<? extends Page> getHomePage()
+	@Override
+	public Class< ? extends Page< ? >> getHomePage()
 	{
 		return Home.class;
 	}

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java Sat May  3 17:58:11 2008
@@ -61,6 +61,7 @@
 	/**
 	 * @see TestCase#setUp()
 	 */
+	@Override
 	protected void setUp() throws Exception
 	{
 		application = new WicketTester(new MyMockWebApplication());
@@ -69,6 +70,7 @@
 	/**
 	 * @see TestCase#tearDown()
 	 */
+	@Override
 	protected void tearDown() throws Exception
 	{
 		application.destroy();
@@ -81,6 +83,7 @@
 	{
 		application = new WicketTester(new MyMockWebApplication()
 		{
+			@Override
 			protected WebResponse newWebResponse(HttpServletResponse response)
 			{
 				return new BufferedWebResponse(response);
@@ -162,11 +165,13 @@
 	{
 		private static final long serialVersionUID = 1L;
 
-		public Class<? extends Page> getHomePage()
+		@Override
+		public Class< ? extends Page< ? >> getHomePage()
 		{
 			return MockHomePage.class;
 		}
 
+		@Override
 		protected void init()
 		{
 			getSecuritySettings().setAuthorizationStrategy(new MyAuthorizationStrategy());
@@ -176,7 +181,7 @@
 		 * 
 		 * @return Class
 		 */
-		public Class<? extends Page> getLoginPage()
+		public Class< ? extends Page> getLoginPage()
 		{
 			return MockLoginPage.class;
 		}
@@ -185,21 +190,25 @@
 		 * 
 		 * @see org.apache.wicket.ISessionFactory#newSession(Request, Response)
 		 */
+		@Override
 		public Session newSession(Request request, Response response)
 		{
 			return new MySession(this, request);
 		}
 
+		@Override
 		protected WebResponse newWebResponse(HttpServletResponse servletResponse)
 		{
 			return new WebResponse(servletResponse);
 		}
 
+		@Override
 		protected void outputDevelopmentModeWarning()
 		{
 			// Do nothing.
 		}
 
+		@Override
 		protected ISessionStore newSessionStore()
 		{
 			// Don't use a filestore, or we spawn lots of threads, which makes things slow.

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java Sat May  3 17:58:11 2008
@@ -28,7 +28,7 @@
 /**
  * @author marrink
  */
-public class MockHomePage extends WebPage
+public class MockHomePage extends WebPage<Void>
 {
 	private static final long serialVersionUID = 1L;
 

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/AbstractPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/AbstractPage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/AbstractPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/AbstractPage.java Sat May  3 17:58:11 2008
@@ -21,7 +21,7 @@
 /**
  * Test page for wicket:head inclusion.
  */
-public abstract class AbstractPage extends WebPage
+public abstract class AbstractPage extends WebPage<Void>
 {
 	/** For serialization. */
 	private static final long serialVersionUID = 1L;

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java Sat May  3 17:58:11 2008
@@ -68,26 +68,31 @@
 			/**
 			 * @see org.apache.wicket.protocol.http.WebApplication#newSession(Request, Response)
 			 */
+			@Override
 			public Session newSession(Request request, Response response)
 			{
 				return new WebSession(request).setStyle("myStyle");
 			}
 
-			public Class<? extends Page> getHomePage()
+			@Override
+			public Class< ? extends Page< ? >> getHomePage()
 			{
 				return ConcretePage2.class;
 			}
 
+			@Override
 			protected WebResponse newWebResponse(HttpServletResponse servletResponse)
 			{
 				return new WebResponse(servletResponse);
 			}
 
+			@Override
 			protected void outputDevelopmentModeWarning()
 			{
 				// Do nothing.
 			}
 
+			@Override
 			protected ISessionStore newSessionStore()
 			{
 				// Don't use a filestore, or we spawn lots of threads, which

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/Home.java Sat May  3 17:58:11 2008
@@ -29,7 +29,7 @@
  * @author Jonathan Locke
  * @author Eelco Hillenius
  */
-public final class Home extends WebPage
+public final class Home extends WebPage<Void>
 {
 	private static final long serialVersionUID = 1L;
 
@@ -49,6 +49,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(Locale.CANADA);
@@ -58,6 +59,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(Locale.US);
@@ -67,6 +69,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(new Locale("nl", "NL"));
@@ -76,6 +79,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(new Locale("de", "DE"));
@@ -85,6 +89,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(new Locale("zh", "CN"));
@@ -94,6 +99,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				getSession().setLocale(new Locale("da", "DK"));

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java Sat May  3 17:58:11 2008
@@ -36,7 +36,8 @@
 	/**
 	 * @see org.apache.wicket.Application#getHomePage()
 	 */
-	public Class<? extends Page> getHomePage()
+	@Override
+	public Class< ? extends Page< ? >> getHomePage()
 	{
 		return Home.class;
 	}

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java Sat May  3 17:58:11 2008
@@ -29,11 +29,13 @@
 {
 	private static final long serialVersionUID = 1L;
 
-	public Class<? extends Page> getHomePage()
+	@Override
+	public Class< ? extends Page< ? >> getHomePage()
 	{
 		return null;
 	}
 
+	@Override
 	protected void outputDevelopmentModeWarning()
 	{
 		// Do nothing.
@@ -42,6 +44,7 @@
 	/**
 	 * @see org.apache.wicket.protocol.http.WebApplication#newSessionStore()
 	 */
+	@Override
 	protected ISessionStore newSessionStore()
 	{
 		return new HttpSessionStore(this);

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Sat May  3 17:58:11 2008
@@ -29,16 +29,19 @@
 {
 	private static final long serialVersionUID = 1L;
 
-	public Class<? extends Page> getHomePage()
+	@Override
+	public Class< ? extends Page< ? >> getHomePage()
 	{
 		return null;
 	}
 
+	@Override
 	protected void outputDevelopmentModeWarning()
 	{
 		// Do nothing.
 	}
 
+	@Override
 	protected ISessionStore newSessionStore()
 	{
 		// Don't use a filestore, or we spawn lots of threads, which makes things slow.

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java Sat May  3 17:58:11 2008
@@ -32,16 +32,19 @@
  */
 public class DummyApplication extends WebApplication
 {
-	public Class<? extends Page> getHomePage()
+	@Override
+	public Class< ? extends Page< ? >> getHomePage()
 	{
 		return null;
 	}
 
+	@Override
 	protected WebResponse newWebResponse(final HttpServletResponse servletResponse)
 	{
 		return new WebResponse(servletResponse);
 	}
 
+	@Override
 	protected void outputDevelopmentModeWarning()
 	{
 		// Do nothing.
@@ -50,6 +53,7 @@
 	/**
 	 * @see org.apache.wicket.protocol.http.WebApplication#newSessionStore()
 	 */
+	@Override
 	protected ISessionStore newSessionStore()
 	{
 		return new HttpSessionStore(this);

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java Sat May  3 17:58:11 2008
@@ -41,24 +41,28 @@
 
 	private WebApplication application;
 
-	private Class<? extends Page> homePage = HomePage.class;
-	private Class<? extends Page> loginPage = LoginPage.class;
+	private Class< ? extends Page< ? >> homePage = HomePage.class;
+	private Class< ? extends Page< ? >> loginPage = LoginPage.class;
 
 
+	@Override
 	protected void setUp() throws Exception
 	{
 		mock = new WicketTester(application = new WebApplication()
 		{
-			public Class<? extends Page> getHomePage()
+			@Override
+			public Class< ? extends Page< ? >> getHomePage()
 			{
 				return StatelessFormTest.this.getHomePage();
 			}
 
+			@Override
 			protected void outputDevelopmentModeWarning()
 			{
 				// Do nothing.
 			}
 
+			@Override
 			protected ISessionStore newSessionStore()
 			{
 				// Don't use a filestore, or we spawn lots of threads, which makes things slow.
@@ -68,6 +72,7 @@
 		}, "src/test/java/" + getClass().getPackage().getName().replace('.', '/'));
 	}
 
+	@Override
 	protected void tearDown() throws Exception
 	{
 		mock.setupRequestAndResponse();
@@ -83,7 +88,7 @@
 	/**
 	 * @return Returns the homePage.
 	 */
-	public Class<? extends Page> getHomePage()
+	public Class< ? extends Page< ? >> getHomePage()
 	{
 		return homePage;
 	}
@@ -92,7 +97,7 @@
 	 * @param homePage
 	 *            The homePage to set.
 	 */
-	public void setHomePage(Class<? extends Page> homePage)
+	public void setHomePage(Class< ? extends Page< ? >> homePage)
 	{
 		this.homePage = homePage;
 	}
@@ -100,7 +105,7 @@
 	/**
 	 * @return Returns the loginPage.
 	 */
-	public Class<? extends Page> getLoginPage()
+	public Class< ? extends Page> getLoginPage()
 	{
 		return loginPage;
 	}
@@ -109,7 +114,7 @@
 	 * @param loginPage
 	 *            The loginPage to set.
 	 */
-	public void setLoginPage(Class<? extends Page> loginPage)
+	public void setLoginPage(Class< ? extends Page< ? >> loginPage)
 	{
 		this.loginPage = loginPage;
 	}

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java Sat May  3 17:58:11 2008
@@ -39,22 +39,26 @@
 	/**
 	 * @see junit.framework.TestCase#setUp()
 	 */
+	@Override
 	protected void setUp() throws Exception
 	{
 		tester = new WicketTester(new WebApplication()
 		{
 
-			public Class<? extends Page> getHomePage()
+			@Override
+			public Class< ? extends Page< ? >> getHomePage()
 			{
 				return HomePage.class;
 			}
 
+			@Override
 			protected void outputDevelopmentModeWarning()
 			{
 				// Do nothing.
 			}
 		}, "src/test/java/" + getClass().getPackage().getName().replace('.', '/'))
 		{
+			@Override
 			public boolean initializeHttpSessionAsTemporary()
 			{
 				return true;

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/HomePage.java Sat May  3 17:58:11 2008
@@ -25,7 +25,7 @@
  * @author marrink
  * 
  */
-public class HomePage extends WebPage
+public class HomePage extends WebPage<Void>
 {
 
 	/**
@@ -43,6 +43,7 @@
 		{
 			private static final long serialVersionUID = 1L;
 
+			@Override
 			public void onClick()
 			{
 				setVisible(true); // dummy op

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/pages/LoginPage.java Sat May  3 17:58:11 2008
@@ -22,7 +22,7 @@
  * 
  * @author marrink
  */
-public class LoginPage extends WebPage
+public class LoginPage extends WebPage<Void>
 {
 
 	private static final long serialVersionUID = 1L;

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java Sat May  3 17:58:11 2008
@@ -40,7 +40,7 @@
 
 	/**
 	 * Tests serialization of a big int.
-	 *
+	 * 
 	 * @throws Exception
 	 */
 	public void testBigInteger() throws Exception
@@ -80,11 +80,13 @@
 	{
 		WebApplication app = new WebApplication()
 		{
-			public Class<? extends Page> getHomePage()
+			@Override
+			public Class< ? extends Page< ? >> getHomePage()
 			{
 				return null;
 			}
 
+			@Override
 			protected ISessionStore newSessionStore()
 			{
 				// Don't use a filestore, or we spawn lots of threads, which makes things slow.
@@ -133,7 +135,7 @@
 		Assert.assertEquals(a, a2);
 
 		Assert.assertSame(a2, a2.getB().getA());
-		
+
 		RequestCycle.get().detach();
 	}
 
@@ -164,6 +166,7 @@
 	/**
 	 * @see junit.framework.TestCase#setUp()
 	 */
+	@Override
 	protected void setUp() throws Exception
 	{
 		super.setUp();

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=653168&r1=653167&r2=653168&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java Sat May  3 17:58:11 2008
@@ -51,22 +51,26 @@
 	/**
 	 * @see junit.framework.TestCase#setUp()
 	 */
+	@Override
 	protected void setUp() throws Exception
 	{
 		person = new Person();
 		app = new MockWebApplication(new WebApplication()
 		{
 
-			public Class<? extends Page> getHomePage()
+			@Override
+			public Class< ? extends Page< ? >> getHomePage()
 			{
 				return null;
 			}
 
+			@Override
 			protected void outputDevelopmentModeWarning()
 			{
 				// Do nothing.
 			}
 
+			@Override
 			protected ISessionStore newSessionStore()
 			{
 				// Don't use a filestore, or we spawn lots of threads, which makes things slow.
@@ -76,6 +80,7 @@
 		}, "/foo");
 	}
 
+	@Override
 	protected void tearDown() throws Exception
 	{
 		super.tearDown();