Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate/Type ArrayType.cs,1.7,1.8 BagType.cs,1.4,1.5 IdentifierBagType.cs,1.2,1.3 ListType.cs,1.5,1.6 MapType.cs,1.5,1.6 PersistentCollectionType.cs,1.19,1.20 SetType.cs,1.5,1.6 SortedMapType.cs,1.3,1.4 SortedSetType.cs,1.6,1.7
|
From: Michael D. <mik...@us...> - 2005-02-07 01:34:52
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10106/Type Modified Files: ArrayType.cs BagType.cs IdentifierBagType.cs ListType.cs MapType.cs PersistentCollectionType.cs SetType.cs SortedMapType.cs SortedSetType.cs Log Message: modifications to Collections and their Types for caching related code. Formatting of the Visitor classes and added in two missing Visitors. Index: BagType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/BagType.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BagType.cs 31 Dec 2004 23:50:57 -0000 1.4 --- BagType.cs 7 Feb 2005 01:34:41 -0000 1.5 *************** *** 44,61 **** } - - /// <summary> - /// - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public override PersistentCollection AssembleCachedCollection( ISessionImplementor session, CollectionPersister persister, object disassembled, object owner ) - { - return new Bag( session, persister, disassembled, owner ); - } - } } \ No newline at end of file --- 44,47 ---- Index: ListType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/ListType.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ListType.cs 31 Dec 2004 23:54:40 -0000 1.5 --- ListType.cs 7 Feb 2005 01:34:41 -0000 1.6 *************** *** 43,63 **** return new List( session, ( IList ) collection ); } - - /// <summary> - /// - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public override PersistentCollection AssembleCachedCollection( - ISessionImplementor session, - CollectionPersister persister, - object disassembled, - object owner ) - { - return new List( session, persister, disassembled, owner ); - } } } \ No newline at end of file --- 43,46 ---- Index: IdentifierBagType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/IdentifierBagType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IdentifierBagType.cs 31 Dec 2004 23:52:52 -0000 1.2 --- IdentifierBagType.cs 7 Feb 2005 01:34:41 -0000 1.3 *************** *** 45,63 **** return new IdentifierBag( session, ( ICollection ) collection ); } - - /// <summary> - /// - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public override PersistentCollection AssembleCachedCollection( ISessionImplementor session, CollectionPersister persister, object disassembled, object owner ) - { - return new IdentifierBag( session, persister, disassembled, owner ); - } - - } } \ No newline at end of file --- 45,48 ---- Index: ArrayType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/ArrayType.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ArrayType.cs 31 Dec 2004 23:50:57 -0000 1.7 --- ArrayType.cs 7 Feb 2005 01:34:41 -0000 1.8 *************** *** 93,112 **** get { return true; } } - - /// <summary> - /// - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public override PersistentCollection AssembleCachedCollection( ISessionImplementor session, - CollectionPersister persister, - object disassembled, - object owner ) - { - return new ArrayHolder( session, persister, disassembled, owner ); - } } } \ No newline at end of file --- 93,96 ---- Index: MapType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/MapType.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MapType.cs 31 Dec 2004 23:54:40 -0000 1.5 --- MapType.cs 7 Feb 2005 01:34:41 -0000 1.6 *************** *** 53,73 **** return new Map( session, ( IDictionary ) collection ); } - - /// <summary> - /// - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public override PersistentCollection AssembleCachedCollection( - ISessionImplementor session, - CollectionPersister persister, - object disassembled, - object owner ) - { - return new Map( session, persister, disassembled, owner ); - } } } \ No newline at end of file --- 53,56 ---- Index: SortedMapType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/SortedMapType.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SortedMapType.cs 31 Dec 2004 23:55:34 -0000 1.3 --- SortedMapType.cs 7 Feb 2005 01:34:41 -0000 1.4 *************** *** 48,64 **** return new SortedMap( session, ( IDictionary ) collection, comparer ); } - - /// <summary> - /// - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public override PersistentCollection AssembleCachedCollection( ISessionImplementor session, CollectionPersister persister, object disassembled, object owner ) - { - return new SortedMap( session, persister, comparer, disassembled, owner ); - } } } \ No newline at end of file --- 48,51 ---- Index: SetType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/SetType.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SetType.cs 31 Dec 2004 23:55:34 -0000 1.5 --- SetType.cs 7 Feb 2005 01:34:41 -0000 1.6 *************** *** 49,65 **** /// <summary> - /// <see cref="PersistentCollectionType.AssembleCachedCollection"/> - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public override PersistentCollection AssembleCachedCollection( ISessionImplementor session, CollectionPersister persister, object disassembled, object owner ) - { - return new Set( session, persister, disassembled, owner ); - } - - /// <summary> /// /// </summary> --- 49,52 ---- Index: PersistentCollectionType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/PersistentCollectionType.cs,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** PersistentCollectionType.cs 6 Feb 2005 01:59:02 -0000 1.19 --- PersistentCollectionType.cs 7 Feb 2005 01:34:41 -0000 1.20 *************** *** 93,130 **** } - /* - /// <summary> - /// - /// </summary> - /// <param name="id"></param> - /// <param name="owner"></param> - /// <param name="session"></param> - /// <returns></returns> - public virtual object GetCollection( object id, object owner, ISessionImplementor session ) - { - // added the owner - PersistentCollection collection = session.GetLoadingCollection( role, id ); - if( collection != null ) - { - return collection.GetCachedValue(); - } //TODO: yuck... call another method - H2.0.3comment - - CollectionPersister persister = session.Factory.GetCollectionPersister( role ); - collection = persister.GetCachedCollection( id, owner, session ); - if( collection != null ) - { - session.AddInitializedCollection( collection, persister, id ); - return collection.GetCachedValue(); - } - else - { - collection = Instantiate( session, persister ); - session.AddUninitializedCollection( collection, persister, id ); - return collection.GetInitialValue( persister.IsLazy ); - } - - } - */ - /// <summary> /// --- 93,96 ---- *************** *** 321,334 **** get { return false; } } - - /// <summary> - /// - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public abstract PersistentCollection AssembleCachedCollection( ISessionImplementor session, CollectionPersister persister, object disassembled, object owner ); } } \ No newline at end of file --- 287,290 ---- Index: SortedSetType.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/SortedSetType.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SortedSetType.cs 31 Dec 2004 23:55:53 -0000 1.6 --- SortedSetType.cs 7 Feb 2005 01:34:41 -0000 1.7 *************** *** 51,68 **** } - - /// <summary> - /// - /// </summary> - /// <param name="session"></param> - /// <param name="persister"></param> - /// <param name="disassembled"></param> - /// <param name="owner"></param> - /// <returns></returns> - public override PersistentCollection AssembleCachedCollection( ISessionImplementor session, CollectionPersister persister, object disassembled, object owner ) - { - return new SortedSet( session, persister, comparer, disassembled, owner ); - } - } } \ No newline at end of file --- 51,54 ---- |
