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 2007/08/08 22:55:09 UTC

svn commit: r564018 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java

Author: ivaynberg
Date: Wed Aug  8 13:55:08 2007
New Revision: 564018

URL: http://svn.apache.org/viewvc?view=rev&rev=564018
Log:
detach cleanup

Modified:
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java?view=diff&rev=564018&r1=564017&r2=564018
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/data/DataViewBase.java Wed Aug  8 13:55:08 2007
@@ -21,7 +21,6 @@
 import org.apache.wicket.markup.html.navigation.paging.IPageable;
 import org.apache.wicket.markup.repeater.AbstractPageableView;
 import org.apache.wicket.markup.repeater.RefreshingView;
-import org.apache.wicket.model.IDetachable;
 
 
 /**
@@ -99,9 +98,9 @@
 		 */
 		public ModelIterator(IDataProvider dataProvider, int offset, int count)
 		{
-			this.items = dataProvider.iterator(offset, count);
+			items = dataProvider.iterator(offset, count);
 			this.dataProvider = dataProvider;
-			this.max = count;
+			max = count;
 		}
 
 		/**
@@ -140,10 +139,7 @@
 	 */
 	protected void onDetach()
 	{
+		dataProvider.detach();
 		super.onDetach();
-		if (dataProvider instanceof IDetachable)
-		{
-			((IDetachable)dataProvider).detach();
-		}
 	}
 }