Moved chain building and validation from Mono.Security to System

[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 492889eda93345d7979d8ebbf6b0b8962734d97e..cf1434afff2497758d294f9e84a6cc9ee47bae2e 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
@@ -7,41 +7,76 @@
 // (C) 2002 John Donagher
 //
 
-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
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+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 ('|');
+               }
+       }
+}