2006-04-27 Atsushi Enomoto <atsushi@ximian.com>

	* SettingElement.cs : more circular dependency fix.

svn path=/trunk/mcs/; revision=60001

diff --git a/mcs/class/System/System.Configuration/ChangeLog b/mcs/class/System/System.Configuration/ChangeLog
index 31d1251a014008be36ea960b4db36d64a0e5f921..3d291f5693ba92674dbc9cb2e64b0796643a0988 100644 (file)
--- a/mcs/class/System/System.Configuration/ChangeLog
+++ b/mcs/class/System/System.Configuration/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-27  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SettingElement.cs : more circular dependency fix.
+
 2006-04-27  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SettingValueElement.cs,

diff --git a/mcs/class/System/System.Configuration/SettingElement.cs b/mcs/class/System/System.Configuration/SettingElement.cs
index 7a19f545d94975e387b3730a8fdd11ea1c843064..254c581b30f922c6b20cc54bad7bc2b80ca3c8f8 100644 (file)
--- a/mcs/class/System/System.Configuration/SettingElement.cs
+++ b/mcs/class/System/System.Configuration/SettingElement.cs
@@ -62,42 +62,37 @@ namespace System.Configuration
                public SettingElement (string name,
                                       SettingsSerializeAs serializeAs)
                {
+#if CONFIGURATION_DEP
                        Name = name;
                        SerializeAs = serializeAs;
+#endif
                }
 
 #if (CONFIGURATION_DEP)
                [ConfigurationProperty ("name", DefaultValue="",
                                        Options = ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
-#endif
                public string Name {
                        get { return (string) base [name_prop]; }
                        set { base [name_prop] = value; } // it does not reject null
                }
 
-#if (CONFIGURATION_DEP)
                [ConfigurationProperty ("value", DefaultValue=null,
                                        Options = ConfigurationPropertyOptions.IsRequired)]
-#endif
                public SettingValueElement Value {
                        get { return (SettingValueElement) base [value_prop]; }
                        set { base [value_prop] = value; }
                }
 
-#if (CONFIGURATION_DEP)
                [ConfigurationProperty ("serializeAs", DefaultValue=SettingsSerializeAs.String,
                                        Options = ConfigurationPropertyOptions.IsRequired)]
-#endif
                public SettingsSerializeAs SerializeAs {
                        get { return base [serialize_as_prop] != null ? (SettingsSerializeAs) base [serialize_as_prop] : default (SettingsSerializeAs); }
                        set { base [serialize_as_prop] = value; }
                }
 
-#if (CONFIGURATION_DEP)
                protected override ConfigurationPropertyCollection Properties {
                        get { return properties; }
                }
-#endif
 
                public override bool Equals (object o)
                {
@@ -117,6 +112,7 @@ namespace System.Configuration
                                v += Value.GetHashCode ();
                        return v;
                }
+#endif
        }
 
 }