svn commit: r659828 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: RestartResponseAtInterceptPageException.java RestartResponseException.java

[gseitz]

Author: gseitz
Date: Sat May 24 07:27:35 2008
New Revision: 659828

URL: http://svn.apache.org/viewvc?rev=659828&view=rev
Log:
generics

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java?rev=659828&r1=659827&r2=659828&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java
 Sat May 24 07:27:35 2008
@@ -42,7 +42,7 @@
         * @param interceptPage
         *            redirect page
         */
-       public RestartResponseAtInterceptPageException(final Page< ? > 
interceptPage)
+       public RestartResponseAtInterceptPageException(final Page<?> 
interceptPage)
        {
                if (interceptPage == null)
                {
@@ -55,11 +55,13 @@
        /**
         * Redirects to the specified intercept page, this will result in a 
bookmarkable redirect.
         * 
+        * @param <C> The page type
+        * 
         * @param interceptPageClass
         *            Class of intercept page to instantiate
         */
-       public RestartResponseAtInterceptPageException(
-               final Class< ? extends Page< ? >> interceptPageClass)
+       public <C extends Page<?>> RestartResponseAtInterceptPageException(
+               final Class<C> interceptPageClass)
        {
                if (interceptPageClass == null)
                {
@@ -74,9 +76,9 @@
         * @param interceptPage
         *            The intercept page to redirect to
         */
-       private void redirectToInterceptPage(final Page< ? > interceptPage)
+       private void redirectToInterceptPage(final Page<?> interceptPage)
        {
-               final Page< ? > requestPage = 
RequestCycle.get().getRequest().getPage();
+               final Page<?> requestPage = 
RequestCycle.get().getRequest().getPage();
 
                /*
                 * requestPage can be null if we throw the restart response 
exception before any page is
@@ -99,13 +101,15 @@
        /**
         * Redirects to intercept page using the page map for the current 
request
         * 
+        * @param <C> The page type
+        * 
         * @param interceptPageClass
         *            The intercept page class to redirect to
         */
-       private void redirectToInterceptPage(final Class< ? extends Page< ? >> 
interceptPageClass)
+       private <C extends Page<?>> void redirectToInterceptPage(final Class<C> 
interceptPageClass)
        {
                final RequestCycle cycle = RequestCycle.get();
-               final Page< ? > requestPage = cycle.getRequest().getPage();
+               final Page<?> requestPage = cycle.getRequest().getPage();
 
                /*
                 * requestPage can be null if we throw the restart response 
exception before any page is

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java?rev=659828&r1=659827&r2=659828&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/RestartResponseException.java
 Sat May 24 07:27:35 2008
@@ -29,10 +29,12 @@
        /**
         * Redirects to the specified bookmarkable page
         * 
+        * @param <C> The page type
+        * 
         * @param pageClass
         *            class of bookmarkable page
         */
-       public RestartResponseException(Class< ? extends Page< ? >> pageClass)
+       public <C extends Page<?>> RestartResponseException(Class<C> pageClass)
        {
                RequestCycle.get().setResponsePage(pageClass);
        }
@@ -40,12 +42,14 @@
        /**
         * Redirects to the specified bookmarkable page with the given page 
parameters
         * 
+        * @param <C> The page type
+        * 
         * @param pageClass
         *            class of bookmarkable page
         * @param params
         *            bookmarkable page parameters
         */
-       public RestartResponseException(Class< ? extends Page< ? >> pageClass, 
PageParameters params)
+       public <C extends Page<?>> RestartResponseException(Class<C> pageClass, 
PageParameters params)
        {
                RequestCycle.get().setResponsePage(pageClass, params);
        }
@@ -56,7 +60,7 @@
         * @param page
         *            redirect page
         */
-       public RestartResponseException(Page< ? > page)
+       public RestartResponseException(Page<?> page)
        {
                RequestCycle.get().setResponsePage(page);
        }