2005-01-13 Atsushi Enomoto <atsushi@ximian.com>

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

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
index 2d6bb038d09a354db7f52753f5ae97b9e248c5ce..0b64944f21dde7dc432566de173a202670cdf977 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
@@ -38,8 +38,6 @@ namespace System.Xml.Serialization
 {\r
        public class XmlTypeMapping : XmlMapping\r
        {\r
-               private string elementName;\r
-               private string ns;\r
                private string xmlType;\r
                private string xmlTypeNamespace;\r
                TypeData type;\r
@@ -53,23 +51,24 @@ namespace System.Xml.Serialization
                ArrayList _derivedTypes = new ArrayList();\r
 \r
                internal XmlTypeMapping(string elementName, string ns, TypeData typeData, string xmlType, string xmlTypeNamespace)\r
+               : base (elementName, ns)\r
                {\r
-                       this.elementName = elementName;\r
-                       this.ns = ns;\r
                        this.type = typeData;\r
                        this.xmlType = xmlType;\r
                        this.xmlTypeNamespace = xmlTypeNamespace;\r
                }\r
 \r
+#if !NET_2_0\r
                public string ElementName\r
                {\r
-                       get { return elementName; }\r
+                       get { return _elementName; }\r
                }\r
 \r
                public string Namespace\r
                {\r
-                       get { return ns; }\r
+                       get { return _namespace; }\r
                }\r
+#endif\r
 \r
                public string TypeFullName\r
                {\r
@@ -164,8 +163,8 @@ namespace System.Xml.Serialization
                internal void UpdateRoot (XmlQualifiedName qname)\r
                {\r
                        if (qname != null) {\r
-                               this.elementName = qname.Name;\r
-                               this.ns = qname.Namespace;\r
+                               this._elementName = qname.Name;\r
+                               this._namespace = qname.Namespace;\r
                        }\r
                }\r
        }\r