Author: mgrigorov
Date: Fri Jun 17 13:32:47 2011
New Revision: 1136876
URL: http://svn.apache.org/viewvc?rev=1136876&view=rev
Log:
WICKET-3810 Fix Generic(Panel|WebPage)'s getModel() method
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/GenericWebPage.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/GenericPanel.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/GenericWebPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/GenericWebPage.java?rev=1136876&r1=1136875&r2=1136876&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/GenericWebPage.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/GenericWebPage.java
Fri Jun 17 13:32:47 2011
@@ -97,9 +97,9 @@ public class GenericWebPage<T> extends W
* @return the model
*/
@SuppressWarnings("unchecked")
- public final T getModel()
+ public final IModel<T> getModel()
{
- return (T)getDefaultModel();
+ return (IModel<T>)getDefaultModel();
}
/**
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/GenericPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/GenericPanel.java?rev=1136876&r1=1136875&r2=1136876&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/GenericPanel.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/GenericPanel.java
Fri Jun 17 13:32:47 2011
@@ -76,9 +76,9 @@ public class GenericPanel<T> extends Pan
* @return the model
*/
@SuppressWarnings("unchecked")
- public final T getModel()
+ public final IModel<T> getModel()
{
- return (T)getDefaultModel();
+ return (IModel<T>)getDefaultModel();
}
/**
