[Adapdev-commits] Adapdev/src/Adapdev.Cache AbstractCache.cs,1.7,1.8 CacheItem.cs,1.5,1.6 CacheManager.cs,1.8,1.9 CacheStats.cs,1.6,1.7 CacheUtil.cs,1.6,1.7 FileCache.cs,1.7,1.8 ICache.cs,1.8,1.9 ImmutableInMemoryCache.cs,1.5,1.6 MutableInMemoryCache.cs,1.5,1.6

[Sean M. <int...@us...>]

Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Cache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6213/src/Adapdev.Cache

Modified Files:
	AbstractCache.cs CacheItem.cs CacheManager.cs CacheStats.cs 
	CacheUtil.cs FileCache.cs ICache.cs ImmutableInMemoryCache.cs 
	MutableInMemoryCache.cs 
Log Message:


Index: AbstractCache.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/AbstractCache.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AbstractCache.cs	16 Nov 2005 07:01:47 -0000	1.7
--- AbstractCache.cs	1 Mar 2006 01:38:50 -0000	1.8
***************
*** 33,37 ****
  		}
  
! 		public CacheItem GetCacheItem(Type t, int key)
  		{
  			return this.GetCacheItem(t, key.ToString());
--- 33,37 ----
  		}
  
! 		public ICacheItem GetCacheItem(Type t, int key)
  		{
  			return this.GetCacheItem(t, key.ToString());
***************
*** 57,63 ****
  		public abstract bool Contains(Type t, string key);
  		public abstract int Count{get;}
! 		public abstract CacheItem[] Entries{get;}
  		public abstract object Get(Type t, string key);
! 		public abstract CacheItem GetCacheItem(Type t, string key);
  		public abstract void Populate();
  		public abstract void Remove(Type t, string key);
--- 57,63 ----
  		public abstract bool Contains(Type t, string key);
  		public abstract int Count{get;}
! 		public abstract ICacheItem[] Entries{get;}
  		public abstract object Get(Type t, string key);
! 		public abstract ICacheItem GetCacheItem(Type t, string key);
  		public abstract void Populate();
  		public abstract void Remove(Type t, string key);

Index: CacheItem.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/CacheItem.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CacheItem.cs	16 Nov 2005 07:01:47 -0000	1.5
--- CacheItem.cs	1 Mar 2006 01:38:50 -0000	1.6
***************
*** 5,11 ****
  {
  	/// <summary>
! 	/// Summary description for CacheItem.
  	/// </summary>
- 	/// 
  	[Serializable]
  	public class CacheItem : ICacheItem
--- 5,10 ----
  {
  	/// <summary>
! 	/// A wrapper for cached objects that contains meta data
  	/// </summary>
  	[Serializable]
  	public class CacheItem : ICacheItem
***************
*** 17,20 ****
--- 16,24 ----
  		protected Type _objectType = null;
  
+ 		/// <summary>
+ 		/// Initializes a new instance of the <see cref="CacheItem"/> class.
+ 		/// </summary>
+ 		/// <param name="key">The key.</param>
+ 		/// <param name="o">The o.</param>
  		public CacheItem(string key, object o)
  		{
***************
*** 25,28 ****
--- 29,36 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets the creation time.
+ 		/// </summary>
+ 		/// <value>The creation time.</value>
  		public DateTime Created
  		{
***************
*** 30,33 ****
--- 38,45 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets the type of the object.
+ 		/// </summary>
+ 		/// <value>The type of the object.</value>
  		public Type ObjectType
  		{
***************
*** 35,38 ****
--- 47,54 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets the cached object.
+ 		/// </summary>
+ 		/// <value>The cached object.</value>
  		public virtual object Object
  		{
***************
*** 40,43 ****
--- 56,63 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets the internal key.
+ 		/// </summary>
+ 		/// <value>The internal key.</value>
  		public string Key
  		{
***************
*** 45,48 ****
--- 65,72 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets the type key.
+ 		/// </summary>
+ 		/// <value>The type key.</value>
  		public string TypeKey
  		{
***************
*** 50,53 ****
--- 74,81 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets or sets the ordinal location.
+ 		/// </summary>
+ 		/// <value>The ordinal location.</value>
  		public int Ordinal
  		{
***************
*** 56,59 ****
--- 84,93 ----
  		}
  
+ 		/// <summary>
+ 		/// Returns a <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
+ 		/// </summary>
+ 		/// <returns>
+ 		/// A <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
+ 		/// </returns>
  		public override string ToString()
  		{

Index: CacheManager.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/CacheManager.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CacheManager.cs	16 Nov 2005 07:01:47 -0000	1.8
--- CacheManager.cs	1 Mar 2006 01:38:50 -0000	1.9
***************
*** 14,17 ****
--- 14,22 ----
  		}
  
+ 		/// <summary>
+ 		/// Gets or sets the cache.
+ 		/// </summary>
+ 		/// 
+ 		/// <value>The cache.</value>
  		public static ICache Cache
  		{
***************
*** 32,35 ****
--- 37,45 ----
  		}
  
+ 		/// <summary>
+ 		/// Sets the cache.
+ 		/// </summary>
+ 		/// <param name="cacheType">Type of the cache.</param>
+ 		/// <param name="copyExisting">if set to <c>true</c> [copy existing].</param>
  		public static void SetCache(CacheType cacheType, bool copyExisting)
  		{
***************
*** 58,61 ****
--- 68,76 ----
  		}
  
+ 		/// <summary>
+ 		/// Sets the cache.  The existing cache will automatically be copied over
+ 		/// to the new cache.
+ 		/// </summary>
+ 		/// <param name="cacheType">Type of the cache.</param>
  		public static void SetCache(CacheType cacheType)
  		{

Index: FileCache.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/FileCache.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FileCache.cs	16 Nov 2005 07:01:47 -0000	1.7
--- FileCache.cs	1 Mar 2006 01:38:50 -0000	1.8
***************
*** 81,85 ****
  		}
  
! 		public override CacheItem GetCacheItem(Type t, string key)
  		{
  			return this._items[TypeKey.Build(t, key)] as SerializedCacheItem;
--- 81,85 ----
  		}
  
! 		public override ICacheItem GetCacheItem(Type t, string key)
  		{
  			return this._items[TypeKey.Build(t, key)] as SerializedCacheItem;
***************
*** 109,113 ****
  		}
  
! 		public override CacheItem[] Entries
  		{
  			get
--- 109,113 ----
  		}
  
! 		public override ICacheItem[] Entries
  		{
  			get

Index: MutableInMemoryCache.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/MutableInMemoryCache.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MutableInMemoryCache.cs	16 Nov 2005 07:01:47 -0000	1.5
--- MutableInMemoryCache.cs	1 Mar 2006 01:38:50 -0000	1.6
***************
*** 35,39 ****
  		}
  
! 		public override CacheItem GetCacheItem(Type t, string key)
  		{
  			return this._hashtable[TypeKey.Build(t, key)] as CacheItem;
--- 35,39 ----
  		}
  
! 		public override ICacheItem GetCacheItem(Type t, string key)
  		{
  			return this._hashtable[TypeKey.Build(t, key)] as CacheItem;
***************
*** 58,62 ****
  		}
  
! 		public override CacheItem[] Entries
  		{
  			get
--- 58,62 ----
  		}
  
! 		public override ICacheItem[] Entries
  		{
  			get

Index: CacheStats.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/CacheStats.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CacheStats.cs	16 Nov 2005 07:01:47 -0000	1.6
--- CacheStats.cs	1 Mar 2006 01:38:50 -0000	1.7
***************
*** 74,83 ****
  		}
  
! 		public CacheItem GetCacheItem(Type t, string key)
  		{
  			return this._cache.GetCacheItem(t, key);
  		}
  
! 		public CacheItem GetCacheItem(Type t, int key)
  		{
  			return this._cache.GetCacheItem(t, key);
--- 74,83 ----
  		}
  
! 		public ICacheItem GetCacheItem(Type t, string key)
  		{
  			return this._cache.GetCacheItem(t, key);
  		}
  
! 		public ICacheItem GetCacheItem(Type t, int key)
  		{
  			return this._cache.GetCacheItem(t, key);
***************
*** 120,124 ****
  		}
  
! 		public CacheItem[] Entries
  		{
  			get
--- 120,124 ----
  		}
  
! 		public ICacheItem[] Entries
  		{
  			get

Index: CacheUtil.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/CacheUtil.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CacheUtil.cs	16 Nov 2005 07:01:47 -0000	1.6
--- CacheUtil.cs	1 Mar 2006 01:38:50 -0000	1.7
***************
*** 10,13 ****
--- 10,18 ----
  		private CacheUtil(){}
  
+ 		/// <summary>
+ 		/// Copies the specified source.
+ 		/// </summary>
+ 		/// <param name="source">The source.</param>
+ 		/// <param name="target">The target.</param>
  		public static void Copy(ICache source, ICache target)
  		{

Index: ICache.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/ICache.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ICache.cs	16 Nov 2005 07:01:47 -0000	1.8
--- ICache.cs	1 Mar 2006 01:38:50 -0000	1.9
***************
*** 10,28 ****
  	public interface ICache
  	{
  		void Add(string key, object o);
  		void Add(int key, object o);
  		void Remove(Type t, int key);
  		void Remove(Type t, string key);
  		object Get(Type t, int key);
  		object Get(Type t, string key);
! 		CacheItem GetCacheItem(Type t, string key);
! 		CacheItem GetCacheItem(Type t, int key);
  		void Clear();
  		int Count{get;}
  		bool Contains(Type t, string key);
  		bool Contains(Type t, int key);
  		void Scavenge(IScavenger scavenger);
! 		CacheItem[] Entries{get;}
  		void Populate();
  		void Copy(ICache cache);
  	}
--- 10,110 ----
  	public interface ICache
  	{
+ 		/// <summary>
+ 		/// Adds the specified object.
+ 		/// </summary>
+ 		/// <param name="key">The key.</param>
+ 		/// <param name="o">The o.</param>
  		void Add(string key, object o);
+ 		/// <summary>
+ 		/// Adds the specified object.
+ 		/// </summary>
+ 		/// <param name="key">The key.</param>
+ 		/// <param name="o">The o.</param>
  		void Add(int key, object o);
+ 		/// <summary>
+ 		/// Removes the specified object.
+ 		/// </summary>
+ 		/// <param name="t">The object.</param>
+ 		/// <param name="key">The key.</param>
  		void Remove(Type t, int key);
+ 		/// <summary>
+ 		/// Removes the specified object.
+ 		/// </summary>
+ 		/// <param name="t">The object.</param>
+ 		/// <param name="key">The key.</param>
  		void Remove(Type t, string key);
+ 		/// <summary>
+ 		/// Gets the specified object.
+ 		/// </summary>
+ 		/// <param name="t">The object.</param>
+ 		/// <param name="key">The key.</param>
+ 		/// <returns></returns>
  		object Get(Type t, int key);
+ 		/// <summary>
+ 		/// Gets the specified object.
+ 		/// </summary>
+ 		/// <param name="t">The object.</param>
+ 		/// <param name="key">The key.</param>
+ 		/// <returns></returns>
  		object Get(Type t, string key);
! 		/// <summary>
! 		/// Gets the cache item.
! 		/// </summary>
! 		/// <param name="t">The object.</param>
! 		/// <param name="key">The key.</param>
! 		/// <returns></returns>
! 		ICacheItem GetCacheItem(Type t, string key);
! 		/// <summary>
! 		/// Gets the cache item.
! 		/// </summary>
! 		/// <param name="t">The object.</param>
! 		/// <param name="key">The key.</param>
! 		/// <returns></returns>
! 		ICacheItem GetCacheItem(Type t, int key);
! 		/// <summary>
! 		/// Clears this instance.
! 		/// </summary>
  		void Clear();
+ 		/// <summary>
+ 		/// Gets the count.
+ 		/// </summary>
+ 		/// <value>The count.</value>
  		int Count{get;}
+ 		/// <summary>
+ 		/// Determines whether [contains] [the specified object].
+ 		/// </summary>
+ 		/// <param name="t">The t.</param>
+ 		/// <param name="key">The key.</param>
+ 		/// <returns>
+ 		/// 	<c>true</c> if [contains] [the specified object]; otherwise, <c>false</c>.
+ 		/// </returns>
  		bool Contains(Type t, string key);
+ 		/// <summary>
+ 		/// Determines whether [contains] [the specified object].
+ 		/// </summary>
+ 		/// <param name="t">The t.</param>
+ 		/// <param name="key">The key.</param>
+ 		/// <returns>
+ 		/// 	<c>true</c> if [contains] [the specified object]; otherwise, <c>false</c>.
+ 		/// </returns>
  		bool Contains(Type t, int key);
+ 		/// <summary>
+ 		/// Scavenges the current cache, using the specified scavenger.
+ 		/// </summary>
+ 		/// <param name="scavenger">The scavenger.</param>
  		void Scavenge(IScavenger scavenger);
! 		/// <summary>
! 		/// Gets the entries.
! 		/// </summary>
! 		/// <value>The entries.</value>
! 		ICacheItem[] Entries{get;}
! 		/// <summary>
! 		/// Populates this instance.
! 		/// </summary>
  		void Populate();
+ 		/// <summary>
+ 		/// Copies the specified cache.
+ 		/// </summary>
+ 		/// <param name="cache">The cache.</param>
  		void Copy(ICache cache);
  	}

Index: ImmutableInMemoryCache.cs
===================================================================
RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Cache/ImmutableInMemoryCache.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ImmutableInMemoryCache.cs	16 Nov 2005 07:01:47 -0000	1.5
--- ImmutableInMemoryCache.cs	1 Mar 2006 01:38:50 -0000	1.6
***************
*** 35,39 ****
  		}
  
! 		public override CacheItem GetCacheItem(Type t, string key)
  		{
  			return this._hashtable[TypeKey.Build(t, key)] as CacheItem;
--- 35,39 ----
  		}
  
! 		public override ICacheItem GetCacheItem(Type t, string key)
  		{
  			return this._hashtable[TypeKey.Build(t, key)] as CacheItem;
***************
*** 58,62 ****
  		}
  
! 		public override CacheItem[] Entries
  		{
  			get
--- 58,62 ----
  		}
  
! 		public override ICacheItem[] Entries
  		{
  			get