You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2008/04/22 21:53:14 UTC
svn commit: r650628 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/markup/html/
main/java/org/apache/wicket/markup/html/debug/
main/java/org/apache/wicket/markup/html/pages/
main/java/org/apache/wicket/version/ ...
Author: jcompagner
Date: Tue Apr 22 12:53:09 2008
New Revision: 650628
URL: http://svn.apache.org/viewvc?rev=650628&view=rev
Log:
generified page
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java Tue Apr 22 12:53:09 2008
@@ -119,8 +119,11 @@
* @author Chris Turner
* @author Eelco Hillenius
* @author Johan Compagner
+ *
+ * @param <T>
+ * The model object type
*/
-public abstract class Page extends MarkupContainer<Object>
+public abstract class Page<T> extends MarkupContainer<T>
implements
IRedirectListener,
IPageMapEntry
@@ -247,7 +250,7 @@
* See Component
* @see Component#Component(String, IModel)
*/
- protected Page(final IModel<Object> model)
+ protected Page(final IModel<T> model)
{
// A Page's id is not determined until setId is called when the Page is
// added to a PageMap in the Session.
@@ -278,7 +281,7 @@
* See Component
* @see Component#Component(String, IModel)
*/
- protected Page(final IPageMap pageMap, final IModel<Object> model)
+ protected Page(final IPageMap pageMap, final IModel<T> model)
{
// A Page's id is not determined until setId is called when the Page is
// added to a PageMap in the Session.
@@ -566,7 +569,7 @@
* @return A Page object with the component/model hierarchy that was attached to this page at
* the time represented by the requested version.
*/
- public Page getVersion(final int versionNumber)
+ public Page<T> getVersion(final int versionNumber)
{
// If we're still the original Page and that's what's desired
if (versionManager == null)
@@ -595,7 +598,7 @@
setFlag(FLAG_TRACK_CHANGES, false);
// Get page of desired version
- final Page page;
+ final Page<T> page;
if (versionNumber != LATEST_VERSION)
{
page = versionManager.getVersion(versionNumber);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java Tue Apr 22 12:53:09 2008
@@ -61,28 +61,34 @@
* @author Eelco Hillenius
* @author Juergen Donnerstag
* @author Gwyn Evans
+ *
+ * @param <T>
+ * The model object type
*/
-public class WebPage extends Page implements INewBrowserWindowListener
+public class WebPage<T> extends Page<T> implements INewBrowserWindowListener
{
/**
* Tries to determine whether this page was opened in a new window or tab. If it is (and this
* checker were able to recognize that), a new page map is created for this page instance, so
* that it will start using it's own history in sync with the browser window or tab.
+ *
+ * @param <T>
+ * The model object type
*/
- private static final class PageMapChecker extends AbstractBehavior
+ private static final class PageMapChecker<T> extends AbstractBehavior
implements
IHeaderContributor
{
private static final long serialVersionUID = 1L;
- private final WebPage webPage;
+ private final WebPage<T> webPage;
/**
* Construct.
*
* @param webPage
*/
- PageMapChecker(WebPage webPage)
+ PageMapChecker(WebPage<T> webPage)
{
this.webPage = webPage;
}
@@ -189,7 +195,7 @@
/**
* @see Page#Page(IModel)
*/
- protected WebPage(final IModel model)
+ protected WebPage(final IModel<T> model)
{
super(model);
commonInit();
@@ -207,7 +213,7 @@
/**
* @see Page#Page(org.apache.wicket.IPageMap, org.apache.wicket.model.IModel)
*/
- protected WebPage(final IPageMap pageMap, final IModel model)
+ protected WebPage(final IPageMap pageMap, final IModel<T> model)
{
super(pageMap, model);
commonInit();
@@ -326,7 +332,7 @@
// if automatic multi window support is on, add a page checker instance
if (getApplication().getPageSettings().getAutomaticMultiWindowSupport())
{
- add(new PageMapChecker(this));
+ add(new PageMapChecker<T>(this));
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/debug/PageView.java Tue Apr 22 12:53:09 2008
@@ -49,10 +49,8 @@
* </pre>
*
* @author Juergen Donnerstag
- * @param <T>
- * The model object type
*/
-public final class PageView<T> extends Panel<T>
+public final class PageView extends Panel<Object>
{
/**
* El cheapo data holder.
@@ -94,7 +92,7 @@
* The page to be analyzed
* @see Component#Component(String)
*/
- public PageView(final String id, final Page page)
+ public PageView(final String id, final Page< ? > page)
{
super(id);
@@ -147,7 +145,7 @@
* @param page
* @return List of component data objects
*/
- private List<ComponentData> getComponentData(final Page page)
+ private List<ComponentData> getComponentData(final Page< ? > page)
{
final List<ComponentData> data = new ArrayList<ComponentData>();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/AccessDeniedPage.java Tue Apr 22 12:53:09 2008
@@ -26,7 +26,7 @@
*
* @author Jonathan Locke
*/
-public class AccessDeniedPage extends WebPage
+public class AccessDeniedPage extends WebPage<Object>
{
private static final long serialVersionUID = 1L;
@@ -41,16 +41,18 @@
/**
* @see org.apache.wicket.markup.html.WebPage#configureResponse()
*/
+ @Override
protected void configureResponse()
{
super.configureResponse();
getWebRequestCycle().getWebResponse().getHttpServletResponse().setStatus(
- HttpServletResponse.SC_FORBIDDEN);
+ HttpServletResponse.SC_FORBIDDEN);
}
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
@@ -59,6 +61,7 @@
/**
* @see org.apache.wicket.Page#isErrorPage()
*/
+ @Override
public boolean isErrorPage()
{
return true;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoForm.java Tue Apr 22 12:53:09 2008
@@ -32,7 +32,7 @@
/**
* Form for posting JavaScript properties.
*/
-public class BrowserInfoForm extends Panel
+public class BrowserInfoForm extends Panel<Object>
{
/** log. */
private static final Logger log = LoggerFactory.getLogger(BrowserInfoForm.class);
@@ -49,16 +49,18 @@
{
super(id);
- Form form = new Form("postback", new CompoundPropertyModel(new ClientPropertiesBean()))
+ Form<ClientPropertiesBean> form = new Form<ClientPropertiesBean>("postback",
+ new CompoundPropertyModel<ClientPropertiesBean>(new ClientPropertiesBean()))
{
private static final long serialVersionUID = 1L;
/**
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
*/
+ @Override
protected void onSubmit()
{
- ClientPropertiesBean propertiesBean = (ClientPropertiesBean)getModelObject();
+ ClientPropertiesBean propertiesBean = getModelObject();
WebRequestCycle requestCycle = (WebRequestCycle)getRequestCycle();
WebSession session = (WebSession)getSession();
@@ -84,21 +86,21 @@
afterSubmit();
}
};
- form.add(new TextField("navigatorAppName"));
- form.add(new TextField("navigatorAppVersion"));
- form.add(new TextField("navigatorAppCodeName"));
- form.add(new TextField("navigatorCookieEnabled"));
- form.add(new TextField("navigatorJavaEnabled"));
- form.add(new TextField("navigatorLanguage"));
- form.add(new TextField("navigatorPlatform"));
- form.add(new TextField("navigatorUserAgent"));
- form.add(new TextField("screenWidth"));
- form.add(new TextField("screenHeight"));
- form.add(new TextField("screenColorDepth"));
- form.add(new TextField("utcOffset"));
- form.add(new TextField("utcDSTOffset"));
- form.add(new TextField("browserWidth"));
- form.add(new TextField("browserHeight"));
+ form.add(new TextField<String>("navigatorAppName"));
+ form.add(new TextField<String>("navigatorAppVersion"));
+ form.add(new TextField<String>("navigatorAppCodeName"));
+ form.add(new TextField<Boolean>("navigatorCookieEnabled"));
+ form.add(new TextField<Boolean>("navigatorJavaEnabled"));
+ form.add(new TextField<String>("navigatorLanguage"));
+ form.add(new TextField<String>("navigatorPlatform"));
+ form.add(new TextField<String>("navigatorUserAgent"));
+ form.add(new TextField<String>("screenWidth"));
+ form.add(new TextField<String>("screenHeight"));
+ form.add(new TextField<String>("screenColorDepth"));
+ form.add(new TextField<String>("utcOffset"));
+ form.add(new TextField<String>("utcDSTOffset"));
+ form.add(new TextField<String>("browserWidth"));
+ form.add(new TextField<String>("browserHeight"));
add(form);
}
@@ -113,8 +115,8 @@
void warnNotUsingWebClientInfo(ClientInfo clientInfo)
{
log.warn("using " + getClass().getName() + " makes no sense if you are not using " +
- WebClientInfo.class.getName() + " (you are using " +
- clientInfo.getClass().getName() + " instead)");
+ WebClientInfo.class.getName() + " (you are using " + clientInfo.getClass().getName() +
+ " instead)");
}
protected void afterSubmit()
@@ -296,10 +298,10 @@
properties.setNavigatorAppName(navigatorAppName);
properties.setNavigatorAppVersion(navigatorAppVersion);
properties.setNavigatorAppCodeName(navigatorAppCodeName);
- properties.setCookiesEnabled((navigatorCookieEnabled != null) ? navigatorCookieEnabled
- .booleanValue() : false);
- properties.setJavaEnabled((navigatorJavaEnabled != null) ? navigatorJavaEnabled
- .booleanValue() : false);
+ properties.setCookiesEnabled((navigatorCookieEnabled != null)
+ ? navigatorCookieEnabled.booleanValue() : false);
+ properties.setJavaEnabled((navigatorJavaEnabled != null)
+ ? navigatorJavaEnabled.booleanValue() : false);
properties.setNavigatorLanguage(navigatorLanguage);
properties.setNavigatorPlatform(navigatorPlatform);
properties.setNavigatorUserAgent(navigatorUserAgent);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Tue Apr 22 12:53:09 2008
@@ -53,7 +53,7 @@
*
* @author Eelco Hillenius
*/
-public class BrowserInfoPage extends WebPage
+public class BrowserInfoPage extends WebPage<Object>
{
/** log. */
private static final Logger log = LoggerFactory.getLogger(BrowserInfoPage.class);
@@ -121,6 +121,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
@@ -131,15 +132,15 @@
*/
private final void initComps()
{
- WebComponent meta = new WebComponent("meta");
+ WebComponent<Object> meta = new WebComponent<Object>("meta");
PageParameters parameters = new PageParameters();
parameters.put("cto", continueTo);
CharSequence url = urlFor(new BookmarkablePageRequestTarget(BrowserInfoPage.class,
- parameters));
- meta.add(new AttributeModifier("content", true, new Model("0; url=" + url)));
+ parameters));
+ meta.add(new AttributeModifier("content", true, new Model<String>("0; url=" + url)));
add(meta);
- WebMarkupContainer link = new WebMarkupContainer("link");
- link.add(new AttributeModifier("href", true, new Model((Serializable)url)));
+ WebMarkupContainer<Object> link = new WebMarkupContainer<Object>("link");
+ link.add(new AttributeModifier("href", true, new Model<Serializable>((Serializable)url)));
add(link);
add(new BrowserInfoForm("postback")
{
@@ -148,6 +149,7 @@
/**
* @see org.apache.wicket.markup.html.pages.BrowserInfoForm#afterSubmit()
*/
+ @Override
protected void afterSubmit()
{
continueToPrevious();
@@ -174,8 +176,8 @@
void warnNotUsingWebClientInfo(ClientInfo clientInfo)
{
log.warn("using " + getClass().getName() + " makes no sense if you are not using " +
- WebClientInfo.class.getName() + " (you are using " +
- clientInfo.getClass().getName() + " instead)");
+ WebClientInfo.class.getName() + " (you are using " + clientInfo.getClass().getName() +
+ " instead)");
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.java Tue Apr 22 12:53:09 2008
@@ -36,7 +36,7 @@
*
* @author Jonathan Locke
*/
-public class ExceptionErrorPage extends WebPage
+public class ExceptionErrorPage extends WebPage<Object>
{
private static final long serialVersionUID = 1L;
@@ -51,12 +51,12 @@
* @param page
* The page being rendered when the exception was thrown
*/
- public ExceptionErrorPage(final Throwable throwable, final Page page)
+ public ExceptionErrorPage(final Throwable throwable, final Page< ? > page)
{
this.throwable = throwable;
// Add exception label
- add(new MultiLineLabel("exception", Strings.toString(throwable)));
+ add(new MultiLineLabel<String>("exception", Strings.toString(throwable)));
// Get values
String resource = "";
@@ -75,24 +75,26 @@
}
// Create markup label
- final MultiLineLabel markupLabel = new MultiLineLabel("markup", markup);
+ final MultiLineLabel<String> markupLabel = new MultiLineLabel<String>("markup", markup);
markupLabel.setEscapeModelStrings(false);
// Add container with markup highlighted
- final WebMarkupContainer markupHighlight = new WebMarkupContainer("markupHighlight");
+ final WebMarkupContainer<String> markupHighlight = new WebMarkupContainer<String>(
+ "markupHighlight");
markupHighlight.add(markupLabel);
- markupHighlight.add(new Label("resource", resource));
+ markupHighlight.add(new Label<String>("resource", resource));
add(markupHighlight);
// Show container if markup stream is available
markupHighlight.setVisible(markupStream != null);
- add(new Link("displayPageViewLink")
+ add(new Link<Object>("displayPageViewLink")
{
private static final long serialVersionUID = 1L;
+ @Override
public void onClick()
{
ExceptionErrorPage.this.replace(new PageView("componentTree", page));
@@ -100,12 +102,13 @@
}
});
- add(new Label("componentTree", ""));
+ add(new Label<String>("componentTree", ""));
}
/**
* @see org.apache.wicket.markup.html.WebPage#configureResponse()
*/
+ @Override
protected void configureResponse()
{
super.configureResponse();
@@ -113,7 +116,7 @@
if (getWebRequestCycle().getResponse() instanceof WebResponse)
{
getWebRequestCycle().getWebResponse().getHttpServletResponse().setStatus(
- HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
}
@@ -130,6 +133,7 @@
/**
* @see org.apache.wicket.Page#isErrorPage()
*/
+ @Override
public boolean isErrorPage()
{
return true;
@@ -138,6 +142,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/InternalErrorPage.java Tue Apr 22 12:53:09 2008
@@ -26,7 +26,7 @@
*
* @author Jonathan Locke
*/
-public class InternalErrorPage extends WebPage
+public class InternalErrorPage extends WebPage<Object>
{
private static final long serialVersionUID = 1L;
@@ -41,16 +41,18 @@
/**
* @see org.apache.wicket.markup.html.WebPage#configureResponse()
*/
+ @Override
protected void configureResponse()
{
super.configureResponse();
getWebRequestCycle().getWebResponse().getHttpServletResponse().setStatus(
- HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
@@ -59,6 +61,7 @@
/**
* @see org.apache.wicket.Page#isErrorPage()
*/
+ @Override
public boolean isErrorPage()
{
return true;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/PageExpiredErrorPage.java Tue Apr 22 12:53:09 2008
@@ -26,7 +26,7 @@
*
* @author Jonathan Locke
*/
-public class PageExpiredErrorPage extends WebPage
+public class PageExpiredErrorPage extends WebPage<Object>
{
private static final long serialVersionUID = 1L;
@@ -41,16 +41,18 @@
/**
* @see org.apache.wicket.markup.html.WebPage#configureResponse()
*/
+ @Override
protected void configureResponse()
{
super.configureResponse();
getWebRequestCycle().getWebResponse().getHttpServletResponse().setStatus(
- HttpServletResponse.SC_NOT_FOUND);
+ HttpServletResponse.SC_NOT_FOUND);
}
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
@@ -59,6 +61,7 @@
/**
* @see org.apache.wicket.Page#isErrorPage()
*/
+ @Override
public boolean isErrorPage()
{
return true;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/pages/RedirectPage.java Tue Apr 22 12:53:09 2008
@@ -29,7 +29,7 @@
*
* @author Eelco Hillenius
*/
-public class RedirectPage extends WebPage
+public class RedirectPage extends WebPage<Object>
{
private static final long serialVersionUID = 1L;
@@ -55,9 +55,9 @@
*/
public RedirectPage(final CharSequence url, final int waitBeforeRedirectInSeconds)
{
- final WebMarkupContainer redirect = new WebMarkupContainer("redirect");
+ final WebMarkupContainer<Object> redirect = new WebMarkupContainer<Object>("redirect");
final String content = waitBeforeRedirectInSeconds + ";URL=" + url;
- redirect.add(new AttributeModifier("content", new Model(content)));
+ redirect.add(new AttributeModifier("content", new Model<String>(content)));
add(redirect);
}
@@ -67,7 +67,7 @@
* @param page
* The page to redirect to.
*/
- public RedirectPage(final Page page)
+ public RedirectPage(final Page< ? > page)
{
this(page.urlFor(IRedirectListener.INTERFACE), 0);
}
@@ -81,7 +81,7 @@
* @param waitBeforeRedirectInSeconds
* The number of seconds the browser should wait before redirecting
*/
- public RedirectPage(final Page page, final int waitBeforeRedirectInSeconds)
+ public RedirectPage(final Page< ? > page, final int waitBeforeRedirectInSeconds)
{
this(page.urlFor(IRedirectListener.INTERFACE), waitBeforeRedirectInSeconds);
}
@@ -89,6 +89,7 @@
/**
* @see org.apache.wicket.Component#isVersioned()
*/
+ @Override
public boolean isVersioned()
{
return false;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/version/IPageVersionManager.java Tue Apr 22 12:53:09 2008
@@ -66,7 +66,7 @@
* @param component
* the <code>Component</code> that was added
*/
- void componentAdded(Component component);
+ void componentAdded(Component< ? > component);
/**
* Indicates that the model for the given <code>Component</code> is about to change.
@@ -74,7 +74,7 @@
* @param component
* the <code>Component</code> whose model is about to change
*/
- void componentModelChanging(Component component);
+ void componentModelChanging(Component< ? > component);
/**
* Indicates an internal state for the given <code>Component</code> is about to change.
@@ -90,7 +90,7 @@
* @param component
* the <code>Component</code> that was removed
*/
- void componentRemoved(Component component);
+ void componentRemoved(Component< ? > component);
/**
* Called when changes to the <code>Page</code> have ended.
@@ -110,23 +110,29 @@
* Retrieves a given <code>Page</code> version. This method does not include the Ajax
* versions.
*
+ * @param <T>
+ * Model Object of the page
+ *
* @param versionNumber
* the version of the page to get
* @return the <code>Page</code>, or <code>null</code> if the version requested is not
* available
*/
- Page getVersion(int versionNumber);
+ <T> Page<T> getVersion(int versionNumber);
/**
* Rolls back the <code>Page</code> by the number of versions specified, including the Ajax
* versions.
*
+ * @param <T>
+ * Model Object of the page
+ *
* @param numberOfVersions
* the number of versions to roll back
* @return the rolled-back <code>Page</code>
*/
- Page rollbackPage(int numberOfVersions);
+ <T> Page<T> rollbackPage(int numberOfVersions);
/**
* Retrieves the number of versions stored in this page version manager.
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=650628&r1=650627&r2=650628&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Tue Apr 22 12:53:09 2008
@@ -17,6 +17,7 @@
package org.apache.wicket.redirect.abort;
import java.util.Collections;
+import java.util.List;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
@@ -31,7 +32,7 @@
*
* @author Peter Ertl
*/
-public class AbortExceptionPage extends WebPage
+public class AbortExceptionPage extends WebPage<Object>
{
private static final long serialVersionUID = -5906071716129043859L;
@@ -42,17 +43,18 @@
if (!triggerError)
throw new AbortWithWebErrorCodeException(1234, "this error will be rendered");
- IModel model = new LoadableDetachableModel()
+ IModel<List<Object>> model = new LoadableDetachableModel<List<Object>>()
{
private static final long serialVersionUID = -1285116295157071919L;
- protected Object load()
+ @Override
+ protected List<Object> load()
{
if (triggerError)
throw new AbortWithWebErrorCodeException(1234,
"this error will NOT be rendered");
else
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
};
@@ -60,6 +62,7 @@
{
private static final long serialVersionUID = -4176346513350288174L;
+ @Override
protected void populateItem(final ListItem item)
{
// not used