You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jr...@apache.org on 2010/06/16 03:17:22 UTC
svn commit: r955105 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
Author: jrthomerson
Date: Wed Jun 16 01:17:22 2010
New Revision: 955105
URL: http://svn.apache.org/viewvc?rev=955105&view=rev
Log:
fixes WICKET-2909 in trunk
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=955105&r1=955104&r2=955105&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java Wed Jun 16 01:17:22 2010
@@ -264,7 +264,7 @@ public abstract class ListView<T> extend
@Override
public void onClick()
{
- final int index = getList().indexOf(item.getModelObject());
+ final int index = item.getIndex();
if (index != -1)
{
addStateChange();
@@ -275,19 +275,12 @@ public abstract class ListView<T> extend
}
}
- /**
- * @see org.apache.wicket.Component#onBeforeRender()
- */
@Override
- protected void onBeforeRender()
+ public boolean isEnabled()
{
- super.onBeforeRender();
- setAutoEnable(false);
- if (getList().indexOf(item.getModelObject()) == (getList().size() - 1))
- {
- setEnabled(false);
- }
+ return item.getIndex() != (getList().size() - 1);
}
+
};
}
@@ -311,7 +304,7 @@ public abstract class ListView<T> extend
@Override
public void onClick()
{
- final int index = getList().indexOf(item.getModelObject());
+ final int index = item.getIndex();
if (index != -1)
{
@@ -323,18 +316,10 @@ public abstract class ListView<T> extend
}
}
- /**
- * @see org.apache.wicket.Component#onBeforeRender()
- */
@Override
- protected void onBeforeRender()
+ public boolean isEnabled()
{
- super.onBeforeRender();
- setAutoEnable(false);
- if (getList().indexOf(item.getModelObject()) == 0)
- {
- setEnabled(false);
- }
+ return item.getIndex() != 0;
}
};
}
@@ -364,7 +349,7 @@ public abstract class ListView<T> extend
item.modelChanging();
// Remove item and invalidate listView
- getList().remove(item.getModelObject());
+ getList().remove(item.getIndex());
ListView.this.modelChanged();
ListView.this.removeAll();