nhibernate-commit

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

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

Modified Files:
	Baz.cs CustomPersister.cs DoubleStringType.cs 
	MultiplicityType.cs 
Log Message:
Renamed NHibernate.NHibernate to NHibernate.NHibernateUtil.

Index: MultiplicityType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/MultiplicityType.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MultiplicityType.cs	3 Jun 2004 14:29:00 -0000	1.2
--- MultiplicityType.cs	17 Jan 2005 03:40:49 -0000	1.3
***************
*** 5,9 ****
  {
  	public class MultiplicityType : ICompositeUserType 
! 	{
		private static readonly string[] PROP_NAMES = new String[] { 
															  "count", "glarch" 
														  };
		private static readonly Type.IType[] TYPES = new Type.IType[] { 
														   NHibernate.Int32, NHibernate.Entity(typeof(Glarch))
													   };
		public String[] PropertyNames
  		{
  			get { return PROP_NAMES; }
		}
		public Type.IType[] PropertyTypes
--- 5,9 ----
  {
  	public class MultiplicityType : ICompositeUserType 
! 	{
		private static readonly string[] PROP_NAMES = new String[] { 
															  "count", "glarch" 
														  };
		private static readonly Type.IType[] TYPES = new Type.IType[] { 
			NHibernateUtil.Int32, NHibernateUtil.Entity(typeof(Glarch))
													   };
		public String[] PropertyNames
  		{
  			get { return PROP_NAMES; }
		}
		public Type.IType[] PropertyTypes
***************
*** 23,28 ****
  			if (mx==null || my==null) return false;
  			return mx.count==my.count && mx.glarch==my.glarch;
		}

		public object NullSafeGet(IDataReader rs, String[] names, Engine.ISessionImplementor session, Object owner)
		{
! 			int c = (int) NHibernate.Int32.NullSafeGet( rs, names[0], session, owner);
! 			GlarchProxy g = (GlarchProxy) NHibernate.Entity(typeof(Glarch)).NullSafeGet(rs, names[1], session, owner);
  			Multiplicity m = new Multiplicity();
  			m.count = ( c==0 ? 0 : c );
--- 23,28 ----
  			if (mx==null || my==null) return false;
  			return mx.count==my.count && mx.glarch==my.glarch;
		}

		public object NullSafeGet(IDataReader rs, String[] names, Engine.ISessionImplementor session, Object owner)
		{
! 			int c = (int) NHibernateUtil.Int32.NullSafeGet( rs, names[0], session, owner);
! 			GlarchProxy g = (GlarchProxy) NHibernateUtil.Entity(typeof(Glarch)).NullSafeGet(rs, names[1], session, owner);
  			Multiplicity m = new Multiplicity();
  			m.count = ( c==0 ? 0 : c );
***************
*** 45,50 ****
  				c = o.count;
  			}
! 			NHibernate.Int32.NullSafeSet(st, c, index, session);
! 			NHibernate.Entity(typeof(Glarch)).NullSafeSet(st, g, index+1, session);

		}

		public object DeepCopy(object value) 
  		{
			if (value==null) return null;
  			Multiplicity v = (Multiplicity) value;
--- 45,50 ----
  				c = o.count;
  			}
! 			NHibernateUtil.Int32.NullSafeSet(st, c, index, session);
! 			NHibernateUtil.Entity(typeof(Glarch)).NullSafeSet(st, g, index+1, session);

		}

		public object DeepCopy(object value) 
  		{
			if (value==null) return null;
  			Multiplicity v = (Multiplicity) value;

Index: DoubleStringType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/DoubleStringType.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DoubleStringType.cs	21 Aug 2004 16:39:00 -0000	1.3
--- DoubleStringType.cs	17 Jan 2005 03:40:49 -0000	1.4
***************
*** 43,48 ****
  		{
  		
! 			String first = (String) NHibernate.String.NullSafeGet(rs, names[0], session, owner);
! 			String second = (String) NHibernate.String.NullSafeGet(rs, names[1], session, owner);
  		
  			return ( first==null && second==null ) ? null : new String[] { first, second };
--- 43,48 ----
  		{
  		
! 			String first = (String) NHibernateUtil.String.NullSafeGet(rs, names[0], session, owner);
! 			String second = (String) NHibernateUtil.String.NullSafeGet(rs, names[1], session, owner);
  		
  			return ( first==null && second==null ) ? null : new String[] { first, second };
***************
*** 54,59 ****
  			String[] strings = (value==null) ? new String[2] : (String[]) value;
  		
! 			NHibernate.String.NullSafeSet(st, strings[0], index, session);
! 			NHibernate.String.NullSafeSet(st, strings[1], index+1, session);
  		}
  	
--- 54,59 ----
  			String[] strings = (value==null) ? new String[2] : (String[]) value;
  		
! 			NHibernateUtil.String.NullSafeSet(st, strings[0], index, session);
! 			NHibernateUtil.String.NullSafeSet(st, strings[1], index+1, session);
  		}
  	
***************
*** 70,74 ****
  			get
  			{
! 				return new Type.IType[] { NHibernate.String, NHibernate.String };
  			}
  		}
--- 70,74 ----
  			get
  			{
! 				return new Type.IType[] { NHibernateUtil.String, NHibernateUtil.String };
  			}
  		}

Index: CustomPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/CustomPersister.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CustomPersister.cs	14 Aug 2004 14:52:01 -0000	1.2
--- CustomPersister.cs	17 Jan 2005 03:40:49 -0000	1.3
***************
*** 22,26 ****
  		private static readonly IIdentifierGenerator Generator = new CounterGenerator();
  
! 		private static readonly IType[] Types = new IType[] { NHibernate.String };
  		private static readonly string[] Names = new string[] { "name" };
  		private static readonly bool[] Mutability = new bool[] { true };
--- 22,26 ----
  		private static readonly IIdentifierGenerator Generator = new CounterGenerator();
  
! 		private static readonly IType[] Types = new IType[] { NHibernateUtil.String };
  		private static readonly string[] Names = new string[] { "name" };
  		private static readonly bool[] Mutability = new bool[] { true };
***************
*** 200,204 ****
  		public IType IdentifierType
  		{
! 			get { return NHibernate.Int64; }
  		}
  
--- 200,204 ----
  		public IType IdentifierType
  		{
! 			get { return NHibernateUtil.Int64; }
  		}
  

Index: Baz.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Baz.cs	20 Dec 2004 05:06:29 -0000	1.13
--- Baz.cs	17 Jan 2005 03:40:49 -0000	1.14
***************
*** 557,561 ****
  		 StringDateMap.Add( "now", DateTime.Now );
  		 StringDateMap.Add( "never", null );
! 		 StringDateMap.Add( "big bang", new DateTime(0) );
  		 ArrayList list = new ArrayList();
  		 list.AddRange( StringSet ); 
--- 557,562 ----
  		 StringDateMap.Add( "now", DateTime.Now );
  		 StringDateMap.Add( "never", null );
! 		 StringDateMap.Add( "millenium", new DateTime( 2000, 01, 01 ) );
! 		 //StringDateMap.Add( "big bang", new DateTime(0) );
  		 ArrayList list = new ArrayList();
  		 list.AddRange( StringSet );