svn commit: r648366 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java

[ivaynberg]

Author: ivaynberg
Date: Tue Apr 15 11:35:08 2008
New Revision: 648366

URL: http://svn.apache.org/viewvc?rev=648366&view=rev
Log:
generics fixes

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java

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=648366&r1=648365&r2=648366&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
 Tue Apr 15 11:35:08 2008
@@ -321,7 +321,9 @@
        /**
         * The container to be associated with the <wicket:body> tag
         */
-       public class BorderBodyContainer extends WebMarkupContainer implements 
IComponentResolver
+       public class BorderBodyContainer extends WebMarkupContainer<Object>
+               implements
+                       IComponentResolver
        {
                private static final long serialVersionUID = 1L;
 
@@ -386,15 +388,15 @@
                 * @see 
org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
                 *      org.apache.wicket.markup.MarkupStream, 
org.apache.wicket.markup.ComponentTag)
                 */
-               public boolean resolve(final MarkupContainer container, final 
MarkupStream markupStream,
-                       final ComponentTag tag)
+               public boolean resolve(final MarkupContainer< ? > container,
+                       final MarkupStream markupStream, final ComponentTag tag)
                {
                        // Usually you add child components to Border instead 
of Body. Hence
                        // we need to help Body to properly resolve the 
children.
                        String id = tag.getId();
                        if (!id.equals(BODY_ID))
                        {
-                               Component component = Border.this.get(id);
+                               Component< ? > component = Border.this.get(id);
                                if (component != null)
                                {
                                        component.render(markupStream);