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/06/19 18:53:19 UTC
svn commit: r669560 [2/8] - in /wicket/sandbox/ivaynberg/generics:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/
wicket-auth-roles/src/mai...
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java Thu Jun 19 09:52:58 2008
@@ -38,7 +38,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java Thu Jun 19 09:52:58 2008
@@ -55,7 +55,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return FormInput.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java Thu Jun 19 09:52:58 2008
@@ -74,12 +74,12 @@
CharSequence leftFrameSrc = RequestCycle.get().urlFor(leftFrame);
// and create a simple component that modifies it's src attribute to
// hold the url to that frame
- WebComponent<?> leftFrameTag = new WebComponent<Void>("leftFrame");
+ WebComponent leftFrameTag = new WebComponent<Void>("leftFrame");
leftFrameTag.add(new AttributeModifier("src", new Model((Serializable)leftFrameSrc)));
add(leftFrameTag);
// make a simple component for the right frame tag
- WebComponent<?> rightFrameTag = new WebComponent<Void>("rightFrame");
+ WebComponent rightFrameTag = new WebComponent<Void>("rightFrame");
// and this time, set a model which retrieves the url to the currently
// set frame class in the frame target
rightFrameTag.add(new AttributeModifier("src", new FrameModel()));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java Thu Jun 19 09:52:58 2008
@@ -29,7 +29,7 @@
private static final long serialVersionUID = 1L;
/** the class of the bookmarkable page. */
- private Class<? extends Page<?>> frameClass;
+ private Class<? extends Page> frameClass;
/**
* Construct.
@@ -45,7 +45,7 @@
*
* @param frameClass
*/
- public <C extends Page<?>> FrameTarget(Class<C> frameClass)
+ public <C extends Page> FrameTarget(Class<C> frameClass)
{
this.frameClass = frameClass;
}
@@ -55,7 +55,7 @@
*
* @return lefFrameClass
*/
- public Class<? extends Page<?>> getFrameClass()
+ public Class<? extends Page> getFrameClass()
{
return frameClass;
}
@@ -68,7 +68,7 @@
* @param frameClass
* lefFrameClass
*/
- public <C extends Page<?>> void setFrameClass(Class<C> frameClass)
+ public <C extends Page> void setFrameClass(Class<C> frameClass)
{
this.frameClass = frameClass;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java Thu Jun 19 09:52:58 2008
@@ -49,7 +49,7 @@
private final BodyFrame bodyFrame;
/** this link's target. */
- private final Class<? extends Page<?>> pageClass;
+ private final Class<? extends Page> pageClass;
/**
* Construct.
@@ -60,7 +60,7 @@
* @param bodyFrame
* @param pageClass
*/
- public <C extends Page<?>> ChangeFramePageLink(String id, BodyFrame bodyFrame,
+ public <C extends Page> ChangeFramePageLink(String id, BodyFrame bodyFrame,
Class<C> pageClass)
{
super(id);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java Thu Jun 19 09:52:58 2008
@@ -38,7 +38,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return GuestBook.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java Thu Jun 19 09:52:58 2008
@@ -40,7 +40,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return HomePage.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java Thu Jun 19 09:52:58 2008
@@ -42,7 +42,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java Thu Jun 19 09:52:58 2008
@@ -24,7 +24,7 @@
* @author Jonathan Locke
* @param <T>
*/
-public class HangmanPage<T> extends WicketExamplePage<T>
+public class HangmanPage extends WicketExamplePage
{
/**
* @return Returns the hangman.
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowserApplication.java Thu Jun 19 09:52:58 2008
@@ -38,7 +38,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return HelloBrowser.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java Thu Jun 19 09:52:58 2008
@@ -66,7 +66,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return HelloWorld.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java Thu Jun 19 09:52:58 2008
@@ -43,7 +43,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java Thu Jun 19 09:52:58 2008
@@ -32,7 +32,7 @@
* @author Jonathan Locke
* @param <T>
*/
-public class AuthenticatedWebPage<T> extends WicketExamplePage<T>
+public class AuthenticatedWebPage extends WicketExamplePage
{
private final Border<?> border;
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java Thu Jun 19 09:52:58 2008
@@ -77,12 +77,12 @@
{
return new PageLink<Void>(name, new IPageLink()
{
- public Page<?> getPage()
+ public Page getPage()
{
return new EditBook(Book.get(id));
}
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
return EditBook.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java Thu Jun 19 09:52:58 2008
@@ -44,7 +44,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java Thu Jun 19 09:52:58 2008
@@ -95,12 +95,12 @@
// Link to BookDetails page
add(new PageLink<Void>("bookDetailsLink", new IPageLink()
{
- public Page<?> getPage()
+ public Page getPage()
{
return new BookDetails(new Book("The Hobbit"));
}
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
return BookDetails.class;
}
@@ -109,12 +109,12 @@
// Delayed link to BookDetails page
add(new PageLink<Void>("bookDetailsLink2", new IPageLink()
{
- public Page<?> getPage()
+ public Page getPage()
{
return new BookDetails(new Book("Inside The Matrix"));
}
- public Class<? extends Page<?>> getPageIdentity()
+ public Class<? extends Page> getPageIdentity()
{
return BookDetails.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java Thu Jun 19 09:52:58 2008
@@ -33,7 +33,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Page1.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/NestedApplication.java Thu Jun 19 09:52:58 2008
@@ -48,7 +48,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java Thu Jun 19 09:52:58 2008
@@ -85,7 +85,7 @@
// as we have to confirm to our HTML definition, and set it's
// visibility
// property to false as we do not want LI tags to be rendered.
- WebMarkupContainer<?> row = new WebMarkupContainer<Void>("row");
+ WebMarkupContainer row = new WebMarkupContainer<Void>("row");
row.setVisible(false);
row.add(new WebMarkupContainer<Void>("label"));
listItem.add(row);
@@ -103,7 +103,7 @@
// add the row (with the LI element attached, and the label with
// the
// row's actual value to display
- WebMarkupContainer<?> row = new WebMarkupContainer<Void>("row");
+ WebMarkupContainer row = new WebMarkupContainer<Void>("row");
row.add(new Label<String>("label", modelObject.toString()));
listItem.add(row);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java Thu Jun 19 09:52:58 2008
@@ -46,12 +46,12 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
- private <C extends Page<?>> void mountBookmarkablePageWithUrlCoding(String path,
+ private <C extends Page> void mountBookmarkablePageWithUrlCoding(String path,
Class<C> pageClass)
{
mount(new QueryStringUrlCodingStrategy(path, pageClass));
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java Thu Jun 19 09:52:58 2008
@@ -80,7 +80,7 @@
password.setType(String.class);
// MarkupContainer row for remember me checkbox
- WebMarkupContainer<?> rememberMeRow = new WebMarkupContainer<Void>("rememberMeRow");
+ WebMarkupContainer rememberMeRow = new WebMarkupContainer<Void>("rememberMeRow");
add(rememberMeRow);
// Add rememberMe checkbox
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java Thu Jun 19 09:52:58 2008
@@ -52,7 +52,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
PortletRequestContext prc = (PortletRequestContext)RequestContext.get();
if (PortletMode.EDIT.equals(prc.getPortletRequest().getPortletMode()))
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java Thu Jun 19 09:52:58 2008
@@ -24,7 +24,7 @@
*
* @param <T>
*/
-public abstract class ExamplePage<T> extends WicketExamplePage<T>
+public abstract class ExamplePage extends WicketExamplePage
{
/**
* Get downcast session object for easy access by subclasses
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java Thu Jun 19 09:52:58 2008
@@ -62,7 +62,7 @@
add(new AttributeModifier("style", true, new Model<String>("background-color:#80b6ed;"))
{
@Override
- public boolean isEnabled(Component<?> component)
+ public boolean isEnabled(Component component)
{
return HighlitableDataItem.this.highlite;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java Thu Jun 19 09:52:58 2008
@@ -59,7 +59,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java Thu Jun 19 09:52:58 2008
@@ -45,7 +45,7 @@
int index = 0;
while (contacts.hasNext())
{
- WebMarkupContainer<?> item = new WebMarkupContainer<Void>(repeating.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer<Void>(repeating.newChildId());
repeating.add(item);
Contact contact = contacts.next();
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java Thu Jun 19 09:52:58 2008
@@ -45,7 +45,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
@@ -67,12 +67,12 @@
{
getSecuritySettings().setAuthorizationStrategy(new IAuthorizationStrategy()
{
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
return true;
}
- public <T extends Component<?>> boolean isInstantiationAuthorized(
+ public <T extends Component> boolean isInstantiationAuthorized(
Class<T> componentClass)
{
if (AuthenticatedWebPage.class.isAssignableFrom(componentClass))
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java Thu Jun 19 09:52:58 2008
@@ -24,6 +24,6 @@
* @author Jonathan Locke
* @param <T>
*/
-public class AuthenticatedWebPage<T> extends WicketExamplePage<T>
+public class AuthenticatedWebPage extends WicketExamplePage
{
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Application.java Thu Jun 19 09:52:58 2008
@@ -50,7 +50,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
@@ -75,12 +75,12 @@
getSecuritySettings().setAuthorizationStrategy(new IAuthorizationStrategy()
{
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
return true;
}
- public <T extends Component<?>> boolean isInstantiationAuthorized(
+ public <T extends Component> boolean isInstantiationAuthorized(
Class<T> componentClass)
{
if (AuthenticatedWebPage.class.isAssignableFrom(componentClass))
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Thu Jun 19 09:52:58 2008
@@ -429,12 +429,12 @@
/**
* The class of the page of which the sources need to be displayed.
*/
- private final Class<? extends Page<?>> page;
+ private final Class<? extends Page> page;
/**
* The panel for setting the ajax calls.
*/
- private final Component<?> codePanel;
+ private final Component codePanel;
private final Label<String> filename;
@@ -475,7 +475,7 @@
* @param page
* the page where the sources need to be shown from.
*/
- public <C extends Page<?>> SourcesPage(Class<C> page)
+ public <C extends Page> SourcesPage(Class<C> page)
{
this.page = page;
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java Thu Jun 19 09:52:58 2008
@@ -40,7 +40,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java Thu Jun 19 09:52:58 2008
@@ -39,7 +39,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java Thu Jun 19 09:52:58 2008
@@ -28,7 +28,7 @@
*/
public abstract class CapturingBookmarkablePageRequestTarget extends BookmarkablePageRequestTarget
{
- Class<? extends Page<?>> displayedPageClass;
+ Class<? extends Page> displayedPageClass;
/**
* @see org.apache.wicket.request.target.component.BookmarkablePageRequestTarget#respond(org.apache.wicket.RequestCycle)
@@ -60,7 +60,7 @@
* @param pageParameters
* the page parameters
*/
- public <C extends Page<?>, D extends Page<?>> CapturingBookmarkablePageRequestTarget(
+ public <C extends Page, D extends Page> CapturingBookmarkablePageRequestTarget(
Class<C> capturedPageClass, Class<D> displayedPageClass, PageParameters pageParameters)
{
super(capturedPageClass, pageParameters);
@@ -78,7 +78,7 @@
* @param displayedPageClass
* the bookmarkable page to display in the browser
*/
- public <C extends Page<?>, D extends Page<?>> CapturingBookmarkablePageRequestTarget(
+ public <C extends Page, D extends Page> CapturingBookmarkablePageRequestTarget(
Class<C> capturedPageClass, Class<D> displayedPageClass)
{
super(capturedPageClass);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java Thu Jun 19 09:52:58 2008
@@ -28,8 +28,8 @@
public class CapturingBookmarkablePageRequestTargetUrlCodingStrategy extends
BookmarkablePageRequestTargetUrlCodingStrategy
{
- Class<? extends Page<?>> capturedPageClass;
- Class<? extends Page<?>> displayedPageClass;
+ Class<? extends Page> capturedPageClass;
+ Class<? extends Page> displayedPageClass;
/**
* Construct.
@@ -41,7 +41,7 @@
* @param capturedPageClass
* @param displayedPageClass
*/
- public <C extends Page<?>, D extends Page<?>> CapturingBookmarkablePageRequestTargetUrlCodingStrategy(
+ public <C extends Page, D extends Page> CapturingBookmarkablePageRequestTargetUrlCodingStrategy(
String mountPath, Class<C> capturedPageClass, Class<D> displayedPageClass)
{
super(mountPath, capturedPageClass, null);
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return StockQuotePage.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return UnicodeConverter.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java Thu Jun 19 09:52:58 2008
@@ -46,7 +46,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return UploadPage.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java Thu Jun 19 09:52:58 2008
@@ -80,7 +80,7 @@
* @return class
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return Home.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java Thu Jun 19 09:52:58 2008
@@ -125,7 +125,7 @@
add(rolesSetNameField);
add(new AbstractFormValidator()
{
- public FormComponent<?>[] getDependentFormComponents()
+ public FormComponent[] getDependentFormComponents()
{
// name and roles don't have anything to validate,
// so might as well just skip them here
Modified: wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java Thu Jun 19 09:52:58 2008
@@ -30,7 +30,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Index.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Thu Jun 19 09:52:58 2008
@@ -167,7 +167,7 @@
* java.lang.String, org.apache.wicket.model.IModel)
*/
@Override
- protected FormComponent<T> newEditor(MarkupContainer<?> parent, String componentId,
+ protected FormComponent newEditor(MarkupContainer parent, String componentId,
IModel<T> model)
{
IModel<List<? extends T>> choiceModel = new AbstractReadOnlyModel<List<? extends T>>()
@@ -222,7 +222,7 @@
}
@Override
- protected WebComponent<T> newLabel(MarkupContainer<?> parent, String componentId,
+ protected WebComponent newLabel(MarkupContainer parent, String componentId,
IModel<T> model)
{
Label<T> label = new Label<T>(componentId, model)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Thu Jun 19 09:52:58 2008
@@ -77,10 +77,10 @@
private static final long serialVersionUID = 1L;
/** editor component. */
- private FormComponent<T> editor;
+ private FormComponent editor;
/** label component. */
- private WebComponent<T> label;
+ private WebComponent label;
protected class EditorAjaxBehavior extends AbstractDefaultAjaxBehavior
{
@@ -280,7 +280,7 @@
* The model
* @return The editor
*/
- protected FormComponent<T> newEditor(MarkupContainer<?> parent, String componentId,
+ protected FormComponent newEditor(MarkupContainer parent, String componentId,
IModel<T> model)
{
TextField<T> editor = new TextField<T>(componentId, model)
@@ -325,7 +325,7 @@
* The model
* @return The editor
*/
- protected WebComponent<T> newLabel(MarkupContainer<?> parent, String componentId,
+ protected WebComponent newLabel(MarkupContainer parent, String componentId,
IModel<T> model)
{
Label<T> label = new Label<T>(componentId, model)
@@ -375,7 +375,7 @@
*
* @return The editor component
*/
- protected final FormComponent<T> getEditor()
+ protected final FormComponent getEditor()
{
if (editor == null)
{
@@ -389,7 +389,7 @@
*
* @return The label component
*/
- protected final WebComponent<T> getLabel()
+ protected final WebComponent getLabel()
{
if (label == null)
{
@@ -512,7 +512,7 @@
// check that a model was found
if (m == null)
{
- Component<?> parent = getParent();
+ Component parent = getParent();
String msg = "No model found for this component, either pass one explicitly or "
+ "make sure an inheritable model is available.";
if (parent == null)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Thu Jun 19 09:52:58 2008
@@ -74,7 +74,7 @@
* java.lang.String, org.apache.wicket.model.IModel)
*/
@Override
- protected MultiLineLabel<T> newLabel(MarkupContainer< ? > parent, String componentId,
+ protected MultiLineLabel<T> newLabel(MarkupContainer parent, String componentId,
IModel<T> model)
{
MultiLineLabel<T> label = new MultiLineLabel<T>(componentId, model)
@@ -117,7 +117,7 @@
* java.lang.String, org.apache.wicket.model.IModel)
*/
@Override
- protected FormComponent<T> newEditor(MarkupContainer< ? > parent, String componentId,
+ protected FormComponent newEditor(MarkupContainer parent, String componentId,
IModel<T> model)
{
TextArea<T> editor = new TextArea<T>(componentId, model)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/WicketAjaxIndicatorAppender.java Thu Jun 19 09:52:58 2008
@@ -45,7 +45,7 @@
/**
* Component instance this behavior is bound to
*/
- private Component< ? > component;
+ private Component component;
/**
*
@@ -81,7 +81,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
@Override
- public void onRendered(Component< ? > component)
+ public void onRendered(Component component)
{
final Response r = component.getResponse();
@@ -127,7 +127,7 @@
* @see org.apache.wicket.behavior.AbstractBehavior#bind(org.apache.wicket.Component)
*/
@Override
- public final void bind(Component< ? > component)
+ public final void bind(Component component)
{
this.component = component;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Thu Jun 19 09:52:58 2008
@@ -185,7 +185,7 @@
*
* @return new page instance
*/
- public Page<?> createPage();
+ public Page createPage();
}
/**
@@ -726,7 +726,7 @@
*
* @return Page instance or null if page couldn't be created.
*/
- private Page<?> createPage()
+ private Page createPage()
{
if (pageCreator == null)
{
@@ -751,7 +751,7 @@
}
try
{
- Page<?> page = pageCreator.createPage();
+ Page page = pageCreator.createPage();
return page;
}
finally
@@ -795,7 +795,7 @@
*
* @return Content component
*/
- private Component<?> getContent()
+ private Component getContent()
{
return get(getContentId());
}
@@ -815,7 +815,7 @@
* @see org.apache.wicket.MarkupContainer#remove(org.apache.wicket.Component)
*/
@Override
- public void remove(Component<?> component)
+ public void remove(Component component)
{
super.remove(component);
if (component.getId().equals(getContentId()))
@@ -829,7 +829,7 @@
*
* @param component
*/
- public void setContent(Component<?> component)
+ public void setContent(Component component)
{
if (component.getId().equals(getContentId()) == false)
{
@@ -978,7 +978,7 @@
if (isCustomComponent() == false)
{
- Page<?> page = createPage();
+ Page page = createPage();
if (page == null)
{
throw new WicketRuntimeException("Error creating page for modal dialog.");
@@ -1061,7 +1061,7 @@
private boolean shown = false;
// empty container - used when no component is added
- private WebMarkupContainer<?> empty;
+ private WebMarkupContainer empty;
private int minimalWidth = 200;
private int minimalHeight = 200;
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackHeadersToolbar.java Thu Jun 19 09:52:58 2008
@@ -56,7 +56,7 @@
* org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator)
*/
@Override
- protected WebMarkupContainer<?> newSortableHeader(String borderId, String property,
+ protected WebMarkupContainer newSortableHeader(String borderId, String property,
ISortStateLocator locator)
{
return new AjaxFallbackOrderByBorder(borderId, property, locator, getAjaxCallDecorator())
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java Thu Jun 19 09:52:58 2008
@@ -115,7 +115,7 @@
while (it.hasNext())
{
// we need a container to represent a row in repeater
- WebMarkupContainer<?> row = new WebMarkupContainer<Void>(newChildId());
+ WebMarkupContainer row = new WebMarkupContainer<Void>(newChildId());
row.setRenderBodyOnly(true);
add(row);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java Thu Jun 19 09:52:58 2008
@@ -215,7 +215,7 @@
* @see org.apache.wicket.AttributeModifier#isEnabled(Component)
*/
@Override
- public boolean isEnabled(Component<?> component)
+ public boolean isEnabled(Component component)
{
return getReplaceModel().getObject() != null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java Thu Jun 19 09:52:58 2008
@@ -83,7 +83,7 @@
/**
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn#getHeader(java.lang.String)
*/
- public Component<?> getHeader(String componentId)
+ public Component getHeader(String componentId)
{
return new Label<String>(componentId, getDisplayModel());
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java Thu Jun 19 09:52:58 2008
@@ -86,7 +86,7 @@
* @see IBehavior#onComponentTag(Component, ComponentTag)
*/
@Override
- public void onComponentTag(Component<?> component, ComponentTag tag)
+ public void onComponentTag(Component component, ComponentTag tag)
{
String className = getCssClass();
if (!Strings.isEmpty(className))
@@ -323,7 +323,7 @@
toolbar.setRenderBodyOnly(true);
// create a container item for the toolbar (required by repeating view)
- WebMarkupContainer<?> item = new WebMarkupContainer<Void>(container.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer<Void>(container.newChildId());
item.setRenderBodyOnly(true);
item.add(toolbar);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java Thu Jun 19 09:52:58 2008
@@ -44,9 +44,9 @@
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn#getHeader(java.lang.String)
*/
@Override
- public Component< ? > getHeader(String componentId)
+ public Component getHeader(String componentId)
{
- Component< ? > header = super.getHeader(componentId);
+ Component header = super.getHeader(componentId);
return header.setEscapeModelStrings(false);
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.java Thu Jun 19 09:52:58 2008
@@ -54,10 +54,10 @@
final IColumn<?>[] columns = table.getColumns();
for (final IColumn<?> column : columns)
{
- WebMarkupContainer<?> item = new WebMarkupContainer<Void>(headers.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer<Void>(headers.newChildId());
headers.add(item);
- WebMarkupContainer<?> header = null;
+ WebMarkupContainer header = null;
if (column.isSortable())
{
header = newSortableHeader("header", column.getSortProperty(), stateLocator);
@@ -100,7 +100,7 @@
* sort state locator
* @return created header component
*/
- protected WebMarkupContainer<?> newSortableHeader(String headerId, String property,
+ protected WebMarkupContainer newSortableHeader(String headerId, String property,
ISortStateLocator locator)
{
return new OrderByBorder(headerId, property, locator)
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java Thu Jun 19 09:52:58 2008
@@ -38,7 +38,7 @@
*
* @return component that will be used as the header for the column
*/
- Component<?> getHeader(String componentId);
+ Component getHeader(String componentId);
/**
* Returns the name of the property that this header sorts. If null is returned the header will
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java Thu Jun 19 09:52:58 2008
@@ -46,7 +46,7 @@
super(table);
this.table = table;
- WebMarkupContainer<?> span = new WebMarkupContainer<Void>("span");
+ WebMarkupContainer span = new WebMarkupContainer<Void>("span");
add(span);
span.add(new AttributeModifier("colspan", true, new Model<String>(
String.valueOf(table.getColumns().length))));
@@ -80,7 +80,7 @@
* @return navigator label that will be used to navigate the data table
*
*/
- protected WebComponent<?> newNavigatorLabel(String navigatorId, final DataTable<?> table)
+ protected WebComponent newNavigatorLabel(String navigatorId, final DataTable<?> table)
{
return new NavigatorLabel(navigatorId, table);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java Thu Jun 19 09:52:58 2008
@@ -61,7 +61,7 @@
public NoRecordsToolbar(final DataTable<?> table, IModel<String> messageModel)
{
super(table);
- WebMarkupContainer<?> td = new WebMarkupContainer<Void>("td");
+ WebMarkupContainer td = new WebMarkupContainer<Void>("td");
add(td);
td.add(new AttributeModifier("colspan", true, new Model<String>(
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/AbstractFilter.java Thu Jun 19 09:52:58 2008
@@ -54,7 +54,7 @@
* @param fc
* form component for which focus tracking will be enabled
*/
- protected void enableFocusTracking(FormComponent<?> fc)
+ protected void enableFocusTracking(FormComponent fc)
{
form.enableFocusTracking(fc);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java Thu Jun 19 09:52:58 2008
@@ -83,7 +83,7 @@
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.filter.IFilteredColumn#getFilter(java.lang.String,
* org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm)
*/
- public Component<T> getFilter(String componentId, FilterForm form)
+ public Component getFilter(String componentId, FilterForm form)
{
ChoiceFilter<T> filter = new ChoiceFilter<T>(componentId, getFilterModel(form), form,
filterChoices, enableAutoSubmit());
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterForm.java Thu Jun 19 09:52:58 2008
@@ -61,7 +61,7 @@
private static final long serialVersionUID = 1L;
@Override
- public void onComponentTag(Component<?> component, ComponentTag tag)
+ public void onComponentTag(Component component, ComponentTag tag)
{
tag.put("id", getFocusTrackerFieldCssId());
super.onComponentTag(component, tag);
@@ -109,14 +109,14 @@
* @param fc
* form component
*/
- public final void enableFocusTracking(FormComponent<?> fc)
+ public final void enableFocusTracking(FormComponent fc)
{
fc.add(new AbstractBehavior()
{
private static final long serialVersionUID = 1L;
@Override
- public void onComponentTag(Component<?> component, ComponentTag tag)
+ public void onComponentTag(Component component, ComponentTag tag)
{
tag.put("id", component.getMarkupId());
tag.put("onfocus", getFocusTrackingHandler(component));
@@ -139,7 +139,7 @@
* @return the javascript focus handler necessary to notify the form of focus tracking changes
* on the component
*/
- public final String getFocusTrackingHandler(Component<?> component)
+ public final String getFocusTrackingHandler(Component component)
{
return ("_filter_focus(this, '" + getFocusTrackerFieldCssId() + "');");
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java Thu Jun 19 09:52:58 2008
@@ -69,11 +69,11 @@
IColumn<?>[] cols = table.getColumns();
for (int i = 0; i < cols.length; i++)
{
- WebMarkupContainer<?> item = new WebMarkupContainer<Void>(filters.newChildId());
+ WebMarkupContainer item = new WebMarkupContainer<Void>(filters.newChildId());
item.setRenderBodyOnly(true);
IColumn<?> col = cols[i];
- Component<?> filter = null;
+ Component filter = null;
if (col instanceof IFilteredColumn)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilteredColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilteredColumn.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilteredColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/IFilteredColumn.java Thu Jun 19 09:52:58 2008
@@ -46,6 +46,6 @@
* @return component that will be used to represent a filter for this column, or null if no such
* component is desired
*/
- Component<T> getFilter(String componentId, FilterForm form);
+ Component getFilter(String componentId, FilterForm form);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java Thu Jun 19 09:52:58 2008
@@ -59,7 +59,7 @@
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.filter.IFilteredColumn#getFilter(java.lang.String,
* org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm)
*/
- public Component<T> getFilter(String componentId, FilterForm form)
+ public Component getFilter(String componentId, FilterForm form)
{
return new TextFilter<T>(componentId, getFilterModel(form), form);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java Thu Jun 19 09:52:58 2008
@@ -128,7 +128,7 @@
}
};
- WebMarkupContainer<?> tabsContainer = new WebMarkupContainer<Void>("tabs-container")
+ WebMarkupContainer tabsContainer = new WebMarkupContainer<Void>("tabs-container")
{
private static final long serialVersionUID = 1L;
@@ -152,7 +152,7 @@
final int index = item.getIteration();
final ITab tab = (TabbedPanel.this.tabs.get(index));
- final WebMarkupContainer<?> titleLink = newLink("link", index);
+ final WebMarkupContainer titleLink = newLink("link", index);
titleLink.add(newTitle("title", tab.getTitle(), index));
item.add(titleLink);
@@ -348,7 +348,7 @@
setDefaultModelObject(new Integer(index));
- final Component<?> component;
+ final Component component;
if (tabs.size() == 0 || !isTabVisible(index))
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java Thu Jun 19 09:52:58 2008
@@ -460,7 +460,7 @@
* The link call back
* @return The link component
*/
- protected <S> MarkupContainer<S> newLink(MarkupContainer<?> parent, String id,
+ protected <S> MarkupContainer<S> newLink(MarkupContainer parent, String id,
final ILinkCallback callback)
{
if (getLinkType() == LinkType.REGULAR)
@@ -555,7 +555,7 @@
* The parent node
* @return The component that represents the link
*/
- protected MarkupContainer<?> newNodeLink(MarkupContainer<?> parent, String id,
+ protected MarkupContainer newNodeLink(MarkupContainer parent, String id,
final TreeNode node)
{
return newLink(parent, id, new ILinkCallback()
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/IWizardStep.java Thu Jun 19 09:52:58 2008
@@ -56,7 +56,7 @@
* The wizard component the header will be placed on
* @return The header component
*/
- Component< ? > getHeader(String id, Component< ? > parent, IWizard wizard);
+ Component getHeader(String id, Component parent, IWizard wizard);
/**
* Returns the current view this step is displaying. This component will be displayed in the
@@ -71,7 +71,7 @@
* The wizard component the header will be placed on
* @return The current view of the step.
*/
- Component< ? > getView(String id, Component< ? > parent, IWizard wizard);
+ Component getView(String id, Component parent, IWizard wizard);
/**
* Initializes this step with the model it will belong to.
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/Wizard.java Thu Jun 19 09:52:58 2008
@@ -292,7 +292,7 @@
*
* @return A new button bar
*/
- protected Component< ? > newButtonBar(String id)
+ protected Component newButtonBar(String id)
{
return new WizardButtonBar(id, this);
}
@@ -330,7 +330,7 @@
protected void onBeforeRender()
{
super.onBeforeRender();
- Component< ? > buttonBar = form.get(BUTTONS_ID);
+ Component buttonBar = form.get(BUTTONS_ID);
if (buttonBar instanceof IDefaultButtonProvider)
{
IFormSubmittingComponent defaultButton = ((IDefaultButtonProvider)buttonBar).getDefaultButton(wizardModel);
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java Thu Jun 19 09:52:58 2008
@@ -123,14 +123,14 @@
/**
* @see org.apache.wicket.markup.html.form.validation.IFormValidator#getDependentFormComponents()
*/
- public FormComponent< ? >[] getDependentFormComponents()
+ public FormComponent[] getDependentFormComponents()
{
if (isActiveStep())
{
- Set<Component< ? >> components = new HashSet<Component< ? >>();
+ Set<Component> components = new HashSet<Component>();
for (IFormValidator v : validators)
{
- FormComponent< ? >[] dependentComponents = v.getDependentFormComponents();
+ FormComponent[] dependentComponents = v.getDependentFormComponents();
if (dependentComponents != null)
{
int len = dependentComponents.length;
@@ -334,7 +334,7 @@
* @see org.apache.wicket.extensions.wizard.IWizardStep#getHeader(java.lang.String,
* org.apache.wicket.Component, org.apache.wicket.extensions.wizard.IWizard)
*/
- public Component< ? > getHeader(String id, Component< ? > parent, IWizard wizard)
+ public Component getHeader(String id, Component parent, IWizard wizard)
{
return new Header(id, wizard);
}
@@ -365,7 +365,7 @@
* @see org.apache.wicket.extensions.wizard.IWizardStep#getView(java.lang.String,
* org.apache.wicket.Component, org.apache.wicket.extensions.wizard.IWizard)
*/
- public Component< ? > getView(String id, Component< ? > parent, IWizard wizard)
+ public Component getView(String id, Component parent, IWizard wizard)
{
return this;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java Thu Jun 19 09:52:58 2008
@@ -44,7 +44,7 @@
*/
public void testAjaxEditableLabel()
{
- Page< ? > page = tester.getLastRenderedPage();
+ Page page = tester.getLastRenderedPage();
AjaxEditableLabel< ? > ajaxLabel = (AjaxEditableLabel< ? >)page.get("ajaxLabel");
AbstractAjaxBehavior labelBehavior = (AbstractAjaxBehavior)ajaxLabel.get("label")
@@ -71,7 +71,7 @@
*/
public void testDisabledAjaxEditableLabel()
{
- Page< ? > page = tester.getLastRenderedPage();
+ Page page = tester.getLastRenderedPage();
AjaxEditableLabel< ? > ajaxLabel = (AjaxEditableLabel< ? >)page.get("ajaxLabel");
AjaxLink< ? > toggle = (AjaxLink< ? >)page.get("toggle");
Modified: wicket/sandbox/ivaynberg/generics/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java Thu Jun 19 09:52:58 2008
@@ -188,7 +188,7 @@
while (current != null && current != Object.class);
}
- public void onInstantiation(Component< ? > component)
+ public void onInstantiation(Component component)
{
inject(component);
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java Thu Jun 19 09:52:58 2008
@@ -47,7 +47,7 @@
}
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-ioc/src/main/java/org/apache/wicket/injection/ComponentInjector.java Thu Jun 19 09:52:58 2008
@@ -47,7 +47,7 @@
/**
* @see org.apache.wicket.application.IComponentInstantiationListener#onInstantiation(org.apache.wicket.Component)
*/
- public void onInstantiation(Component< ? > component)
+ public void onInstantiation(Component component)
{
getInjector().inject(component);
}