netreflector-develop

[Owen R. <exo...@us...>]

Update of /cvsroot/netreflector/NetReflector/src/NetReflector/Serialisers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6408/src/NetReflector/Serialisers

Modified Files:
	IXmlTypeSerialiser.cs XmlMemberSerialiser.cs 
	XmlTypeSerialiser.cs 
Log Message:
attempting to fix long standing broken build by sorting members

Index: XmlMemberSerialiser.cs
===================================================================
RCS file: /cvsroot/netreflector/NetReflector/src/NetReflector/Serialisers/XmlMemberSerialiser.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** XmlMemberSerialiser.cs	8 Sep 2005 01:07:47 -0000	1.11
--- XmlMemberSerialiser.cs	8 Sep 2005 03:47:09 -0000	1.12
***************
*** 68,72 ****
  		}
  
! 		public object Read(XmlNode node, NetReflectorTypeTable table)
  		{
  			if (node == null)
--- 68,72 ----
  		}
  
! 		public virtual object Read(XmlNode node, NetReflectorTypeTable table)
  		{
  			if (node == null)
***************
*** 148,152 ****
  		}
  
! 		public void SetValue(object instance, object value)
  		{
  			member.SetValue(instance, value);
--- 148,152 ----
  		}
  
! 		public virtual void SetValue(object instance, object value)
  		{
  			member.SetValue(instance, value);

Index: IXmlTypeSerialiser.cs
===================================================================
RCS file: /cvsroot/netreflector/NetReflector/src/NetReflector/Serialisers/IXmlTypeSerialiser.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IXmlTypeSerialiser.cs	15 Nov 2004 05:13:02 -0000	1.3
--- IXmlTypeSerialiser.cs	8 Sep 2005 03:47:09 -0000	1.4
***************
*** 1,3 ****
--- 1,4 ----
  using System;
+ using System.Collections;
  
  namespace Exortech.NetReflector
***************
*** 7,11 ****
  		Type Type { get; }
  		ReflectorTypeAttribute Attribute { get; }
! 		IXmlMemberSerialiser[] MemberSerialisers { get; }
  	}
  }
--- 8,12 ----
  		Type Type { get; }
  		ReflectorTypeAttribute Attribute { get; }
! 		IEnumerable MemberSerialisers { get; }
  	}
  }

Index: XmlTypeSerialiser.cs
===================================================================
RCS file: /cvsroot/netreflector/NetReflector/src/NetReflector/Serialisers/XmlTypeSerialiser.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** XmlTypeSerialiser.cs	8 Sep 2005 01:07:47 -0000	1.10
--- XmlTypeSerialiser.cs	8 Sep 2005 03:47:09 -0000	1.11
***************
*** 11,15 ****
  		private Type type;
  		private ReflectorTypeAttribute attribute;
! 		private IXmlMemberSerialiser[] serialisers;
  		private IInstantiator instantiator;
  
--- 11,15 ----
  		private Type type;
  		private ReflectorTypeAttribute attribute;
! 		private IEnumerable serialisers;
  		private IInstantiator instantiator;
  
***************
*** 39,43 ****
  		}
  
! 		public IXmlMemberSerialiser[] MemberSerialisers
  		{
  			get
--- 39,43 ----
  		}
  
! 		public IEnumerable MemberSerialisers
  		{
  			get
***************
*** 51,57 ****
  		}
  
! 		private IXmlMemberSerialiser[] InitialiseMemberSerialisers()
  		{
! 			ArrayList serialisers = new ArrayList();
  			foreach (MemberInfo member in type.GetMembers())
  			{
--- 51,57 ----
  		}
  
! 		private IEnumerable InitialiseMemberSerialisers()
  		{
! 			SortedList serialisers = new SortedList();
  			foreach (MemberInfo member in type.GetMembers())
  			{
***************
*** 59,66 ****
  				if (attribute != null)
  				{
! 					serialisers.Add(attribute.CreateSerialiser(ReflectorMember.Create(member)));
  				}
  			}
! 			return (IXmlMemberSerialiser[]) serialisers.ToArray(typeof (IXmlMemberSerialiser));
  		}
  
--- 59,66 ----
  				if (attribute != null)
  				{
! 					serialisers.Add(member.Name, attribute.CreateSerialiser(ReflectorMember.Create(member)));
  				}
  			}
! 			return serialisers.Values;
  		}