Fixed bug #4668 - C# compiler doesn't like decimal in custom attribute values, so...

[mono.git] / mcs / class / System.XML / System.Xml.Serialization / XmlChoiceIdentifierAttribute.cs

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
index 2daae2bef21a8440e6a041f25b19b886616df1d5..cf1434afff2497758d294f9e84a6cc9ee47bae2e 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
@@ -28,41 +28,55 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;\r
-\r
-namespace System.Xml.Serialization\r
-{\r
-       /// <summary>\r
-       /// Summary description for XmlChoiceIdentifierAttribute.\r
-       /// </summary>\r
-       [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field\r
-                | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]\r
-       public class XmlChoiceIdentifierAttribute : Attribute\r
-       {\r
-               private string memberName;\r
-\r
-               public XmlChoiceIdentifierAttribute ()\r
-               {\r
-               }\r
-               public XmlChoiceIdentifierAttribute (string name)\r
-               {\r
-                       MemberName = name;\r
-               }\r
-\r
-               public string MemberName {\r
+using System;
+using System.Reflection;
+
+namespace System.Xml.Serialization
+{
+       /// <summary>
+       /// Summary description for XmlChoiceIdentifierAttribute.
+       /// </summary>
+       [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field
+                | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
+       public class XmlChoiceIdentifierAttribute : Attribute
+       {
+               private string memberName;
+
+               public XmlChoiceIdentifierAttribute ()
+               {
+               }
+               public XmlChoiceIdentifierAttribute (string name)
+               {
+                       memberName = name;
+               }
+
+               public string MemberName {
                        get {
+                               if (memberName == null) {
+                                       return string.Empty;
+                               }
                                return memberName;
-                       } \r
+                       }
+                       set { memberName = value; }
+               }
+
+#if NET_2_1
+               MemberInfo member;
+               // It is used only in 2.1 S.X.Serialization.dll in MS SDK.
+               internal MemberInfo MemberInfo {
+                       get { return member; }
                        set {
-                               memberName = value;
-                       }\r
-               }\r
-               \r
-               internal void AddKeyHash (System.Text.StringBuilder sb)\r
-               {\r
-                       sb.Append ("XCA ");\r
-                       KeyHelper.AddField (sb, 1, memberName);\r
-                       sb.Append ('|');\r
-               }\r
-       }\r
-}\r
+                               MemberName = value != null ? value.Name : null;
+                               member = value;
+                       }
+               }
+#endif
+
+               internal void AddKeyHash (System.Text.StringBuilder sb)
+               {
+                       sb.Append ("XCA ");
+                       KeyHelper.AddField (sb, 1, memberName);
+                       sb.Append ('|');
+               }
+       }
+}