From: Michael D. <mik...@us...> - 2004-11-21 22:58:35
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/Type Modified Files: CharBooleanType.cs NullableType.cs Log Message: NHibernate is now CLSCompliant Index: NullableType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/NullableType.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NullableType.cs 20 Sep 2004 03:00:29 -0000 1.11 --- NullableType.cs 21 Nov 2004 22:56:31 -0000 1.12 *************** *** 20,28 **** private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(NullableType) ); ! /// <summary> ! /// The underlying <see cref="SqlType"/> used to retrieve and store the value. ! /// </summary> ! /// <value>The underlying <see cref="SqlType"/>.</value> ! protected SqlType sqlType; /// <summary> --- 20,24 ---- private static readonly log4net.ILog log = log4net.LogManager.GetLogger( typeof(NullableType) ); ! private SqlType _sqlType; /// <summary> *************** *** 34,38 **** protected NullableType(SqlType sqlType) { ! this.sqlType = sqlType; } --- 30,34 ---- protected NullableType(SqlType sqlType) { ! _sqlType = sqlType; } *************** *** 279,283 **** public virtual SqlType SqlType { ! get {return this.sqlType;} } --- 275,279 ---- public virtual SqlType SqlType { ! get {return _sqlType;} } Index: CharBooleanType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/CharBooleanType.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CharBooleanType.cs 25 Oct 2004 05:37:56 -0000 1.7 --- CharBooleanType.cs 21 Nov 2004 22:56:31 -0000 1.8 *************** *** 41,52 **** } ! public Object stringToObject(String xml) { ! if ( TrueString.Equals(xml) ) { return true; } ! else if ( FalseString.Equals(xml) ) { return false; } ! else { throw new HibernateException("Could not interpret: " + xml); } --- 41,56 ---- } ! public override object StringToObject(String xml) ! { ! if( TrueString.Equals(xml) ) ! { return true; } ! else if( FalseString.Equals(xml) ) ! { return false; } ! else ! { throw new HibernateException("Could not interpret: " + xml); } |