[Nhibernate-commit] nhibernate/src/NHibernate/SqlTypes SqlType.cs,1.3,1.4

[Michael D. <mik...@us...>]

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

Modified Files:
	SqlType.cs 
Log Message:
NHibernate is now CLSCompliant

Index: SqlType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/SqlTypes/SqlType.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SqlType.cs	9 Aug 2004 03:33:54 -0000	1.3
--- SqlType.cs	21 Nov 2004 22:56:30 -0000	1.4
***************
*** 15,74 ****
  	public abstract class SqlType
  	{
! 		protected DbType dbType;
! 		protected int length;
! 		protected byte precision;
! 		protected byte scale;
  
! 		protected bool lengthDefined = false;
! 		protected bool precisionDefined = false;
  		
  		protected SqlType(DbType dbType)
  		{
! 			this.dbType = dbType;
  		}
  
  		protected SqlType(DbType dbType, int length)
  		{
! 			this.dbType = dbType;
! 			this.length = length;
! 			this.lengthDefined = true;
  		}
  
  		protected SqlType(DbType dbType, byte precision, byte scale) 
  		{
! 			this.dbType = dbType;
! 			this.precision = precision;
! 			this.scale = scale;
! 			this.precisionDefined = true;
  		}
  
  		public DbType DbType 
  		{
! 			get { return dbType;}
  		}
  
  		public int Length 
  		{
! 			get { return length;}
  		}
  
  		public byte Precision 
  		{
! 			get { return precision;}
  		}
  
  		public byte Scale 
  		{
! 			get { return scale;}
  		}
  
  		public bool LengthDefined 
  		{
! 			get { return lengthDefined;}
  		}
  
  		public bool PrecisionDefined 
  		{
! 			get { return precisionDefined;}
  		}
  
--- 15,74 ----
  	public abstract class SqlType
  	{
! 		private DbType _dbType;
! 		private int _length;
! 		private byte _precision;
! 		private byte _scale;
  
! 		private bool _lengthDefined = false;
! 		private bool _precisionDefined = false;
  		
  		protected SqlType(DbType dbType)
  		{
! 			_dbType = dbType;
  		}
  
  		protected SqlType(DbType dbType, int length)
  		{
! 			_dbType = dbType;
! 			_length = length;
! 			_lengthDefined = true;
  		}
  
  		protected SqlType(DbType dbType, byte precision, byte scale) 
  		{
! 			_dbType = dbType;
! 			_precision = precision;
! 			_scale = scale;
! 			_precisionDefined = true;
  		}
  
  		public DbType DbType 
  		{
! 			get { return _dbType;}
  		}
  
  		public int Length 
  		{
! 			get { return _length;}
  		}
  
  		public byte Precision 
  		{
! 			get { return _precision;}
  		}
  
  		public byte Scale 
  		{
! 			get { return _scale;}
  		}
  
  		public bool LengthDefined 
  		{
! 			get { return _lengthDefined;}
  		}
  
  		public bool PrecisionDefined 
  		{
! 			get { return _precisionDefined;}
  		}
  
***************
*** 79,93 ****
  			int hashCode = 0;
  
! 			if(lengthDefined) 
  			{
! 				hashCode = (dbType.GetHashCode()/2) + (length.GetHashCode()/2);
  			}
! 			else if(precisionDefined) 
  			{
! 				hashCode = (dbType.GetHashCode()/3) + (precision.GetHashCode()/3) + (scale.GetHashCode()/3);
  			}
  			else 
  			{
! 				hashCode = dbType.GetHashCode();
  			}
  
--- 79,93 ----
  			int hashCode = 0;
  
! 			if( LengthDefined ) 
  			{
! 				hashCode = ( DbType.GetHashCode()/2 ) + ( Length.GetHashCode()/2 );
  			}
! 			else if( PrecisionDefined) 
  			{
! 				hashCode = ( DbType.GetHashCode()/3 ) + ( Precision.GetHashCode()/3 ) + ( Scale.GetHashCode()/3 );
  			}
  			else 
  			{
! 				hashCode = DbType.GetHashCode();
  			}
  
***************
*** 101,126 ****
  			
  			// Step1: Perform an equals test
! 			if(obj==this) return true;
  
  			// Step	2: Instance of check
  			rhsSqlType = obj as SqlType;
! 			if(rhsSqlType==null) return false;
  
  			//Step 3: Check each important field
  
! 			if(lengthDefined)
  			{
! 				equals = (dbType.Equals(rhsSqlType.DbType)) 
! 					&& (length==rhsSqlType.Length);
  			}
! 			else if (precisionDefined) 
  			{
! 				equals = (dbType.Equals(rhsSqlType.DbType))
! 					&& (precision==rhsSqlType.Precision)
! 					&& (scale==rhsSqlType.Scale);
  			}
  			else 
  			{
! 				equals = (dbType.Equals(rhsSqlType.DbType));
  			}
  
--- 101,126 ----
  			
  			// Step1: Perform an equals test
! 			if( obj==this ) return true;
  
  			// Step	2: Instance of check
  			rhsSqlType = obj as SqlType;
! 			if( rhsSqlType==null ) return false;
  
  			//Step 3: Check each important field
  
! 			if( LengthDefined )
  			{
! 				equals = ( DbType.Equals( rhsSqlType.DbType ) ) 
! 					&& ( Length==rhsSqlType.Length );
  			}
! 			else if( PrecisionDefined ) 
  			{
! 				equals = ( DbType.Equals( rhsSqlType.DbType ) )
! 					&& ( Precision==rhsSqlType.Precision )
! 					&& ( Scale==rhsSqlType.Scale );
  			}
  			else 
  			{
! 				equals = ( DbType.Equals( rhsSqlType.DbType ) );
  			}