Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate IInterceptor.cs,1.4,1.5 ILifecycle.cs,1.1,1.2 InstantiationException.cs,1.4,1.5 IQuery.cs,1.12,1.13 ISession.cs,1.12,1.13
|
From: Kevin W. <kev...@us...> - 2005-01-01 03:33:51
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1542 Modified Files: IInterceptor.cs ILifecycle.cs InstantiationException.cs IQuery.cs ISession.cs Log Message: fix xml documentation and allow ReSharper to reformat Index: IQuery.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/IQuery.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** IQuery.cs 31 Dec 2004 23:57:30 -0000 1.12 --- IQuery.cs 1 Jan 2005 03:33:40 -0000 1.13 *************** *** 52,56 **** /// The Hibernate types of the query result set. /// </summary> ! IType[ ] ReturnTypes { get; } /// <summary> --- 52,56 ---- /// The Hibernate types of the query result set. /// </summary> ! IType[] ReturnTypes { get; } /// <summary> *************** *** 58,62 **** /// </summary> /// <value>The parameter names, in no particular order</value> ! string[ ] NamedParameters { get; } /// <summary> --- 58,62 ---- /// </summary> /// <value>The parameter names, in no particular order</value> ! string[] NamedParameters { get; } /// <summary> *************** *** 176,180 **** /// <param name="val"></param> /// <returns></returns> ! IQuery SetBinary( int position, byte[ ] val ); /// <summary> --- 176,180 ---- /// <param name="val"></param> /// <returns></returns> ! IQuery SetBinary( int position, byte[] val ); /// <summary> *************** *** 296,300 **** /// <param name="val"></param> /// <returns></returns> ! IQuery SetBinary( string name, byte[ ] val ); /// <summary> --- 296,300 ---- /// <param name="val"></param> /// <returns></returns> ! IQuery SetBinary( string name, byte[] val ); /// <summary> Index: ILifecycle.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/ILifecycle.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ILifecycle.cs 17 Feb 2003 18:16:13 -0000 1.1 --- ILifecycle.cs 1 Jan 2005 03:33:40 -0000 1.2 *************** *** 1,6 **** ! using System; ! ! namespace NHibernate { ! /// <summary> /// Provides callbacks from the <c>ISession</c> to the persistent object. Persistent classes may --- 1,4 ---- ! namespace NHibernate ! { /// <summary> /// Provides callbacks from the <c>ISession</c> to the persistent object. Persistent classes may *************** *** 32,37 **** /// </para> /// </remarks> ! public interface ILifecycle { ! /// <summary> /// Called when an entity is saved --- 30,35 ---- /// </para> /// </remarks> ! public interface ILifecycle ! { /// <summary> /// Called when an entity is saved *************** *** 39,43 **** /// <param name="s">The session</param> /// <returns>If we should veto the save</returns> ! LifecycleVeto OnSave(ISession s); /// <summary> --- 37,41 ---- /// <param name="s">The session</param> /// <returns>If we should veto the save</returns> ! LifecycleVeto OnSave( ISession s ); /// <summary> *************** *** 50,54 **** /// <param name="s">The session</param> /// <returns>If we should veto the update</returns> ! LifecycleVeto OnUpdate(ISession s); /// <summary> --- 48,52 ---- /// <param name="s">The session</param> /// <returns>If we should veto the update</returns> ! LifecycleVeto OnUpdate( ISession s ); /// <summary> *************** *** 57,61 **** /// <param name="s">The session</param> /// <returns>If we should veto the delete</returns> ! LifecycleVeto OnDelete(ISession s); /// <summary> --- 55,59 ---- /// <param name="s">The session</param> /// <returns>If we should veto the delete</returns> ! LifecycleVeto OnDelete( ISession s ); /// <summary> *************** *** 68,75 **** /// <param name="s">The session</param> /// <param name="id">The identifier</param> ! void OnLoad(ISession s, object id); } ! public enum LifecycleVeto { /// <summary> /// Veto the action --- 66,75 ---- /// <param name="s">The session</param> /// <param name="id">The identifier</param> ! void OnLoad( ISession s, object id ); } ! /// <summary></summary> ! public enum LifecycleVeto ! { /// <summary> /// Veto the action *************** *** 81,83 **** NoVeto } ! } --- 81,83 ---- NoVeto } ! } \ No newline at end of file Index: InstantiationException.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/InstantiationException.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** InstantiationException.cs 22 Nov 2004 03:50:03 -0000 1.4 --- InstantiationException.cs 1 Jan 2005 03:33:40 -0000 1.5 *************** *** 8,38 **** /// </summary> [Serializable] ! public class InstantiationException : HibernateException { private System.Type type; ! public InstantiationException(string message, System.Type type, Exception root) ! : base(message, root) { this.type = type; } ! public System.Type PersistentType { get { return type; } } ! public override string Message { get { return base.Message + type.FullName; } } ! public InstantiationException(string message, Exception root) : this(message, typeof(InstantiationException), root) {} ! public InstantiationException(string message) : this(message, typeof(InstantiationException), new InvalidOperationException("Invalid Operation")) {} ! public InstantiationException() : this("Exception occured", typeof(InstantiationException), new InvalidOperationException("Invalid Operation")) {} ! protected InstantiationException(SerializationInfo info, StreamingContext context) : base(info, context) { } } ! } --- 8,71 ---- /// </summary> [Serializable] ! public class InstantiationException : HibernateException { private System.Type type; ! /// <summary> ! /// ! /// </summary> ! /// <param name="message"></param> ! /// <param name="type"></param> ! /// <param name="root"></param> ! public InstantiationException( string message, System.Type type, Exception root ) ! : base( message, root ) { this.type = type; } ! /// <summary></summary> ! public System.Type PersistentType { get { return type; } } ! /// <summary></summary> ! public override string Message { get { return base.Message + type.FullName; } } ! /// <summary> ! /// ! /// </summary> ! /// <param name="message"></param> ! /// <param name="root"></param> ! public InstantiationException( string message, Exception root ) : this( message, typeof( InstantiationException ), root ) ! { ! } ! /// <summary> ! /// ! /// </summary> ! /// <param name="message"></param> ! public InstantiationException( string message ) : this( message, typeof( InstantiationException ), new InvalidOperationException( "Invalid Operation" ) ) ! { ! } ! /// <summary> ! /// ! /// </summary> ! public InstantiationException() : this( "Exception occured", typeof( InstantiationException ), new InvalidOperationException( "Invalid Operation" ) ) ! { ! } ! /// <summary> ! /// ! /// </summary> ! /// <param name="info"></param> ! /// <param name="context"></param> ! protected InstantiationException( SerializationInfo info, StreamingContext context ) : base( info, context ) ! { ! } } ! } \ No newline at end of file Index: ISession.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/ISession.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ISession.cs 29 Nov 2004 18:43:17 -0000 1.12 --- ISession.cs 1 Jan 2005 03:33:40 -0000 1.13 *************** *** 1,9 **** using System; - using System.Data; using System.Collections; ! using System.Runtime.Serialization; using NHibernate.Type; ! namespace NHibernate { /// <summary> --- 1,8 ---- using System; using System.Collections; ! using System.Data; using NHibernate.Type; ! namespace NHibernate { /// <summary> *************** *** 66,70 **** /// </para> /// </remarks> ! public interface ISession : IDisposable { /// <summary> --- 65,69 ---- /// </para> /// </remarks> ! public interface ISession : IDisposable { /// <summary> *************** *** 120,124 **** /// <remarks>This is used by applications which require long transactions</remarks> /// <param name="connection">An ADO.NET connection</param> ! void Reconnect(IDbConnection connection); /// <summary> --- 119,123 ---- /// <remarks>This is used by applications which require long transactions</remarks> /// <param name="connection">An ADO.NET connection</param> ! void Reconnect( IDbConnection connection ); /// <summary> *************** *** 151,155 **** /// <param name="obj">a persistent instance</param> /// <returns>the identifier</returns> ! object GetIdentifier(object obj); /// <summary> --- 150,154 ---- /// <param name="obj">a persistent instance</param> /// <returns>the identifier</returns> ! object GetIdentifier( object obj ); /// <summary> *************** *** 158,163 **** /// <param name="obj">an instance of a persistent class</param> /// <returns>true if the given instance is associated with this Session</returns> ! bool Contains(object obj); ! /// <summary> /// Remove this instance from the session cache. Changes to the instance will --- 157,162 ---- /// <param name="obj">an instance of a persistent class</param> /// <returns>true if the given instance is associated with this Session</returns> ! bool Contains( object obj ); ! /// <summary> /// Remove this instance from the session cache. Changes to the instance will *************** *** 165,169 **** /// </summary> /// <param name="obj">a persistent instance</param> ! void Evict(Object obj); /// <summary> --- 164,168 ---- /// </summary> /// <param name="obj">a persistent instance</param> ! void Evict( Object obj ); /// <summary> *************** *** 175,179 **** /// <param name="lockMode">The lock level</param> /// <returns>the persistent instance</returns> ! object Load(System.Type theType, object id, LockMode lockMode); /// <summary> --- 174,178 ---- /// <param name="lockMode">The lock level</param> /// <returns>the persistent instance</returns> ! object Load( System.Type theType, object id, LockMode lockMode ); /// <summary> *************** *** 183,187 **** /// <param name="id">A valid identifier of an existing persistent instance of the class</param> /// <returns>The persistent instance</returns> ! object Load(System.Type theType, object id); /// <summary> --- 182,186 ---- /// <param name="id">A valid identifier of an existing persistent instance of the class</param> /// <returns>The persistent instance</returns> ! object Load( System.Type theType, object id ); /// <summary> *************** *** 191,195 **** /// <param name="obj">An "empty" instance of the persistent class</param> /// <param name="id">A valid identifier of an existing persistent instance of the class</param> ! void Load(object obj, object id); /// <summary> --- 190,194 ---- /// <param name="obj">An "empty" instance of the persistent class</param> /// <param name="id">A valid identifier of an existing persistent instance of the class</param> ! void Load( object obj, object id ); /// <summary> *************** *** 202,206 **** /// <param name="obj">A transient instance of a persistent class</param> /// <returns>The generated identifier</returns> ! object Save(object obj); /// <summary> --- 201,205 ---- /// <param name="obj">A transient instance of a persistent class</param> /// <returns>The generated identifier</returns> ! object Save( object obj ); /// <summary> *************** *** 209,213 **** /// <param name="obj">A transient instance of a persistent class</param> /// <param name="id">An unused valid identifier</param> ! void Save(object obj, object id); /// <summary> --- 208,212 ---- /// <param name="obj">A transient instance of a persistent class</param> /// <param name="id">An unused valid identifier</param> ! void Save( object obj, object id ); /// <summary> *************** *** 220,224 **** /// </remarks> /// <param name="obj">A transient instance containing new or updated state</param> ! void SaveOrUpdate(object obj); /// <summary> --- 219,223 ---- /// </remarks> /// <param name="obj">A transient instance containing new or updated state</param> ! void SaveOrUpdate( object obj ); /// <summary> *************** *** 230,234 **** /// </remarks> /// <param name="obj">A transient instance containing updated state</param> ! void Update(object obj); /// <summary> --- 229,233 ---- /// </remarks> /// <param name="obj">A transient instance containing updated state</param> ! void Update( object obj ); /// <summary> *************** *** 241,245 **** /// <param name="obj">A transient instance containing updated state</param> /// <param name="id">Identifier of persistent instance</param> ! void Update(object obj, object id); /// <summary> --- 240,244 ---- /// <param name="obj">A transient instance containing updated state</param> /// <param name="id">Identifier of persistent instance</param> ! void Update( object obj, object id ); /// <summary> *************** *** 251,255 **** /// </remarks> /// <param name="obj">The instance to be removed</param> ! void Delete(object obj); /// <summary> --- 250,254 ---- /// </remarks> /// <param name="obj">The instance to be removed</param> ! void Delete( object obj ); /// <summary> *************** *** 259,263 **** /// <returns>A distinct list of instances</returns> /// <remarks>See <see cref="IQuery.List"/> for implications of <c>cache</c> usage.</remarks> ! IList Find(string query); /// <summary> --- 258,262 ---- /// <returns>A distinct list of instances</returns> /// <remarks>See <see cref="IQuery.List"/> for implications of <c>cache</c> usage.</remarks> ! IList Find( string query ); /// <summary> *************** *** 269,273 **** /// <returns>A distinct list of instances</returns> /// <remarks>See <see cref="IQuery.List"/> for implications of <c>cache</c> usage.</remarks> ! IList Find(string query, object value, IType type); /// <summary> --- 268,272 ---- /// <returns>A distinct list of instances</returns> /// <remarks>See <see cref="IQuery.List"/> for implications of <c>cache</c> usage.</remarks> ! IList Find( string query, object value, IType type ); /// <summary> *************** *** 279,283 **** /// <returns>A distinct list of instances</returns> /// <remarks>See <see cref="IQuery.List"/> for implications of <c>cache</c> usage.</remarks> ! IList Find(string query, object[] values, IType[] types); /// <summary> --- 278,282 ---- /// <returns>A distinct list of instances</returns> /// <remarks>See <see cref="IQuery.List"/> for implications of <c>cache</c> usage.</remarks> ! IList Find( string query, object[] values, IType[] types ); /// <summary> *************** *** 297,301 **** /// <param name="query">The query string</param> /// <returns>An enumerator</returns> ! IEnumerable Enumerable(string query); /// <summary> --- 296,300 ---- /// <param name="query">The query string</param> /// <returns>An enumerator</returns> ! IEnumerable Enumerable( string query ); /// <summary> *************** *** 318,322 **** /// <param name="type">The hibernate type of the value</param> /// <returns>An enumerator</returns> ! IEnumerable Enumerable(string query, object value, IType type); /// <summary> --- 317,321 ---- /// <param name="type">The hibernate type of the value</param> /// <returns>An enumerator</returns> ! IEnumerable Enumerable( string query, object value, IType type ); /// <summary> *************** *** 339,343 **** /// <param name="types">A list of hibernate types of the values</param> /// <returns>An enumerator</returns> ! IEnumerable Enumerable(string query, object[] values, IType[] types); /// <summary> --- 338,342 ---- /// <param name="types">A list of hibernate types of the values</param> /// <returns>An enumerator</returns> ! IEnumerable Enumerable( string query, object[] values, IType[] types ); /// <summary> *************** *** 352,356 **** /// <param name="filter">A filter query string</param> /// <returns>The resulting collection</returns> ! ICollection Filter(object collection, string filter); /// <summary> --- 351,355 ---- /// <param name="filter">A filter query string</param> /// <returns>The resulting collection</returns> ! ICollection Filter( object collection, string filter ); /// <summary> *************** *** 367,371 **** /// <param name="type">The hibernate type of value</param> /// <returns>A collection</returns> ! ICollection Filter(object collection, string filter, object value, IType type); /// <summary> --- 366,370 ---- /// <param name="type">The hibernate type of value</param> /// <returns>A collection</returns> ! ICollection Filter( object collection, string filter, object value, IType type ); /// <summary> *************** *** 382,387 **** /// <param name="types">The hibernate types of the values</param> /// <returns>A collection</returns> ! ICollection Filter(object collection, string filter, object[] values, IType[] types); ! /// <summary> /// Delete all objects returned by the query. --- 381,386 ---- /// <param name="types">The hibernate types of the values</param> /// <returns>A collection</returns> ! ICollection Filter( object collection, string filter, object[] values, IType[] types ); ! /// <summary> /// Delete all objects returned by the query. *************** *** 389,393 **** /// <param name="query">The query string</param> /// <returns>Returns the number of objects deleted.</returns> ! int Delete(string query); /// <summary> --- 388,392 ---- /// <param name="query">The query string</param> /// <returns>Returns the number of objects deleted.</returns> ! int Delete( string query ); /// <summary> *************** *** 398,402 **** /// <param name="type">The hibernate type of value.</param> /// <returns>The number of instances deleted</returns> ! int Delete(string query, object value, IType type); /// <summary> --- 397,401 ---- /// <param name="type">The hibernate type of value.</param> /// <returns>The number of instances deleted</returns> ! int Delete( string query, object value, IType type ); /// <summary> *************** *** 407,411 **** /// <param name="types">A list of Hibernate types of the values</param> /// <returns>The number of instances deleted</returns> ! int Delete(string query, object[] values, IType[] types); /// <summary> --- 406,410 ---- /// <param name="types">A list of Hibernate types of the values</param> /// <returns>The number of instances deleted</returns> ! int Delete( string query, object[] values, IType[] types ); /// <summary> *************** *** 414,418 **** /// <param name="obj">A persistent instance</param> /// <param name="lockMode">The lock level</param> ! void Lock(object obj, LockMode lockMode); /// <summary> --- 413,417 ---- /// <param name="obj">A persistent instance</param> /// <param name="lockMode">The lock level</param> ! void Lock( object obj, LockMode lockMode ); /// <summary> *************** *** 434,438 **** /// </remarks> /// <param name="obj">A persistent instance</param> ! void Refresh(object obj); /// <summary> --- 433,437 ---- /// </remarks> /// <param name="obj">A persistent instance</param> ! void Refresh( object obj ); /// <summary> *************** *** 441,445 **** /// <param name="obj">A persistent instance</param> /// <returns>The current lock mode</returns> ! LockMode GetCurrentLockMode(object obj); /// <summary> --- 440,444 ---- /// <param name="obj">A persistent instance</param> /// <returns>The current lock mode</returns> ! LockMode GetCurrentLockMode( object obj ); /// <summary> *************** *** 462,467 **** /// instead of throwing an Exception because that would allow other methods to just do null checks instead /// of error checking... ! ITransaction Transaction {get;} ! /// <summary> /// Creates a new <c>Criteria</c> for the entity class. --- 461,466 ---- /// instead of throwing an Exception because that would allow other methods to just do null checks instead /// of error checking... ! ITransaction Transaction { get; } ! /// <summary> /// Creates a new <c>Criteria</c> for the entity class. *************** *** 469,473 **** /// <param name="persistentClass">The class to Query</param> /// <returns>An ICriteria object</returns> ! ICriteria CreateCriteria(System.Type persistentClass); /// <summary> --- 468,472 ---- /// <param name="persistentClass">The class to Query</param> /// <returns>An ICriteria object</returns> ! ICriteria CreateCriteria( System.Type persistentClass ); /// <summary> *************** *** 476,480 **** /// <param name="queryString">A hibernate query string</param> /// <returns>The query</returns> ! IQuery CreateQuery(string queryString); /// <summary> --- 475,479 ---- /// <param name="queryString">A hibernate query string</param> /// <returns>The query</returns> ! IQuery CreateQuery( string queryString ); /// <summary> *************** *** 484,488 **** /// <param name="queryString">A hibernate query</param> /// <returns>A query</returns> ! IQuery CreateFilter(object collection, string queryString); /// <summary> --- 483,487 ---- /// <param name="queryString">A hibernate query</param> /// <returns>A query</returns> ! IQuery CreateFilter( object collection, string queryString ); /// <summary> *************** *** 492,496 **** /// <param name="queryName">The name of a query defined externally</param> /// <returns>A queru</returns> ! IQuery GetNamedQuery(string queryName); } ! } --- 491,495 ---- /// <param name="queryName">The name of a query defined externally</param> /// <returns>A queru</returns> ! IQuery GetNamedQuery( string queryName ); } ! } \ No newline at end of file Index: IInterceptor.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/IInterceptor.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IInterceptor.cs 31 Dec 2004 15:38:09 -0000 1.4 --- IInterceptor.cs 1 Jan 2005 03:33:40 -0000 1.5 *************** *** 35,39 **** /// uninitialized instance of the class.</remarks> /// <returns><c>true</c> if the user modified the <c>state</c> in any way</returns> ! bool OnLoad( object entity, object id, object[ ] state, string[ ] propertyNames, IType[ ] types ); /// <summary> --- 35,39 ---- /// uninitialized instance of the class.</remarks> /// <returns><c>true</c> if the user modified the <c>state</c> in any way</returns> ! bool OnLoad( object entity, object id, object[] state, string[] propertyNames, IType[] types ); /// <summary> *************** *** 54,58 **** /// </remarks> /// <returns><c>true</c> if the user modified the <c>currentState</c> in any way</returns> ! bool OnFlushDirty( object entity, object id, object[ ] currentState, object[ ] previousState, string[ ] propertyNames, IType[ ] types ); /// <summary> --- 54,58 ---- /// </remarks> /// <returns><c>true</c> if the user modified the <c>currentState</c> in any way</returns> ! bool OnFlushDirty( object entity, object id, object[] currentState, object[] previousState, string[] propertyNames, IType[] types ); /// <summary> *************** *** 69,73 **** /// </remarks> /// <returns><c>true</c> if the user modified the <c>state</c> in any way</returns> ! bool OnSave( object entity, object id, object[ ] state, string[ ] propertyNames, IType[ ] types ); /// <summary> --- 69,73 ---- /// </remarks> /// <returns><c>true</c> if the user modified the <c>state</c> in any way</returns> ! bool OnSave( object entity, object id, object[] state, string[] propertyNames, IType[] types ); /// <summary> *************** *** 82,86 **** /// It is not recommended that the interceptor modify the <c>state</c>. /// </remarks> ! void OnDelete( object entity, object id, object[ ] state, string[ ] propertyNames, IType[ ] types ); /// <summary> --- 82,86 ---- /// It is not recommended that the interceptor modify the <c>state</c>. /// </remarks> ! void OnDelete( object entity, object id, object[] state, string[] propertyNames, IType[] types ); /// <summary> *************** *** 129,133 **** /// <param name="types"></param> /// <returns>An array of dirty property indicies or <c>null</c> to choose default behavior</returns> ! int[ ] FindDirty( object entity, object id, object[ ] currentState, object[ ] previousState, string[ ] propertyNames, IType[ ] types ); /// <summary> --- 129,133 ---- /// <param name="types"></param> /// <returns>An array of dirty property indicies or <c>null</c> to choose default behavior</returns> ! int[] FindDirty( object entity, object id, object[] currentState, object[] previousState, string[] propertyNames, IType[] types ); /// <summary> |
