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/04/28 06:58:53 UTC
svn commit: r652055 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket: ./ ajax/ markup/html/
markup/html/border/ markup/html/internal/
Author: ivaynberg
Date: Sun Apr 27 21:58:45 2008
New Revision: 652055
URL: http://svn.apache.org/viewvc?rev=652055&view=rev
Log:
generics cleanup
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=652055&r1=652054&r2=652055&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Sun Apr 27 21:58:45 2008
@@ -2594,7 +2594,7 @@
* @param container
* The HtmlHeaderContainer
*/
- public void renderHead(final HtmlHeaderContainer< ? > container)
+ public void renderHead(final HtmlHeaderContainer container)
{
if (isVisible())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=652055&r1=652054&r2=652055&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Sun Apr 27 21:58:45 2008
@@ -248,13 +248,13 @@
/** a list of listeners */
private List<IListener> listeners = null;
- private final Page page;
+ private final Page< ? > page;
/**
*
* @see org.apache.wicket.request.target.component.IPageRequestTarget#getPage()
*/
- public Page getPage()
+ public Page< ? > getPage()
{
return page;
}
@@ -264,7 +264,7 @@
*
* @param page
*/
- public AjaxRequestTarget(Page page)
+ public AjaxRequestTarget(Page< ? > page)
{
this.page = page;
Response response = RequestCycle.get().getResponse();
@@ -694,7 +694,7 @@
RequestCycle.get().setResponse(encodingBodyResponse);
// Initialize temporary variables
- final Page page = component.getPage();
+ final Page< ? > page = component.getPage();
if (page == null)
{
// dont throw an exception but just ignore this component, somehow
@@ -950,18 +950,8 @@
if (header == null)
{
header = new AjaxHtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID, this);
- Component< ? > oldHeader = component.getPage().get(HtmlHeaderSectionHandler.HEADER_ID);
-
- // add or replace the container to page
-
- if (oldHeader != null)
- {
- component.getPage().replace(header);
- }
- else
- {
- component.getPage().add(header);
- }
+ final Page< ? > page = component.getPage();
+ page.addOrReplace(header);
}
// save old response, set new
@@ -1078,7 +1068,7 @@
/**
* Returns the HTML id of the last focused element.
*
- * @return
+ * @return markup id of last focused element, <code>null</code> if none
*/
public String getLastFocusedElementId()
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java?rev=652055&r1=652054&r2=652055&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java Sun Apr 27 21:58:45 2008
@@ -65,8 +65,7 @@
* @param htmlContainer
* The HtmlHeaderContainer added to the Page
*/
- public final void renderHeadFromAssociatedMarkupFile(
- final HtmlHeaderContainer< ? > htmlContainer)
+ public final void renderHeadFromAssociatedMarkupFile(final HtmlHeaderContainer htmlContainer)
{
// Gracefully getAssociateMarkupStream. Throws no exception in case
// markup is not found
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java?rev=652055&r1=652054&r2=652055&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebMarkupContainerWithAssociatedMarkup.java Sun Apr 27 21:58:45 2008
@@ -65,7 +65,7 @@
* @param container
* The HtmlHeaderContainer added to the Page
*/
- protected final void renderHeadFromAssociatedMarkupFile(final HtmlHeaderContainer< ? > container)
+ protected final void renderHeadFromAssociatedMarkupFile(final HtmlHeaderContainer container)
{
if (markupHelper == null)
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=652055&r1=652054&r2=652055&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java Sun Apr 27 21:58:45 2008
@@ -312,7 +312,7 @@
* @see org.apache.wicket.Component#renderHead(org.apache.wicket.markup.html.internal.HtmlHeaderContainer)
*/
@Override
- public void renderHead(HtmlHeaderContainer< ? > container)
+ public void renderHead(HtmlHeaderContainer container)
{
renderHeadFromAssociatedMarkupFile(container);
super.renderHead(container);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=652055&r1=652054&r2=652055&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java Sun Apr 27 21:58:45 2008
@@ -62,10 +62,9 @@
* </ul>
*
* @author Juergen Donnerstag
- * @param <T>
- * The model object type
+ *
*/
-public class HtmlHeaderContainer<T> extends WebMarkupContainer<T>
+public class HtmlHeaderContainer extends WebMarkupContainer<Void>
{
private static final long serialVersionUID = 1L;
@@ -207,7 +206,7 @@
* The header component container
*/
private final void renderHeaderSections(final MarkupContainer< ? > page,
- final HtmlHeaderContainer< ? > container)
+ final HtmlHeaderContainer container)
{
page.renderHead(container);
// Make sure all Components interested in contributing to the header