nhibernate-commit

[Kevin W. <kev...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1675

Modified Files:
	NHibernate.cs ObjectDeletedException.cs 
	ObjectNotFoundException.cs PersistentObjectException.cs 
	PropertyAccessException.cs PropertyNotFoundException.cs 
Log Message:
fix xml documentation and allow ReSharper to reformat

Index: ObjectDeletedException.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/ObjectDeletedException.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ObjectDeletedException.cs	22 Nov 2004 03:50:03 -0000	1.4
--- ObjectDeletedException.cs	1 Jan 2005 03:34:16 -0000	1.5
***************
*** 2,6 ****
  using System.Runtime.Serialization;
  
! namespace NHibernate 
  {
  	/// <summary>
--- 2,6 ----
  using System.Runtime.Serialization;
  
! namespace NHibernate
  {
  	/// <summary>
***************
*** 8,39 ****
  	/// </summary>
  	[Serializable]
! 	public class ObjectDeletedException : HibernateException 
  	{
  		private object identifier;
  
! 		public ObjectDeletedException(string message, object identifier) : base(message) 
  		{
  			this.identifier = identifier;
  		}
  
! 		public object Identifier 
  		{
  			get { return identifier; }
  		}
  
! 		public override string Message 
  		{
  			get { return base.Message + ": " + identifier; }
  		}
  
! 		public ObjectDeletedException(string message, Exception root) : this(message, root.Message) {}
  
! 		public ObjectDeletedException(string message) : this(message, message) {}
  
! 		public ObjectDeletedException(Exception root) : this(root.Message, root.Message) {}
  
! 		public ObjectDeletedException() : this(string.Empty, string.Empty) {}
  
! 		protected ObjectDeletedException(SerializationInfo info, StreamingContext context) : base(info, context) { }
  	}
! }
--- 8,75 ----
  	/// </summary>
  	[Serializable]
! 	public class ObjectDeletedException : HibernateException
  	{
  		private object identifier;
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		/// <param name="identifier"></param>
! 		public ObjectDeletedException( string message, object identifier ) : base( message )
  		{
  			this.identifier = identifier;
  		}
  
! 		/// <summary></summary>
! 		public object Identifier
  		{
  			get { return identifier; }
  		}
  
! 		/// <summary></summary>
! 		public override string Message
  		{
  			get { return base.Message + ": " + identifier; }
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		/// <param name="root"></param>
! 		public ObjectDeletedException( string message, Exception root ) : this( message, root.Message )
! 		{
! 		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		public ObjectDeletedException( string message ) : this( message, message )
! 		{
! 		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="root"></param>
! 		public ObjectDeletedException( Exception root ) : this( root.Message, root.Message )
! 		{
! 		}
  
! 		/// <summary></summary>
! 		public ObjectDeletedException() : this( string.Empty, string.Empty )
! 		{
! 		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="info"></param>
! 		/// <param name="context"></param>
! 		protected ObjectDeletedException( SerializationInfo info, StreamingContext context ) : base( info, context )
! 		{
! 		}
  	}
! }
\ No newline at end of file

Index: PropertyAccessException.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/PropertyAccessException.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PropertyAccessException.cs	22 Nov 2004 03:50:03 -0000	1.3
--- PropertyAccessException.cs	1 Jan 2005 03:34:16 -0000	1.4
***************
*** 1,5 ****
  using System;
  
! namespace NHibernate 
  {
  	/// <summary>
--- 1,5 ----
  using System;
  
! namespace NHibernate
  {
  	/// <summary>
***************
*** 7,11 ****
  	/// </summary>
  	[Serializable]
! 	public class PropertyAccessException : HibernateException 
  	{
  		private System.Type persistentType;
--- 7,11 ----
  	/// </summary>
  	[Serializable]
! 	public class PropertyAccessException : HibernateException
  	{
  		private System.Type persistentType;
***************
*** 13,17 ****
  		private bool wasSetter;
  
! 		public PropertyAccessException(Exception root, string message, bool wasSetter, System.Type persistentType, string propertyName) : base(message, root) 
  		{
  			this.persistentType = persistentType;
--- 13,25 ----
  		private bool wasSetter;
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="root"></param>
! 		/// <param name="message"></param>
! 		/// <param name="wasSetter"></param>
! 		/// <param name="persistentType"></param>
! 		/// <param name="propertyName"></param>
! 		public PropertyAccessException( Exception root, string message, bool wasSetter, System.Type persistentType, string propertyName ) : base( message, root )
  		{
  			this.persistentType = persistentType;
***************
*** 20,34 ****
  		}
  
! 		public System.Type PersistentType 
  		{
  			get { return persistentType; }
  		}
  
! 		public override string Message 
  		{
  			get
  			{
! 				return base.Message + 
! 					( wasSetter ? " setter of " : " getter of ") +
  					persistentType.FullName +
  					"." +
--- 28,44 ----
  		}
  
! 		/// <summary></summary>
! 		public System.Type PersistentType
  		{
  			get { return persistentType; }
  		}
  
! 		/// <summary></summary>
! 		public override string Message
  		{
  			get
  			{
! 				return base.Message +
! 					( wasSetter ? " setter of " : " getter of " ) +
  					persistentType.FullName +
  					"." +
***************
*** 37,39 ****
  		}
  	}
! }
--- 47,49 ----
  		}
  	}
! }
\ No newline at end of file

Index: PropertyNotFoundException.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/PropertyNotFoundException.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PropertyNotFoundException.cs	22 Nov 2004 03:50:03 -0000	1.3
--- PropertyNotFoundException.cs	1 Jan 2005 03:34:16 -0000	1.4
***************
*** 1,5 ****
  using System;
  
! namespace NHibernate 
  {
  	/// <summary>
--- 1,5 ----
  using System;
  
! namespace NHibernate
  {
  	/// <summary>
***************
*** 7,15 ****
  	/// </summary>
  	[Serializable]
! 	public class PropertyNotFoundException : MappingException 
  	{
! 		public PropertyNotFoundException(string message, Exception root) : base(message, root) {}
! 		public PropertyNotFoundException(Exception root) : base(root) {}
! 		public PropertyNotFoundException(string message) : base(message) {}
  	}
! }
--- 7,36 ----
  	/// </summary>
  	[Serializable]
! 	public class PropertyNotFoundException : MappingException
  	{
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		/// <param name="root"></param>
! 		public PropertyNotFoundException( string message, Exception root ) : base( message, root )
! 		{
! 		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="root"></param>
! 		public PropertyNotFoundException( Exception root ) : base( root )
! 		{
! 		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		public PropertyNotFoundException( string message ) : base( message )
! 		{
! 		}
  	}
! }
\ No newline at end of file

Index: NHibernate.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.cs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** NHibernate.cs	11 Dec 2004 20:08:16 -0000	1.24
--- NHibernate.cs	1 Jan 2005 03:34:16 -0000	1.25
***************
*** 1,12 ****
  using System;
- using System.IO;
- 
  using NHibernate.Collection;
  using NHibernate.Proxy;
- using NHibernate.SqlTypes;
  using NHibernate.Type;
  
! namespace NHibernate {
! 
  	/// <summary>
  	/// Provides access to the full range of NHibernate built-in types.
--- 1,9 ----
  using System;
  using NHibernate.Collection;
  using NHibernate.Proxy;
  using NHibernate.Type;
  
! namespace NHibernate
! {
  	/// <summary>
  	/// Provides access to the full range of NHibernate built-in types.
***************
*** 14,29 ****
  	/// Also a factory for new Blobs and Clobs.
  	/// </summary>
! 	public class NHibernate	{
! 
  		/// <summary>
  		/// NHibernate Ansi String type
  		/// </summary>
! 		public static readonly NullableType AnsiString = new AnsiStringType(); 
! 		
  		/// <summary>
  		/// NHibernate binary type
  		/// </summary>
! 		public static readonly NullableType Binary = new BinaryType(); 
! 		
  		/// <summary>
  		/// NHibernate binary blob type
--- 11,26 ----
  	/// Also a factory for new Blobs and Clobs.
  	/// </summary>
! 	public class NHibernate
! 	{
  		/// <summary>
  		/// NHibernate Ansi String type
  		/// </summary>
! 		public static readonly NullableType AnsiString = new AnsiStringType();
! 
  		/// <summary>
  		/// NHibernate binary type
  		/// </summary>
! 		public static readonly NullableType Binary = new BinaryType();
! 
  		/// <summary>
  		/// NHibernate binary blob type
***************
*** 34,179 ****
  		/// NHibernate boolean type
  		/// </summary>
! 		public static readonly NullableType Boolean = new BooleanType(); 
! 		
  		/// <summary>
  		/// NHibernate byte type
  		/// </summary>
! 		public static readonly NullableType Byte = new ByteType(); 
! 		
  		/// <summary>
  		/// NHibernate character type
  		/// </summary>
! 		public static readonly NullableType Character = new CharType(); 
! 		
  		/// <summary>
  		/// NHibernate Culture Info type
  		/// </summary>
! 		public static readonly NullableType CultureInfo = new CultureInfoType(); 
! 		
  		/// <summary>
  		/// NHibernate date type
  		/// </summary>
! 		public static readonly NullableType DateTime = new DateTimeType(); 
! 		
  		/// <summary>
  		/// NHibernate date type
  		/// </summary>
! 		public static readonly NullableType Date = new DateType(); 
  
  		/// <summary>
  		/// NHibernate decimal type
  		/// </summary>
! 		public static readonly NullableType Decimal = new DecimalType(); 
! 		
  		/// <summary>
  		/// NHibernate double type
  		/// </summary>
! 		public static readonly NullableType Double = new DoubleType(); 
! 		
  		/// <summary>
  		/// NHibernate Guid type.
  		/// </summary>
! 		public static readonly NullableType Guid = new GuidType(); 
! 		
  		/// <summary>
  		/// NHibernate System.Int16 (short in C#) type
  		/// </summary>
! 		public static readonly NullableType Int16 = new Int16Type(); 
! 		
  		/// <summary>
  		/// NHibernate System.Int32 (int in C#) type
  		/// </summary>
! 		public static readonly NullableType Int32 = new Int32Type(); 
! 		
  		/// <summary>
  		/// NHibernate System.Int64 (long in C#) type
  		/// </summary>
! 		public static readonly NullableType Int64 = new Int64Type(); 
  
  		/// <summary>
  		/// NHibernate System.SByte type
  		/// </summary>
! 		public static readonly NullableType SByte = new SByteType(); 
  
  		/// <summary>
  		/// NHIbernate System.Single (float in C#) Type
  		/// </summary>
! 		public static readonly NullableType Single = new SingleType(); 
  
  		/// <summary>
  		/// NHibernate String type
  		/// </summary>
! 		public static readonly NullableType String = new StringType(); 
! 		
  		/// <summary>
  		/// NHibernate string clob type
  		/// </summary>
! 		public static readonly NullableType StringClob = new StringClobType(); 
! 		
  		/// <summary>
  		/// NHibernate Time type
  		/// </summary>
! 		public static readonly NullableType Time = new TimeType(); 
! 		
  		/// <summary>
  		/// NHibernate Ticks type
  		/// </summary>
! 		public static readonly NullableType Ticks = new TicksType(); 
! 		
  		/// <summary>
  		/// NHibernate Ticks type
  		/// </summary>
! 		public static readonly NullableType TimeSpan = new TimeSpanType(); 
  
  		/// <summary>
  		/// NHibernate Timestamp type
  		/// </summary>
! 		public static readonly NullableType Timestamp = new TimestampType(); 
! 		
  		/// <summary>
  		/// NHibernate TrueFalse type
  		/// </summary>
! 		public static readonly NullableType TrueFalse = new TrueFalseType(); 
! 		
  		/// <summary>
  		/// NHibernate YesNo type
  		/// </summary>
! 		public static readonly NullableType YesNo = new YesNoType(); 
  
  		/// <summary>
  		/// NHibernate class type
  		/// </summary>
! 		public static readonly NullableType Class =  new TypeType(); 
! 		
  		/// <summary>
  		/// NHibernate serializable type
  		/// </summary>
! 		public static readonly NullableType Serializable =  new SerializableType(); 
  
  		/// <summary>
  		/// NHibernate System.Object type
  		/// </summary>
! 		public static readonly IType Object = new ObjectType(); 
  
! 		
! 		/// <summary>
! 		/// NHibernate blob type
! 		/// </summary>
! 		//public static readonly NullableType Blob = new BlobType();
! 		
! 		/// <summary>
! 		/// NHibernate clob type
! 		/// </summary>
! 		//public static readonly NullableType Clob = new ClobType();
! 		
  		/// <summary>
  		/// Cannot be instantiated.
  		/// </summary>
! 		private NHibernate() 
! 		{																	  
! 			throw new NotSupportedException();											
  		}
! 		
! 		
  		/// <summary>
  		/// A NHibernate persistent enum type
--- 31,174 ----
  		/// NHibernate boolean type
  		/// </summary>
! 		public static readonly NullableType Boolean = new BooleanType();
! 
  		/// <summary>
  		/// NHibernate byte type
  		/// </summary>
! 		public static readonly NullableType Byte = new ByteType();
! 
  		/// <summary>
  		/// NHibernate character type
  		/// </summary>
! 		public static readonly NullableType Character = new CharType();
! 
  		/// <summary>
  		/// NHibernate Culture Info type
  		/// </summary>
! 		public static readonly NullableType CultureInfo = new CultureInfoType();
! 
  		/// <summary>
  		/// NHibernate date type
  		/// </summary>
! 		public static readonly NullableType DateTime = new DateTimeType();
! 
  		/// <summary>
  		/// NHibernate date type
  		/// </summary>
! 		public static readonly NullableType Date = new DateType();
  
  		/// <summary>
  		/// NHibernate decimal type
  		/// </summary>
! 		public static readonly NullableType Decimal = new DecimalType();
! 
  		/// <summary>
  		/// NHibernate double type
  		/// </summary>
! 		public static readonly NullableType Double = new DoubleType();
! 
  		/// <summary>
  		/// NHibernate Guid type.
  		/// </summary>
! 		public static readonly NullableType Guid = new GuidType();
! 
  		/// <summary>
  		/// NHibernate System.Int16 (short in C#) type
  		/// </summary>
! 		public static readonly NullableType Int16 = new Int16Type();
! 
  		/// <summary>
  		/// NHibernate System.Int32 (int in C#) type
  		/// </summary>
! 		public static readonly NullableType Int32 = new Int32Type();
! 
  		/// <summary>
  		/// NHibernate System.Int64 (long in C#) type
  		/// </summary>
! 		public static readonly NullableType Int64 = new Int64Type();
  
  		/// <summary>
  		/// NHibernate System.SByte type
  		/// </summary>
! 		public static readonly NullableType SByte = new SByteType();
  
  		/// <summary>
  		/// NHIbernate System.Single (float in C#) Type
  		/// </summary>
! 		public static readonly NullableType Single = new SingleType();
  
  		/// <summary>
  		/// NHibernate String type
  		/// </summary>
! 		public static readonly NullableType String = new StringType();
! 
  		/// <summary>
  		/// NHibernate string clob type
  		/// </summary>
! 		public static readonly NullableType StringClob = new StringClobType();
! 
  		/// <summary>
  		/// NHibernate Time type
  		/// </summary>
! 		public static readonly NullableType Time = new TimeType();
! 
  		/// <summary>
  		/// NHibernate Ticks type
  		/// </summary>
! 		public static readonly NullableType Ticks = new TicksType();
! 
  		/// <summary>
  		/// NHibernate Ticks type
  		/// </summary>
! 		public static readonly NullableType TimeSpan = new TimeSpanType();
  
  		/// <summary>
  		/// NHibernate Timestamp type
  		/// </summary>
! 		public static readonly NullableType Timestamp = new TimestampType();
! 
  		/// <summary>
  		/// NHibernate TrueFalse type
  		/// </summary>
! 		public static readonly NullableType TrueFalse = new TrueFalseType();
! 
  		/// <summary>
  		/// NHibernate YesNo type
  		/// </summary>
! 		public static readonly NullableType YesNo = new YesNoType();
  
  		/// <summary>
  		/// NHibernate class type
  		/// </summary>
! 		public static readonly NullableType Class = new TypeType();
! 
  		/// <summary>
  		/// NHibernate serializable type
  		/// </summary>
! 		public static readonly NullableType Serializable = new SerializableType();
  
  		/// <summary>
  		/// NHibernate System.Object type
  		/// </summary>
! 		public static readonly IType Object = new ObjectType();
  
! 
! //		/// <summary>
! //		/// NHibernate blob type
! //		/// </summary>
! //		public static readonly NullableType Blob = new BlobType();
! //		/// <summary>
! //		/// NHibernate clob type
! //		/// </summary>
! //		public static readonly NullableType Clob = new ClobType();
  		/// <summary>
  		/// Cannot be instantiated.
  		/// </summary>
! 		private NHibernate()
! 		{
! 			throw new NotSupportedException();
  		}
! 
! 
  		/// <summary>
  		/// A NHibernate persistent enum type
***************
*** 181,189 ****
  		/// <param name="enumClass"></param>
  		/// <returns></returns>
! 		public static IType Enum(System.Type enumClass) {
! 			return new PersistentEnumType(enumClass);
  		}
! 		
! 		
  		/// <summary>
  		/// A NHibernate serializable type
--- 176,185 ----
  		/// <param name="enumClass"></param>
  		/// <returns></returns>
! 		public static IType Enum( System.Type enumClass )
! 		{
! 			return new PersistentEnumType( enumClass );
  		}
! 
! 
  		/// <summary>
  		/// A NHibernate serializable type
***************
*** 191,196 ****
  		/// <param name="serializableClass"></param>
  		/// <returns></returns>
! 		public static IType GetSerializable(System.Type serializableClass) {
! 			return new SerializableType(serializableClass);
  		}
  
--- 187,193 ----
  		/// <param name="serializableClass"></param>
  		/// <returns></returns>
! 		public static IType GetSerializable( System.Type serializableClass )
! 		{
! 			return new SerializableType( serializableClass );
  		}
  
***************
*** 198,208 ****
  		/// A NHibernate serializable type
  		/// </summary>
! 		/// <param name="metaType">a type mapping <see cref="NHibernate.Type.IType"/> to a single column</param>
  		/// <param name="identifierType">the entity identifier type</param>
  		/// <returns></returns>
! 		public static IType Any(IType metaType, IType identifierType) {
! 			return new ObjectType(metaType, identifierType);
  		}
! 		
  		/// <summary>
  		/// A NHibernate persistent object (entity) type
--- 195,206 ----
  		/// A NHibernate serializable type
  		/// </summary>
! 		/// <param name="metaType">a type mapping <see cref="Type.IType"/> to a single column</param>
  		/// <param name="identifierType">the entity identifier type</param>
  		/// <returns></returns>
! 		public static IType Any( IType metaType, IType identifierType )
! 		{
! 			return new ObjectType( metaType, identifierType );
  		}
! 
  		/// <summary>
  		/// A NHibernate persistent object (entity) type
***************
*** 210,219 ****
  		/// <param name="persistentClass">a mapped entity class</param>
  		/// <returns></returns>
! 		[Obsolete("use NHibernate.Entity instead")]
! 		public static IType Association(System.Type persistentClass) {
  			// not really a many-to-one association *necessarily*
! 			return new ManyToOneType(persistentClass);
  		}
! 		
  		/// <summary>
  		/// A NHibernate persistent object (entity) type
--- 208,218 ----
  		/// <param name="persistentClass">a mapped entity class</param>
  		/// <returns></returns>
! 		[Obsolete( "use NHibernate.Entity instead" )]
! 		public static IType Association( System.Type persistentClass )
! 		{
  			// not really a many-to-one association *necessarily*
! 			return new ManyToOneType( persistentClass );
  		}
! 
  		/// <summary>
  		/// A NHibernate persistent object (entity) type
***************
*** 221,230 ****
  		/// <param name="persistentClass">a mapped entity class</param>
  		/// <returns></returns>
! 		public static IType Entity(System.Type persistentClass) 
  		{
  			// not really a many-to-one association *necessarily*
! 			return new ManyToOneType(persistentClass);
  		}
! 		
  		/// <summary>
  		/// A NHibernate custom type
--- 220,229 ----
  		/// <param name="persistentClass">a mapped entity class</param>
  		/// <returns></returns>
! 		public static IType Entity( System.Type persistentClass )
  		{
  			// not really a many-to-one association *necessarily*
! 			return new ManyToOneType( persistentClass );
  		}
! 
  		/// <summary>
  		/// A NHibernate custom type
***************
*** 232,237 ****
  		/// <param name="userTypeClass">a class that implements UserType</param>
  		/// <returns></returns>
! 		public static IType Custom(System.Type userTypeClass) {
! 			if( typeof(ICompositeUserType).IsAssignableFrom( userTypeClass ))
  			{
  				return new CompositeCustomType( userTypeClass );
--- 231,237 ----
  		/// <param name="userTypeClass">a class that implements UserType</param>
  		/// <returns></returns>
! 		public static IType Custom( System.Type userTypeClass )
! 		{
! 			if( typeof( ICompositeUserType ).IsAssignableFrom( userTypeClass ) )
  			{
  				return new CompositeCustomType( userTypeClass );
***************
*** 239,247 ****
  			else
  			{
! 				return new CustomType(userTypeClass);
  			}
  		}
! 				
! 		
  		/// <summary>
  		/// Force initialization of a proxy or persistent collection.
--- 239,247 ----
  			else
  			{
! 				return new CustomType( userTypeClass );
  			}
  		}
! 
! 
  		/// <summary>
  		/// Force initialization of a proxy or persistent collection.
***************
*** 249,254 ****
  		/// <param name="proxy">a persistable object, proxy, persistent collection or null</param>
  		/// <exception cref="HibernateException">if we can't initialize the proxy at this time, eg. the Session was closed</exception>
! 		public static void Initialize(object proxy) {
! 			if( proxy==null )
  			{
  				return;
--- 249,255 ----
  		/// <param name="proxy">a persistable object, proxy, persistent collection or null</param>
  		/// <exception cref="HibernateException">if we can't initialize the proxy at this time, eg. the Session was closed</exception>
! 		public static void Initialize( object proxy )
! 		{
! 			if( proxy == null )
  			{
  				return;
***************
*** 256,264 ****
  			else if( proxy is INHibernateProxy )
  			{
! 				NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).Initialize();
  			}
  			else if( proxy is PersistentCollection )
  			{
! 				( (PersistentCollection) proxy ).ForceLoad();
  			}
  		}
--- 257,265 ----
  			else if( proxy is INHibernateProxy )
  			{
! 				NHibernateProxyHelper.GetLazyInitializer( ( INHibernateProxy ) proxy ).Initialize();
  			}
  			else if( proxy is PersistentCollection )
  			{
! 				( ( PersistentCollection ) proxy ).ForceLoad();
  			}
  		}
***************
*** 269,283 ****
  		/// <param name="proxy">a persistable object, proxy, persistent collection or null</param>
  		/// <returns>true if the argument is already initialized, or is not a proxy or collection</returns>
! 		public static bool IsInitialized(object proxy)
  		{
! 			if ( proxy is INHibernateProxy ) 
  			{
! 				return !NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).IsUninitialized;
! 			} 
! 			else if ( proxy is PersistentCollection ) 
  			{
! 				return ( (PersistentCollection) proxy).WasInitialized;
! 			} 
! 			else 
  			{
  				return true;
--- 270,284 ----
  		/// <param name="proxy">a persistable object, proxy, persistent collection or null</param>
  		/// <returns>true if the argument is already initialized, or is not a proxy or collection</returns>
! 		public static bool IsInitialized( object proxy )
  		{
! 			if( proxy is INHibernateProxy )
  			{
! 				return !NHibernateProxyHelper.GetLazyInitializer( ( INHibernateProxy ) proxy ).IsUninitialized;
! 			}
! 			else if( proxy is PersistentCollection )
  			{
! 				return ( ( PersistentCollection ) proxy ).WasInitialized;
! 			}
! 			else
  			{
  				return true;
***************
*** 291,306 ****
  		/// <param name="proxy">a persistable object or proxy</param>
  		/// <returns>the true class of the instance</returns>
! 		public System.Type GetClass(object proxy) 
  		{
! 			if(proxy is INHibernateProxy) 
  			{
! 				return NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).GetImplementation().GetType();
  			}
! 			else 
  			{
  				return proxy.GetType();
  			}
  		}
! 	
  		/*
  		/// <summary>
--- 292,307 ----
  		/// <param name="proxy">a persistable object or proxy</param>
  		/// <returns>the true class of the instance</returns>
! 		public System.Type GetClass( object proxy )
  		{
! 			if( proxy is INHibernateProxy )
  			{
! 				return NHibernateProxyHelper.GetLazyInitializer( ( INHibernateProxy ) proxy ).GetImplementation().GetType();
  			}
! 			else
  			{
  				return proxy.GetType();
  			}
  		}
! 
  		/*
  		/// <summary>
***************
*** 376,378 ****
  		*/
  	}
! }
--- 377,379 ----
  		*/
  	}
! }
\ No newline at end of file

Index: ObjectNotFoundException.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/ObjectNotFoundException.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ObjectNotFoundException.cs	22 Nov 2004 03:50:03 -0000	1.4
--- ObjectNotFoundException.cs	1 Jan 2005 03:34:16 -0000	1.5
***************
*** 2,18 ****
  using System.Runtime.Serialization;
  
! namespace NHibernate 
  {
- 
  	/// <summary>
  	/// Thrown when the user tries to pass a deleted object to the <c>ISession</c>.
  	/// </summary>
  	[Serializable]
! 	public class ObjectNotFoundException : HibernateException 
  	{
  		private object identifier;
  		private System.Type type;
  
! 		public ObjectNotFoundException(string message, object identifier, System.Type type) : base(message) 
  		{
  			this.identifier = identifier;
--- 2,23 ----
  using System.Runtime.Serialization;
  
! namespace NHibernate
  {
  	/// <summary>
  	/// Thrown when the user tries to pass a deleted object to the <c>ISession</c>.
  	/// </summary>
  	[Serializable]
! 	public class ObjectNotFoundException : HibernateException
  	{
  		private object identifier;
  		private System.Type type;
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		/// <param name="identifier"></param>
! 		/// <param name="type"></param>
! 		public ObjectNotFoundException( string message, object identifier, System.Type type ) : base( message )
  		{
  			this.identifier = identifier;
***************
*** 20,44 ****
  		}
  
! 		public object Identifier 
  		{
  			get { return identifier; }
  		}
  
! 		public override string Message 
  		{
  			get { return base.Message + ": " + identifier + ", of class: " + type.FullName; }
  		}
  
! 		public System.Type Type 
  		{
  			get { return type; }
  		}
- 		public ObjectNotFoundException(string message, Exception root) : this(message, root.Message, typeof(ObjectNotFoundException)) {}
  
! 		public ObjectNotFoundException(string message) : this(message, message, typeof(ObjectNotFoundException)) {}
  
! 		public ObjectNotFoundException(Exception root) : this(root.Message, root.Message, typeof(ObjectNotFoundException)) {}
  
! 		protected ObjectNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { }
  	}
! }
--- 25,79 ----
  		}
  
! 		/// <summary></summary>
! 		public object Identifier
  		{
  			get { return identifier; }
  		}
  
! 		/// <summary></summary>
! 		public override string Message
  		{
  			get { return base.Message + ": " + identifier + ", of class: " + type.FullName; }
  		}
  
! 		/// <summary></summary>
! 		public System.Type Type
  		{
  			get { return type; }
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		/// <param name="root"></param>
! 		public ObjectNotFoundException( string message, Exception root ) : this( message, root.Message, typeof( ObjectNotFoundException ) )
! 		{
! 		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		public ObjectNotFoundException( string message ) : this( message, message, typeof( ObjectNotFoundException ) )
! 		{
! 		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="root"></param>
! 		public ObjectNotFoundException( Exception root ) : this( root.Message, root.Message, typeof( ObjectNotFoundException ) )
! 		{
! 		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="info"></param>
! 		/// <param name="context"></param>
! 		protected ObjectNotFoundException( SerializationInfo info, StreamingContext context ) : base( info, context )
! 		{
! 		}
  	}
! }
\ No newline at end of file

Index: PersistentObjectException.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/PersistentObjectException.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PersistentObjectException.cs	22 Nov 2004 03:50:03 -0000	1.3
--- PersistentObjectException.cs	1 Jan 2005 03:34:16 -0000	1.4
***************
*** 1,5 ****
  using System;
  
! namespace NHibernate 
  {
  	/// <summary>
--- 1,5 ----
  using System;
  
! namespace NHibernate
  {
  	/// <summary>
***************
*** 8,14 ****
  	/// </summary>
  	[Serializable]
! 	public class PersistentObjectException : HibernateException 
  	{
! 		public PersistentObjectException(string message) : base(message) {}
  	}
! }
--- 8,20 ----
  	/// </summary>
  	[Serializable]
! 	public class PersistentObjectException : HibernateException
  	{
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="message"></param>
! 		public PersistentObjectException( string message ) : base( message )
! 		{
! 		}
  	}
! }
\ No newline at end of file