Author: toshok
Date: 2005-11-14 23:48:53 -0500 (Mon, 14 Nov 2005)
New Revision: 53037
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BufferModeSettings.cs
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProvider.cs
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/Compiler.cs
Log:
2005-11-14 Chris Toshok <[EMAIL PROTECTED]>
* BufferModeSettings.cs: add validators/converters to the
programmatic property list.
* BuildProvider.cs: add validators/converters to the programmatic
property list, and add an internal ctor with no args.
* Compiler.cs: wrap the code i hacked from the 1.1 stuff with a
#region.
* BuildProviderCollection.cs (CreateNewElement): use the internal
BuildProvider ctor to get around validation.
* AssemblyCollection.cs: same.
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs
2005-11-15 04:44:33 UTC (rev 53036)
+++
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/AssemblyCollection.cs
2005-11-15 04:48:53 UTC (rev 53037)
@@ -58,7 +58,7 @@
protected override ConfigurationElement CreateNewElement ()
{
- return new AssemblyInfo ("");
+ return new AssemblyInfo ();
}
protected override object GetElementKey (ConfigurationElement
element)
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BufferModeSettings.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BufferModeSettings.cs
2005-11-15 04:44:33 UTC (rev 53036)
+++
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BufferModeSettings.cs
2005-11-15 04:48:53 UTC (rev 53037)
@@ -49,13 +49,23 @@
static BufferModeSettings ()
{
- maxBufferSizeProp = new ConfigurationProperty
("maxBufferSize", typeof (int), Int32.MaxValue,
ConfigurationPropertyOptions.IsRequired);
- maxBufferThreadsProp = new ConfigurationProperty
("maxBufferThreads", typeof (int), 1);
- maxFlushSizeProp = new ConfigurationProperty
("maxFlushSize", typeof (int), Int32.MaxValue,
ConfigurationPropertyOptions.IsRequired);
- nameProp = new ConfigurationProperty ("name", typeof
(string), "", ConfigurationPropertyOptions.IsRequired |
ConfigurationPropertyOptions.IsKey);
- regularFlushIntervalProp = new ConfigurationProperty
("regularFlushInterval", typeof (TimeSpan), TimeSpan.FromSeconds (1),
ConfigurationPropertyOptions.IsRequired);
- urgentFlushIntervalProp = new ConfigurationProperty
("urgentFlushInterval", typeof (TimeSpan), TimeSpan.FromSeconds (0),
ConfigurationPropertyOptions.IsRequired);
- urgentFlushThresholdProp = new ConfigurationProperty
("urgentFlushThreshold", typeof (int), Int32.MaxValue,
ConfigurationPropertyOptions.IsRequired);
+ InfiniteIntConverter infIntCvt = new
InfiniteIntConverter ();
+ IntegerValidator iv = new IntegerValidator (1,
Int32.MaxValue);
+ InfiniteTimeSpanConverter infTSCvt = new
InfiniteTimeSpanConverter ();
+
+ maxBufferSizeProp = new ConfigurationProperty
("maxBufferSize", typeof (int), Int32.MaxValue, infIntCvt, iv,
ConfigurationPropertyOptions.IsRequired);
+ maxBufferThreadsProp = new ConfigurationProperty
("maxBufferThreads", typeof (int), 1, infIntCvt, iv,
ConfigurationPropertyOptions.None);
+ maxFlushSizeProp = new ConfigurationProperty
("maxFlushSize", typeof (int), Int32.MaxValue, infIntCvt, iv,
ConfigurationPropertyOptions.IsRequired);
+ nameProp = new ConfigurationProperty ("name", typeof
(string), "", null, new StringValidator (1),
ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey);
+ regularFlushIntervalProp = new ConfigurationProperty
("regularFlushInterval", typeof (TimeSpan), TimeSpan.FromSeconds (1),
+
infTSCvt, new TimeSpanValidator (TimeSpan.Zero, TimeSpan.MaxValue),
+
ConfigurationPropertyOptions.IsRequired);
+ urgentFlushIntervalProp = new ConfigurationProperty
("urgentFlushInterval", typeof (TimeSpan), TimeSpan.FromSeconds (0),
+
infTSCvt, null,
+
ConfigurationPropertyOptions.IsRequired);
+ urgentFlushThresholdProp = new ConfigurationProperty
("urgentFlushThreshold", typeof (int), Int32.MaxValue,
+
infIntCvt, iv,
+
ConfigurationPropertyOptions.IsRequired);
properties = new ConfigurationPropertyCollection ();
properties.Add (maxBufferSizeProp);
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProvider.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProvider.cs
2005-11-15 04:44:33 UTC (rev 53036)
+++ trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProvider.cs
2005-11-15 04:48:53 UTC (rev 53037)
@@ -43,14 +43,19 @@
static BuildProvider ()
{
- extensionProp = new ConfigurationProperty ("extension",
typeof (string), "", ConfigurationPropertyOptions.IsRequired |
ConfigurationPropertyOptions.IsKey);
- typeProp = new ConfigurationProperty ("type", typeof
(string), "", ConfigurationPropertyOptions.IsRequired);
+ StringValidator sv = new StringValidator (1);
+ extensionProp = new ConfigurationProperty ("extension",
typeof (string), "", null, sv, ConfigurationPropertyOptions.IsRequired |
ConfigurationPropertyOptions.IsKey);
+ typeProp = new ConfigurationProperty ("type", typeof
(string), "", null, sv, ConfigurationPropertyOptions.IsRequired);
properties = new ConfigurationPropertyCollection();
properties.Add (extensionProp);
properties.Add (typeProp);
}
+ internal BuildProvider ()
+ {
+ }
+
public BuildProvider (string extension, string type)
{
this.Extension = extension;
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs
2005-11-15 04:44:33 UTC (rev 53036)
+++
trunk/mcs/class/System.Web/System.Web.Configuration_2.0/BuildProviderCollection.cs
2005-11-15 04:48:53 UTC (rev 53037)
@@ -84,7 +84,7 @@
protected override ConfigurationElement CreateNewElement ()
{
- return new BuildProvider (null, null);
+ return new BuildProvider ();
}
protected override object GetElementKey (ConfigurationElement
element)
Modified: trunk/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
2005-11-15 04:44:33 UTC (rev 53036)
+++ trunk/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
2005-11-15 04:48:53 UTC (rev 53037)
@@ -1,5 +1,21 @@
2005-11-14 Chris Toshok <[EMAIL PROTECTED]>
+ * BufferModeSettings.cs: add validators/converters to the
+ programmatic property list.
+
+ * BuildProvider.cs: add validators/converters to the programmatic
+ property list, and add an internal ctor with no args.
+
+ * Compiler.cs: wrap the code i hacked from the 1.1 stuff with a
+ #region.
+
+ * BuildProviderCollection.cs (CreateNewElement): use the internal
+ BuildProvider ctor to get around validation.
+
+ * AssemblyCollection.cs: same.
+
+2005-11-14 Chris Toshok <[EMAIL PROTECTED]>
+
* TagPrefixCollection.cs (Remove): pass the key to BaseRemove.
(set_Item (int index)): implement.
Modified: trunk/mcs/class/System.Web/System.Web.Configuration_2.0/Compiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration_2.0/Compiler.cs
2005-11-15 04:44:33 UTC (rev 53036)
+++ trunk/mcs/class/System.Web/System.Web.Configuration_2.0/Compiler.cs
2005-11-15 04:48:53 UTC (rev 53037)
@@ -110,6 +110,7 @@
get { return properties; }
}
+#region CompatabilityCode
[MonoTODO ("we shouldn't need this")]
CodeDomProvider provider;
internal CodeDomProvider Provider {
@@ -124,6 +125,7 @@
provider = value;
}
}
+#endregion
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
