Merge pull request #1304 from slluis/mac-proxy-autoconfig

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

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
index 10fd2e3537491401442e48a53553cdab05b65b6d..b68d33eec94f2109a6cbad94f7e44d05ba41897a 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
@@ -122,27 +122,23 @@ namespace System.Xml.Serialization
                        get { return _form; }
                }
                
-#if NET_2_0
-               [MonoTODO]
                public string XsdElementName
                {
-                       get { throw new NotImplementedException (); }
+                       get { return _mapMember.Name; }
                }
-               
-               [MonoTODO]
+#if !NET_2_1
                public string GenerateTypeName (System.CodeDom.Compiler.CodeDomProvider codeProvider)
                {
-                       throw new NotImplementedException ();
+                       string ret = codeProvider.CreateValidIdentifier (_mapMember.TypeData.FullTypeName);
+                       return _mapMember.TypeData.IsValueType && _mapMember.TypeData.IsNullable ? 
+                               "System.Nullable`1[" + ret + "]" : ret;
                }
 #endif
 
-#if NET_1_1
                public bool CheckSpecified
                {
                        get { return _mapMember.IsOptionalValueType; }
                }
-#endif
-
                #endregion // Properties
        }
 }