New test.

[mono.git] / mcs / class / System.Web / System.Web.Configuration_2.0 / ExpressionBuilder.cs

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilder.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilder.cs
index c20e2038d7ad0779c69b1660a4fa7333862d555f..7353b3b25d544b754be5728f582c57023a745b3c 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilder.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ExpressionBuilder.cs
@@ -3,6 +3,7 @@
 //
 // Authors:
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//     Chris Toshok (toshok@ximian.com)
 //
 // (C) 2005 Novell, Inc (http://www.novell.com)
 //
@@ -27,45 +28,71 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+
 using System;
-using System.Collections;
+using System.ComponentModel;
 using System.Configuration;
 
-namespace System.Web.Configuration
-{
+#if NET_2_0
+
+namespace System.Web.Configuration {
+
        public sealed class ExpressionBuilder : ConfigurationElement
        {
-               static ConfigurationPropertyCollection props;
-               static ConfigurationProperty expressionPrefix;
-               static ConfigurationProperty type;
+               static ConfigurationProperty expressionPrefixProp;
+               static ConfigurationProperty typeProp;
+               static ConfigurationPropertyCollection properties;
 
                static ExpressionBuilder ()
                {
-/*                     ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.Required | ConfigurationPropertyFlags.IsKey;
-                       type = new NonEmptyStringConfigurationProperty ("type", "", flags);
-                       flags = ConfigurationPropertyFlags.Required;
-                       expressionPrefix = new NonEmptyStringConfigurationProperty ("expressionPrefix", "", flags);
+                       expressionPrefixProp = new ConfigurationProperty ("expressionPrefix", typeof (string), "",
+                                                                         TypeDescriptor.GetConverter (typeof (string)),
+                                                                         PropertyHelper.NonEmptyStringValidator,
+                                                                         ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey);
+                       typeProp = new ConfigurationProperty ("type", typeof (string), "",
+                                                             TypeDescriptor.GetConverter (typeof (string)),
+                                                             PropertyHelper.NonEmptyStringValidator,
+                                                             ConfigurationPropertyOptions.IsRequired);
+                       properties = new ConfigurationPropertyCollection ();
+
+                       properties.Add (expressionPrefixProp);
+                       properties.Add (typeProp);
+               }
+
+               internal ExpressionBuilder ()
+               {
+               }
 
-                       props = new ConfigurationPropertyCollection ();
-                       props.Add (type);
-                       props.Add (expressionPrefix);
-*/             }
+               public ExpressionBuilder (string expressionPrefix, string theType)
+               {
+                       this.ExpressionPrefix = expressionPrefix;
+                       this.Type = theType;
+               }
 
+               [StringValidator (MinLength = 1)]
+               [ConfigurationProperty ("expressionPrefix", DefaultValue = "", Options = ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
                public string ExpressionPrefix {
-                       get { return (string) this [expressionPrefix]; }
-                       set { this [expressionPrefix] = value; }
+                       get { return (string) base[expressionPrefixProp]; }
+                       set { base[expressionPrefixProp] = value; }
                }
 
+               [StringValidator (MinLength = 1)]
+               [ConfigurationProperty ("type", DefaultValue = "", Options = ConfigurationPropertyOptions.IsRequired)]
                public string Type {
-                       get { return (string) this [type]; }
-                       set { this [type] = value; }
+                       get { return (string) base[typeProp]; }
+                       set { base[typeProp] = value; }
+               }
+
+               internal Type TypeInternal {
+                       get {
+                               return System.Type.GetType (this.Type, true);
+                       }
                }
 
                protected override ConfigurationPropertyCollection Properties {
-                       get { return props; }
+                       get { return properties; }
                }
        }
 }
-#endif // NET_2_0
 
+#endif