svn commit: r1203891 - in /wicket/trunk: wicket-core/src/main/java/org/apache/wicket/markup/html/list/ wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/ wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/

[ivaynberg]

Author: ivaynberg
Date: Fri Nov 18 22:48:46 2011
New Revision: 1203891

URL: http://svn.apache.org/viewvc?rev=1203891&view=rev
Log:
switch from using int to long in IDataProvider and the cascade from that
Issue: WICKET-1175

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/Loop.java
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/Loop.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/Loop.java?rev=1203891&r1=1203890&r2=1203891&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/Loop.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/Loop.java
 Fri Nov 18 22:48:46 2011
@@ -49,9 +49,9 @@ public abstract class Loop extends Abstr
         *            max index of the loop
         * @see org.apache.wicket.Component#Component(String, IModel)
         */
-       public Loop(final String id, final int iterations)
+       public Loop(final String id, final long iterations)
        {
-               super(id, new Model<Integer>(iterations));
+               super(id, new Model<Long>(iterations));
        }
 
        /**
@@ -63,7 +63,7 @@ public abstract class Loop extends Abstr
         *            Must contain a Integer model object
         * @see org.apache.wicket.Component#Component(String, IModel)
         */
-       public Loop(final String id, final IModel<Integer> model)
+       public Loop(final String id, final IModel<Long> model)
        {
                super(id, model);
        }

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java?rev=1203891&r1=1203890&r2=1203891&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
 Fri Nov 18 22:48:46 2011
@@ -94,14 +94,14 @@ public class TabbedPanel extends Panel
 
                this.tabs = Args.notNull(tabs, "tabs");
 
-               final IModel<Integer> tabCount = new 
AbstractReadOnlyModel<Integer>()
+               final IModel<Long> tabCount = new AbstractReadOnlyModel<Long>()
                {
                        private static final long serialVersionUID = 1L;
 
                        @Override
-                       public Integer getObject()
+                       public Long getObject()
                        {
-                               return TabbedPanel.this.tabs.size();
+                               return (long)TabbedPanel.this.tabs.size();
                        }
                };
 

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java?rev=1203891&r1=1203890&r2=1203891&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
 Fri Nov 18 22:48:46 2011
@@ -104,7 +104,7 @@ public abstract class RatingPanel extend
 
                private RatingStarBar(final String id, final IModel<Integer> 
model)
                {
-                       super(id, model);
+                       super(id, new IntToLongModel(model));
                }
 
                @Override
@@ -432,4 +432,39 @@ public abstract class RatingPanel extend
         *            the request target, null if the request is a regular, 
non-AJAX request.
         */
        protected abstract void onRated(int rating, AjaxRequestTarget target);
+
+       /**
+        * Adapts an int model to a long model
+        * 
+        * @author igor
+        */
+       private static class IntToLongModel implements IModel<Long>
+       {
+               private final IModel<Integer> integer;
+
+               public IntToLongModel(IModel<Integer> integer)
+               {
+                       this.integer = integer;
+               }
+
+               @Override
+               public void detach()
+               {
+                       integer.detach();
+               }
+
+               @Override
+               public Long getObject()
+               {
+                       return (long)integer.getObject();
+               }
+
+               @Override
+               public void setObject(Long object)
+               {
+                       integer.setObject((object == null) ? null : 
object.intValue());
+               }
+
+
+       }
 }