Author: kostat
Date: 2007-05-30 08:02:34 -0400 (Wed, 30 May 2007)
New Revision: 78194
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSource.cs
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapDataSourceTest.cs
Log:
partial merge for 78130:78131, 78192:78193
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
2007-05-30 11:59:49 UTC (rev 78193)
+++
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceView.cs
2007-05-30 12:02:34 UTC (rev 78194)
@@ -294,7 +294,12 @@
private ConflictOptions conflictDetection =
ConflictOptions.OverwriteChanges;
public ConflictOptions ConflictDetection {
get { return conflictDetection; }
- set { conflictDetection = value; }
+ set {
+ if (ConflictDetection == value)
+ return;
+ conflictDetection = value;
+ OnDataSourceViewChanged (EventArgs.Empty);
+ }
}
public bool ConvertNullToDBNull {
@@ -306,9 +311,12 @@
get {
return dataObjectTypeName != null ?
dataObjectTypeName : string.Empty;
}
- set {
+ set {
+ if (DataObjectTypeName == value)
+ return;
dataObjectTypeName = value;
- dataObjectType = null;
+ dataObjectType = null;
+ OnDataSourceViewChanged (EventArgs.Empty);
}
}
@@ -334,8 +342,11 @@
get {
return enablePaging;
}
- set {
- enablePaging = value;
+ set {
+ if (EnablePaging == value)
+ return;
+ enablePaging = value;
+ OnDataSourceViewChanged (EventArgs.Empty);
}
}
@@ -343,8 +354,11 @@
get {
return filterExpression != null ?
filterExpression : string.Empty;
}
- set {
- filterExpression = value;
+ set {
+ if (FilterExpression == value)
+ return;
+ filterExpression = value;
+ OnDataSourceViewChanged (EventArgs.Empty);
}
}
@@ -382,8 +396,11 @@
get {
return maximumRowsParameterName != null ?
maximumRowsParameterName : "maximumRows";
}
- set {
- maximumRowsParameterName = value;
+ set {
+ if (MaximumRowsParameterName == value)
+ return;
+ maximumRowsParameterName = value;
+ OnDataSourceViewChanged (EventArgs.Empty);
}
}
@@ -391,8 +408,11 @@
get {
return oldValuesParameterFormatString != null ?
oldValuesParameterFormatString : "{0}";
}
- set {
- oldValuesParameterFormatString = value;
+ set {
+ if (OldValuesParameterFormatString == value)
+ return;
+ oldValuesParameterFormatString = value;
+ OnDataSourceViewChanged (EventArgs.Empty);
}
}
@@ -445,8 +465,11 @@
get {
return startRowIndexParameterName != null ?
startRowIndexParameterName : "startRowIndex";
}
- set {
- startRowIndexParameterName = value;
+ set {
+ if (StartRowIndexParameterName == value)
+ return;
+ startRowIndexParameterName = value;
+ OnDataSourceViewChanged (EventArgs.Empty);
}
}
@@ -454,9 +477,12 @@
get {
return typeName != null ? typeName :
string.Empty;
}
- set {
+ set {
+ if (TypeName == value)
+ return;
typeName = value;
- objectType = null;
+ objectType = null;
+ OnDataSourceViewChanged (EventArgs.Empty);
}
}
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSource.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSource.cs
2007-05-30 11:59:49 UTC (rev 78193)
+++
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSource.cs
2007-05-30 12:02:34 UTC (rev 78194)
@@ -131,7 +131,10 @@
[DefaultValue (0)]
public virtual int StartingNodeOffset {
get { return ViewState.GetInt ("StartingNodeOffset",
0); }
- set { ViewState["StartingNodeOffset"] = value; }
+ set {
+ ViewState ["StartingNodeOffset"] = value;
+ OnDataSourceChanged (EventArgs.Empty);
+ }
}
[DefaultValueAttribute (false)]
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
2007-05-30 11:59:49 UTC (rev 78193)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
2007-05-30 12:02:34 UTC (rev 78194)
@@ -980,7 +980,6 @@
#endregion
[Test]
- [Category ("NotWorking")]
public void ObjectDataSourceView_DataSourceViewChanged ()
{
ObjectDataSource ds = new ObjectDataSource ();
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapDataSourceTest.cs
===================================================================
---
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapDataSourceTest.cs
2007-05-30 11:59:49 UTC (rev 78193)
+++
branches/mainsoft/gh20/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapDataSourceTest.cs
2007-05-30 12:02:34 UTC (rev 78194)
@@ -125,7 +125,6 @@
[Test]
- [Category("NotWorking")]
public void SiteMapDataSource_DataSourceChanged ()
{
PokerSiteMapDataSource p = new PokerSiteMapDataSource
();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
