Author: lluis
Date: 2005-04-01 12:29:02 -0500 (Fri, 01 Apr 2005)
New Revision: 42468
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
trunk/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
trunk/mcs/class/System.Web/System.Web.UI/ITextControl.cs
Log:
2005-04-01 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* DataSourceView.cs: Rethrow exceptions not handled by operation
callbacks.
* ITextControl.cs: Removed event.
* CollectionBuilder.cs: Don't crash when a collection has more
than one indexer.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2005-04-01 17:28:43 UTC
(rev 42467)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2005-04-01 17:29:02 UTC
(rev 42468)
@@ -1,3 +1,11 @@
+2005-04-01 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * DataSourceView.cs: Rethrow exceptions not handled by operation
+ callbacks.
+ * ITextControl.cs: Removed event.
+ * CollectionBuilder.cs: Don't crash when a collection has more
+ than one indexer.
+
2005-03-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* Control.cs: Added a new internal property: HasRenderMethodDelegate.
Modified: trunk/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
2005-04-01 17:28:43 UTC (rev 42467)
+++ trunk/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
2005-04-01 17:29:02 UTC (rev 42468)
@@ -69,7 +69,10 @@
PropertyInfo prop =
parentBuilder.ControlType.GetProperty (tagName, flagsNoCase);
SetControlType (prop.PropertyType);
- prop = ControlType.GetProperty ("Item", flagsNoCase &
~BindingFlags.IgnoreCase);
+ MemberInfo[] mems = ControlType.GetMember ("Item",
MemberTypes.Property, flagsNoCase & ~BindingFlags.IgnoreCase);
+ if (mems.Length > 0) prop = (PropertyInfo) mems [0];
+ else throw new HttpException ("Collection of type '" +
ControlType + "' does not have an indexer.");
+
elementType = prop.PropertyType;
}
}
Modified: trunk/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/DataSourceView.cs 2005-04-01
17:28:43 UTC (rev 42467)
+++ trunk/mcs/class/System.Web/System.Web.UI/DataSourceView.cs 2005-04-01
17:29:02 UTC (rev 42468)
@@ -67,7 +67,8 @@
passOn = e;
}
- callBack (rowAffected, passOn);
+ if (!callBack (rowAffected, passOn) && passOn != null)
+ throw passOn;
}
protected virtual int ExecuteDelete(IDictionary keys,
IDictionary values)
@@ -103,7 +104,8 @@
passOn = e;
}
- callBack (rowAffected, passOn);
+ if (!callBack (rowAffected, passOn) && passOn != null)
+ throw passOn;
}
protected virtual void OnDataSourceViewChanged (EventArgs
eventArgs)
@@ -157,7 +159,9 @@
passOn = e;
}
- callBack (rowAffected, passOn);
+ if (!callBack (rowAffected, passOn) && passOn != null)
+ throw passOn;
+
return rowAffected;
}
Modified: trunk/mcs/class/System.Web/System.Web.UI/ITextControl.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ITextControl.cs 2005-04-01
17:28:43 UTC (rev 42467)
+++ trunk/mcs/class/System.Web/System.Web.UI/ITextControl.cs 2005-04-01
17:29:02 UTC (rev 42468)
@@ -36,7 +36,6 @@
public interface ITextControl
{
string Text { get; set; }
- event EventHandler TextChanged;
}
}
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
