Moved chain building and validation from Mono.Security to System

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

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeAttribute.cs
index bc0ac101095d0d83e57415d04557cd6ad7a6cc39..f389dc668087ca50a807057e04d397e1df25fa16 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeAttribute.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeAttribute.cs
@@ -28,98 +28,88 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System.Xml.Schema;\r
-using System;\r
-\r
-namespace System.Xml.Serialization\r
-{\r
-       /// <summary>\r
-       /// Summary description for XmlAttributeAttribute.\r
-       /// </summary>\r
-       [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field\r
-                | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]\r
-       public class XmlAttributeAttribute : Attribute\r
-       {\r
-               private string attributeName;\r
-               private string dataType;\r
-               private Type type;\r
-               private XmlSchemaForm form;\r
-               private string ns;\r
-\r
-               public XmlAttributeAttribute ()\r
-               {\r
-               }\r
-\r
-               public XmlAttributeAttribute (string attributeName)\r
-               {\r
-                       AttributeName = attributeName;\r
-               }\r
-               \r
-               public XmlAttributeAttribute (Type type)\r
-               {\r
-                       Type = type;\r
-               }\r
-\r
-               public XmlAttributeAttribute (string attributeName, Type type)\r
-               {\r
-                       AttributeName = attributeName;\r
-                       Type = type;\r
-               }\r
-\r
-               public string AttributeName {\r
+using System.Xml.Schema;
+using System;
+
+namespace System.Xml.Serialization
+{
+       /// <summary>
+       /// Summary description for XmlAttributeAttribute.
+       /// </summary>
+       [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field
+                | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
+       public class XmlAttributeAttribute : Attribute
+       {
+               private string attributeName;
+               private string dataType;
+               private Type type;
+               private XmlSchemaForm form;
+               private string ns;
+
+               public XmlAttributeAttribute ()
+               {
+               }
+
+               public XmlAttributeAttribute (string attributeName)
+               {
+                       this.attributeName = attributeName;
+               }
+               
+               public XmlAttributeAttribute (Type type)
+               {
+                       this.type = type;
+               }
+
+               public XmlAttributeAttribute (string attributeName, Type type)
+               {
+                       this.attributeName = attributeName;
+                       this.type = type;
+               }
+
+               public string AttributeName {
                        get {
+                               if (attributeName == null) {
+                                       return string.Empty;
+                               }
                                return attributeName;
-                       }\r
-                       set {
-                               attributeName = value;
-                       }\r
-               }\r
-               public string DataType {\r
+                       }
+                       set { attributeName = value; }
+               }
+
+               public string DataType {
                        get {
+                               if (dataType == null) {
+                                       return string.Empty;
+                               }
                                return dataType;
-                       }\r
-                       set {
-                               dataType = value;
-                       }\r
-               }\r
-               public XmlSchemaForm Form {\r
-                       get {
-                               return form;
-                       }\r
-                       set {
-                               form = value;
-                       }\r
-               }\r
-               public string Namespace {\r
-                       get {
-                               return ns;
-                       }\r
-                       set {
-                               ns = value;
-                       }\r
-               }\r
-\r
-               public Type Type\r
-               {\r
-                       get \r
-                       {
-                               return type;
-                       }\r
-                       set \r
-                       {
-                               type = value;
-                       }\r
-               }\r
-               \r
-               internal void AddKeyHash (System.Text.StringBuilder sb)\r
-               {\r
-                       sb.Append ("XAA ");\r
-                       KeyHelper.AddField (sb, 1, ns);\r
-                       KeyHelper.AddField (sb, 2, attributeName);\r
-                       KeyHelper.AddField (sb, 3, form.ToString(), XmlSchemaForm.None.ToString());\r
-                       KeyHelper.AddField (sb, 4, dataType);\r
-                       KeyHelper.AddField (sb, 5, type);\r
-                       sb.Append ('|');\r
-               }\r
-       }\r
-}\r
+                       }
+                       set { dataType = value; }
+               }
+
+               public XmlSchemaForm Form {
+                       get { return form; }
+                       set { form = value; }
+               }
+
+               public string Namespace {
+                       get { return ns; }
+                       set { ns = value; }
+               }
+
+               public Type Type {
+                       get { return type; }
+                       set { type = value; }
+               }
+               
+               internal void AddKeyHash (System.Text.StringBuilder sb)
+               {
+                       sb.Append ("XAA ");
+                       KeyHelper.AddField (sb, 1, ns);
+                       KeyHelper.AddField (sb, 2, attributeName);
+                       KeyHelper.AddField (sb, 3, form.ToString(), XmlSchemaForm.None.ToString());
+                       KeyHelper.AddField (sb, 4, dataType);
+                       KeyHelper.AddField (sb, 5, type);
+                       sb.Append ('|');
+               }
+       }
+}