* XmlTypeMapElementInfo.cs: no need to compare nesting level in Equals.

* XmlReflectionImporter.cs: Changed nullable default. Assign member's namespace to an array if the namespace is not specified in XmlArrayItemAttribute. svn path=/trunk/mcs/; revision=15611
mono · Jun 24, 2003 · 282c082 · 282c082
1 parent b815e6e
commit 282c082
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-24  Lluis Sanchez Gual <lluis@ximian.com>
+
+	* XmlTypeMapElementInfo.cs: no need to compare nesting level in Equals.
+	* XmlReflectionImporter.cs: Changed nullable default. Assign member's namespace to an
+	  array if the namespace is not specified in XmlArrayItemAttribute.
+
 2003-06-17  Lluis Sanchez Gual <lluis@ximian.com>
 
 	* XmlReflectionImporter.cs: Reset internal tables for each ImportMembersMapping call.

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
@@ -241,7 +241,8 @@ XmlTypeMapping ImportListMapping (Type type, XmlRootAttribute root, string defau
 				Type elemType = (att.Type != null) ? att.Type : itemType;
 				XmlTypeMapElementInfo elem = new XmlTypeMapElementInfo (null, TypeTranslator.GetTypeData(elemType));
 				elem.DataType = att.DataType;
-				elem.Namespace = att.Namespace != null ? att.Namespace : "";
+				elem.Namespace = att.Namespace != null ? att.Namespace : defaultNamespace;
+				if (elem.Namespace == null) elem.Namespace = "";
 				elem.Form = att.Form;
 				elem.IsNullable = att.IsNullable;
 				elem.NestingLevel = att.NestingLevel;
@@ -270,7 +271,7 @@ XmlTypeMapping ImportListMapping (Type type, XmlRootAttribute root, string defau
 				else elem.ElementName = TypeTranslator.GetTypeData(itemType).XmlType ;
 
 				elem.Namespace = (defaultNamespace != null) ? defaultNamespace : "";
-				elem.IsNullable = true;	// By default, items are nullable
+				elem.IsNullable = false;
 				list.Add (elem);
 			}
 

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapElementInfo.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapElementInfo.cs
@@ -135,7 +135,6 @@ public override bool Equals (object other)
 			if (_choiceValue != oinfo._choiceValue) return false;
 			if (_type.Type != oinfo._type.Type) return false;
 			if (_isNullable != oinfo._isNullable) return false;
-			if (_nestingLevel != oinfo._nestingLevel) return false;
 			return true;
 		}