You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by th...@apache.org on 2008/12/01 16:34:20 UTC
svn commit: r722097 - in /wicket/trunk:
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/
wicket-examples/src/main/java/org/apache/wicket/examples/compref/
wicket-examples/src/main/java/org/apache/wicket/examples/library/
wicket-ex...
Author: thrantal
Date: Mon Dec 1 07:34:17 2008
New Revision: 722097
URL: http://svn.apache.org/viewvc?rev=722097&view=rev
Log:
Added missing generics parameter types, and fixed other Java 5 stuff
- no functional changes
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/AllTests.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/AttributeMap.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AutoCompletePage.java Mon Dec 1 07:34:17 2008
@@ -43,7 +43,7 @@
*/
public AutoCompletePage()
{
- Form form = new Form("form");
+ Form<Void> form = new Form<Void>("form");
add(form);
final AutoCompleteTextField<String> field = new AutoCompleteTextField<String>("ac",
@@ -62,9 +62,8 @@
Locale[] locales = Locale.getAvailableLocales();
- for (int i = 0; i < locales.length; i++)
+ for (final Locale locale : locales)
{
- final Locale locale = locales[i];
final String country = locale.getDisplayCountry();
if (country.toUpperCase().startsWith(input.toUpperCase()))
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/BasePage.java Mon Dec 1 07:34:17 2008
@@ -30,6 +30,6 @@
*/
public BasePage()
{
- add(new BookmarkablePageLink("back", Index.class).setAutoEnable(true));
+ add(new BookmarkablePageLink<Void>("back", Index.class).setAutoEnable(true));
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePage.java Mon Dec 1 07:34:17 2008
@@ -76,6 +76,6 @@
// Add a link back. We did not hold any important instance data in
// BookMarkabelPageLinkPage,
// so navigating to a new instance is just fine
- add(new BookmarkablePageLink("navigateBackLink", BookmarkablePageLinkPage.class));
+ add(new BookmarkablePageLink<Void>("navigateBackLink", BookmarkablePageLinkPage.class));
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BookmarkablePageLinkPage.java Mon Dec 1 07:34:17 2008
@@ -39,7 +39,7 @@
// Here, we add a link to a bookmarkable page without passing any
// parameters
- add(new BookmarkablePageLink("pageLinkNoArgs", BookmarkablePage.class));
+ add(new BookmarkablePageLink<Void>("pageLinkNoArgs", BookmarkablePage.class));
// And here, we add a link to a bookmarkable page with passing a
// parameter that holds
@@ -48,7 +48,7 @@
// thus be strings
PageParameters parameters = new PageParameters();
parameters.put("message", "This message was passed as a page parameter argument");
- add(new BookmarkablePageLink("pageLinkWithArgs", BookmarkablePage.class, parameters));
+ add(new BookmarkablePageLink<Void>("pageLinkWithArgs", BookmarkablePage.class, parameters));
}
/**
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java Mon Dec 1 07:34:17 2008
@@ -102,10 +102,10 @@
* The title to show if book is null
* @return The external page link
*/
- public static BookmarkablePageLink link(final String name, final Book book,
+ public static BookmarkablePageLink<Void> link(final String name, final Book book,
final String noBookTitle)
{
- final BookmarkablePageLink link = new BookmarkablePageLink(name, BookDetails.class);
+ final BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>(name, BookDetails.class);
if (book != null)
{
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java Mon Dec 1 07:34:17 2008
@@ -58,6 +58,6 @@
columns.add(new PropertyColumn<String>(new Model<String>("Home Phone"), "homePhone"));
columns.add(new PropertyColumn<String>(new Model<String>("Cell Phone"), "cellPhone"));
- add(new AjaxFallbackDefaultDataTable("table", columns, new SortableContactDataProvider(), 8));
+ add(new AjaxFallbackDefaultDataTable<Contact>("table", columns, new SortableContactDataProvider(), 8));
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java Mon Dec 1 07:34:17 2008
@@ -31,6 +31,6 @@
*/
public BasePage()
{
- add(new BookmarkablePageLink("home-link", HomePage.class));
+ add(new BookmarkablePageLink<Void>("home-link", HomePage.class));
}
}
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/AllTests.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/AllTests.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/AllTests.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/AllTests.java Mon Dec 1 07:34:17 2008
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.examples;
+import com.meterware.httpunit.HttpUnitOptions;
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.apache.wicket.examples.ajax.prototype.AjaxTest;
import org.apache.wicket.examples.compref.ComprefTest;
import org.apache.wicket.examples.encodings.EncodingTest;
@@ -36,8 +36,6 @@
import org.apache.wicket.examples.signin2.Signin2Test;
import org.apache.wicket.util.license.ApacheLicenceHeaderTest;
-import com.meterware.httpunit.HttpUnitOptions;
-
/**
* All tests in the project; used by Maven.
*/
@@ -72,8 +70,7 @@
suite.addTestSuite(ImagesTest.class);
suite.addTestSuite(LibraryTest.class);
suite.addTestSuite(ApacheLicenceHeaderTest.class);
- JettyTestCaseDecorator deco = new JettyTestCaseDecorator(suite);
- return deco;
+ return new JettyTestCaseDecorator(suite);
}
/**
@@ -89,7 +86,7 @@
*
* @param arg0
*/
- public AllTests(Class arg0)
+ public AllTests(Class<?> arg0)
{
super(arg0);
}
@@ -100,7 +97,7 @@
* @param arg0
* @param arg1
*/
- public AllTests(Class arg0, String arg1)
+ public AllTests(Class<?> arg0, String arg1)
{
super(arg0, arg1);
}
Modified: wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java (original)
+++ wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/filtertest/Application.java Mon Dec 1 07:34:17 2008
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.filtertest;
+import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
/**
@@ -45,7 +46,8 @@
/**
* @see org.apache.wicket.Application#getHomePage()
*/
- public Class getHomePage()
+ @Override
+ public Class<? extends Page> getHomePage()
{
return HelloWorld.class;
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Mon Dec 1 07:34:17 2008
@@ -119,8 +119,7 @@
protected void respond(AjaxRequestTarget target)
{
RequestCycle requestCycle = RequestCycle.get();
- boolean save = Boolean.valueOf(requestCycle.getRequest().getParameter("save"))
- .booleanValue();
+ boolean save = Boolean.valueOf(requestCycle.getRequest().getParameter("save"));
if (save)
{
@@ -196,7 +195,7 @@
* The validator
* @return This
*/
- public final AjaxEditableLabel add(IValidator validator)
+ public final AjaxEditableLabel<T> add(IValidator<T> validator)
{
getEditor().add(validator);
return this;
@@ -224,7 +223,7 @@
* @param labelModel
* @return this for chaining
*/
- public final AjaxEditableLabel setLabel(final IModel<String> labelModel)
+ public final AjaxEditableLabel<T> setLabel(final IModel<String> labelModel)
{
getEditor().setLabel(labelModel);
return this;
@@ -234,7 +233,7 @@
* @see org.apache.wicket.MarkupContainer#setDefaultModel(org.apache.wicket.model.IModel)
*/
@Override
- public final AjaxEditableLabel setDefaultModel(IModel<?> model)
+ public final AjaxEditableLabel<T> setDefaultModel(IModel<?> model)
{
super.setDefaultModel(model);
getLabel().setDefaultModel(model);
@@ -248,7 +247,7 @@
* @param required
* @return this for chaining
*/
- public final AjaxEditableLabel setRequired(final boolean required)
+ public final AjaxEditableLabel<T> setRequired(final boolean required)
{
getEditor().setRequired(required);
return this;
@@ -261,7 +260,7 @@
* @param type
* @return this for chaining
*/
- public final AjaxEditableLabel setType(Class<?> type)
+ public final AjaxEditableLabel<T> setType(Class<?> type)
{
getEditor().setType(type);
return this;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java Mon Dec 1 07:34:17 2008
@@ -17,7 +17,6 @@
package org.apache.wicket.extensions.breadcrumb;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.wicket.Component;
@@ -78,6 +77,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected IBreadCrumbParticipant getParticipant(String componentId)
{
return breadCrumbParticipant;
@@ -92,7 +92,7 @@
/**
* List view for rendering the bread crumbs.
*/
- protected class BreadCrumbsListView extends ListView implements IBreadCrumbModelListener
+ protected class BreadCrumbsListView extends ListView<IBreadCrumbParticipant> implements IBreadCrumbModelListener
{
private static final long serialVersionUID = 1L;
@@ -114,10 +114,11 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected Object load()
{
// save a copy
- List l = new ArrayList(allBreadCrumbParticipants());
+ List<IBreadCrumbParticipant> l = new ArrayList<IBreadCrumbParticipant>(allBreadCrumbParticipants());
size = l.size();
return l;
}
@@ -163,6 +164,7 @@
/**
* @see org.apache.wicket.markup.html.list.ListView#onBeforeRender()
*/
+ @Override
protected void onBeforeRender()
{
super.onBeforeRender();
@@ -175,7 +177,8 @@
/**
* @see org.apache.wicket.markup.html.list.ListView#populateItem(org.apache.wicket.markup.html.list.ListItem)
*/
- protected void populateItem(ListItem item)
+ @Override
+ protected void populateItem(ListItem<IBreadCrumbParticipant> item)
{
int index = item.getIndex();
IBreadCrumbParticipant breadCrumbParticipant = (IBreadCrumbParticipant)item.getDefaultModelObject();
@@ -214,7 +217,7 @@
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel#allBreadCrumbParticipants()
*/
- public List allBreadCrumbParticipants()
+ public List<IBreadCrumbParticipant> allBreadCrumbParticipants()
{
return decorated.allBreadCrumbParticipants();
}
@@ -280,19 +283,18 @@
/**
* @see org.apache.wicket.Component#onDetach()
*/
+ @Override
protected void onDetach()
{
super.onDetach();
- for (Iterator i = decorated.allBreadCrumbParticipants().iterator(); i.hasNext();)
+ for (IBreadCrumbParticipant crumb : decorated.allBreadCrumbParticipants())
{
- IBreadCrumbParticipant crumb = (IBreadCrumbParticipant)i.next();
if (crumb instanceof Component)
{
- ((Component)crumb).detach();
- }
- else if (crumb instanceof IDetachable)
+ ((Component) crumb).detach();
+ } else if (crumb instanceof IDetachable)
{
- ((IDetachable)crumb).detach();
+ ((IDetachable) crumb).detach();
}
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbLink.java Mon Dec 1 07:34:17 2008
@@ -34,7 +34,7 @@
*
* @author Eelco Hillenius
*/
-public abstract class BreadCrumbLink extends Link
+public abstract class BreadCrumbLink extends Link<Void>
{
private static final long serialVersionUID = 1L;
@@ -58,6 +58,7 @@
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
+ @Override
public void onClick()
{
// get the currently active particpant
@@ -76,6 +77,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
public void undo()
{
breadCrumbModel.setActive(active);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbModelListenerSupport.java Mon Dec 1 07:34:17 2008
@@ -17,7 +17,6 @@
package org.apache.wicket.extensions.breadcrumb;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.wicket.IClusterable;
@@ -33,7 +32,7 @@
private static final long serialVersionUID = 1L;
/** listeners for bread crumb events. */
- private final List listeners = new ArrayList(1);
+ private final List<IBreadCrumbModelListener> listeners = new ArrayList<IBreadCrumbModelListener>(1);
/**
* Adds a bread crumb model listener.
@@ -62,10 +61,9 @@
public final void fireBreadCrumbActivated(IBreadCrumbParticipant previousParticipant,
IBreadCrumbParticipant breadCrumbParticipant)
{
- for (Iterator i = listeners.iterator(); i.hasNext();)
+ for (IBreadCrumbModelListener listener1 : listeners)
{
- IBreadCrumbModelListener listener = (IBreadCrumbModelListener)i.next();
- listener.breadCrumbActivated(previousParticipant, breadCrumbParticipant);
+ listener1.breadCrumbActivated(previousParticipant, breadCrumbParticipant);
}
}
@@ -77,9 +75,8 @@
*/
public final void fireBreadCrumbAdded(IBreadCrumbParticipant breadCrumbParticipant)
{
- for (Iterator i = listeners.iterator(); i.hasNext();)
+ for (IBreadCrumbModelListener listener : listeners)
{
- IBreadCrumbModelListener listener = (IBreadCrumbModelListener)i.next();
listener.breadCrumbAdded(breadCrumbParticipant);
}
}
@@ -92,9 +89,8 @@
*/
public final void fireBreadCrumbRemoved(IBreadCrumbParticipant breadCrumbParticipant)
{
- for (Iterator i = listeners.iterator(); i.hasNext();)
+ for (IBreadCrumbModelListener listener : listeners)
{
- IBreadCrumbModelListener listener = (IBreadCrumbModelListener)i.next();
listener.breadCrumbRemoved(breadCrumbParticipant);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/DefaultBreadCrumbsModel.java Mon Dec 1 07:34:17 2008
@@ -32,7 +32,7 @@
private IBreadCrumbParticipant activeParticipant = null;
/** Holds the current list of crumbs. */
- private List crumbs = new ArrayList();
+ private List<IBreadCrumbParticipant> crumbs = new ArrayList<IBreadCrumbParticipant>();
/** listeners utility. */
private final BreadCrumbModelListenerSupport listenerSupport = new BreadCrumbModelListenerSupport();
@@ -49,13 +49,13 @@
*/
public final void addListener(IBreadCrumbModelListener listener)
{
- this.listenerSupport.addListener(listener);
+ listenerSupport.addListener(listener);
}
/**
* @see org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel#allBreadCrumbParticipants()
*/
- public final List allBreadCrumbParticipants()
+ public final List<IBreadCrumbParticipant> allBreadCrumbParticipants()
{
return crumbs;
}
@@ -73,7 +73,7 @@
*/
public final void removeListener(IBreadCrumbModelListener listener)
{
- this.listenerSupport.removeListener(listener);
+ listenerSupport.removeListener(listener);
}
/**
@@ -88,7 +88,7 @@
int i = len;
while (i > -1)
{
- IBreadCrumbParticipant temp = (IBreadCrumbParticipant)crumbs.get(i);
+ IBreadCrumbParticipant temp = crumbs.get(i);
// if we found the bread crumb
if (breadCrumbParticipant.equals(temp))
@@ -98,7 +98,7 @@
while (j > i)
{
// remove and fire event
- IBreadCrumbParticipant removed = (IBreadCrumbParticipant)crumbs.remove(j--);
+ IBreadCrumbParticipant removed = crumbs.remove(j--);
listenerSupport.fireBreadCrumbRemoved(removed);
}
@@ -133,10 +133,10 @@
protected final void activate(final IBreadCrumbParticipant breadCrumbParticipant)
{
// get old value
- IBreadCrumbParticipant previousParticipant = this.activeParticipant;
+ IBreadCrumbParticipant previousParticipant = activeParticipant;
// and set the provided participant as the active one
- this.activeParticipant = breadCrumbParticipant;
+ activeParticipant = breadCrumbParticipant;
// fire bread crumb activated event
listenerSupport.fireBreadCrumbActivated(previousParticipant, breadCrumbParticipant);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/IBreadCrumbModel.java Mon Dec 1 07:34:17 2008
@@ -80,7 +80,7 @@
* @return The bread crumbs participants, as list with
* {@link IBreadCrumbParticipant bread crumb participants}.
*/
- List allBreadCrumbParticipants();
+ List<IBreadCrumbParticipant> allBreadCrumbParticipants();
/**
* Gets the currently active participant, if any.
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java Mon Dec 1 07:34:17 2008
@@ -76,7 +76,7 @@
final T choice = options.next();
String id = renderer.getIdValue(choice, 0);
Object displayValue = renderer.getDisplayValue(choice);
- Class displayClass = displayValue == null ? null : displayValue.getClass();
+ Class<?> displayClass = displayValue == null ? null : displayValue.getClass();
String value = getConverter(displayClass).convertToString(displayValue, getLocale());
value = getLocalizer().getString(id + "." + value, this, value);
@@ -85,12 +85,10 @@
Map<String, String> additionalAttributesMap = getAdditionalAttributes(choice);
if (additionalAttributesMap != null)
{
- Iterator<String> iter = additionalAttributesMap.keySet().iterator();
- while (iter.hasNext())
+ for (String s : additionalAttributesMap.keySet())
{
- String next = iter.next();
- buffer.append(" " + next + "=\"" +
- additionalAttributesMap.get(next).toString() + "\"");
+ buffer.append(" " + s + "=\"" +
+ additionalAttributesMap.get(s) + "\"");
}
}
@@ -124,7 +122,7 @@
IValueMap attrs = tag.getAttributes();
attrs.put("multiple", null);
- attrs.put("size", new Integer(getPalette().getRows()));
+ attrs.put("size", getPalette().getRows());
if (!palette.isPaletteEnabled())
{
Modified: wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java (original)
+++ wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabelPage.java Mon Dec 1 07:34:17 2008
@@ -33,7 +33,7 @@
*/
public AjaxEditableLabelPage()
{
- final AjaxEditableLabel ajaxLabel = new AjaxEditableLabel("ajaxLabel",
+ final AjaxEditableLabel<String> ajaxLabel = new AjaxEditableLabel<String>("ajaxLabel",
new Model<String>("ajaxTest"));
add(ajaxLabel);
add(new AjaxLink("toggle")
Modified: wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java (original)
+++ wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java Mon Dec 1 07:34:17 2008
@@ -42,10 +42,11 @@
/**
* Tests default AjaxEditableLabel behavior
*/
+ @SuppressWarnings({"unchecked"})
public void testAjaxEditableLabel()
{
Page page = tester.getLastRenderedPage();
- AjaxEditableLabel ajaxLabel = (AjaxEditableLabel)page.get("ajaxLabel");
+ AjaxEditableLabel<String> ajaxLabel = (AjaxEditableLabel<String>)page.get("ajaxLabel");
AbstractAjaxBehavior labelBehavior = (AbstractAjaxBehavior)ajaxLabel.get("label")
.getBehaviors()
@@ -69,11 +70,12 @@
* Tests whether disabling/enabling an AjaxEditableLabel also disables/enables the
* <code>LabelBehavior</code>
*/
+ @SuppressWarnings({"unchecked"})
public void testDisabledAjaxEditableLabel()
{
Page page = tester.getLastRenderedPage();
- AjaxEditableLabel ajaxLabel = (AjaxEditableLabel)page.get("ajaxLabel");
- AjaxLink toggle = (AjaxLink)page.get("toggle");
+ AjaxEditableLabel<String> ajaxLabel = (AjaxEditableLabel<String>)page.get("ajaxLabel");
+ AjaxLink<Void> toggle = (AjaxLink<Void>)page.get("toggle");
AbstractAjaxBehavior toggleBehavior = (AbstractAjaxBehavior)toggle.getBehaviors().get(0);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Mon Dec 1 07:34:17 2008
@@ -419,7 +419,7 @@
try
{
final Class<? extends Page> clazz = (Class<? extends Page>)defaultClassResolver.resolveClass(className);
- return new AutolinkBookmarkablePageLink(autoId, clazz, pathInfo.pageParameters,
+ return new AutolinkBookmarkablePageLink<Void>(autoId, clazz, pathInfo.pageParameters,
pathInfo.anchor);
}
catch (ClassNotFoundException ex)
@@ -454,7 +454,7 @@
try
{
clazz = (Class<? extends Page>)defaultClassResolver.resolveClass(className);
- return new AutolinkBookmarkablePageLink(autoId, clazz,
+ return new AutolinkBookmarkablePageLink<Void>(autoId, clazz,
pathInfo.getPageParameters(), pathInfo.anchor);
}
catch (ClassNotFoundException ex)
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/BufferedHttpServletResponse.java Mon Dec 1 07:34:17 2008
@@ -16,6 +16,9 @@
*/
package org.apache.wicket.protocol.http;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -23,16 +26,11 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.io.StringBufferWriter;
@@ -211,7 +209,7 @@
}
else if (previousObject instanceof List)
{
- ((List)previousObject).add(object);
+ ((List<Object>)previousObject).add(object);
}
else
{
@@ -228,7 +226,7 @@
public void setDateHeader(String name, long date)
{
testAndCreateHeaders();
- headers.put(name, new Long(date));
+ headers.put(name, date);
}
/**
@@ -237,7 +235,7 @@
public void addDateHeader(String name, long date)
{
testAndCreateHeaders();
- addHeaderObject(name, new Long(date));
+ addHeaderObject(name, date);
}
/**
@@ -273,7 +271,7 @@
public void addIntHeader(String name, int value)
{
testAndCreateHeaders();
- addHeaderObject(name, new Integer(value));
+ addHeaderObject(name, value);
}
/**
@@ -519,21 +517,18 @@
}
if (headers != null)
{
- Iterator<Entry<String, Object>> it = headers.entrySet().iterator();
- while (it.hasNext())
+ for (Entry<String, Object> stringObjectEntry : headers.entrySet())
{
- Entry<String, Object> entry = it.next();
- String name = entry.getKey();
- Object value = entry.getValue();
+ String name = stringObjectEntry.getKey();
+ Object value = stringObjectEntry.getValue();
if (value instanceof List)
{
- List<?> lst = (List<?>)value;
- for (int i = 0; i < lst.size(); i++)
+ List<?> lst = (List<?>) value;
+ for (Object aLst : lst)
{
- addHeader(name, lst.get(i), servletResponse);
+ addHeader(name, aLst, servletResponse);
}
- }
- else
+ } else
{
setHeader(name, value, servletResponse);
}
@@ -542,9 +537,8 @@
if (cookies != null)
{
- for (int i = 0; i < cookies.size(); i++)
+ for (Cookie cookie : cookies)
{
- Cookie cookie = cookies.get(i);
servletResponse.addCookie(cookie);
}
}
@@ -578,11 +572,11 @@
}
else if (value instanceof Long)
{
- servletResponse.setDateHeader(name, ((Long)value).longValue());
+ servletResponse.setDateHeader(name, (Long) value);
}
else if (value instanceof Integer)
{
- servletResponse.setIntHeader(name, ((Integer)value).intValue());
+ servletResponse.setIntHeader(name, (Integer) value);
}
}
@@ -602,11 +596,11 @@
}
else if (value instanceof Long)
{
- servletResponse.addDateHeader(name, ((Long)value).longValue());
+ servletResponse.addDateHeader(name, (Long) value);
}
else if (value instanceof Integer)
{
- servletResponse.addIntHeader(name, ((Integer)value).intValue());
+ servletResponse.addIntHeader(name, (Integer) value);
}
}
}
\ No newline at end of file
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java Mon Dec 1 07:34:17 2008
@@ -17,7 +17,6 @@
package org.apache.wicket.request.target.coding;
import java.util.Collections;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -84,28 +83,25 @@
* @param parameters
* Map object to be encoded
*/
- protected void appendParameters(AppendingStringBuffer url, Map parameters)
+ protected void appendParameters(AppendingStringBuffer url, Map<?,?> parameters)
{
if (parameters != null && parameters.size() > 0)
{
- final Iterator entries = parameters.entrySet().iterator();
- while (entries.hasNext())
+ for (Entry<?, ?> entry1 : parameters.entrySet())
{
- Map.Entry entry = (Entry)entries.next();
- Object value = entry.getValue();
+ Object value = ((Entry<?, ?>) entry1).getValue();
if (value != null)
{
if (value instanceof String[])
{
- String[] values = (String[])value;
- for (int i = 0; i < values.length; i++)
+ String[] values = (String[]) value;
+ for (String value1 : values)
{
- appendValue(url, entry.getKey().toString(), values[i]);
+ appendValue(url, ((Entry<?, ?>) entry1).getKey().toString(), value1);
}
- }
- else
+ } else
{
- appendValue(url, entry.getKey().toString(), value.toString());
+ appendValue(url, ((Entry<?, ?>) entry1).getKey().toString(), value.toString());
}
}
}
@@ -134,7 +130,7 @@
* query string parameters
* @return Parameters created from the url fragment and query string
*/
- protected ValueMap decodeParameters(String urlFragment, Map urlParameters)
+ protected ValueMap decodeParameters(String urlFragment, Map<String,Object> urlParameters)
{
// Hack off any leading slash
if (urlFragment.startsWith("/"))
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Mon Dec 1 07:34:17 2008
@@ -16,17 +16,15 @@
*/
package org.apache.wicket.util.tester;
+import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
@@ -407,8 +405,8 @@
{
try
{
- Constructor<? extends Panel> c = panelClass.getConstructor(new Class[] { String.class });
- return c.newInstance(new Object[] { panelId });
+ Constructor<? extends Panel> c = panelClass.getConstructor(String.class);
+ return c.newInstance(panelId);
}
catch (SecurityException e)
{
@@ -774,7 +772,7 @@
{
Field parametersField = BookmarkablePageLink.class.getDeclaredField("parameters");
Method getParametersMethod = BookmarkablePageLink.class.getDeclaredMethod(
- "getPageParameters", (Class[])null);
+ "getPageParameters", (Class<?>[])null);
getParametersMethod.setAccessible(true);
PageParameters parameters = (PageParameters)getParametersMethod.invoke(
@@ -987,10 +985,9 @@
public void debugComponentTrees(String filter)
{
log.info("debugging ----------------------------------------------");
- for (Iterator<WicketTesterHelper.ComponentData> iter = WicketTesterHelper.getComponentData(
- getLastRenderedPage()).iterator(); iter.hasNext();)
+ for (WicketTesterHelper.ComponentData obj : WicketTesterHelper.getComponentData(
+ getLastRenderedPage()))
{
- WicketTesterHelper.ComponentData obj = iter.next();
if (obj.path.matches(".*" + filter + ".*"))
{
log.info("path\t" + obj.path + " \t" + obj.type + " \t[" + obj.value + "]");
@@ -1246,9 +1243,8 @@
form.visitFormComponents(new FormComponent.AbstractVisitor()
{
- @SuppressWarnings("unchecked")
@Override
- public void onFormComponent(FormComponent formComponent)
+ public void onFormComponent(FormComponent<?> formComponent)
{
// !(formComponent instanceof Button) &&
if (!(formComponent instanceof RadioGroup) &&
@@ -1376,7 +1372,7 @@
{
try
{
- Method method = RequestCycle.class.getDeclaredMethod("onBeginRequest", (Class[])null);
+ Method method = RequestCycle.class.getDeclaredMethod("onBeginRequest", (Class<?>[])null);
method.setAccessible(true);
method.invoke(rc, (Object[])null);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/AttributeMap.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/AttributeMap.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/AttributeMap.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/value/AttributeMap.java Mon Dec 1 07:34:17 2008
@@ -42,7 +42,7 @@
* @param map
* a <code>Map</code> to be copied
*/
- public AttributeMap(Map map)
+ public AttributeMap(Map<String,Object> map)
{
super(map);
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ApplicationSettingsTest.java Mon Dec 1 07:34:17 2008
@@ -20,10 +20,10 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-
import org.apache.wicket.resource.loader.BundleStringResourceLoader;
import org.apache.wicket.resource.loader.ClassStringResourceLoader;
import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
+import org.apache.wicket.resource.loader.IStringResourceLoader;
import org.apache.wicket.resource.loader.PackageStringResourceLoader;
import org.apache.wicket.resource.loader.ValidatorStringResourceLoader;
import org.apache.wicket.settings.Settings;
@@ -107,7 +107,7 @@
public void testDefaultStringResourceLoaderSetup()
{
Settings settings = new Settings(tester.getApplication());
- List loaders = settings.getStringResourceLoaders();
+ List<IStringResourceLoader> loaders = settings.getStringResourceLoaders();
Assert.assertEquals("There should be 4 default loaders", 4, loaders.size());
Assert.assertTrue("First loader one should be the component one",
loaders.get(0) instanceof ComponentStringResourceLoader);
@@ -130,7 +130,7 @@
settings.addStringResourceLoader(new BundleStringResourceLoader(
"org.apache.wicket.resource.DummyResources"));
settings.addStringResourceLoader(new ComponentStringResourceLoader());
- List loaders = settings.getStringResourceLoaders();
+ List<IStringResourceLoader> loaders = settings.getStringResourceLoaders();
Assert.assertEquals("There should be 2 overridden loaders", 2, loaders.size());
Assert.assertTrue("First loader one should be the bundle one",
loaders.get(0) instanceof BundleStringResourceLoader);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java Mon Dec 1 07:34:17 2008
@@ -75,7 +75,7 @@
new DummyAuthorizationStrategy()
{
@Override
- public boolean isInstantiationAuthorized(Class c)
+ public <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass)
{
return false;
}
@@ -206,7 +206,7 @@
/**
* @see org.apache.wicket.authorization.IAuthorizationStrategy#isInstantiationAuthorized(java.lang.Class)
*/
- public boolean isInstantiationAuthorized(Class c)
+ public <T extends Component> boolean isInstantiationAuthorized(Class<T> componentClass)
{
return true;
}
@@ -263,7 +263,7 @@
}
/** test form. */
- private class TestForm extends Form
+ private class TestForm extends Form<Input>
{
private static final long serialVersionUID = 1L;
@@ -275,8 +275,8 @@
public TestForm(String id)
{
super(id);
- setDefaultModel(new CompoundPropertyModel(input = new Input()));
- add(new TextField("stringInput"));
+ setDefaultModel(new CompoundPropertyModel<Input>(input = new Input()));
+ add(new TextField<String>("stringInput"));
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java Mon Dec 1 07:34:17 2008
@@ -47,7 +47,7 @@
// components to the border.
// border.add(new TextField("text"));
// border.add(new Image("img"));
- border.getBodyContainer().add(new TextField("text"));
+ border.getBodyContainer().add(new TextField<String>("text"));
border.getBodyContainer().add(new Image("img"));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java Mon Dec 1 07:34:17 2008
@@ -17,6 +17,7 @@
package org.apache.wicket.markup.html.border;
import org.apache.wicket.Application;
+import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupException;
@@ -68,15 +69,16 @@
*
* @throws Exception
*/
+ @SuppressWarnings({"unchecked"})
public void test3() throws Exception
{
executeTest(BoxBorderTestPage_3.class, "BoxBorderTestPage_ExpectedResult_3.html");
Border border = (Border)tester.getLastRenderedPage().get("border");
assertNotNull(border);
- Form form = (Form)tester.getLastRenderedPage().get("border:myForm");
+ Form<?> form = (Form<?>)tester.getLastRenderedPage().get("border:myForm");
- TextField input = (TextField)tester.getLastRenderedPage().get("border:name");
+ TextField<String> input = (TextField<String>)tester.getLastRenderedPage().get("border:name");
assertEquals("", input.getDefaultModelObjectAsString());
tester.setupRequestAndResponse();
@@ -87,7 +89,7 @@
tester.processRequestCycle();
- input = (TextField)tester.getLastRenderedPage().get("border:name");
+ input = (TextField<String>)tester.getLastRenderedPage().get("border:name");
assertEquals("jdo", input.getDefaultModelObjectAsString());
}
@@ -99,7 +101,7 @@
*/
public void test4() throws Exception
{
- Class pageClass = BorderTestHierarchyPage_4.class;
+ Class<? extends Page> pageClass = BorderTestHierarchyPage_4.class;
System.out.println("=== " + pageClass.getName() + " ===");
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_2.java Mon Dec 1 07:34:17 2008
@@ -40,7 +40,7 @@
BoxBorder border = new BoxBorder("box");
add(border);
- border.add(new TextField("text"));
+ border.add(new TextField<String>("text"));
border.add(new Image("img"));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage.java Mon Dec 1 07:34:17 2008
@@ -17,6 +17,7 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.Application;
+import org.apache.wicket.Page;
import org.apache.wicket.PageMap;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
@@ -34,10 +35,11 @@
*/
public BookmarkableHomePageLinksPage()
{
- add(new BookmarkablePageLink("defaulthompage", Application.get().getHomePage()));
- add(new BookmarkablePageLink("defaulthompagewithparams", Application.get().getHomePage(),
+ Class<? extends Page> homePage = Application.get().getHomePage();
+ add(new BookmarkablePageLink<Void>("defaulthompage", homePage));
+ add(new BookmarkablePageLink<Void>("defaulthompagewithparams", homePage,
new PageParameters("param1=1,param2=test")));
- add(new BookmarkablePageLink("defaulthompagewithpagemap", Application.get().getHomePage()).setPageMap(PageMap.forName("testpagemap")));
+ add(new BookmarkablePageLink<Void>("defaulthompagewithpagemap", homePage).setPageMap(PageMap.forName("testpagemap")));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionPage.java Mon Dec 1 07:34:17 2008
@@ -58,14 +58,13 @@
}
};
- add(new ListView("test", model)
+ add(new ListView<Object>("test", model)
{
private static final long serialVersionUID = -4176346513350288174L;
@Override
- protected void populateItem(final ListItem item)
+ protected void populateItem(final ListItem<Object> item)
{
- // not used
}
});
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java Mon Dec 1 07:34:17 2008
@@ -34,7 +34,7 @@
*/
public BlockedResourceLinkPage()
{
- add(new ResourceLink("link", new ResourceReference(BlockedResourceLinkPage.class,
+ add(new ResourceLink<Void>("link", new ResourceReference(BlockedResourceLinkPage.class,
"BlockedResourceLinkPage.html")));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java Mon Dec 1 07:34:17 2008
@@ -297,7 +297,7 @@
public void testAssertComponentOnAjaxResponse()
{
final Page page = new MockPageWithLink();
- AjaxLink ajaxLink = new AjaxLink(MockPageWithLink.LINK_ID)
+ AjaxLink<Void> ajaxLink = new AjaxLink<Void>(MockPageWithLink.LINK_ID)
{
private static final long serialVersionUID = 1L;
@@ -305,14 +305,13 @@
public void onClick(AjaxRequestTarget target)
{
// Replace the link with a normal Link
- Link link = new Link(MockPageWithLink.LINK_ID)
+ Link<Void> link = new Link<Void>(MockPageWithLink.LINK_ID)
{
private static final long serialVersionUID = 1L;
@Override
public void onClick()
{
- // Do nothing
}
};
link.setOutputMarkupId(true);
@@ -381,7 +380,7 @@
label.setOutputMarkupId(true);
final Page page = new MockPageWithLinkAndLabel();
- AjaxLink ajaxLink = new AjaxLink(MockPageWithLinkAndLabel.LINK_ID)
+ AjaxLink<Void> ajaxLink = new AjaxLink<Void>(MockPageWithLinkAndLabel.LINK_ID)
{
private static final long serialVersionUID = 1L;
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java?rev=722097&r1=722096&r2=722097&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java Mon Dec 1 07:34:17 2008
@@ -62,7 +62,7 @@
public void testBasicAjaxLinkClick()
{
// Create a link, which we test is actually invoked
- final AjaxLink ajaxLink = new AjaxLink("ajaxLink")
+ final AjaxLink<Void> ajaxLink = new AjaxLink<Void>("ajaxLink")
{
private static final long serialVersionUID = 1L;