[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.61,1.62 NHibernate.cs,1.22,1.23

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18504

Modified Files:
	NHibernate-1.1.csproj NHibernate.cs 
Log Message:
Migrated most Proxy items from proxy branch to this one.  Have not moved
the actual proxy code.  Will do that when the serialization bug in
DynamicProxy is fixed.

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** NHibernate-1.1.csproj	27 Nov 2004 03:42:16 -0000	1.61
--- NHibernate-1.1.csproj	9 Dec 2004 17:52:14 -0000	1.62
***************
*** 1365,1374 ****
                  />
                  <File
!                     RelPath = "Proxy\HibernateProxy.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "Proxy\HibernateProxyHelper.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
--- 1365,1374 ----
                  />
                  <File
!                     RelPath = "Proxy\INHibernateProxy.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
                  />
                  <File
!                     RelPath = "Proxy\IProxyGenerator.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
***************
*** 1380,1383 ****
--- 1380,1393 ----
                  />
                  <File
+                     RelPath = "Proxy\NHibernateProxyHelper.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "Proxy\ProxyGeneratorFactory.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "SqlCommand\Alias.cs"
                      SubType = "Code"

Index: NHibernate.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** NHibernate.cs	25 Aug 2004 03:59:07 -0000	1.22
--- NHibernate.cs	9 Dec 2004 17:52:14 -0000	1.23
***************
*** 245,257 ****
  		/// <exception cref="HibernateException">if we can't initialize the proxy at this time, eg. the Session was closed</exception>
  		public static void Initialize(object proxy) {
! 			if (proxy==null)
  			{
  				return;
  			}
! 			else if ( proxy is HibernateProxy )
  			{
! 				HibernateProxyHelper.GetLazyInitializer( (HibernateProxy) proxy ).Initialize();
  			}
! 			else if ( proxy is PersistentCollection )
  			{
  				( (PersistentCollection) proxy ).ForceLoad();
--- 245,257 ----
  		/// <exception cref="HibernateException">if we can't initialize the proxy at this time, eg. the Session was closed</exception>
  		public static void Initialize(object proxy) {
! 			if( proxy==null )
  			{
  				return;
  			}
! 			else if( proxy is INHibernateProxy )
  			{
! 				NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).Initialize();
  			}
! 			else if( proxy is PersistentCollection )
  			{
  				( (PersistentCollection) proxy ).ForceLoad();
***************
*** 266,272 ****
  		public static bool IsInitialized(object proxy)
  		{
! 			if ( proxy is HibernateProxy ) 
  			{
! 				return !HibernateProxyHelper.GetLazyInitializer( (HibernateProxy) proxy ).IsUninitialized;
  			} 
  			else if ( proxy is PersistentCollection ) 
--- 266,272 ----
  		public static bool IsInitialized(object proxy)
  		{
! 			if ( proxy is INHibernateProxy ) 
  			{
! 				return !NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).IsUninitialized;
  			} 
  			else if ( proxy is PersistentCollection ) 
***************
*** 288,294 ****
  		public System.Type GetClass(object proxy) 
  		{
! 			if(proxy is HibernateProxy) 
  			{
! 				return HibernateProxyHelper.GetLazyInitializer( (HibernateProxy) proxy ).GetImplementation().GetType();
  			}
  			else 
--- 288,294 ----
  		public System.Type GetClass(object proxy) 
  		{
! 			if(proxy is INHibernateProxy) 
  			{
! 				return NHibernateProxyHelper.GetLazyInitializer( (INHibernateProxy) proxy ).GetImplementation().GetType();
  			}
  			else