2006-10-29 Igor Zelmanovich <[email protected]>

	* ListControl.cs: fixed: DataBinding for 2.0.
	for 1.x refactoring only.	


svn path=/trunk/mcs/; revision=67078

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,8 @@
+2006-10-29 Igor Zelmanovich <[email protected]>
+
+	* ListControl.cs: fixed: DataBinding for 2.0.
+	for 1.x refactoring only.	
+
 2006-10-25 Igor Zelmanovich <[email protected]>
 
 	* ChangePassword.cs: new class was implemented.

mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs

@@ -325,9 +325,11 @@ namespace System.Web.UI.WebControls {
 		{
 			base.OnDataBinding (e);
 
+#if !NET_2_0
 			IEnumerable list = DataSourceResolver.ResolveDataSource (DataSource, DataMember);
 			if (list == null)
 				return;
+#endif
 
 #if NET_2_0
 			if (!AppendDataBoundItems)
@@ -337,14 +339,6 @@ namespace System.Web.UI.WebControls {
 #if !NET_2_0
 			DoDataBinding (list);
 #endif
-			if (saved_selected_value != null) {
-				SelectedValue = saved_selected_value;
-				if (saved_selected_index != -2 && saved_selected_index != SelectedIndex)
-					throw new ArgumentException ("SelectedIndex and SelectedValue are mutually exclusive.");
-			} else if (saved_selected_index != -2) {
-				SelectedIndex = saved_selected_index;
-				// No need to check saved_selected_value here, as it's done before.
-			}
 		}
 
 #if NET_2_0
@@ -392,6 +386,16 @@ namespace System.Web.UI.WebControls {
 					coll.Add (new ListItem (text, val));
 				}
 			}
+			
+			if (saved_selected_value != null) {
+				SelectedValue = saved_selected_value;
+				if (saved_selected_index != -2 && saved_selected_index != SelectedIndex)
+					throw new ArgumentException ("SelectedIndex and SelectedValue are mutually exclusive.");
+			}
+			else if (saved_selected_index != -2) {
+				SelectedIndex = saved_selected_index;
+				// No need to check saved_selected_value here, as it's done before.
+			}
 		}
 
 #if NET_2_0
@@ -562,3 +566,4 @@ namespace System.Web.UI.WebControls {
 	}
 }
 
+

mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,7 @@
+2006-10-29 Igor Zelmanovich <[email protected]>
+
+	* ListControlTest.cs: removed NotWorking attributes
+			
 2006-10-26 Yoni Klain <[email protected]>
 	
 	* Changed tests for to be runned on run-tests-ondotnet,

mcs/class/System.Web/Test/System.Web.UI.WebControls/ListControlTest.cs

@@ -365,7 +365,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-        [Category ("NotWorking")]
 		public void DataBinding1 ()
 		{
 			ListControlPoker p = new ListControlPoker ();
@@ -395,7 +394,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-        [Category("NotWorking")]
 		public void DataBinding3 ()
 		{
 			ListControlPoker p = new ListControlPoker ();
@@ -445,7 +443,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-        [Category("NotWorking")]
 		public void DataBinding5 ()
 		{
 			ListControlPoker p = new ListControlPoker ();
@@ -463,7 +460,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-        [Category("NotWorking")]
 		public void DataBindingFormat1 ()
 		{
 			ListControlPoker p = new ListControlPoker ();
@@ -479,7 +475,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-        [Category("NotWorking")]
 		public void DataBindingFormat2 ()
 		{
 			ListControlPoker p = new ListControlPoker ();
@@ -558,3 +553,4 @@ namespace MonoTests.System.Web.UI.WebControls {
 	}
 }
 
+