Author: thrantal
Date: Mon Jun 23 20:07:40 2008
New Revision: 671001
URL: http://svn.apache.org/viewvc?rev=671001&view=rev
Log:
More typing: Changed MarkupContainer.iterator() overridable and to return
Iterator<? extends Component>, and ListView.iterator() to return Iterator<?
extends ListItem>.
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ComponentSourceEntry.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ComponentSourceEntry.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ComponentSourceEntry.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ComponentSourceEntry.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ComponentSourceEntry.java
Mon Jun 23 20:07:40 2008
@@ -92,7 +92,7 @@
{
buffer.append('(');
- Iterator<Component> i =
((MarkupContainer)component).iterator();
+ Iterator<? extends Component> i =
((MarkupContainer)component).iterator();
while (i.hasNext())
{
Component child = i.next();
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
Mon Jun 23 20:07:40 2008
@@ -438,7 +438,7 @@
/**
* @return Iterator that iterates through children in the order they
were added
*/
- public final Iterator<Component> iterator()
+ public Iterator<? extends Component> iterator()
{
return new Iterator<Component>()
{
@@ -1718,7 +1718,7 @@
void onAfterRenderChildren()
{
// Loop through child components
- final Iterator<Component> iter = iterator();
+ final Iterator<? extends Component> iter = iterator();
while (iter.hasNext())
{
// Get next child
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/Page.java
Mon Jun 23 20:07:40 2008
@@ -1081,7 +1081,7 @@
Component component = iterator.next();
// Now first test if the component has
a sibling that is a transparent resolver.
- Iterator<Component> iterator2 =
component.getParent().iterator();
+ Iterator<? extends Component> iterator2
= component.getParent().iterator();
while (iterator2.hasNext())
{
Component sibling =
iterator2.next();
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
Mon Jun 23 20:07:40 2008
@@ -1099,7 +1099,7 @@
if (getParent() instanceof Border)
{
MarkupContainer border = getParent();
- Iterator<Component> iter = border.iterator();
+ Iterator<? extends Component> iter = border.iterator();
while (iter.hasNext())
{
Component child = iter.next();
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Mon Jun 23 20:07:40 2008
@@ -407,7 +407,7 @@
}
if (visitChildren)
{
- final Iterator<Component> children =
container.iterator();
+ final Iterator<? extends Component>
children = container.iterator();
while (children.hasNext())
{
final Component child =
children.next();
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
Mon Jun 23 20:07:40 2008
@@ -527,10 +527,10 @@
{
// Remove all ListItems no longer required
final int maxIndex = firstIndex + size;
- for (final Iterator<Component> iterator =
iterator(); iterator.hasNext();)
+ for (final Iterator<? extends ListItem<T>>
iterator = iterator(); iterator.hasNext();)
{
// Get next child component
- final ListItem<?> child =
(ListItem<?>)iterator.next();
+ final ListItem<?> child =
iterator.next();
if (child != null)
{
final int index =
child.getIndex();
@@ -661,7 +661,13 @@
};
}
- /**
+ @SuppressWarnings({"unchecked"})
+ @Override
+ public Iterator<? extends ListItem<T>> iterator() {
+ return (Iterator<? extends ListItem<T>>) super.iterator();
+ }
+
+ /**
* Gets model
*
* @return model
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
Mon Jun 23 20:07:40 2008
@@ -76,7 +76,7 @@
*
* @return iterator over child components to be rendered
*/
- protected abstract Iterator<Component> renderIterator();
+ protected abstract Iterator<? extends Component> renderIterator();
/**
* Renders all child items in no specified order
@@ -89,7 +89,7 @@
{
final int markupStart = markupStream.getCurrentIndex();
- Iterator<Component> it = renderIterator();
+ Iterator<? extends Component> it = renderIterator();
if (it.hasNext())
{
do
@@ -132,7 +132,7 @@
if
(Application.get().getConfigurationType().equals(Application.DEVELOPMENT))
{
- Iterator<Component> i = iterator();
+ Iterator<? extends Component> i = iterator();
while (i.hasNext())
{
Component c = i.next();
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/RepeatingView.java
Mon Jun 23 20:07:40 2008
@@ -107,7 +107,7 @@
* @see
org.apache.wicket.markup.repeater.AbstractRepeater#renderIterator()
*/
@Override
- protected Iterator<Component> renderIterator()
+ protected Iterator<? extends Component> renderIterator()
{
return iterator();
}
Modified:
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java?rev=671001&r1=671000&r2=671001&view=diff
==============================================================================
---
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
(original)
+++
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/repeater/data/GridView.java
Mon Jun 23 20:07:40 2008
@@ -358,7 +358,7 @@
{
MarkupContainer row = rows.next();
- final Iterator<Component> rawCells;
+ final Iterator<? extends Component>
rawCells;
rawCells =
((MarkupContainer)row.iterator().next()).iterator();
cells = Generics.iterator(rawCells);
if (cells.hasNext())
