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 [8/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/src/main/java/org/apache/wicket/version/undo/Remove.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java Thu Jun 19 09:52:58 2008
@@ -37,10 +37,10 @@
private static final Logger log = LoggerFactory.getLogger(Remove.class);
/** the subject <code>Component</code> */
- private final Component<?> component;
+ private final Component component;
/** the parent <code>MarkupContainer</code> */
- private final MarkupContainer<?> container;
+ private final MarkupContainer container;
/**
* Constructor.
@@ -48,7 +48,7 @@
* @param component
* the subject <code>Component</code>
*/
- Remove(final Component<?> component)
+ Remove(final Component component)
{
if (component == null)
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java Thu Jun 19 09:52:58 2008
@@ -57,7 +57,7 @@
private final int maxVersions;
/** the <code>Page</code> being managed */
- private final Page<T> page;
+ private final Page page;
/**
* If this is true, the version that was created is not merged with the previous one.
@@ -72,7 +72,7 @@
* @param maxVersions
* the maximum number of versions to maintain before expiring old versions
*/
- public UndoPageVersionManager(final Page<T> page, final int maxVersions)
+ public UndoPageVersionManager(final Page page, final int maxVersions)
{
this.page = page;
this.maxVersions = maxVersions;
@@ -112,7 +112,7 @@
/**
* @see IPageVersionManager#componentAdded(Component)
*/
- public void componentAdded(Component<?> component)
+ public void componentAdded(Component component)
{
changeList.componentAdded(component);
}
@@ -120,7 +120,7 @@
/**
* @see IPageVersionManager#componentModelChanging(Component)
*/
- public void componentModelChanging(Component<?> component)
+ public void componentModelChanging(Component component)
{
changeList.componentModelChanging(component);
}
@@ -128,7 +128,7 @@
/**
* @see IPageVersionManager#componentRemoved(Component)
*/
- public void componentRemoved(Component<?> component)
+ public void componentRemoved(Component component)
{
changeList.componentRemoved(component);
}
@@ -204,7 +204,7 @@
/**
* @see IPageVersionManager#getVersion(int)
*/
- public Page<T> getVersion(final int versionNumber)
+ public Page getVersion(final int versionNumber)
{
// If the requested version is at or before the current version,
if (versionNumber <= getCurrentVersionNumber())
@@ -232,7 +232,7 @@
/**
* @see IPageVersionManager#rollbackPage(int)
*/
- public Page<T> rollbackPage(int numberOfVersions)
+ public Page rollbackPage(int numberOfVersions)
{
// TODO NEEDS IMPL! See SecondLevelCache PageMap impl
return null;
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/WicketTestCase.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/WicketTestCase.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/WicketTestCase.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/WicketTestCase.java Thu Jun 19 09:52:58 2008
@@ -79,7 +79,7 @@
* @param filename
* @throws Exception
*/
- protected <T extends Page<?>> void executeTest(final Class<T> pageClass, final String filename)
+ protected <T extends Page> void executeTest(final Class<T> pageClass, final String filename)
throws Exception
{
System.out.println("=== " + pageClass.getName() + " ===");
@@ -100,7 +100,7 @@
* @param filename
* @throws Exception
*/
- protected <T extends Page<?>> void executeTest(final Class<T> pageClass,
+ protected <T extends Page> void executeTest(final Class<T> pageClass,
PageParameters parameters, final String filename) throws Exception
{
System.out.println("=== " + pageClass.getName() + " ===");
@@ -117,7 +117,7 @@
* @param filename
* @throws Exception
*/
- protected void executedListener(final Class<?> clazz, final Component<?> component,
+ protected void executedListener(final Class<?> clazz, final Component component,
final String filename) throws Exception
{
assertNotNull(component);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java Thu Jun 19 09:52:58 2008
@@ -43,7 +43,7 @@
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isActionAuthorized(org.apache.wicket.Component,
* org.apache.wicket.authorization.Action)
*/
- public boolean isActionAuthorized(Component<?> component, Action action)
+ public boolean isActionAuthorized(Component component, Action action)
{
if (action == Component.ENABLE && component.getId().endsWith("disabled"))
return false;
@@ -54,7 +54,7 @@
*
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public <T extends Component<?>> boolean isInstantiationAuthorized(Class<T> componentClass)
+ public <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass)
{
return true;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage.java Thu Jun 19 09:52:58 2008
@@ -32,11 +32,11 @@
*/
public AjaxHeaderContributionPage()
{
- final Component<?> test1 = new AjaxHeaderContribution("test1").setOutputMarkupId(true);
+ final Component test1 = new AjaxHeaderContribution("test1").setOutputMarkupId(true);
add(test1);
- final Component<?> test2 = new AjaxHeaderContribution("test2").setOutputMarkupId(true);
+ final Component test2 = new AjaxHeaderContribution("test2").setOutputMarkupId(true);
add(test2);
- final Component<?> test3 = new AjaxHeaderContribution("test3").setOutputMarkupId(true);
+ final Component test3 = new AjaxHeaderContribution("test3").setOutputMarkupId(true);
add(test3);
add(new AjaxFallbackLink<Void>("link")
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2.java Thu Jun 19 09:52:58 2008
@@ -32,18 +32,18 @@
*/
public AjaxHeaderContributionPage2()
{
- final Component<?> test1 = new AjaxHeaderContribution("test1").setOutputMarkupId(true);
+ final Component test1 = new AjaxHeaderContribution("test1").setOutputMarkupId(true);
add(test1);
- final Component<?> test2 = new AjaxHeaderContribution("test2").setOutputMarkupId(true);
+ final Component test2 = new AjaxHeaderContribution("test2").setOutputMarkupId(true);
add(test2);
- final Component<?> test3 = new AjaxHeaderContribution("test3").setOutputMarkupId(true);
+ final Component test3 = new AjaxHeaderContribution("test3").setOutputMarkupId(true);
add(test3);
- final Component<?> btest1 = new AjaxHeaderContribution2("btest1").setOutputMarkupId(true);
+ final Component btest1 = new AjaxHeaderContribution2("btest1").setOutputMarkupId(true);
add(btest1);
- final Component<?> btest2 = new AjaxHeaderContribution2("btest2").setOutputMarkupId(true);
+ final Component btest2 = new AjaxHeaderContribution2("btest2").setOutputMarkupId(true);
add(btest2);
- final Component<?> btest3 = new AjaxHeaderContribution2("btest3").setOutputMarkupId(true);
+ final Component btest3 = new AjaxHeaderContribution2("btest3").setOutputMarkupId(true);
add(btest3);
add(new AjaxFallbackLink<Void>("link")
{
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java Thu Jun 19 09:52:58 2008
@@ -77,13 +77,13 @@
executeHeaderTest(MockComponent3.class, "MockComponent3-expected.html");
}
- private <C extends Component<?>> void executeHeaderTest(final Class<C> componentClass)
+ private <C extends Component> void executeHeaderTest(final Class<C> componentClass)
throws IOException
{
executeHeaderTest(componentClass, null);
}
- private <C extends Component<?>> void executeHeaderTest(final Class<C> componentClass,
+ private <C extends Component> void executeHeaderTest(final Class<C> componentClass,
String expectedFile) throws IOException
{
final MockPageWithLinkAndComponent page = new MockPageWithLinkAndComponent();
@@ -101,9 +101,9 @@
// Create an instance of the component
try
{
- Constructor<? extends Component<?>> con = componentClass.getConstructor(new Class[] { String.class });
+ Constructor<? extends Component> con = componentClass.getConstructor(new Class[] { String.class });
- Component<?> comp = con.newInstance(new Object[] { MockPageWithLinkAndComponent.COMPONENT_ID });
+ Component comp = con.newInstance(new Object[] { MockPageWithLinkAndComponent.COMPONENT_ID });
page.replace(comp);
comp.setOutputMarkupId(true);
@@ -120,7 +120,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java Thu Jun 19 09:52:58 2008
@@ -73,7 +73,7 @@
@Override
public void onClick(AjaxRequestTarget target)
{
- WebMarkupContainer<?> wmc = new WebMarkupContainer<Void>(
+ WebMarkupContainer wmc = new WebMarkupContainer<Void>(
MockPageWithLinkAndComponent.COMPONENT_ID);
wmc.setOutputMarkupId(true);
wmc.add(timer);
@@ -86,7 +86,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
@@ -126,7 +126,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java Thu Jun 19 09:52:58 2008
@@ -52,7 +52,7 @@
*/
public void testSubmitNoDefProcessing()
{
- Class<? extends Page<?>> pageClass = AjaxFormSubmitTestPage.class;
+ Class<? extends Page> pageClass = AjaxFormSubmitTestPage.class;
System.out.println("=== " + pageClass.getName() + " ===");
tester.startPage(pageClass);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.java Thu Jun 19 09:52:58 2008
@@ -61,16 +61,16 @@
}
});
- WebMarkupContainer<?> cont1 = new WebMarkupContainer<Void>("cont1");
+ WebMarkupContainer cont1 = new WebMarkupContainer<Void>("cont1");
add(cont1);
cont1.add(new ScopedLabel("localscoped", "Local Scoped"));
cont1.add(new Label<String>("local", "Local"));
- WebMarkupContainer<?> cont11 = new WebMarkupContainer<Void>("cont11");
+ WebMarkupContainer cont11 = new WebMarkupContainer<Void>("cont11");
cont1.add(cont11);
cont11.add(new Label<String>("global", " hide global"));
- WebMarkupContainer<?> cont2 = new WebMarkupContainer<Void>("cont2");
+ WebMarkupContainer cont2 = new WebMarkupContainer<Void>("cont2");
add(cont2);
cont2.add(new Label<String>("local", "Local2"));
cont2.add(new ScopedLabel("localscoped", "Local Scoped"));
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java Thu Jun 19 09:52:58 2008
@@ -54,11 +54,11 @@
{
executeTest(HideableBorderPage.class, "HideableBorderPage_ExpectedResult.html");
- Page<?> page = tester.getLastRenderedPage();
+ Page page = tester.getLastRenderedPage();
Border<?> border = (Border<?>)page.get("hideable");
assertNotNull(border);
AjaxLink<?> link = (AjaxLink<?>)border.get("hideLink");
- WebMarkupContainer<?> wrapper = (WebMarkupContainer<?>)border.get("wrapper");
+ WebMarkupContainer wrapper = (WebMarkupContainer)border.get("wrapper");
assertNotNull(link);
tester.clickLink("hideable:hideLink");
tester.assertComponentOnAjaxResponse(wrapper);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java Thu Jun 19 09:52:58 2008
@@ -37,7 +37,7 @@
public HideableBorder(String name)
{
super(name);
- final WebMarkupContainer<?> containerWrapper = new WebMarkupContainer<Void>("wrapper");
+ final WebMarkupContainer containerWrapper = new WebMarkupContainer<Void>("wrapper");
add(containerWrapper);
containerWrapper.add(getBodyContainer());
add(new AjaxLink<Void>("hideLink")
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java Thu Jun 19 09:52:58 2008
@@ -47,7 +47,7 @@
Form<?> form = new Form<Void>("form");
CheckGroup<String> group = new CheckGroup<String>("group", new Model((Serializable)list));
- WebMarkupContainer<?> container = new WebMarkupContainer<Void>("container");
+ WebMarkupContainer container = new WebMarkupContainer<Void>("container");
Check<String> check1 = new Check<String>("check1", new Model<String>("check1"));
Check<String> check2 = new Check<String>("check2", new Model<String>("check2"));
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/PubApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/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/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java Thu Jun 19 09:52:58 2008
@@ -166,7 +166,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return MockHomePage.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java Thu Jun 19 09:52:58 2008
@@ -62,7 +62,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
@@ -157,7 +157,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java Thu Jun 19 09:52:58 2008
@@ -75,7 +75,7 @@
}
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return ConcretePage2.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/image/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/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java Thu Jun 19 09:52:58 2008
@@ -63,7 +63,7 @@
{
private static final long serialVersionUID = 1L;
- private final WebMarkupContainer<?> nextContainer;
+ private final WebMarkupContainer nextContainer;
/**
* Construct.
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/html/panel/Provider.java Thu Jun 19 09:52:58 2008
@@ -55,7 +55,7 @@
* @param container
* @param id
*/
- public void addFragment(WebMarkupContainer<?> container, String id)
+ public void addFragment(WebMarkupContainer container, String id)
{
Fragment<?> fragment = new Fragment<Void>(id, "fragment", this);
fragmentContent = new Label<String>("fragmentContent", "foo");
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java Thu Jun 19 09:52:58 2008
@@ -47,17 +47,17 @@
{
add(new Label<String>("myLabel", "Test Label"));
- MarkupContainer<?> container = new NoopOutputTransformerContainer<Void>("test");
+ MarkupContainer container = new NoopOutputTransformerContainer<Void>("test");
add(container);
container.add(new Label<String>("myLabel2", "Test Label2"));
- MarkupContainer<?> panelContainer = new AbstractOutputTransformerContainer<Void>("test2")
+ MarkupContainer panelContainer = new AbstractOutputTransformerContainer<Void>("test2")
{
private static final long serialVersionUID = 1L;
@Override
- public CharSequence transform(Component<?> component, CharSequence output)
+ public CharSequence transform(Component component, CharSequence output)
{
// replace the generated String
return "Whatever";
@@ -69,12 +69,12 @@
panel.setRenderBodyOnly(true);
panelContainer.add(panel);
- MarkupContainer<?> borderContainer = new AbstractOutputTransformerContainer<Void>("test3")
+ MarkupContainer borderContainer = new AbstractOutputTransformerContainer<Void>("test3")
{
private static final long serialVersionUID = 1L;
@Override
- public CharSequence transform(Component<?> component, CharSequence output)
+ public CharSequence transform(Component component, CharSequence output)
{
// Convert all text to uppercase
return output.toString().toUpperCase();
@@ -85,7 +85,7 @@
Border<?> border = new SimpleBorder("myBorder");
borderContainer.add(border);
- MarkupContainer<?> xsltContainer = new XsltOutputTransformerContainer<Void>("test4");
+ MarkupContainer xsltContainer = new XsltOutputTransformerContainer<Void>("test4");
add(xsltContainer);
Border<?> border2 = new SimpleBorder("myBorder2");
@@ -93,7 +93,7 @@
border2.add(new AttributeModifier("testAttr", true, new Model<String>("myValue")));
xsltContainer.add(border2);
- MarkupContainer<?> xsltContainer2 = new XsltOutputTransformerContainer<Void>("test5", null,
+ MarkupContainer xsltContainer2 = new XsltOutputTransformerContainer<Void>("test5", null,
"org/apache/wicket/markup/outputTransformer/anyName.xsl");
add(xsltContainer2);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/markup/outputTransformer/Page_2.java Thu Jun 19 09:52:58 2008
@@ -47,17 +47,17 @@
{
add(new Label<String>("myLabel", "Test Label"));
- MarkupContainer<?> container = new NoopOutputTransformerContainer<Void>("test");
+ MarkupContainer container = new NoopOutputTransformerContainer<Void>("test");
add(container);
container.add(new Label<String>("myLabel2", "Test Label2"));
- MarkupContainer<?> panelContainer = new AbstractOutputTransformerContainer<Void>("test2")
+ MarkupContainer panelContainer = new AbstractOutputTransformerContainer<Void>("test2")
{
private static final long serialVersionUID = 1L;
@Override
- public CharSequence transform(Component<?> component, CharSequence output)
+ public CharSequence transform(Component component, CharSequence output)
{
// replace the generated String
return "Whatever";
@@ -69,12 +69,12 @@
panel.setRenderBodyOnly(true);
panelContainer.add(panel);
- MarkupContainer<?> borderContainer = new AbstractOutputTransformerContainer<Void>("test3")
+ MarkupContainer borderContainer = new AbstractOutputTransformerContainer<Void>("test3")
{
private static final long serialVersionUID = 1L;
@Override
- public CharSequence transform(Component<?> component, CharSequence output)
+ public CharSequence transform(Component component, CharSequence output)
{
// Convert all text to uppercase
return output.toString().toUpperCase();
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java Thu Jun 19 09:52:58 2008
@@ -118,7 +118,7 @@
innerPOJO + "]:bindings=[]";
assertEquals(expected, pojoProperty.toString());
- Component<?> component1 = pojoProperty.bind(new Label<Object>("label"));
+ Component component1 = pojoProperty.bind(new Label<Object>("label"));
expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" +
innerPOJO + "]:bindings=[Binding(:component=[" + component1 + "]:expression=[label])]";
assertEquals(expected, pojoProperty.toString());
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java Thu Jun 19 09:52:58 2008
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Thu Jun 19 09:52:58 2008
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 1L;
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java Thu Jun 19 09:52:58 2008
@@ -50,12 +50,12 @@
private boolean block = true;
- 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 (block &&
@@ -71,7 +71,7 @@
}
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return HomePage.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/resource/DummyApplication.java Thu Jun 19 09:52:58 2008
@@ -33,7 +33,7 @@
public class DummyApplication extends WebApplication
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java Thu Jun 19 09:52:58 2008
@@ -41,8 +41,8 @@
private WebApplication application;
- private Class<? extends Page<?>> homePage = HomePage.class;
- private Class<? extends Page<?>> loginPage = LoginPage.class;
+ private Class<? extends Page> homePage = HomePage.class;
+ private Class<? extends Page> loginPage = LoginPage.class;
@Override
@@ -51,7 +51,7 @@
mock = new WicketTester(application = new WebApplication()
{
@Override
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return StatelessFormTest.this.getHomePage();
}
@@ -88,7 +88,7 @@
/**
* @return Returns the homePage.
*/
- public Class<? extends Page<?>> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return homePage;
}
@@ -98,7 +98,7 @@
* @param homePage
* The homePage to set.
*/
- public <C extends Page<?>> void setHomePage(Class<C> homePage)
+ public <C extends Page> void setHomePage(Class<C> homePage)
{
this.homePage = homePage;
}
@@ -106,7 +106,7 @@
/**
* @return Returns the loginPage.
*/
- public Class<? extends Page<?>> getLoginPage()
+ public Class<? extends Page> getLoginPage()
{
return loginPage;
}
@@ -116,7 +116,7 @@
* @param loginPage
* The loginPage to set.
*/
- public <C extends Page<?>> void setLoginPage(Class<C> loginPage)
+ public <C extends Page> void setLoginPage(Class<C> loginPage)
{
this.loginPage = loginPage;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java Thu Jun 19 09:52:58 2008
@@ -46,7 +46,7 @@
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return HomePage.class;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/stateless/pages/UsernamePasswordSignInPanel.java Thu Jun 19 09:52:58 2008
@@ -161,7 +161,7 @@
public void setRememberMe(boolean rememberMe)
{
this.rememberMe = rememberMe;
- ((FormComponent<?>)get("username")).setPersistent(rememberMe);
+ ((FormComponent)get("username")).setPersistent(rememberMe);
}
}
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/io/WicketOutputStreamTest.java Thu Jun 19 09:52:58 2008
@@ -81,7 +81,7 @@
WebApplication app = new WebApplication()
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java Thu Jun 19 09:52:58 2008
@@ -59,7 +59,7 @@
{
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class< ? extends Page> getHomePage()
{
return null;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Thu Jun 19 09:52:58 2008
@@ -79,7 +79,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
Book mockBook = new Book("xxId", "xxName");
return new ViewBook(mockBook);
@@ -148,7 +148,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
Book mockBook = new Book("xxId", "xxName");
return new ViewBook(mockBook);
@@ -265,7 +265,7 @@
public void testPageConstructor() throws Exception
{
Book mockBook = new Book("xxId", "xxName");
- Page<?> page = new ViewBook(mockBook);
+ Page page = new ViewBook(mockBook);
tester.startPage(page);
// assertion
@@ -294,7 +294,7 @@
*/
public void testAssertComponentOnAjaxResponse()
{
- final Page<?> page = new MockPageWithLink();
+ final Page page = new MockPageWithLink();
AjaxLink<?> ajaxLink = new AjaxLink<Void>(MockPageWithLink.LINK_ID)
{
private static final long serialVersionUID = 1L;
@@ -328,7 +328,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
@@ -378,7 +378,7 @@
final Label<String> label = new Label<String>(MockPageWithLinkAndLabel.LABEL_ID, labelModel);
label.setOutputMarkupId(true);
- final Page<?> page = new MockPageWithLinkAndLabel();
+ final Page page = new MockPageWithLinkAndLabel();
AjaxLink<?> ajaxLink = new AjaxLink<Void>(MockPageWithLinkAndLabel.LINK_ID)
{
private static final long serialVersionUID = 1L;
@@ -399,7 +399,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
@@ -444,7 +444,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
@@ -562,7 +562,7 @@
public void testToggleButtonEnabledState()
{
tester.startPage(MockFormPage.class);
- Component<?> submit = tester.getComponentFromLastRenderedPage("form:submit");
+ Component submit = tester.getComponentFromLastRenderedPage("form:submit");
assertTrue(submit.isEnabled());
tester.createRequestCycle();
submit.setEnabled(false);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java Thu Jun 19 09:52:58 2008
@@ -81,9 +81,9 @@
*/
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
- Page<?> page = new MockPageWithLink();
+ Page page = new MockPageWithLink();
page.add(ajaxLink);
return page;
@@ -104,7 +104,7 @@
*/
public void testAjaxFallbackLinkClick()
{
- final Page<?> page = new MockPageWithLink();
+ final Page page = new MockPageWithLink();
// Create a link, which we test is actually invoked
page.add(new AjaxFallbackLink<Void>("ajaxLink")
@@ -126,7 +126,7 @@
*/
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
@@ -144,7 +144,7 @@
*/
public void testFallbackLinkWithAjaxDisabled()
{
- final Page<?> page = new MockPageWithLink();
+ final Page page = new MockPageWithLink();
// Create a link, which we test is actually invoked
page.add(new AjaxFallbackLink<Void>("ajaxLink")
@@ -166,7 +166,7 @@
*/
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java?rev=669560&r1=669559&r2=669560&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java Thu Jun 19 09:52:58 2008
@@ -77,7 +77,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}
@@ -124,7 +124,7 @@
{
private static final long serialVersionUID = 1L;
- public Page<?> getTestPage()
+ public Page getTestPage()
{
return page;
}