[Nhibernate-commit] nhibernate/src/NHibernate/Type Int32Type.cs,1.7,1.8 Int64Type.cs,1.7,1.8 IType.cs,1.10,1.11 IType.cs.xmldoc,1.1,1.2 IVersionType.cs,1.5,1.6

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

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

Modified Files:
	Int32Type.cs Int64Type.cs IType.cs IType.cs.xmldoc 
	IVersionType.cs 
Log Message:
fixing xml comments and letting ReSharper do reformatting

Index: Int32Type.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/Int32Type.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Int32Type.cs	25 Oct 2004 05:37:56 -0000	1.7
--- Int32Type.cs	31 Dec 2004 23:53:39 -0000	1.8
***************
*** 1,62 ****
  using System;
  using System.Data;
- 
  using NHibernate.SqlTypes;
  
! namespace NHibernate.Type {
! 
  	/// <summary>
  	/// Maps a <see cref="System.Int32"/> Property 
  	/// to a <see cref="DbType.Int32"/> column.
  	/// </summary>
! 	public class Int32Type : ValueTypeType, IDiscriminatorType, IVersionType 
  	{
! 	
! 		internal Int32Type() : base( new Int32SqlType() ) 
  		{
  		}
  
! 		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToInt32(rs[index]);
  		}
  
! 		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToInt32(rs[name]);
  		}
  
! 		public override System.Type ReturnedClass {
! 			get { return typeof(System.Int32); }
  		}
! 		
! 		public override void Set(IDbCommand cmd, object value, int index) {
! 			IDataParameter parm = cmd.Parameters[index] as IDataParameter;
  			parm.Value = value;
  		}
  
! 		public override string Name {
  			get { return "Int32"; }
  		}
  
! 		public override string ObjectToSQLString(object value) {
  			return value.ToString();
  		}
  
! 		public object StringToObject(string xml) {
! 			return int.Parse(xml);
  		}
  
  		#region IVersionType Members
  
! 		public virtual object Next(object current) 
  		{
! 			return ((int) current) + 1;
  		}
  
! 		public virtual object Seed {
! 			get	{ return 0; }
  		}
  
  		#endregion
- 
  	}
  }
\ No newline at end of file
--- 1,104 ----
  using System;
  using System.Data;
  using NHibernate.SqlTypes;
  
! namespace NHibernate.Type
! {
  	/// <summary>
  	/// Maps a <see cref="System.Int32"/> Property 
  	/// to a <see cref="DbType.Int32"/> column.
  	/// </summary>
! 	public class Int32Type : ValueTypeType, IDiscriminatorType, IVersionType
  	{
! 		/// <summary></summary>
! 		internal Int32Type() : base( new Int32SqlType() )
  		{
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="rs"></param>
! 		/// <param name="index"></param>
! 		/// <returns></returns>
! 		public override object Get( IDataReader rs, int index )
! 		{
! 			return Convert.ToInt32( rs[ index ] );
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="rs"></param>
! 		/// <param name="name"></param>
! 		/// <returns></returns>
! 		public override object Get( IDataReader rs, string name )
! 		{
! 			return Convert.ToInt32( rs[ name ] );
  		}
  
! 		/// <summary></summary>
! 		public override System.Type ReturnedClass
! 		{
! 			get { return typeof( Int32 ); }
  		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="cmd"></param>
! 		/// <param name="value"></param>
! 		/// <param name="index"></param>
! 		public override void Set( IDbCommand cmd, object value, int index )
! 		{
! 			IDataParameter parm = cmd.Parameters[ index ] as IDataParameter;
  			parm.Value = value;
  		}
  
! 		/// <summary></summary>
! 		public override string Name
! 		{
  			get { return "Int32"; }
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="value"></param>
! 		/// <returns></returns>
! 		public override string ObjectToSQLString( object value )
! 		{
  			return value.ToString();
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="xml"></param>
! 		/// <returns></returns>
! 		public object StringToObject( string xml )
! 		{
! 			return int.Parse( xml );
  		}
  
  		#region IVersionType Members
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="current"></param>
! 		/// <returns></returns>
! 		public virtual object Next( object current )
  		{
! 			return ( ( int ) current ) + 1;
  		}
  
! 		/// <summary></summary>
! 		public virtual object Seed
! 		{
! 			get { return 0; }
  		}
  
  		#endregion
  	}
  }
\ No newline at end of file

Index: IVersionType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/IVersionType.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IVersionType.cs	19 Oct 2004 02:24:08 -0000	1.5
--- IVersionType.cs	31 Dec 2004 23:53:39 -0000	1.6
***************
*** 1,11 ****
! using System;
! 
! namespace NHibernate.Type 
  {
- 
  	/// <summary>
  	/// An <see cref="IType"/> that may be used to version data.
  	/// </summary>
! 	public interface IVersionType : IType 
  	{
  		/// <summary>
--- 1,8 ----
! namespace NHibernate.Type
  {
  	/// <summary>
  	/// An <see cref="IType"/> that may be used to version data.
  	/// </summary>
! 	public interface IVersionType : IType
  	{
  		/// <summary>
***************
*** 14,18 ****
  		/// <param name="current">The current version</param>
  		/// <returns>an instance of the <see cref="IType"/> that has been incremented.</returns>
! 		object Next(object current);
  
  		/// <summary>
--- 11,15 ----
  		/// <param name="current">The current version</param>
  		/// <returns>an instance of the <see cref="IType"/> that has been incremented.</returns>
! 		object Next( object current );
  
  		/// <summary>
***************
*** 22,26 ****
  		object Seed { get; }
  
! 		
  	}
! }
--- 19,23 ----
  		object Seed { get; }
  
! 
  	}
! }
\ No newline at end of file

Index: IType.cs.xmldoc
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/IType.cs.xmldoc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IType.cs.xmldoc	10 Feb 2004 19:05:41 -0000	1.1
--- IType.cs.xmldoc	31 Dec 2004 23:53:39 -0000	1.2
***************
*** 179,183 ****
  		state, stopping at entities and at collections.
  		</summary>
! 		<param name="value">A Collection element or Entity field</param>
  		<returns>A deep copy of the object.</returns>
  	</member>
--- 179,183 ----
  		state, stopping at entities and at collections.
  		</summary>
! 		<param name="val">A Collection element or Entity field</param>
  		<returns>A deep copy of the object.</returns>
  	</member>

Index: Int64Type.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/Int64Type.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Int64Type.cs	20 Nov 2004 21:13:03 -0000	1.7
--- Int64Type.cs	31 Dec 2004 23:53:39 -0000	1.8
***************
*** 1,63 ****
  using System;
  using System.Data;
- 
  using NHibernate.SqlTypes;
  
! namespace NHibernate.Type {
! 	
  	/// <summary>
  	/// Maps a <see cref="System.Int64"/> Property 
  	/// to a <see cref="DbType.Int64"/> column.
  	/// </summary>
! 	public class Int64Type : ValueTypeType, IIdentifierType, IVersionType 
  	{
! 		
! 		internal Int64Type() : base( new Int64SqlType() ) 
  		{
  		}
  
! 		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToInt64(rs[index]);
  		}
  
! 		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToInt64(rs[name]);
  		}
  
! 		public override System.Type ReturnedClass {
! 			get { return typeof(System.Int64); }
  		}
  
! 		public override void Set(IDbCommand st, object value, int index) {
! 			IDataParameter parm = st.Parameters[index] as IDataParameter;
  			parm.Value = value;
  		}
  
! 		public override string Name {
  			get { return "Int64"; }
  		}
  
! 		public object StringToObject(string xml) {
! 			return long.Parse(xml);
  		}
  
  		#region IVersionType Members
  
! 		public object Next(object current) 
  		{
! 			return ((long)current) + 1;
  		}
  
! 		public object Seed 
  		{
! 			get { return (long)0; }
  		}
  
  		#endregion
  
! 		public override string ObjectToSQLString(object value) 
  		{
  			return value.ToString();
  		}
  	}
! }
--- 1,104 ----
  using System;
  using System.Data;
  using NHibernate.SqlTypes;
  
! namespace NHibernate.Type
! {
  	/// <summary>
  	/// Maps a <see cref="System.Int64"/> Property 
  	/// to a <see cref="DbType.Int64"/> column.
  	/// </summary>
! 	public class Int64Type : ValueTypeType, IIdentifierType, IVersionType
  	{
! 		/// <summary></summary>
! 		internal Int64Type() : base( new Int64SqlType() )
  		{
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="rs"></param>
! 		/// <param name="index"></param>
! 		/// <returns></returns>
! 		public override object Get( IDataReader rs, int index )
! 		{
! 			return Convert.ToInt64( rs[ index ] );
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="rs"></param>
! 		/// <param name="name"></param>
! 		/// <returns></returns>
! 		public override object Get( IDataReader rs, string name )
! 		{
! 			return Convert.ToInt64( rs[ name ] );
  		}
  
! 		/// <summary></summary>
! 		public override System.Type ReturnedClass
! 		{
! 			get { return typeof( Int64 ); }
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="st"></param>
! 		/// <param name="value"></param>
! 		/// <param name="index"></param>
! 		public override void Set( IDbCommand st, object value, int index )
! 		{
! 			IDataParameter parm = st.Parameters[ index ] as IDataParameter;
  			parm.Value = value;
  		}
  
! 		/// <summary></summary>
! 		public override string Name
! 		{
  			get { return "Int64"; }
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="xml"></param>
! 		/// <returns></returns>
! 		public object StringToObject( string xml )
! 		{
! 			return long.Parse( xml );
  		}
  
  		#region IVersionType Members
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="current"></param>
! 		/// <returns></returns>
! 		public object Next( object current )
  		{
! 			return ( ( long ) current ) + 1;
  		}
  
! 		/// <summary></summary>
! 		public object Seed
  		{
! 			get { return ( long ) 0; }
  		}
  
  		#endregion
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="value"></param>
! 		/// <returns></returns>
! 		public override string ObjectToSQLString( object value )
  		{
  			return value.ToString();
  		}
  	}
! }
\ No newline at end of file

Index: IType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/IType.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IType.cs	20 Aug 2004 17:39:01 -0000	1.10
--- IType.cs	31 Dec 2004 23:53:39 -0000	1.11
***************
*** 1,22 ****
  using System;
  using System.Data;
- 
- using NHibernate.SqlTypes;
  using NHibernate.Engine;
  
! namespace NHibernate.Type {
  	/// <include file='IType.cs.xmldoc' 
  	///		path='//members[@type="IType"]/member[@name="T:IType"]/*'
! 	/// /> 
! 	public interface IType 
  	{
  		// QUESTION:
  		// How do we implement Serializable interface? Standard .NET pattern or other?
! 		
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsAssociationType"]/*'
  		/// /> 
  		bool IsAssociationType { get; }
! 		
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsPersistentCollectionType"]/*'
--- 1,23 ----
  using System;
  using System.Data;
  using NHibernate.Engine;
+ using NHibernate.SqlTypes;
  
! namespace NHibernate.Type
! {
  	/// <include file='IType.cs.xmldoc' 
  	///		path='//members[@type="IType"]/member[@name="T:IType"]/*'
! 	/// />
! 	public interface IType
  	{
  		// QUESTION:
  		// How do we implement Serializable interface? Standard .NET pattern or other?
! 		// Can we mark this interface with the Serializable attribute?
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsAssociationType"]/*'
  		/// /> 
  		bool IsAssociationType { get; }
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsPersistentCollectionType"]/*'
***************
*** 28,101 ****
  		/// /> 
  		bool IsComponentType { get; }
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsEntityType"]/*'
  		/// /> 
  		bool IsEntityType { get; }
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsObjectType"]/*'
  		/// /> 
  		bool IsObjectType { get; }
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.SqlTypes"]/*'
  		/// /> 
! 		SqlType[] SqlTypes(IMapping mapping);
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.GetColumnSpan"]/*'
  		/// /> 
! 		int GetColumnSpan(IMapping mapping);
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.ReturnedClass"]/*'
  		/// /> 
  		System.Type ReturnedClass { get; }
! 		
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.Equals"]/*'
  		/// /> 
! 		bool Equals(object x, object y);
! 		
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.IsDirty"]/*'
  		/// /> 
! 		bool IsDirty(object old, object current, ISessionImplementor session);
! 	
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.NullSafeGet(IDataReader, String[], ISessionImplementor, Object)"]/*'
  		/// /> 
! 		object NullSafeGet(IDataReader rs, string[] names, ISessionImplementor session, object owner);
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.NullSafeGet(IDataReader, String, ISessionImplementor, Object)"]/*'
  		/// /> 
! 		object NullSafeGet(IDataReader rs, string name, ISessionImplementor session, Object owner);
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.NullSafeSet"]/*'
  		/// /> 
! 		void NullSafeSet(IDbCommand st, object value, int index, ISessionImplementor session);
! 	
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.ToXML"]/*'
  		/// /> 
! 		string ToXML(object value, ISessionFactoryImplementor factory);
  
- 		
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.Name"]/*'
  		/// /> 
  		string Name { get; }
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.DeepCopy"]/*'
  		/// /> 
! 		object DeepCopy(object val);
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsMutable"]/*'
--- 29,102 ----
  		/// /> 
  		bool IsComponentType { get; }
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsEntityType"]/*'
  		/// /> 
  		bool IsEntityType { get; }
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsObjectType"]/*'
  		/// /> 
  		bool IsObjectType { get; }
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.SqlTypes"]/*'
  		/// /> 
! 		SqlType[ ] SqlTypes( IMapping mapping );
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.GetColumnSpan"]/*'
  		/// /> 
! 		int GetColumnSpan( IMapping mapping );
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.ReturnedClass"]/*'
  		/// /> 
  		System.Type ReturnedClass { get; }
! 
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.Equals"]/*'
  		/// /> 
! 		bool Equals( object x, object y );
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.IsDirty"]/*'
  		/// /> 
! 		bool IsDirty( object old, object current, ISessionImplementor session );
! 
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.NullSafeGet(IDataReader, String[], ISessionImplementor, Object)"]/*'
  		/// /> 
! 		object NullSafeGet( IDataReader rs, string[ ] names, ISessionImplementor session, object owner );
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.NullSafeGet(IDataReader, String, ISessionImplementor, Object)"]/*'
  		/// /> 
! 		object NullSafeGet( IDataReader rs, string name, ISessionImplementor session, Object owner );
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.NullSafeSet"]/*'
  		/// /> 
! 		void NullSafeSet( IDbCommand st, object value, int index, ISessionImplementor session );
! 
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.ToXML"]/*'
  		/// /> 
! 		string ToXML( object value, ISessionFactoryImplementor factory );
! 
  
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.Name"]/*'
  		/// /> 
  		string Name { get; }
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.DeepCopy"]/*'
  		/// /> 
! 		object DeepCopy( object val );
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="P:IType.IsMutable"]/*'
***************
*** 106,115 ****
  		///		path='//members[@type="IType"]/member[@name=M:IType.Disassemble"]/*'
  		/// /> 
! 		object Disassemble(object value, ISessionImplementor session);
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.Assemble"]/*'
  		/// /> 
! 		object Assemble(object cached, ISessionImplementor session, object owner);
  
  		/// <include file='IType.cs.xmldoc' 
--- 107,116 ----
  		///		path='//members[@type="IType"]/member[@name=M:IType.Disassemble"]/*'
  		/// /> 
! 		object Disassemble( object value, ISessionImplementor session );
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.Assemble"]/*'
  		/// /> 
! 		object Assemble( object cached, ISessionImplementor session, object owner );
  
  		/// <include file='IType.cs.xmldoc' 
***************
*** 117,131 ****
  		/// /> 
  		bool HasNiceEquals { get; }
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.Hydrate"]/*'
  		/// /> 
! 		object Hydrate(IDataReader rs, string[] names, ISessionImplementor session, object owner);
! 	
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.ResolveIdentifier"]/*'
  		/// /> 
! 		object ResolveIdentifier(object value, ISessionImplementor session, object owner);
  
  	}
! }
--- 118,132 ----
  		/// /> 
  		bool HasNiceEquals { get; }
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.Hydrate"]/*'
  		/// /> 
! 		object Hydrate( IDataReader rs, string[ ] names, ISessionImplementor session, object owner );
! 
  		/// <include file='IType.cs.xmldoc' 
  		///		path='//members[@type="IType"]/member[@name="M:IType.ResolveIdentifier"]/*'
  		/// /> 
! 		object ResolveIdentifier( object value, ISessionImplementor session, object owner );
  
  	}
! }
\ No newline at end of file