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/27 06:47:18 UTC
svn commit: r651882 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater:
AbstractRepeater.java DefaultItemReuseStrategy.java IItemReuseStrategy.java
Item.java OddEvenItem.java RefreshingView.java
ReuseIfModelsEqualStrategy.java
Author: ivaynberg
Date: Sat Apr 26 21:47:10 2008
New Revision: 651882
URL: http://svn.apache.org/viewvc?rev=651882&view=rev
Log:
warnigs cleanup
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java?rev=651882&r1=651881&r2=651882&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java Sat Apr 26 21:47:10 2008
@@ -96,7 +96,7 @@
{
do
{
- Component child = it.next();
+ Component< ? > child = it.next();
if (child == null)
{
throw new IllegalStateException("the render iterator returned null for a child");
@@ -119,7 +119,7 @@
* @param child
* Child component to be rendered
*/
- protected void renderChild(final Component child)
+ protected void renderChild(final Component< ? > child)
{
child.render(getMarkupStream());
}
@@ -137,7 +137,7 @@
Iterator<Component< ? >> i = iterator();
while (i.hasNext())
{
- Component c = i.next();
+ Component< ? > c = i.next();
Matcher matcher = SAFE_CHILD_ID_PATTERN.matcher(c.getId());
if (!matcher.matches())
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java?rev=651882&r1=651881&r2=651882&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/DefaultItemReuseStrategy.java Sat Apr 26 21:47:10 2008
@@ -18,7 +18,6 @@
import java.util.Iterator;
-import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.model.IModel;
@@ -45,13 +44,14 @@
}
/**
- * @see org.apache.wicket.markup.repeater.IItemReuseStrategy#getItems(IItemFactory,
+ *
+ * @see org.apache.wicket.markup.repeater.IItemReuseStrategy#getItems(org.apache.wicket.markup.repeater.IItemFactory,
* java.util.Iterator, java.util.Iterator)
*/
- public Iterator getItems(final IItemFactory factory, final Iterator newModels,
- final Iterator existingItems)
+ public <T> Iterator<Item<T>> getItems(final IItemFactory<T> factory,
+ final Iterator<IModel<T>> newModels, Iterator<Item<T>> existingItems)
{
- return new Iterator()
+ return new Iterator<Item<T>>()
{
private int index = 0;
@@ -65,19 +65,11 @@
return newModels.hasNext();
}
- public Object next()
+ public Item<T> next()
{
- Object next = newModels.next();
- if (next != null && !(next instanceof IModel))
- {
- throw new WicketRuntimeException("Expecting an instance of " +
- IModel.class.getName() + ", got " + next.getClass().getName());
- }
- final IModel model = (IModel)next;
-
- Item item = factory.newItem(index, model);
+ IModel<T> model = newModels.next();
+ Item<T> item = factory.newItem(index, model);
index++;
-
return item;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java?rev=651882&r1=651881&r2=651882&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/IItemReuseStrategy.java Sat Apr 26 21:47:10 2008
@@ -39,6 +39,9 @@
* Returns an iterator over items that will be added to the view. The iterator needs to return
* all the items because the old ones are removed prior to the new ones added.
*
+ * @param <T>
+ * type of Item
+ *
* @param factory
* implementation of IItemFactory
* @param newModels
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java?rev=651882&r1=651881&r2=651882&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/Item.java Sat Apr 26 21:47:10 2008
@@ -113,14 +113,14 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
- public static class IndexComparator implements Comparator<Item>
+ public static class IndexComparator implements Comparator<Item< ? >>
{
- private static final Comparator<Item> instance = new IndexComparator();
+ private static final Comparator<Item< ? >> instance = new IndexComparator();
/**
* @return static instance of the comparator
*/
- public static final Comparator<Item> getInstance()
+ public static final Comparator<Item< ? >> getInstance()
{
return instance;
}
@@ -128,7 +128,7 @@
/**
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(Item lhs, Item rhs)
+ public int compare(Item< ? > lhs, Item< ? > rhs)
{
return lhs.getIndex() - rhs.getIndex();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java?rev=651882&r1=651881&r2=651882&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java Sat Apr 26 21:47:10 2008
@@ -23,9 +23,11 @@
* Item that sets class="even" or class="odd" attributes based on its index
*
* @author Igor Vaynberg (ivaynberg)
+ * @param <T>
+ * type of Item's model object
*
*/
-public class OddEvenItem extends Item
+public class OddEvenItem<T> extends Item<T>
{
private static final long serialVersionUID = 1L;
@@ -42,11 +44,12 @@
* @param model
* item model
*/
- public OddEvenItem(String id, int index, IModel model)
+ public OddEvenItem(String id, int index, IModel<T> model)
{
super(id, index, model);
}
+ @Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java?rev=651882&r1=651881&r2=651882&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java Sat Apr 26 21:47:10 2008
@@ -19,9 +19,9 @@
import java.util.Collection;
import java.util.Iterator;
-import org.apache.wicket.Component;
import org.apache.wicket.markup.repeater.util.ModelIteratorAdapter;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.version.undo.Change;
@@ -165,25 +165,7 @@
*/
public Iterator<Item<T>> getItems()
{
- return new Iterator<Item<T>>()
- {
- private final Iterator<Component< ? >> delegate = iterator();
-
- public boolean hasNext()
- {
- return delegate.hasNext();
- }
-
- public Item<T> next()
- {
- return (Item<T>)delegate.next();
- }
-
- public void remove()
- {
- delegate.remove();
- }
- };
+ return Generics.iterator(iterator());
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java?rev=651882&r1=651881&r2=651882&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/ReuseIfModelsEqualStrategy.java Sat Apr 26 21:47:10 2008
@@ -16,11 +16,11 @@
*/
package org.apache.wicket.markup.repeater;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.lang.Generics;
/**
@@ -51,20 +51,20 @@
}
/**
- * @see org.apache.wicket.markup.repeater.IItemReuseStrategy#getItems(IItemFactory,
+ * @see org.apache.wicket.markup.repeater.IItemReuseStrategy#getItems(org.apache.wicket.markup.repeater.IItemFactory,
* java.util.Iterator, java.util.Iterator)
*/
- public Iterator getItems(final IItemFactory factory, final Iterator newModels,
- Iterator existingItems)
+ public <T> Iterator<Item<T>> getItems(final IItemFactory<T> factory,
+ final Iterator<IModel<T>> newModels, Iterator<Item<T>> existingItems)
{
- final Map modelToItem = new HashMap();
+ final Map<IModel<T>, Item<T>> modelToItem = Generics.newHashMap();
while (existingItems.hasNext())
{
- final Item item = (Item)existingItems.next();
+ final Item<T> item = existingItems.next();
modelToItem.put(item.getModel(), item);
}
- return new Iterator()
+ return new Iterator<Item<T>>()
{
private int index = 0;
@@ -73,12 +73,12 @@
return newModels.hasNext();
}
- public Object next()
+ public Item<T> next()
{
- final IModel model = (IModel)newModels.next();
- final Item oldItem = (Item)modelToItem.get(model);
+ final IModel<T> model = newModels.next();
+ final Item<T> oldItem = modelToItem.get(model);
- final Item item;
+ final Item<T> item;
if (oldItem == null)
{
item = factory.newItem(index, model);