Author: toshok
Date: 2005-09-23 13:59:20 -0400 (Fri, 23 Sep 2005)
New Revision: 50599
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationProperty.cs
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyAttribute.cs
trunk/mcs/class/System.Configuration/System.Configuration/ConnectionStringSettings.cs
trunk/mcs/class/System.Configuration/System.Configuration/ProviderSettings.cs
Log:
2005-09-23 Chris Toshok <[EMAIL PROTECTED]>
* ConfigurationPropertyAttribute.cs, ConfigurationProperty.cs,
ProviderSettings.cs: track change to ConfigurationPropertyOptions.
* ConnectionStringSettings.cs: track change to
ConfigurationProprertyOptions, and add some ConfigurationProperty
attributes.
* ConfigurationPropertyOptions.cs: DefaultCollection ->
IsDefaultCollection, Required -> IsRequired.
Modified: trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
2005-09-23 17:55:31 UTC (rev 50598)
+++ trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
2005-09-23 17:59:20 UTC (rev 50599)
@@ -1,3 +1,15 @@
+2005-09-23 Chris Toshok <[EMAIL PROTECTED]>
+
+ * ConfigurationPropertyAttribute.cs, ConfigurationProperty.cs,
+ ProviderSettings.cs: track change to ConfigurationPropertyOptions.
+
+ * ConnectionStringSettings.cs: track change to
+ ConfigurationProprertyOptions, and add some ConfigurationProperty
+ attributes.
+
+ * ConfigurationPropertyOptions.cs: DefaultCollection ->
+ IsDefaultCollection, Required -> IsRequired.
+
2005-09-22 Chris Toshok <[EMAIL PROTECTED]>
* PositiveTimeSpanValidator.cs: this lives in
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationProperty.cs
===================================================================
---
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationProperty.cs
2005-09-23 17:55:31 UTC (rev 50598)
+++
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationProperty.cs
2005-09-23 17:59:20 UTC (rev 50599)
@@ -96,7 +96,7 @@
}
public bool IsRequired {
- get { return (flags &
ConfigurationPropertyOptions.Required) != 0; }
+ get { return (flags &
ConfigurationPropertyOptions.IsRequired) != 0; }
}
public string Name {
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyAttribute.cs
===================================================================
---
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyAttribute.cs
2005-09-23 17:55:31 UTC (rev 50598)
+++
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationPropertyAttribute.cs
2005-09-23 17:59:20 UTC (rev 50599)
@@ -43,7 +43,7 @@
this.name = name;
}
- public bool IsCollectionKey {
+ public bool IsKey {
get { return (flags &
ConfigurationPropertyOptions.IsKey) != 0; }
set {
if (value) flags |=
ConfigurationPropertyOptions.IsKey;
@@ -51,11 +51,11 @@
}
}
- public bool IsDefaultCollectionProperty {
- get { return (flags &
ConfigurationPropertyOptions.DefaultCollection) != 0; }
+ public bool IsDefaultCollection {
+ get { return (flags &
ConfigurationPropertyOptions.IsDefaultCollection) != 0; }
set {
- if (value) flags |=
ConfigurationPropertyOptions.DefaultCollection;
- else flags &=
~ConfigurationPropertyOptions.DefaultCollection;
+ if (value) flags |=
ConfigurationPropertyOptions.IsDefaultCollection;
+ else flags &=
~ConfigurationPropertyOptions.IsDefaultCollection;
}
}
@@ -73,11 +73,11 @@
get { return name; }
}
- public bool RequiredValue {
- get { return (flags &
ConfigurationPropertyOptions.Required) != 0; }
+ public bool IsRequired {
+ get { return (flags &
ConfigurationPropertyOptions.IsRequired) != 0; }
set {
- if (value) flags |=
ConfigurationPropertyOptions.Required;
- else flags &=
~ConfigurationPropertyOptions.Required;
+ if (value) flags |=
ConfigurationPropertyOptions.IsRequired;
+ else flags &=
~ConfigurationPropertyOptions.IsRequired;
}
}
}
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ConnectionStringSettings.cs
===================================================================
---
trunk/mcs/class/System.Configuration/System.Configuration/ConnectionStringSettings.cs
2005-09-23 17:55:31 UTC (rev 50598)
+++
trunk/mcs/class/System.Configuration/System.Configuration/ConnectionStringSettings.cs
2005-09-23 17:59:20 UTC (rev 50599)
@@ -56,20 +56,20 @@
_propName = new ConfigurationProperty ("name",
typeof(string),
"",
-
ConfigurationPropertyOptions.Required |
+
ConfigurationPropertyOptions.IsRequired |
ConfigurationPropertyOptions.IsKey
);
_propProviderName = new ConfigurationProperty
("providerName",
typeof
(string),
"",
-
ConfigurationPropertyOptions.Required
+
ConfigurationPropertyOptions.IsRequired
);
_propConnectionString = new ConfigurationProperty
("connectionString",
typeof (string),
"",
-
ConfigurationPropertyOptions.Required
+
ConfigurationPropertyOptions.IsRequired
);
_properties.Add (_propName);
@@ -104,18 +104,22 @@
return _properties;
}
}
+
+ [ConfigurationProperty ("name", DefaultValue = "", Options =
ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
public string Name
{
get { return (string) base [_propName];}
set { base [_propName] = value; }
}
+ [ConfigurationProperty ("providerName", DefaultValue =
"System.Data.SqlClient")]
public string ProviderName
{
get { return (string) base [_propProviderName]; }
set { base [_propProviderName] = value; }
}
+ [ConfigurationProperty ("connectionString", DefaultValue = "",
Options = ConfigurationPropertyOptions.IsRequired)]
public string ConnectionString
{
get { return (string) base [_propConnectionString]; }
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ProviderSettings.cs
===================================================================
---
trunk/mcs/class/System.Configuration/System.Configuration/ProviderSettings.cs
2005-09-23 17:55:31 UTC (rev 50598)
+++
trunk/mcs/class/System.Configuration/System.Configuration/ProviderSettings.cs
2005-09-23 17:59:20 UTC (rev 50599)
@@ -82,13 +82,13 @@
base.Unmerge (source, parent, serializeCollectionKey,
updateMode);
}
- [ConfigurationProperty ("name", Options =
ConfigurationPropertyOptions.Required | ConfigurationPropertyOptions.IsKey)]
+ [ConfigurationProperty ("name", Options =
ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
public string Name {
get { return (string) this ["name"]; }
set { this ["name"] = value; }
}
- [ConfigurationProperty ("type", Options =
ConfigurationPropertyOptions.Required)]
+ [ConfigurationProperty ("type", Options =
ConfigurationPropertyOptions.IsRequired)]
public string Type {
get { return (string) this ["type"]; }
set { this ["type"] = value; }
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
