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 2011/11/28 18:21:31 UTC
svn commit: r1207472 - in /wicket/trunk:
wicket-core/src/main/java/org/apache/wicket/markup/html/list/
wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/t...
Author: ivaynberg
Date: Mon Nov 28 17:21:30 2011
New Revision: 1207472
URL: http://svn.apache.org/viewvc?rev=1207472&view=rev
Log:
reverting loop to using ints
Issue: WICKET-1175
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/Loop.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.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=1207472&r1=1207471&r2=1207472&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 Mon Nov 28 17:21:30 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 long iterations)
+ public Loop(final String id, final int iterations)
{
- super(id, new Model<Long>(iterations));
+ super(id, new Model<Integer>(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<Long> model)
+ public Loop(final String id, final IModel<Integer> model)
{
super(id, model);
}
@@ -71,9 +71,9 @@ public abstract class Loop extends Abstr
/**
* @return The number of loop iterations
*/
- public final long getIterations()
+ public final int getIterations()
{
- return (Long)getDefaultModelObject();
+ return (Integer)getDefaultModelObject();
}
/**
@@ -86,11 +86,11 @@ public abstract class Loop extends Abstr
removeAll();
// Get number of iterations
- final long iterations = getIterations();
+ final int iterations = getIterations();
if (iterations > 0)
{
// Create LoopItems for each iteration
- for (long iteration = 0; iteration < iterations; iteration++)
+ for (int iteration = 0; iteration < iterations; iteration++)
{
// Create item for loop iteration
LoopItem item = newItem(iteration);
@@ -109,7 +109,7 @@ public abstract class Loop extends Abstr
* iteration in the loop
* @return LoopItem
*/
- protected LoopItem newItem(long iteration)
+ protected LoopItem newItem(int iteration)
{
return new LoopItem(iteration);
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java?rev=1207472&r1=1207471&r2=1207472&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/list/LoopItem.java Mon Nov 28 17:21:30 2011
@@ -28,7 +28,7 @@ public class LoopItem extends AbstractIt
private static final long serialVersionUID = 1L;
/** The index of the ListItem in the parent ListView */
- private long index;
+ private int index;
/**
* Constructor
@@ -36,7 +36,7 @@ public class LoopItem extends AbstractIt
* @param index
* The index of the item
*/
- public LoopItem(final long index)
+ public LoopItem(final int index)
{
super(index);
this.index = index;
@@ -51,7 +51,7 @@ public class LoopItem extends AbstractIt
* @param model
* The model object of the item
*/
- public LoopItem(final long index, final IModel<?> model)
+ public LoopItem(final int index, final IModel<?> model)
{
super(index, model);
this.index = index;
@@ -92,7 +92,7 @@ public class LoopItem extends AbstractIt
*
* @return The index of this listItem in the parent listView
*/
- public final long getIndex()
+ public final int getIndex()
{
return index;
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java?rev=1207472&r1=1207471&r2=1207472&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java Mon Nov 28 17:21:30 2011
@@ -137,7 +137,7 @@ public class PagingNavigation extends Lo
/**
* The maximum number of page links to show.
*/
- private long viewSize = 10;
+ private int viewSize = 10;
/**
@@ -201,7 +201,7 @@ public class PagingNavigation extends Lo
*
* @return view size
*/
- public long getViewSize()
+ public int getViewSize()
{
return viewSize;
}
@@ -242,7 +242,8 @@ public class PagingNavigation extends Lo
@Override
protected void onBeforeRender()
{
- setDefaultModel(new Model<Long>(pageable.getPageCount()));
+ setDefaultModel(new Model<Integer>(
+ (int)Math.max(Integer.MAX_VALUE, pageable.getPageCount())));
// PagingNavigation itself (as well as the PageableListView)
// may have pages.
@@ -337,7 +338,7 @@ public class PagingNavigation extends Lo
long firstListItem = startIndex;
// How many page links shall be displayed
- long viewSize = Math.min(getViewSize(), pageable.getPageCount());
+ int viewSize = (int)Math.min(getViewSize(), pageable.getPageCount());
long margin = getMargin();
// What is the PageableListView's page index to be displayed
@@ -375,7 +376,7 @@ public class PagingNavigation extends Lo
addStateChange();
startIndex = firstListItem;
- setIterations(Math.min(viewSize, pageable.getPageCount()));
+ setIterations((int)Math.min(viewSize, pageable.getPageCount()));
modelChanged();
@@ -390,7 +391,7 @@ public class PagingNavigation extends Lo
* @param i
* the number of iterations
*/
- private void setIterations(long i)
+ private void setIterations(int i)
{
setDefaultModelObject(i);
}
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=1207472&r1=1207471&r2=1207472&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 Mon Nov 28 17:21:30 2011
@@ -94,14 +94,14 @@ public class TabbedPanel extends Panel
this.tabs = Args.notNull(tabs, "tabs");
- final IModel<Long> tabCount = new AbstractReadOnlyModel<Long>()
+ final IModel<Integer> tabCount = new AbstractReadOnlyModel<Integer>()
{
private static final long serialVersionUID = 1L;
@Override
- public Long getObject()
+ public Integer getObject()
{
- return (long)TabbedPanel.this.tabs.size();
+ return TabbedPanel.this.tabs.size();
}
};
@@ -116,7 +116,7 @@ public class TabbedPanel extends Panel
@Override
protected void populateItem(final LoopItem item)
{
- final int index = (int)item.getIndex();
+ final int index = item.getIndex();
final ITab tab = TabbedPanel.this.tabs.get(index);
final WebMarkupContainer titleLink = newLink("link", index);
@@ -126,7 +126,7 @@ public class TabbedPanel extends Panel
}
@Override
- protected LoopItem newItem(final long iteration)
+ protected LoopItem newItem(final int iteration)
{
return newTabContainer(iteration);
}
@@ -162,7 +162,7 @@ public class TabbedPanel extends Panel
* @param tabIndex
* @return new loop item
*/
- protected LoopItem newTabContainer(final long tabIndex)
+ protected LoopItem newTabContainer(final int tabIndex)
{
return new LoopItem(tabIndex)
{
@@ -193,7 +193,7 @@ public class TabbedPanel extends Panel
@Override
public boolean isVisible()
{
- return getTabs().get((int)tabIndex).isVisible();
+ return getTabs().get(tabIndex).isVisible();
}
};
}
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=1207472&r1=1207471&r2=1207472&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 Mon Nov 28 17:21:30 2011
@@ -104,7 +104,7 @@ public abstract class RatingPanel extend
private RatingStarBar(final String id, final IModel<Integer> model)
{
- super(id, new IntToLongModel(model));
+ super(id, model);
}
@Override
@@ -125,7 +125,7 @@ public abstract class RatingPanel extend
// of our rating component, so other components can also get
// updated in case of an AJAX event.
- onRated((int)(item.getIndex() + 1), target);
+ onRated(item.getIndex() + 1, target);
// if we process an AJAX event, update this panel
if (target != null)
@@ -141,7 +141,7 @@ public abstract class RatingPanel extend
}
};
- int iteration = (int)item.getIndex();
+ int iteration = item.getIndex();
// add the star image, which is either active (highlighted) or
// inactive (no star)
@@ -432,39 +432,4 @@ 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());
- }
-
-
- }
}