From: Michael D. <mik...@us...> - 2005-01-17 03:41:08
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11286/NHibernate/Impl Modified Files: QueryImpl.cs SessionImpl.cs Log Message: Renamed NHibernate.NHibernate to NHibernate.NHibernateUtil. Index: SessionImpl.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/SessionImpl.cs,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** SessionImpl.cs 1 Jan 2005 03:36:43 -0000 1.59 --- SessionImpl.cs 17 Jan 2005 03:40:57 -0000 1.60 *************** *** 555,559 **** } ! if( !NHibernate.IsInitialized( obj ) ) { throw new PersistentObjectException( "uninitialized proxy passed to save()" ); --- 555,559 ---- } ! if( !NHibernateUtil.IsInitialized( obj ) ) { throw new PersistentObjectException( "uninitialized proxy passed to save()" ); *************** *** 609,613 **** } ! if( !NHibernate.IsInitialized( obj ) ) { throw new PersistentObjectException( "uninitialized proxy passed to save()" ); --- 609,613 ---- } ! if( !NHibernateUtil.IsInitialized( obj ) ) { throw new PersistentObjectException( "uninitialized proxy passed to save()" ); *************** *** 1247,1251 **** { IClassPersister persister = GetPersister( ( ( EntityType ) type ).PersistentClass ); ! if( persister.HasProxy && !NHibernate.IsInitialized( value ) ) { ReassociateProxy( value ); --- 1247,1251 ---- { IClassPersister persister = GetPersister( ( ( EntityType ) type ).PersistentClass ); ! if( persister.HasProxy && !NHibernateUtil.IsInitialized( value ) ) { ReassociateProxy( value ); *************** *** 1278,1282 **** } ! if( !NHibernate.IsInitialized( obj ) ) { ReassociateProxy( obj ); --- 1278,1282 ---- } ! if( !NHibernateUtil.IsInitialized( obj ) ) { ReassociateProxy( obj ); *************** *** 1321,1325 **** } ! if( !NHibernate.IsInitialized( obj ) ) { ReassociateProxy( obj ); --- 1321,1325 ---- } ! if( !NHibernateUtil.IsInitialized( obj ) ) { ReassociateProxy( obj ); *************** *** 1417,1421 **** } ! if( !NHibernate.IsInitialized( obj ) ) { ReassociateProxy( obj ); --- 1417,1421 ---- } ! if( !NHibernateUtil.IsInitialized( obj ) ) { ReassociateProxy( obj ); *************** *** 2383,2387 **** } ! if( !NHibernate.IsInitialized( obj ) ) { ReassociateProxy( obj ); --- 2383,2387 ---- } ! if( !NHibernateUtil.IsInitialized( obj ) ) { ReassociateProxy( obj ); Index: QueryImpl.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/QueryImpl.cs,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** QueryImpl.cs 5 Jan 2005 02:47:05 -0000 1.19 --- QueryImpl.cs 17 Jan 2005 03:40:57 -0000 1.20 *************** *** 162,166 **** public IQuery SetAnsiString( int position, string val ) { ! SetParameter( position, val, NHibernate.AnsiString ); return this; } --- 162,166 ---- public IQuery SetAnsiString( int position, string val ) { ! SetParameter( position, val, NHibernateUtil.AnsiString ); return this; } *************** *** 174,178 **** public IQuery SetString( int position, string val ) { ! SetParameter( position, val, NHibernate.String ); return this; } --- 174,178 ---- public IQuery SetString( int position, string val ) { ! SetParameter( position, val, NHibernateUtil.String ); return this; } *************** *** 186,190 **** public IQuery SetCharacter( int position, char val ) { ! SetParameter( position, val, NHibernate.Character ); // ); return this; } --- 186,190 ---- public IQuery SetCharacter( int position, char val ) { ! SetParameter( position, val, NHibernateUtil.Character ); // ); return this; } *************** *** 198,202 **** public IQuery SetBoolean( int position, bool val ) { ! SetParameter( position, val, NHibernate.Boolean ); // ); return this; } --- 198,202 ---- public IQuery SetBoolean( int position, bool val ) { ! SetParameter( position, val, NHibernateUtil.Boolean ); // ); return this; } *************** *** 210,214 **** public IQuery SetByte( int position, byte val ) { ! SetParameter( position, val, NHibernate.Byte ); return this; } --- 210,214 ---- public IQuery SetByte( int position, byte val ) { ! SetParameter( position, val, NHibernateUtil.Byte ); return this; } *************** *** 222,226 **** public IQuery SetInt16( int position, short val ) { ! SetParameter( position, val, NHibernate.Int16 ); return this; } --- 222,226 ---- public IQuery SetInt16( int position, short val ) { ! SetParameter( position, val, NHibernateUtil.Int16 ); return this; } *************** *** 234,238 **** public IQuery SetInt32( int position, int val ) { ! SetParameter( position, val, NHibernate.Int32 ); return this; } --- 234,238 ---- public IQuery SetInt32( int position, int val ) { ! SetParameter( position, val, NHibernateUtil.Int32 ); return this; } *************** *** 246,250 **** public IQuery SetInt64( int position, long val ) { ! SetParameter( position, val, NHibernate.Int64 ); return this; } --- 246,250 ---- public IQuery SetInt64( int position, long val ) { ! SetParameter( position, val, NHibernateUtil.Int64 ); return this; } *************** *** 258,262 **** public IQuery SetSingle( int position, float val ) { ! SetParameter( position, val, NHibernate.Single ); return this; } --- 258,262 ---- public IQuery SetSingle( int position, float val ) { ! SetParameter( position, val, NHibernateUtil.Single ); return this; } *************** *** 270,274 **** public IQuery SetDouble( int position, double val ) { ! SetParameter( position, val, NHibernate.Double ); return this; } --- 270,274 ---- public IQuery SetDouble( int position, double val ) { ! SetParameter( position, val, NHibernateUtil.Double ); return this; } *************** *** 282,286 **** public IQuery SetBinary( int position, byte[ ] val ) { ! SetParameter( position, val, NHibernate.Binary ); return this; } --- 282,286 ---- public IQuery SetBinary( int position, byte[ ] val ) { ! SetParameter( position, val, NHibernateUtil.Binary ); return this; } *************** *** 294,298 **** public IQuery SetDecimal( int position, decimal val ) { ! SetParameter( position, val, NHibernate.Decimal ); return this; } --- 294,298 ---- public IQuery SetDecimal( int position, decimal val ) { ! SetParameter( position, val, NHibernateUtil.Decimal ); return this; } *************** *** 306,310 **** public IQuery SetDateTime( int position, DateTime val ) { ! SetParameter( position, val, NHibernate.DateTime ); return this; } --- 306,310 ---- public IQuery SetDateTime( int position, DateTime val ) { ! SetParameter( position, val, NHibernateUtil.DateTime ); return this; } *************** *** 318,322 **** public IQuery SetTime( int position, DateTime val ) { ! SetParameter( position, val, NHibernate.DateTime ); //TODO: change to time return this; } --- 318,322 ---- public IQuery SetTime( int position, DateTime val ) { ! SetParameter( position, val, NHibernateUtil.DateTime ); //TODO: change to time return this; } *************** *** 330,334 **** public IQuery SetTimestamp( int position, DateTime val ) { ! SetParameter( position, val, NHibernate.Timestamp ); return this; } --- 330,334 ---- public IQuery SetTimestamp( int position, DateTime val ) { ! SetParameter( position, val, NHibernateUtil.Timestamp ); return this; } *************** *** 342,346 **** public IQuery SetEntity( int position, object val ) { ! SetParameter( position, val, NHibernate.Entity( NHibernateProxyHelper.GetClass( val ) ) ); return this; } --- 342,346 ---- public IQuery SetEntity( int position, object val ) { ! SetParameter( position, val, NHibernateUtil.Entity( NHibernateProxyHelper.GetClass( val ) ) ); return this; } *************** *** 354,358 **** public IQuery SetEnum( int position, Enum val ) { ! SetParameter( position, val, NHibernate.Enum( val.GetType() ) ); return this; } --- 354,358 ---- public IQuery SetEnum( int position, Enum val ) { ! SetParameter( position, val, NHibernateUtil.Enum( val.GetType() ) ); return this; } *************** *** 366,370 **** public IQuery SetAnsiString( string name, string val ) { ! SetParameter( name, val, NHibernate.AnsiString ); return this; } --- 366,370 ---- public IQuery SetAnsiString( string name, string val ) { ! SetParameter( name, val, NHibernateUtil.AnsiString ); return this; } *************** *** 378,382 **** public IQuery SetString( string name, string val ) { ! SetParameter( name, val, NHibernate.String ); return this; } --- 378,382 ---- public IQuery SetString( string name, string val ) { ! SetParameter( name, val, NHibernateUtil.String ); return this; } *************** *** 390,394 **** public IQuery SetCharacter( string name, char val ) { ! SetParameter( name, val, NHibernate.Character ); return this; } --- 390,394 ---- public IQuery SetCharacter( string name, char val ) { ! SetParameter( name, val, NHibernateUtil.Character ); return this; } *************** *** 402,406 **** public IQuery SetBoolean( string name, bool val ) { ! SetParameter( name, val, NHibernate.Boolean ); return this; } --- 402,406 ---- public IQuery SetBoolean( string name, bool val ) { ! SetParameter( name, val, NHibernateUtil.Boolean ); return this; } *************** *** 414,418 **** public IQuery SetByte( string name, byte val ) { ! SetParameter( name, val, NHibernate.Byte ); return this; } --- 414,418 ---- public IQuery SetByte( string name, byte val ) { ! SetParameter( name, val, NHibernateUtil.Byte ); return this; } *************** *** 426,430 **** public IQuery SetInt16( string name, short val ) { ! SetParameter( name, val, NHibernate.Int16 ); return this; } --- 426,430 ---- public IQuery SetInt16( string name, short val ) { ! SetParameter( name, val, NHibernateUtil.Int16 ); return this; } *************** *** 438,442 **** public IQuery SetInt32( string name, int val ) { ! SetParameter( name, val, NHibernate.Int32 ); return this; } --- 438,442 ---- public IQuery SetInt32( string name, int val ) { ! SetParameter( name, val, NHibernateUtil.Int32 ); return this; } *************** *** 450,454 **** public IQuery SetInt64( string name, long val ) { ! SetParameter( name, val, NHibernate.Int64 ); return this; } --- 450,454 ---- public IQuery SetInt64( string name, long val ) { ! SetParameter( name, val, NHibernateUtil.Int64 ); return this; } *************** *** 462,466 **** public IQuery SetSingle( string name, float val ) { ! SetParameter( name, val, NHibernate.Single ); return this; } --- 462,466 ---- public IQuery SetSingle( string name, float val ) { ! SetParameter( name, val, NHibernateUtil.Single ); return this; } *************** *** 474,478 **** public IQuery SetDouble( string name, double val ) { ! SetParameter( name, val, NHibernate.Double ); return this; } --- 474,478 ---- public IQuery SetDouble( string name, double val ) { ! SetParameter( name, val, NHibernateUtil.Double ); return this; } *************** *** 486,490 **** public IQuery SetBinary( string name, byte[ ] val ) { ! SetParameter( name, val, NHibernate.Binary ); return this; } --- 486,490 ---- public IQuery SetBinary( string name, byte[ ] val ) { ! SetParameter( name, val, NHibernateUtil.Binary ); return this; } *************** *** 498,502 **** public IQuery SetDecimal( string name, decimal val ) { ! SetParameter( name, val, NHibernate.Decimal ); return this; } --- 498,502 ---- public IQuery SetDecimal( string name, decimal val ) { ! SetParameter( name, val, NHibernateUtil.Decimal ); return this; } *************** *** 510,514 **** public IQuery SetDateTime( string name, DateTime val ) { ! SetParameter( name, val, NHibernate.DateTime ); return this; } --- 510,514 ---- public IQuery SetDateTime( string name, DateTime val ) { ! SetParameter( name, val, NHibernateUtil.DateTime ); return this; } *************** *** 522,526 **** public IQuery SetTime( string name, DateTime val ) { ! SetParameter( name, val, NHibernate.DateTime ); //TODO: change to time return this; } --- 522,526 ---- public IQuery SetTime( string name, DateTime val ) { ! SetParameter( name, val, NHibernateUtil.DateTime ); //TODO: change to time return this; } *************** *** 534,538 **** public IQuery SetTimestamp( string name, DateTime val ) { ! SetParameter( name, val, NHibernate.Timestamp ); return this; } --- 534,538 ---- public IQuery SetTimestamp( string name, DateTime val ) { ! SetParameter( name, val, NHibernateUtil.Timestamp ); return this; } *************** *** 546,550 **** public IQuery SetEntity( string name, object val ) { ! SetParameter( name, val, NHibernate.Entity( NHibernateProxyHelper.GetClass( val ) ) ); return this; } --- 546,550 ---- public IQuery SetEntity( string name, object val ) { ! SetParameter( name, val, NHibernateUtil.Entity( NHibernateProxyHelper.GetClass( val ) ) ); return this; } *************** *** 558,562 **** public IQuery SetEnum( string name, Enum val ) { ! SetParameter( name, val, NHibernate.Enum( val.GetType() ) ); return this; } --- 558,562 ---- public IQuery SetEnum( string name, Enum val ) { ! SetParameter( name, val, NHibernateUtil.Enum( val.GetType() ) ); return this; } *************** *** 614,618 **** } } ! return NHibernate.Entity( clazz ); } else --- 614,618 ---- } } ! return NHibernateUtil.Entity( clazz ); } else |