2007-10-30 Atsushi Enomoto <[email protected]>

	* MapCodeGenerator.cs, XmlSchemaImporter.cs: revert the previous
	  change; the type is included in the output, but it should not be
	  the base type.

	* XmlCodeExporterTests.cs : disable the previous test; it's reverted.


svn path=/trunk/mcs/; revision=88364

mcs/class/System.XML/System.Xml.Serialization/ChangeLog

@@ -1,3 +1,9 @@
+2007-10-30  Atsushi Enomoto  <[email protected]>
+
+	* MapCodeGenerator.cs, XmlSchemaImporter.cs: revert the previous
+	  change; the type is included in the output, but it should not be
+	  the base type.
+
 2007-10-30  Atsushi Enomoto  <[email protected]>
 
 	* MapCodeGenerator.cs, XmlSchemaImporter.cs: when a complexType has

mcs/class/System.XML/System.Xml.Serialization/MapCodeGenerator.cs

@@ -407,8 +407,6 @@ namespace System.Xml.Serialization {
 
 		bool DefinedInBaseMap (XmlTypeMapping map, XmlTypeMapMember member)
 		{
-			if (map.ObjectMap is EnumMap) // FIXME: it is almost just a hack. It may have better check items.
-				return false;
 			if (((ClassMap)map.ObjectMap).FindMember (member.Name) != null)
 				return true;
 			else if (map.BaseMap != null)

mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs

@@ -1173,9 +1173,6 @@ namespace System.Xml.Serialization
 				
 				if (baseMap.IsSimpleType) {
 					simpleType = baseMap.TypeData;
-					// might not be limited to EnumMap depending on XML serializer design, but for now it is.
-					if (baseMap.ObjectMap is EnumMap)
-						map.BaseMap = baseMap;
 				} else {
 					ClassMap baseClassMap = (ClassMap)baseMap.ObjectMap;
 		

mcs/class/System.XML/Test/System.Xml.Serialization/ChangeLog

@@ -1,3 +1,7 @@
+2007-10-30  Atsushi Enomoto  <[email protected]>
+
+	* XmlCodeExporterTests.cs : disable the previous test; it's reverted.
+
 2007-10-30  Atsushi Enomoto  <[email protected]>
 
 	* XmlCodeExporterTests.cs : added test for (part of?) bug #336739,

mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs

@@ -961,6 +961,7 @@ namespace MonoTests.System.XmlSerialization
 #endif
 
 		[Test]
+		[Category ("NotWorking")]
 		public void ExportSimpleContentExtensionEnum ()
 		{
 			string xsd = @"