|
From: <fab...@us...> - 2008-07-25 19:46:10
|
Revision: 3669
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3669&view=rev
Author: fabiomaulo
Date: 2008-07-25 19:46:18 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
Merge r3668 (minor)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
trunk/nhibernate/src/NHibernate/Mapping/RootClass.cs
trunk/nhibernate/src/NHibernate/WrongClassException.cs
trunk/nhibernate/src/NHibernate.Test/JoinedSubclass/JoinedSubclassFixture.cs
trunk/nhibernate/src/NHibernate.Test/Subclass/SubclassFixture.cs
Modified: trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2008-07-25 19:43:07 UTC (rev 3668)
+++ trunk/nhibernate/src/NHibernate/Dialect/Dialect.cs 2008-07-25 19:46:18 UTC (rev 3669)
@@ -22,7 +22,7 @@
namespace NHibernate.Dialect
{
/// <summary>
- /// Represents a dialect of SQL implemented by a particular RDBMS. Sublcasses
+ /// Represents a dialect of SQL implemented by a particular RDBMS. Subclasses
/// implement NHibernate compatibility with different systems.
/// </summary>
/// <remarks>
Modified: trunk/nhibernate/src/NHibernate/Mapping/RootClass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/RootClass.cs 2008-07-25 19:43:07 UTC (rev 3668)
+++ trunk/nhibernate/src/NHibernate/Mapping/RootClass.cs 2008-07-25 19:46:18 UTC (rev 3669)
@@ -10,7 +10,7 @@
{
/// <summary>
/// Declaration of a System.Type mapped with the <c><class></c> element that
- /// is the root class of a table-per-sublcass, or table-per-concrete-class
+ /// is the root class of a table-per-subclass, or table-per-concrete-class
/// inheritance heirarchy.
/// </summary>
[Serializable]
Modified: trunk/nhibernate/src/NHibernate/WrongClassException.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/WrongClassException.cs 2008-07-25 19:43:07 UTC (rev 3668)
+++ trunk/nhibernate/src/NHibernate/WrongClassException.cs 2008-07-25 19:46:18 UTC (rev 3669)
@@ -51,7 +51,7 @@
{
get
{
- return string.Format("Object with id: {0} was not of the specified sublcass: {1} ({2})", identifier, entityName, base.Message);
+ return string.Format("Object with id: {0} was not of the specified subclass: {1} ({2})", identifier, entityName, base.Message);
}
}
@@ -96,4 +96,4 @@
#endregion
}
-}
\ No newline at end of file
+}
Modified: trunk/nhibernate/src/NHibernate.Test/JoinedSubclass/JoinedSubclassFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/JoinedSubclass/JoinedSubclassFixture.cs 2008-07-25 19:43:07 UTC (rev 3668)
+++ trunk/nhibernate/src/NHibernate.Test/JoinedSubclass/JoinedSubclassFixture.cs 2008-07-25 19:46:18 UTC (rev 3669)
@@ -210,7 +210,7 @@
person = (Person) s.Load(typeof(Person), personId);
// the object with id=2 was loaded using the base class - lets make sure it actually loaded
- // the sublcass
+ // the subclass
Assert.AreEqual(typeof(Employee), empAsPerson.GetType(),
"even though person was queried, should have returned correct subclass.");
emp = (Employee) s.Load(typeof(Employee), empId);
@@ -266,4 +266,4 @@
s.Close();
}
}
-}
\ No newline at end of file
+}
Modified: trunk/nhibernate/src/NHibernate.Test/Subclass/SubclassFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Subclass/SubclassFixture.cs 2008-07-25 19:43:07 UTC (rev 3668)
+++ trunk/nhibernate/src/NHibernate.Test/Subclass/SubclassFixture.cs 2008-07-25 19:46:18 UTC (rev 3669)
@@ -64,7 +64,7 @@
SubclassAssert.AreEqual(base1, base2);
// the object with id=2 was loaded using the base class - lets make sure it actually loaded
- // the sublcass
+ // the subclass
SubclassOne one2 = oneBase2 as SubclassOne;
Assert.IsNotNull(one2);
@@ -160,4 +160,4 @@
s.Close();
}
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|