svn commit: r649374 - in /wicket/trunk: wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/ wicket/src/main/java/org/apache/wicket/markup/repeater/data/

[ivaynberg]

Author: ivaynberg
Date: Thu Apr 17 22:40:44 2008
New Revision: 649374

URL: http://svn.apache.org/viewvc?rev=649374&view=rev
Log:
windened genercs WICKET-1512

Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java?rev=649374&r1=649373&r2=649374&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
 Thu Apr 17 22:40:44 2008
@@ -32,6 +32,12 @@
 /**
  * Component that makes it easy to produce a list of SelectOption components
  * 
+ * Example markup:
+ * 
+ * <pre><code>
+ * &lt;wicket:container wicket:id=&quot;selectOptions&quot;&gt;&lt;option 
wicket:id=&quot;option&quot;&gt;&lt;/option&gt;&lt;/wicket:contaner&gt;
+ * </code></pre>
+ * 
  * @author Igor Vaynberg (ivaynberg)
  * 
  */
@@ -82,6 +88,7 @@
        /**
         * @see org.apache.wicket.Component#onBeforeRender()
         */
+       @Override
        protected final void onPopulate()
        {
                if (size() == 0 || recreateChoices)
@@ -148,6 +155,7 @@
                        this.text = text;
                }
 
+               @Override
                protected void onComponentTagBody(MarkupStream markupStream, 
ComponentTag openTag)
                {
                        replaceComponentTagBody(markupStream, openTag, text);

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java?rev=649374&r1=649373&r2=649374&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
 Thu Apr 17 22:40:44 2008
@@ -89,7 +89,7 @@
         */
        private static final class ModelIterator<T> implements 
Iterator<IModel<T>>
        {
-               private final Iterator<T> items;
+               private final Iterator< ? extends T> items;
                private final IDataProvider<T> dataProvider;
                private final int max;
                private int index;

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java?rev=649374&r1=649373&r2=649374&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
 Thu Apr 17 22:40:44 2008
@@ -73,7 +73,7 @@
         * 
         * @return iterator capable of iterating over {first, first+count} items
         */
-       Iterator<T> iterator(int first, int count);
+       Iterator< ? extends T> iterator(int first, int count);
 
        /**
         * Gets total number of items in the collection represented by the 
DataProvider