Browse Source

2004-11-24 Lluis Sanchez Gual <[email protected]>

	* SerializationSource.cs: Made SerializationSource abstract, and
	renamed Equals to BaseEquals to avoid missing GetHashCode warning
	(it does not really make sense in this case).
	* XmlSchemaExporter.cs, SerializationCodeGenerator.cs,
	XmlReflectionImporter.cs, XmlSerializationWriterInterpreter.cs,
	XmlSerializationReader.cs: Fixed warnings.


svn path=/trunk/mcs/; revision=36462
Lluis Sanchez 21 years ago
parent
commit
212bcb99fe

+ 9 - 0
mcs/class/System.XML/System.Xml.Serialization/ChangeLog

@@ -1,3 +1,12 @@
+2004-11-24  Lluis Sanchez Gual  <[email protected]>
+
+	* SerializationSource.cs: Made SerializationSource abstract, and
+	renamed Equals to BaseEquals to avoid missing GetHashCode warning
+	(it does not really make sense in this case).
+	* XmlSchemaExporter.cs, SerializationCodeGenerator.cs,
+	XmlReflectionImporter.cs, XmlSerializationWriterInterpreter.cs,
+	XmlSerializationReader.cs: Fixed warnings.
+
 2004-10-19  Atsushi Enomoto  <[email protected]>
 
 	* XmlSerializationWriter.cs : When namespace is an empty string,

+ 0 - 1
mcs/class/System.XML/System.Xml.Serialization/SerializationCodeGenerator.cs

@@ -775,7 +775,6 @@ namespace System.Xml.Serialization
 	//							WriteLineUni ("}");
 									
 								bool first = true;
-								Type type = memberValue.GetType();
 								foreach (XmlTypeMapElementInfo elem in member.ElementInfo)
 								{
 									WriteLineInd ((first?"":"else ") + "if (" + memberValue + " is " + elem.TypeData.FullTypeName + ") {");

+ 5 - 7
mcs/class/System.XML/System.Xml.Serialization/SerializationSource.cs

@@ -34,7 +34,7 @@ using System.Text;
 
 namespace System.Xml.Serialization 
 {
-	internal class SerializationSource 
+	internal abstract class SerializationSource 
 	{
 		Type[] includedTypes;
 		string namspace;
@@ -46,10 +46,8 @@ namespace System.Xml.Serialization
 			this.includedTypes = includedTypes;
 		}
 		
-		public override bool Equals (object o)
+		protected bool BaseEquals (SerializationSource other)
 		{
-			SerializationSource other = o as SerializationSource;
-			if (other == null) return false;
 			if (namspace != other.namspace) return false;
 			if (canBeGenerated != other.canBeGenerated) return false;
 			
@@ -103,7 +101,7 @@ namespace System.Xml.Serialization
 			if (rootHash != other.rootHash) return false;
 			if (attributeOverridesHash != other.attributeOverridesHash) return false;
 			
-			return base.Equals (o);
+			return base.BaseEquals (other);
 		}
 		
 		public override int GetHashCode ()
@@ -136,7 +134,7 @@ namespace System.Xml.Serialization
 			if (!type.Equals(other.type)) return false;
 			if (attributeOverridesHash != other.attributeOverridesHash) return false;
 			
-			return base.Equals (o);
+			return base.BaseEquals (other);
 		}
 		
 		public override int GetHashCode ()
@@ -180,7 +178,7 @@ namespace System.Xml.Serialization
 			if (hasWrapperElement != other.hasWrapperElement) return false;
 			if (membersHash != other.membersHash) return false;
 			
-			return base.Equals (o);
+			return base.BaseEquals (other);
 		}
 		
 		public override int GetHashCode ()

+ 1 - 0
mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs

@@ -244,6 +244,7 @@ namespace System.Xml.Serialization {
 			
 			XmlTypeMapping map = new XmlTypeMapping (elementName, rootNamespace, typeData, defaultXmlType, typeNamespace);
 			map.IncludeInSchema = includeInSchema;
+			map.IsNullable = nullable;
 			relatedMaps.Add (map);
 			
 			return map;

+ 0 - 1
mcs/class/System.XML/System.Xml.Serialization/XmlSchemaExporter.cs

@@ -454,7 +454,6 @@ namespace System.Xml.Serialization {
 			{
 				if (isTypeMember) selem.IsNillable = einfo.IsNullable;
 				selem.Name = einfo.ElementName;
-				XmlQualifiedName typeName = new XmlQualifiedName (einfo.TypeData.XmlType, einfo.DataTypeNamespace);
 
 				if (defaultValue != System.DBNull.Value)
 					selem.DefaultValue = XmlCustomFormatter.ToXmlString (einfo.TypeData, defaultValue);

+ 0 - 1
mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs

@@ -550,7 +550,6 @@ namespace System.Xml.Serialization
 				for (int n=0; n<count; n++)
 				{
 					Reader.MoveToContent ();
-					string refid = Reader.GetAttribute ("href");
 					string id;
 					object item = ReadReferencingElement (itemType, qn.Namespace, out id);
 					if (id == null) 

+ 0 - 1
mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriterInterpreter.cs

@@ -441,7 +441,6 @@ namespace System.Xml.Serialization
 				memberValue = new object[] { memberValue };
 			}
 
-			bool canBeText = member.CanBeText;
 			Array elems = (Array) memberValue;
 			foreach (XmlNode elem in elems)
 			{