[Jcframework-commits] Nunit/InheritedClasses tblAtoNClasses.vb,NONE,1.1 AtomsFrameworkTests.vb,1.17,1.18 AutoIdClasses.vb,1.1,1.2 AutoIdTests.vb,1.2,1.3 CEmployee.vb,1.3,1.4 CJob.vb,1.1,1.2 CSharedClasses.vb,1.2,1.3 CTeam.vb,1.1,1.2 ManyToManyClasses_v2.vb,1.3,1.4 ManyToManyTests_v2.vb,1.5,1.6 MultiRetrieveTestClasses.vb,1.3,1.4 MultiRetrieveTests.vb,1.5,1.6 RetrieveCriteriaTests.vb,1.5,1.6 SharedTests.vb,1.5,1.6 SuperClassTests.vb,1.7,1.8 TableA_B.vb,1.6,1.7

[Dan M. <dan...@us...>]

Update of /cvsroot/jcframework/Nunit/InheritedClasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6561/Nunit/InheritedClasses

Modified Files:
	AtomsFrameworkTests.vb AutoIdClasses.vb AutoIdTests.vb 
	CEmployee.vb CJob.vb CSharedClasses.vb CTeam.vb 
	ManyToManyClasses_v2.vb ManyToManyTests_v2.vb 
	MultiRetrieveTestClasses.vb MultiRetrieveTests.vb 
	RetrieveCriteriaTests.vb SharedTests.vb SuperClassTests.vb 
	TableA_B.vb 
Added Files:
	tblAtoNClasses.vb 
Log Message:
Add support for standard classes super classes.
Add new NUnit test to test standard classes super classes.

Index: CJob.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/CJob.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CJob.vb	19 Oct 2004 00:13:38 -0000	1.1
+++ CJob.vb	10 Jul 2005 11:35:38 -0000	1.2
@@ -3,7 +3,7 @@
 Namespace InheritedClasses
 	<AFTable("jobs", "MSA", AFTableAttribute.KeyType.useOIDValue, OIDcolumn:="oidvalue")> _
 	Public Class CJob
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private m_description As String
 
@@ -18,7 +18,7 @@
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New CJob
 		End Function
 

Index: MultiRetrieveTestClasses.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/MultiRetrieveTestClasses.vb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MultiRetrieveTestClasses.vb	19 Dec 2004 22:44:46 -0000	1.3
+++ MultiRetrieveTestClasses.vb	10 Jul 2005 11:35:38 -0000	1.4
@@ -3,7 +3,7 @@
 
 Namespace InheritedClasses
 	Public Class mr1
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private _id As String
 		Private _mr2_id As String
@@ -64,7 +64,7 @@
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New mr1
 		End Function
 
@@ -74,7 +74,7 @@
 	End Class
 
 	Public Class mr2
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private _id As String
 		Public Property id() As String
@@ -136,7 +136,7 @@
 		End Property
 
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New mr2
 		End Function
 
@@ -146,7 +146,7 @@
 	End Class
 
 	Public Class mr3
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private _id As String
 		Public Property id() As String
@@ -181,7 +181,7 @@
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New mr3
 		End Function
 

Index: TableA_B.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/TableA_B.vb,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TableA_B.vb	14 Feb 2005 02:24:12 -0000	1.6
+++ TableA_B.vb	10 Jul 2005 11:35:38 -0000	1.7
@@ -2,7 +2,7 @@
 
 Namespace InheritedClasses
 	Public Class TableA
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private _id As String
 		Public Property Id() As String
@@ -26,27 +26,27 @@
 			End Set
 		End Property
 
-		Private WithEvents _tableBCol As New CPersistentCollection
-		Public Property TableBCollection() As CPersistentCollection
+		Private WithEvents _tableBCol As New PersistentObjectCollection
+		Public Property TableBCollection() As PersistentObjectCollection
 			Get
 				Return _tableBCol
 			End Get
-			Set(ByVal Value As CPersistentCollection)
+			Set(ByVal Value As PersistentObjectCollection)
 				_tableBCol = Value
 			End Set
 		End Property
 
-		Private _tableCCol As New CPersistentCollection
-		Public Property TableCCollection() As CPersistentCollection
+		Private _tableCCol As New PersistentObjectCollection
+		Public Property TableCCollection() As PersistentObjectCollection
 			Get
 				Return _tableCCol
 			End Get
-			Set(ByVal Value As CPersistentCollection)
+			Set(ByVal Value As PersistentObjectCollection)
 				_tableCCol = Value
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New TableA
 		End Function
 
@@ -68,7 +68,7 @@
 	End Class
 
   Public Class TableB
-    Inherits CPersistentObject
+    Inherits PersistentObject
 
     Private _id As String
     Public Property Id() As String
@@ -116,7 +116,7 @@
       End Set
     End Property
 
-    Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+    Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
       Return New TableB
     End Function
 
@@ -126,7 +126,7 @@
   End Class
 
   Public Class TableC
-    Inherits CPersistentObject
+    Inherits PersistentObject
 
     Private _id As String
     Public Property Id() As String
@@ -174,7 +174,7 @@
       End Set
     End Property
 
-    Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+    Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
       Return New TableC
     End Function
 

--- NEW FILE: tblAtoNClasses.vb ---
Imports AToMSFramework

Namespace InheritedClasses

	Public Class A
		Inherits PersistentObject
		Public _id As Integer = 0
		Public _text As String = String.Empty

		Public _c As C
		Public _cOID As String
		Public WithEvents _bCol As PersistentObjectCollection

		Public Sub New()
			_bCol = New PersistentObjectCollection
			Me.SetDirtyFlag()
		End Sub

		Public Property Id() As Integer
			Get
				Return _id
			End Get
			Set(ByVal value As Integer)
				If (_id <> value) Then
					_id = value
					SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property Text() As String
			Get
				Return _text
			End Get
			Set(ByVal Value As String)
				If (_text <> Value) Then
					_text = Value
					SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property C() As C
			Get
				'Retrieving manually when we have an association set to autoretrieve can produce
				'unpredictable results.
				'If _c Is Nothing AndAlso _cOID <> String.Empty Then
				'	_c = New C
				'	_c.OIDValue = _cOID
				'	_c.Retrieve()
				'End If
				Return _c
			End Get
			Set(ByVal Value As C)
				If Me._c Is Nothing AndAlso Not (Value Is Nothing) Then
					Me._c = Value
					Me._cOID = Value.OidValue
				Else
					If Value Is Nothing Then
						Me._c = Nothing
						Me._cOID = Nothing
					Else
						If Not Me._c.Equals(Value) Then
							Me._c = Value
							Me._cOID = Value.OidValue
						End If
					End If
				End If
				Me.SetDirtyFlag()
			End Set
		End Property

		Public Property COID() As String
			Get
				If Not _c Is Nothing Then
					Return _c.OidValue
				Else
					Return _cOID
				End If
			End Get
			Set(ByVal Value As String)
				_cOID = Value
			End Set
		End Property

		Public Property BCol() As PersistentObjectCollection
			Get
				Return _bCol
			End Get
			Set(ByVal Value As PersistentObjectCollection)
				If _bCol.Equals(Value) Then
					_bCol = Value
					For Each _b As B In _bCol
						_b.A = Me
					Next
					SetDirtyFlag()
				End If
			End Set
		End Property

		Public Overrides Function GetNewObject() As PersistentObject
			Return New A
		End Function

		Public Overrides Function IsValid() As Boolean
			Return True
		End Function

		Private Sub _bCol_ListChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ListChangedEventArgs) Handles _bCol.ListChanged
			Me.SetDirtyFlag()
		End Sub
	End Class

	Public Class B
		Inherits PersistentObject

		Public Sub New()
			_nCol = New PersistentObjectCollection
			Me.SetDirtyFlag()
		End Sub

		Public _id As Integer = 0
		Public _text As String = String.Empty
		Public _a As A = Nothing
		Public _aOID As String = Nothing
		Public WithEvents _nCol As PersistentObjectCollection

		Public Property Id() As Integer
			Get
				Return Me._id
			End Get
			Set(ByVal Value As Integer)
				If Not (Me._id = Value) Then
					Me._id = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property Text() As String
			Get
				Return Me._text
			End Get
			Set(ByVal Value As String)
				If Not (Me._text = Value) Then
					Me._text = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property A() As A
			Get
				Return Me._a
			End Get
			Set(ByVal Value As A)
				If Me._a Is Nothing AndAlso Not (Value Is Nothing) Then
					Me._a = Value
					Me._aOID = Value.OidValue
				Else
					If Value Is Nothing Then
						Me._a = Nothing
						Me._aOID = Nothing
					Else
						If Not Me._a.Equals(Value) Then
							Me._a = Value
							Me._aOID = Value.OidValue
						End If
					End If
				End If
				Me.SetDirtyFlag()
			End Set
		End Property

		Public Property AOID() As String
			Get
				If Not (Me._a Is Nothing) Then
					Return Me._a.OidValue
				Else
					Return Me._aOID
				End If
			End Get
			Set(ByVal Value As String)
				If Not (Me._a Is Nothing) Then
					If Not (Me._a.OidValue = Value) Then
						Me._a.OidValue = Value
						Me.SetDirtyFlag()
					End If
				End If
				Me._aOID = Value
			End Set
		End Property

		Public Property NCol() As PersistentObjectCollection
			Get
				Return Me._nCol
			End Get
			Set(ByVal Value As PersistentObjectCollection)
				If Me._nCol.Equals(Value) Then
					Me._nCol = Value
					For Each _n As N In Me._nCol
						_n.B = Me
					Next
					SetDirtyFlag()
				End If
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New B
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function

		Private Sub _nCol_ListChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ListChangedEventArgs) Handles _nCol.ListChanged
			Me.SetDirtyFlag()
		End Sub
	End Class

	Public Class C
		Inherits PersistentObject

		Public Sub New()
		End Sub
		Private _id As Integer = 0
		Private _text As String = String.Empty

		Public Property Id() As Integer
			Get
				Return Me._id
			End Get
			Set(ByVal Value As Integer)
				If Not (Me._id = Value) Then
					Me._id = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property Text() As String
			Get
				Return Me._text
			End Get
			Set(ByVal Value As String)
				If Not (Me._text = Value) Then
					Me._text = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New C
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class D
		Inherits B

		Public Sub New()
		End Sub
		Private _str As String = String.Empty

		Public Property Str() As String
			Get
				Return Me._str
			End Get
			Set(ByVal Value As String)
				If Not (Me._str = Value) Then
					Me._str = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New D
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class E
		Inherits B

		Public Sub New()
		End Sub
		Private _str As String = String.Empty
		Private _m As M = Nothing
		Private _mOID As String

		Public Property Str() As String
			Get
				Return Me._str
			End Get
			Set(ByVal Value As String)
				If Not (Me._str = Value) Then
					Me._str = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property M1()
			Get
				Return Me._m
			End Get
			Set(ByVal Value)
				If Me._m Is Nothing AndAlso Not (Value Is Nothing) Then
					Me._m = Value
					Me._mOID = Value.OidValue
				Else
					If Value Is Nothing Then
						Me._m = Nothing
						Me._mOID = Nothing
					Else
						If Not Me._m.Equals(Value) Then
							Me._m = Value
							Me._mOID = Value.OidValue
						End If
					End If
				End If
				Me.SetDirtyFlag()
			End Set
		End Property

		Public Property M1OID()
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.OidValue
				Else
					Return Me._mOID
				End If
			End Get
			Set(ByVal Value)
				If Not Me._m Is Nothing Then
					If Not Me._m.OidValue.Equals(Value) Then
						Me._m.OidValue = Value
						Me.SetDirtyFlag()
					End If
				End If
				Me._mOID = Value
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New E
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class F
		Inherits E

		Public Sub New()
		End Sub
		Private _i As Integer = 0

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				If Not (Me._i = Value) Then
					Me._i = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New F
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class G
		Inherits E

		Public Sub New()
		End Sub
		Private _i As Integer = 0
		Private _m As M = Nothing
		Private _mOID As String = Nothing

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				If Not (Me._i = Value) Then
					Me._i = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property M()
			Get
				Return Me._m
			End Get
			Set(ByVal Value)
				If Me._m Is Nothing AndAlso Not (Value Is Nothing) Then
					Me._m = Value
					Me._mOID = Value.OidValue
				Else
					If Value Is Nothing Then
						Me._m = Nothing
						Me._mOID = Nothing
					Else
						If Not Me._m.Equals(Value) Then
							Me._m = Value
							Me._mOID = Value.OidValue
						End If
					End If
				End If
				Me.SetDirtyFlag()
			End Set
		End Property

		Public Property MOID()
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.OidValue
				Else
					Return Me._mOID
				End If
			End Get
			Set(ByVal Value)
				If Not Me._m Is Nothing Then
					If Not Me._m.OidValue.Equals(Value) Then
						Me._m.OidValue = Value
						Me.SetDirtyFlag()
					End If
				End If
				Me._mOID = Value
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New G
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class H
		Inherits C

		Public Sub New()
		End Sub
		Private _str As String = String.Empty
		Private _m As M = Nothing
		Private _mOID As String

		Public Property Str() As String
			Get
				Return Me._str
			End Get
			Set(ByVal Value As String)
				If Not (Me._str = Value) Then
					Me._str = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property M1()
			Get
				Return Me._m
			End Get
			Set(ByVal Value)
				If Me._m Is Nothing AndAlso Not (Value Is Nothing) Then
					Me._m = Value
					Me._mOID = Value.OidValue
				Else
					If Value Is Nothing Then
						Me._m = Nothing
						Me._mOID = Nothing
					Else
						If Not Me._m.Equals(Value) Then
							Me._m = Value
							Me._mOID = Value.OidValue
						End If
					End If
				End If
				Me.SetDirtyFlag()
			End Set
		End Property

		Public Property M1OID()
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.OidValue
				Else
					Return Me._mOID
				End If
			End Get
			Set(ByVal Value)
				If Not Me._m Is Nothing Then
					If Not Me._m.OidValue.Equals(Value) Then
						Me._m.OidValue = Value
						Me.SetDirtyFlag()
					End If
				End If
				Me._mOID = Value
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New H
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class I
		Inherits C

		Public Sub New()
		End Sub
		Private _str As String = String.Empty

		Public Property Str() As String
			Get
				Return Me._str
			End Get
			Set(ByVal Value As String)
				If Not (Me._str = Value) Then
					Me._str = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New I
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class J
		Inherits H

		Public Sub New()
		End Sub
		Private _i As Integer = 0

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				If Not (Me._i = Value) Then
					Me._i = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New J
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class K
		Inherits H

		Public Sub New()
		End Sub
		Private _i As Integer = 0
		Private _m As M = Nothing
		Private _mOID As String

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				If Not (Me._i = Value) Then
					Me._i = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property M()
			Get
				Return Me._m
			End Get
			Set(ByVal Value)
				If Me._m Is Nothing AndAlso Not (Value Is Nothing) Then
					Me._m = Value
					Me._mOID = Value.OidValue
				Else
					If Value Is Nothing Then
						Me._m = Nothing
						Me._mOID = Nothing
					Else
						If Not Me._m.Equals(Value) Then
							Me._m = Value
							Me._mOID = Value.OidValue
						End If
					End If
				End If
				Me.SetDirtyFlag()
			End Set
		End Property

		Public Property MOID()
			Get
				If Not Me._m Is Nothing Then
					Return Me._m.OidValue
				Else
					Return Me._mOID
				End If
			End Get
			Set(ByVal Value)
				If Not Me._m Is Nothing Then
					If Not Me._m.OidValue.Equals(Value) Then
						Me._m.OidValue = Value
						Me.SetDirtyFlag()
					End If
				End If
				Me._mOID = Value
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New K
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class M
		Inherits PersistentObject

		Public Sub New()
		End Sub
		Private _i As Integer = 0

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				If Not (Me._i = Value) Then
					Me._i = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New M
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class

	Public Class N
		Inherits PersistentObject

		Public Sub New()
		End Sub
		Private _i As Integer = 0
		Private _b As B = Nothing
		Private _bOID As String = Nothing

		Public Property I() As Integer
			Get
				Return Me._i
			End Get
			Set(ByVal Value As Integer)
				If Not (Me._i = Value) Then
					Me._i = Value
					Me.SetDirtyFlag()
				End If
			End Set
		End Property

		Public Property B() As B
			Get
				Return Me._b
			End Get
			Set(ByVal Value As B)
				If Me._b Is Nothing AndAlso Not (Value Is Nothing) Then
					Me._b = Value
					Me._bOID = Value.OidValue
				Else
					If Value Is Nothing Then
						Me._b = Nothing
						Me._bOID = Nothing
					Else
						If Not Me._b.Equals(Value) Then
							Me._b = Value
							Me._bOID = Value.OidValue
						End If
					End If
				End If
				Me.SetDirtyFlag()
			End Set
		End Property

		Public Property BOID() As String
			Get
				If Not (Me._b Is Nothing) Then
					Return Me._b.OidValue
				Else
					Return Me._bOID
				End If
			End Get
			Set(ByVal Value As String)
				If Not (Me._b Is Nothing) Then
					If Not (Me._b.OidValue = Value) Then
						Me._b.OidValue = Value
						Me.SetDirtyFlag()
					End If
				End If
				Me._bOID = Value
			End Set
		End Property

		Public Overloads Overrides Function GetNewObject() As PersistentObject
			Return New N
		End Function

		Public Overloads Overrides Function IsValid() As Boolean
			Return True
		End Function
	End Class
End Namespace
Index: RetrieveCriteriaTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/RetrieveCriteriaTests.vb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RetrieveCriteriaTests.vb	16 Mar 2005 11:34:12 -0000	1.5
+++ RetrieveCriteriaTests.vb	10 Jul 2005 11:35:38 -0000	1.6
@@ -4,11 +4,11 @@
 Namespace InheritedClasses
 	<TestFixture()> Public Class RetrieveCriteriaTests
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 		Private emp As CEmployee
-		Private r As CRetrieveCriteria
-		Private mr As CMultiRetrieveCriteria
-		Private c As CCursor
+		Private r As RetrieveCriteria
+		Private mr As MultiRetrieveCriteria
+		Private c As ResultCursor
 
 		<TestFixtureSetUp()> Public Sub Init()
 			Environment.CurrentDirectory = System.AppDomain.CurrentDomain.BaseDirectory
@@ -26,7 +26,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 
@@ -40,7 +40,7 @@
 		End Sub
 
 		<Test()> Public Sub SingleClassRetrieve()
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = emp.getClassMap
 			c = r.perform
 			Assert.IsTrue(c.hasElements)
@@ -50,11 +50,11 @@
 		End Sub
 
 		<Test()> Public Sub MultiRetrieveTest1()
-			Dim si As CSelectInCriteria
+			Dim si As SelectInCriteria
 
-			mr = New CMultiRetrieveCriteria(emp)
-			mr.WhereCondition.addSelectEqualTo("Name", "ac")
-			si = New CSelectInCriteria(emp)
+			mr = New MultiRetrieveCriteria(emp)
+			mr.WhereCondition.AddSelectEqualTo("Name", "ac")
+			si = New SelectInCriteria(emp)
 			si.WhereCondition.addSelectEqualTo("Name", "ac")
 			si.SetSelectAttribute("Name")
 			mr.WhereCondition.addSelectNotIn("Name", si)
@@ -64,7 +64,7 @@
 		End Sub
 
 		<Test()> Public Sub RetrieveCriteriaOffset()
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = emp.getClassMap
 			r.RowLimit = 1
 			r.Offset = 1
@@ -74,7 +74,7 @@
 		End Sub
 
 		<Test()> Public Sub LoadFullObjects()
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ReturnFullObjects = True
 			c = r.perform(emp)
 			Assert.IsFalse(c.HoldsProxies)
@@ -91,7 +91,7 @@
 		End Sub
 
 		<Test()> Public Sub SimpleOrCriteria()
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = emp.getClassMap
 			r.WhereCondition.addSelectEqualTo("Name", "aa")
 			r.WhereCondition.addSelectEqualTo("Name", "b", True)
@@ -110,7 +110,7 @@
 			Dim al As New ArrayList
 			al.Add("aa")
 			al.Add("b")
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = emp.getClassMap
 			r.WhereCondition.addSelectInList("Name", al)
 			c = r.perform
@@ -125,12 +125,12 @@
 		End Sub
 
 		<Test()> Public Sub SubCriteria()
-			Dim xx_1 As New CCriteriaCondition
-			Dim xx_2 As New CCriteriaCondition
-			Dim xx_3 As New CCriteriaCondition
-			Dim xx_4 As New CCriteriaCondition
+			Dim xx_1 As New CriteriaCondition
+			Dim xx_2 As New CriteriaCondition
+			Dim xx_3 As New CriteriaCondition
+			Dim xx_4 As New CriteriaCondition
 
-			r = New CRetrieveCriteria
+			r = New RetrieveCriteria
 			r.ClassMap = emp.getClassMap
 			xx_1.ClassMap = r.ClassMap
 			xx_2.ClassMap = r.ClassMap

Index: ManyToManyClasses_v2.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/ManyToManyClasses_v2.vb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ManyToManyClasses_v2.vb	16 Mar 2005 11:34:12 -0000	1.3
+++ ManyToManyClasses_v2.vb	10 Jul 2005 11:35:38 -0000	1.4
@@ -3,7 +3,7 @@
 Namespace InheritedClasses
 #Region "M2MA"
 	Public Class M2MA
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private _description As String
 		Private WithEvents _bCol As M2MBCollection
@@ -27,7 +27,7 @@
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New M2MA
 		End Function
 
@@ -47,7 +47,7 @@
 
 #Region "M2MB"
 	Public Class M2MB
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private _description As String
 		Private _aCol As M2MACollection
@@ -71,7 +71,7 @@
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New M2MB
 		End Function
 
@@ -88,7 +88,7 @@
 
 #Region "M2MACollection"
 	Public Class M2MACollection
-		Inherits CPersistentCollection
+		Inherits PersistentObjectCollection
 
 		Public Overloads Sub Add(ByVal a As M2MA)
 			list.Add(a)
@@ -102,7 +102,7 @@
 
 #Region "M2MBCollection"
 	Public Class M2MBCollection
-		Inherits CPersistentCollection
+		Inherits PersistentObjectCollection
 
 		Public Overloads Sub Add(ByVal b As M2MB)
 			list.Add(b)

Index: CEmployee.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/CEmployee.vb,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CEmployee.vb	1 Apr 2005 00:00:10 -0000	1.3
+++ CEmployee.vb	10 Jul 2005 11:35:38 -0000	1.4
@@ -1,18 +1,18 @@
 Imports AToMSFramework
 
 Namespace InheritedClasses
-	<AFTable("employee", "MSA", AFTableAttribute.KeyType.useOIDValue, OIDColumn:="oid"), _
-	AFAssociation(GetType(CEmployee), "ReportsTo", CUDAMap.CardinalityEnum.ONE_TO_ONE, Name:="boss", Retrieve:=True), _
+	<AFTable("employee", "MSA", AFTableAttribute.KeyType.UseOidValue, OIDColumn:="oid"), _
+	AFAssociation(GetType(CEmployee), "ReportsTo", AssociationMap.Cardinality.OneToOne, Name:="boss", Retrieve:=True), _
 	AFAssociationEntry("boss", "ReportsToOID", "OIDValue"), _
-	AFAssociation(GetType(CEmployee), "Workers", CUDAMap.CardinalityEnum.ONE_TO_MANY, Retrieve:=True), _
+	AFAssociation(GetType(CEmployee), "Workers", AssociationMap.Cardinality.OneToMany, Retrieve:=True), _
 	AFAssociationEntry("Workers", "OIDValue", "ReportsToOID")> _
 	Public Class CEmployee
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private m_name As String
 		Private m_parentoid As String
 		Private m_parent As CEmployee
-		Private WithEvents m_children As CPersistentCollection
+		Private WithEvents m_children As PersistentObjectCollection
 		Private m_team As CTeam
 		Private m_teamoid As String
 		Public Event NameChanged As EventHandler
@@ -36,7 +36,7 @@
 			Set(ByVal Value As CEmployee)
 				If Not Value Is Nothing Then
 					m_parent = Value
-					m_parentoid = Value.OIDValue
+					m_parentoid = Value.OidValue
 					SetDirtyFlag()
 				End If
 			End Set
@@ -48,7 +48,7 @@
 				If m_parent Is Nothing Then
 					Return m_parentoid
 				Else
-					Return (m_parent.OIDValue)
+					Return (m_parent.OidValue)
 				End If
 			End Get
 			Set(ByVal Value As String)
@@ -57,11 +57,11 @@
 			End Set
 		End Property
 
-		Public Property Workers() As CPersistentCollection
+		Public Property Workers() As PersistentObjectCollection
 			Get
 				Return m_children
 			End Get
-			Set(ByVal Value As CPersistentCollection)
+			Set(ByVal Value As PersistentObjectCollection)
 				m_children = Value
 				SetDirtyFlag()
 			End Set
@@ -74,7 +74,7 @@
 			Set(ByVal Value As CTeam)
 				If Not Value Is Nothing Then
 					m_team = Value
-					m_teamoid = Value.OIDValue
+					m_teamoid = Value.OidValue
 					SetDirtyFlag()
 				End If
 			End Set
@@ -86,7 +86,7 @@
 				If m_team Is Nothing Then
 					Return m_teamoid
 				Else
-					Return (m_team.OIDValue)
+					Return (m_team.OidValue)
 				End If
 			End Get
 			Set(ByVal Value As String)
@@ -95,7 +95,7 @@
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AtomsFramework.PersistentObject
 			Return New CEmployee
 		End Function
 
@@ -105,7 +105,7 @@
 
 		Public Sub New()
 			MyBase.New()
-			m_children = New CPersistentCollection
+			m_children = New PersistentObjectCollection
 		End Sub
 
 		Private Sub m_children_ListChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ListChangedEventArgs) Handles m_children.ListChanged

Index: AutoIdClasses.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/AutoIdClasses.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AutoIdClasses.vb	17 Dec 2004 03:27:49 -0000	1.1
+++ AutoIdClasses.vb	10 Jul 2005 11:35:38 -0000	1.2
@@ -1,11 +1,11 @@
 Imports AToMSFramework
 
 Namespace InheritedClasses
-	<AFTable("AutoIdParent", "MSA", AFTableAttribute.KeyType.usePrimary), _
-	AFAssociation(GetType(AutoIdChild), "Children", CUDAMap.CardinalityEnum.ONE_TO_MANY, Retrieve:=True, Save:=True), _
+	<AFTable("AutoIdParent", "MSA", AFTableAttribute.KeyType.UsePrimary), _
+	AFAssociation(GetType(AutoIdChild), "Children", AssociationMap.Cardinality.OneToMany, Retrieve:=True, Save:=True), _
 	AFAssociationEntry("Children", "Id", "ParentId")> _
 	Public Class AutoIdParent
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private _Id As Integer
 		<AFColumn("autoId", Identity:=True, iskey:=True)> _
@@ -19,12 +19,12 @@
 			End Set
 		End Property
 
-		Private _Children As New CPersistentCollection
-		Public Property Children() As CPersistentCollection
+		Private _Children As New PersistentObjectCollection
+		Public Property Children() As PersistentObjectCollection
 			Get
 				Return _Children
 			End Get
-			Set(ByVal Value As CPersistentCollection)
+			Set(ByVal Value As PersistentObjectCollection)
 				_Children = Value
 			End Set
 		End Property
@@ -41,7 +41,7 @@
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AtomsFramework.PersistentObject
 			Return New AutoIdParent
 		End Function
 
@@ -52,9 +52,9 @@
 
 
 
-	<AFTable("AutoIdChild", "MSA", AFTableAttribute.KeyType.usePrimary)> _
+	<AFTable("AutoIdChild", "MSA", AFTableAttribute.KeyType.UsePrimary)> _
 	Public Class AutoIdChild
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private _Id As Integer
 		<AFColumn("autoId", Identity:=True, iskey:=True)> _
@@ -106,7 +106,7 @@
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AtomsFramework.PersistentObject
 			Return New AutoIdChild
 		End Function
 

Index: SuperClassTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/SuperClassTests.vb,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SuperClassTests.vb	16 Mar 2005 11:34:12 -0000	1.7
+++ SuperClassTests.vb	10 Jul 2005 11:35:38 -0000	1.8
@@ -5,7 +5,7 @@
 Namespace InheritedClasses
 	<TestFixture()> Public Class SuperClassTests
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 
 		<TestFixtureSetUp()> Public Sub Init()
 			Environment.CurrentDirectory = System.AppDomain.CurrentDomain.BaseDirectory
@@ -23,7 +23,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 
@@ -37,8 +37,8 @@
 
 		<TearDown()> Public Sub TestEnd()
 			pbroker.ClearCache()
-			Dim col As CPersistentCollection
-			Dim cpo As CPersistentObject = New A
+			Dim col As PersistentObjectCollection
+			Dim cpo As PersistentObject = New A
 			col = cpo.getAll(True)
 
 			For Each a As A In col
@@ -51,7 +51,7 @@
 			Dim root As New A
 			root.Id = 1
 			root.Text = "Root object"
-			root.BCol = New CPersistentCollection
+			root.BCol = New PersistentObjectCollection
 			' create G and add it to the collection
 			Dim g As New G
 			g.Id = 5
@@ -74,8 +74,8 @@
 			'Now check that A, G and K are in the database
 
 			pbroker.ClearCache()
-			Dim col As CPersistentCollection
-			Dim cpo As CPersistentObject = New A
+			Dim col As PersistentObjectCollection
+			Dim cpo As PersistentObject = New A
 			col = cpo.getAll(True)
 
 			Assert.IsTrue(col.Count > 0)
@@ -91,7 +91,7 @@
 			Dim root As New A
 			root.Id = 1
 			root.Text = "Root object"
-			root.BCol = New CPersistentCollection
+			root.BCol = New PersistentObjectCollection
 			' create G and add it to the collection
 			Dim g As New G
 			g.Id = 5
@@ -113,8 +113,8 @@
 			root.Save(True)
 			'Now check that A, G and K are in the database
 			pbroker.ClearCache()
-			Dim col As CPersistentCollection
-			Dim cpo As CPersistentObject = New A
+			Dim col As PersistentObjectCollection
+			Dim cpo As PersistentObject = New A
 			col = cpo.getAll(True)
 
 			Assert.IsTrue(col.Count > 0)
@@ -136,14 +136,14 @@
 			j.Save()
 
 			j = New J
-			Dim rc As New CRetrieveCriteria
+			Dim rc As New RetrieveCriteria
 			rc.ClassMap = j.getClassMap
-			Dim condition As New CCriteriaCondition
+			Dim condition As New CriteriaCondition
 			condition.ClassMap = j.getClassMap
 			condition.Tables = rc.Tables
 			condition.addSelectEqualTo("Text", "Class C Text")
 			rc.WhereCondition = condition
-			Dim cursor As CCursor = rc.perform
+			Dim cursor As ResultCursor = rc.perform
 			Assert.IsTrue(cursor.hasElements)
 			Assert.AreEqual(1, cursor.TotalRows)
 			cursor.loadObject(j)
@@ -161,10 +161,10 @@
 			j.Save()
 
 			j = New J
-			Dim rc As New CRetrieveCriteria
+			Dim rc As New RetrieveCriteria
 			rc.ClassMap = j.getClassMap
 			rc.WhereCondition.addSelectEqualTo("Text", "Class C Text1")
-			Dim cursor As CCursor = rc.perform
+			Dim cursor As ResultCursor = rc.perform
 			Assert.IsTrue(cursor.hasElements)
 			Assert.AreEqual(1, cursor.TotalRows)
 			cursor.loadObject(j)
@@ -197,10 +197,10 @@
 
 			pbroker.ClearCache()
 
-			Dim mrc As New CMultiRetrieveCriteria
+			Dim mrc As New MultiRetrieveCriteria
 			Dim a1 As New A
-			Dim cpo As CPersistentObject
-			Dim c As CCursor
+			Dim cpo As PersistentObject
+			Dim c As ResultCursor
 
 			cpo = CType(a1, A)
 			mrc.addObjectToJoin(a1, Nothing, "")

Index: SharedTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/SharedTests.vb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SharedTests.vb	21 Dec 2004 22:00:01 -0000	1.5
+++ SharedTests.vb	10 Jul 2005 11:35:38 -0000	1.6
@@ -4,7 +4,7 @@
 Namespace InheritedClasses
 	<TestFixture()> Public Class SharedTests
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 		Dim sc As SharedChild
 		Dim sp As SharedParent
 
@@ -24,7 +24,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 

Index: ManyToManyTests_v2.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/ManyToManyTests_v2.vb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ManyToManyTests_v2.vb	1 Mar 2005 20:51:33 -0000	1.5
+++ ManyToManyTests_v2.vb	10 Jul 2005 11:35:38 -0000	1.6
@@ -4,7 +4,7 @@
 Namespace InheritedClasses
 	<TestFixture()> Public Class ManyToManyTests_v2
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 		Private A As M2MA
 		Private B As M2MB
 
@@ -24,7 +24,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 
@@ -138,7 +138,7 @@
 			A.SetDirtyFlag()
 			A.Save()
 			s = "select * from ManyToManyAB where AGuidValue = """ & gvalA & """ and BGuidValue = """ & gvalB & """"
-			Dim c As CCursor = pbroker.ProcessPureSQL(s, A.getClassMap.RelationalDatabase.getConnection(Nothing))
+			Dim c As ResultCursor = pbroker.ProcessPureSql(s, A.GetClassMap.RelationalDatabase.GetConnection())
 			Assert.AreEqual(0, c.ResultSet.ResultSet.Tables(0).Rows.Count)
 		End Sub
 

Index: CTeam.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/CTeam.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CTeam.vb	19 Oct 2004 00:13:38 -0000	1.1
+++ CTeam.vb	10 Jul 2005 11:35:38 -0000	1.2
@@ -1,22 +1,22 @@
 Imports AToMSFramework
 
 Namespace InheritedClasses
-	<AFTable("teams", "MSA", AFTableAttribute.KeyType.useOIDValue, oidcolumn:="oidvalue"), _
-	AFAssociation(GetType(CEmployee), "TeamLeader", CUDAMap.CardinalityEnum.ONE_TO_ONE, Retrieve:=True), _
+	<AFTable("teams", "MSA", AFTableAttribute.KeyType.UseOidValue, oidcolumn:="oidvalue"), _
+	AFAssociation(GetType(CEmployee), "TeamLeader", AssociationMap.Cardinality.OneToOne, Retrieve:=True), _
 	AFAssociationEntry("TeamLeader", "TeamLeaderOID", "OIDValue"), _
-	AFAssociation(GetType(CJob), "Job", CUDAMap.CardinalityEnum.ONE_TO_ONE, Retrieve:=True), _
+	AFAssociation(GetType(CJob), "Job", AssociationMap.Cardinality.OneToOne, Retrieve:=True), _
 	AFAssociationEntry("Job", "jobOID", "OIDValue"), _
-	AFAssociation(GetType(CEmployee), "Members", CUDAMap.CardinalityEnum.ONE_TO_MANY, Retrieve:=True, Save:=False), _
+	AFAssociation(GetType(CEmployee), "Members", AssociationMap.Cardinality.OneToMany, Retrieve:=True, Save:=False), _
 	AFAssociationEntry("Members", "OIDValue", "TeamOID")> _
 	Public Class CTeam
-		Inherits CPersistentObject
+		Inherits PersistentObject
 
 		Private m_leader As CEmployee
 		Private m_leaderoid As String
 		Private m_name As String
 		Private m_job As CJob
 		Private m_joboid As String
-		Private m_members As CPersistentCollection
+		Private m_members As PersistentObjectCollection
 
 		Public Property TeamLeader() As CEmployee
 			Get
@@ -24,7 +24,7 @@
 			End Get
 			Set(ByVal Value As CEmployee)
 				m_leader = Value
-				m_leaderoid = Value.OIDValue
+				m_leaderoid = Value.OidValue
 				SetDirtyFlag()
 			End Set
 		End Property
@@ -35,7 +35,7 @@
 				If m_leader Is Nothing Then
 					Return m_leaderoid
 				Else
-					Return (m_leader.OIDValue)
+					Return (m_leader.OidValue)
 				End If
 			End Get
 			Set(ByVal Value As String)
@@ -50,7 +50,7 @@
 			End Get
 			Set(ByVal Value As CJob)
 				m_job = Value
-				m_joboid = Value.OIDValue
+				m_joboid = Value.OidValue
 				SetDirtyFlag()
 			End Set
 		End Property
@@ -61,7 +61,7 @@
 				If m_job Is Nothing Then
 					Return m_joboid
 				Else
-					Return (m_job.OIDValue)
+					Return (m_job.OidValue)
 				End If
 			End Get
 			Set(ByVal Value As String)
@@ -81,17 +81,17 @@
 			End Set
 		End Property
 
-		Public Property Members() As CPersistentCollection
+		Public Property Members() As PersistentObjectCollection
 			Get
 				Return m_members
 			End Get
-			Set(ByVal Value As CPersistentCollection)
+			Set(ByVal Value As PersistentObjectCollection)
 				m_members = Value
 				SetDirtyFlag()
 			End Set
 		End Property
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AtomsFramework.PersistentObject
 			Return New CTeam
 		End Function
 
@@ -101,7 +101,7 @@
 
 		Public Sub New()
 			MyBase.new()
-			m_members = New CPersistentCollection
+			m_members = New PersistentObjectCollection
 		End Sub
 
 		Protected Overrides Sub Finalize()

Index: AutoIdTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/AutoIdTests.vb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AutoIdTests.vb	21 Dec 2004 22:00:01 -0000	1.2
+++ AutoIdTests.vb	10 Jul 2005 11:35:38 -0000	1.3
@@ -4,11 +4,11 @@
 Namespace InheritedClasses
 	<TestFixture()> Public Class AutoIdTests
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 		Private parent As AutoIdParent
 		Private child As AutoIdChild
-		Private rc As CRetrieveCriteria
-		Private c As CCursor
+		Private rc As RetrieveCriteria
+		Private c As ResultCursor
 
 		<TestFixtureSetUp()> Public Sub Init()
 			Environment.CurrentDirectory = System.AppDomain.CurrentDomain.BaseDirectory
@@ -26,7 +26,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 

Index: CSharedClasses.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/CSharedClasses.vb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CSharedClasses.vb	1 Nov 2004 21:27:10 -0000	1.2
+++ CSharedClasses.vb	10 Jul 2005 11:35:38 -0000	1.3
@@ -2,10 +2,10 @@
 
 Namespace InheritedClasses
 	Public Class SharedParent
-		Inherits CPersistentObject
+		Inherits PersistentObject
 		Private _field1 As String
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New SharedParent
 		End Function
 
@@ -30,7 +30,7 @@
 
 		Private _field2 As String
 
-		Public Overrides Function getNewObject() As AToMSFramework.CPersistentObject
+		Public Overrides Function getNewObject() As AToMSFramework.PersistentObject
 			Return New SharedChild
 		End Function
 

Index: MultiRetrieveTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/MultiRetrieveTests.vb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MultiRetrieveTests.vb	16 Mar 2005 11:34:12 -0000	1.5
+++ MultiRetrieveTests.vb	10 Jul 2005 11:35:38 -0000	1.6
@@ -4,10 +4,10 @@
 Namespace InheritedClasses
 	<TestFixture()> Public Class MultiRetrieveTests
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 		Private mr1 As mr1
-		Private mrc As CMultiRetrieveCriteria
-		Private c As CCursor
+		Private mrc As MultiRetrieveCriteria
+		Private c As ResultCursor
 
 		<TestFixtureSetUp()> Public Sub Init()
 			Environment.CurrentDirectory = System.AppDomain.CurrentDomain.BaseDirectory
@@ -25,7 +25,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 
@@ -38,104 +38,104 @@
 			Dim mr1 As New mr1
 			Dim mr2 As New mr2
 			Dim mr3 As New mr3
-			mrc = New CMultiRetrieveCriteria
-			mrc.addObjectToJoin(mr1, Nothing, "")
-			mrc.addObjectToJoin(mr2, mr1, "mr1tomr2")
-			mrc.addObjectToJoin(mr3, mr2, "mr2tomr3")
+			mrc = New MultiRetrieveCriteria
+			mrc.AddObjectToJoin(mr1, Nothing, "")
+			mrc.AddObjectToJoin(mr2, mr1, "mr1tomr2")
+			mrc.AddObjectToJoin(mr3, mr2, "mr2tomr3")
 			mrc.ReturnFullObjects = True
-			c = mrc.perform
-			Assert.IsTrue(c.hasElements)
+			c = mrc.Perform
+			Assert.IsTrue(c.HasElements)
 			Assert.IsTrue(Not c.EOF)
 			Assert.IsFalse(c.HoldsProxies)
 			Assert.AreEqual(3, c.TotalRows)
 		End Sub
 
-    <Test()> Public Sub ChainedClassesWithWhere()
-      Dim mr1 As New mr1
-      Dim mr2 As New mr2
-      Dim mr3 As New mr3
-      mrc = New CMultiRetrieveCriteria
-      mrc.addObjectToJoin(mr1, Nothing, "")
-      mrc.addObjectToJoin(mr2, mr1, "mr1tomr2")
-      mrc.addObjectToJoin(mr3, mr2, "mr2tomr3")
-      mrc.WhereCondition.addSelectNotEqualTo("field1", "xxx")
-      mrc.ReturnFullObjects = True
-      c = mrc.perform
-      Assert.IsTrue(c.hasElements)
-      Assert.IsTrue(Not c.EOF)
-      Assert.IsFalse(c.HoldsProxies)
-      Assert.AreEqual(3, c.TotalRows)
-    End Sub
+		<Test()> Public Sub ChainedClassesWithWhere()
+			Dim mr1 As New mr1
+			Dim mr2 As New mr2
+			Dim mr3 As New mr3
+			mrc = New MultiRetrieveCriteria
+			mrc.AddObjectToJoin(mr1, Nothing, "")
+			mrc.AddObjectToJoin(mr2, mr1, "mr1tomr2")
+			mrc.AddObjectToJoin(mr3, mr2, "mr2tomr3")
+			mrc.WhereCondition.AddSelectNotEqualTo("field1", "xxx")
+			mrc.ReturnFullObjects = True
+			c = mrc.Perform
+			Assert.IsTrue(c.HasElements)
+			Assert.IsTrue(Not c.EOF)
+			Assert.IsFalse(c.HoldsProxies)
+			Assert.AreEqual(3, c.TotalRows)
+		End Sub
 
-    <Test()> Public Sub ChainedClassesWithOrderBy()
-      Dim mr1 As New mr1
-      Dim mr2 As New mr2
-      Dim mr3 As New mr3
-      mrc = New CMultiRetrieveCriteria
-      mrc.addObjectToJoin(mr1, Nothing, "")
-      mrc.addObjectToJoin(mr2, mr1, "mr1tomr2")
-      mrc.addObjectToJoin(mr3, mr2, "mr2tomr3")
-      mrc.addOrderAttribute("mr3.field1")
-      mrc.ReturnFullObjects = True
-      c = mrc.perform
-      Assert.IsTrue(c.hasElements)
-      Assert.IsTrue(Not c.EOF)
-      Assert.IsFalse(c.HoldsProxies)
-      Assert.AreEqual(3, c.TotalRows)
-    End Sub
+		<Test()> Public Sub ChainedClassesWithOrderBy()
+			Dim mr1 As New mr1
+			Dim mr2 As New mr2
+			Dim mr3 As New mr3
+			mrc = New MultiRetrieveCriteria
+			mrc.AddObjectToJoin(mr1, Nothing, "")
+			mrc.AddObjectToJoin(mr2, mr1, "mr1tomr2")
+			mrc.AddObjectToJoin(mr3, mr2, "mr2tomr3")
+			mrc.AddOrderAttribute("mr3.field1")
+			mrc.ReturnFullObjects = True
+			c = mrc.Perform
+			Assert.IsTrue(c.HasElements)
+			Assert.IsTrue(Not c.EOF)
+			Assert.IsFalse(c.HoldsProxies)
+			Assert.AreEqual(3, c.TotalRows)
+		End Sub
 
-    <Test()> Public Sub SaveMRClasses()
-      Dim mr1 As New mr1
-      mr1.id = "id1"
-      mr1.field1 = "_a"
-      mr1.field2 = 1
-      Dim mr2 As New mr2
-      mr2.id = "id2"
-      mr2.field1 = "_aa"
-      mr2.field2 = 2
-      mr1.mr2 = mr2
-      Dim mr3 As New mr3
-      mr3.id = "id3"
-      mr3.field1 = "zz"
-      mr3.field2 = 3
-      mr2.mr3 = mr3
-      mr1.Save()
-      mr2.field2 = 22
-      mr2.Save()
-    End Sub
+		<Test()> Public Sub SaveMRClasses()
+			Dim mr1 As New mr1
+			mr1.id = "id1"
+			mr1.field1 = "_a"
+			mr1.field2 = 1
+			Dim mr2 As New mr2
+			mr2.id = "id2"
+			mr2.field1 = "_aa"
+			mr2.field2 = 2
+			mr1.mr2 = mr2
+			Dim mr3 As New mr3
+			mr3.id = "id3"
+			mr3.field1 = "zz"
+			mr3.field2 = 3
+			mr2.mr3 = mr3
+			mr1.Save()
+			mr2.field2 = 22
+			mr2.Save()
+		End Sub
 
-    <Test()> Public Sub SummaryChainedClasses()
-      Dim mr1 As New mr1
-      Dim mr2 As New mr2
-      Dim mr3 As New mr3
-      Dim src As CMultiSummaryCriteria
-      src = New CMultiSummaryCriteria
-      src.addObjectToJoin(mr1, Nothing, "")
-      src.addObjectToJoin(mr2, mr1, "mr1tomr2")
-      src.addObjectToJoin(mr3, mr2, "mr2tomr3")
-      src.addSummaryField("mr1tomr2.field1", CMultiSummaryCriteria.SumMethod.Count)
-      c = src.perform
-      Assert.IsTrue(c.hasElements)
-      Assert.IsFalse(c.EOF)
-      Assert.AreEqual(1, c.TotalRows)
-    End Sub
+		<Test()> Public Sub SummaryChainedClasses()
+			Dim mr1 As New mr1
+			Dim mr2 As New mr2
+			Dim mr3 As New mr3
+			Dim src As MultiSummaryCriteria
+			src = New MultiSummaryCriteria
+			src.AddObjectToJoin(mr1, Nothing, "")
+			src.AddObjectToJoin(mr2, mr1, "mr1tomr2")
+			src.AddObjectToJoin(mr3, mr2, "mr2tomr3")
+			src.AddSummaryField("mr1tomr2.field1", MultiSummaryCriteria.SumMethod.Count)
+			c = src.Perform
+			Assert.IsTrue(c.HasElements)
+			Assert.IsFalse(c.EOF)
+			Assert.AreEqual(1, c.TotalRows)
+		End Sub
 
-    <Test()> Public Sub SummaryChainedClassesWithWhere()
-      Dim mr1 As New mr1
-      Dim mr2 As New mr2
-      Dim mr3 As New mr3
-      Dim src As CMultiSummaryCriteria
-      src = New CMultiSummaryCriteria
-      src.addObjectToJoin(mr1, Nothing, "")
-      src.addObjectToJoin(mr2, mr1, "mr1tomr2")
-      src.addObjectToJoin(mr3, mr2, "mr2tomr3")
-      src.addSummaryField("field1", CMultiSummaryCriteria.SumMethod.Count)
-      src.WhereCondition.addSelectNotEqualTo("field1", "xxx")
-      c = src.perform
-      Assert.IsTrue(c.hasElements)
-      Assert.IsTrue(Not c.EOF)
-      Assert.AreEqual(1, c.TotalRows)
-    End Sub
+		<Test()> Public Sub SummaryChainedClassesWithWhere()
+			Dim mr1 As New mr1
+			Dim mr2 As New mr2
+			Dim mr3 As New mr3
+			Dim src As MultiSummaryCriteria
+			src = New MultiSummaryCriteria
+			src.AddObjectToJoin(mr1, Nothing, "")
+			src.AddObjectToJoin(mr2, mr1, "mr1tomr2")
+			src.AddObjectToJoin(mr3, mr2, "mr2tomr3")
+			src.AddSummaryField("field1", MultiSummaryCriteria.SumMethod.Count)
+			src.WhereCondition.AddSelectNotEqualTo("field1", "xxx")
+			c = src.Perform
+			Assert.IsTrue(c.HasElements)
+			Assert.IsTrue(Not c.EOF)
+			Assert.AreEqual(1, c.TotalRows)
+		End Sub
 
-  End Class
+	End Class
 End Namespace
\ No newline at end of file

Index: AtomsFrameworkTests.vb
===================================================================
RCS file: /cvsroot/jcframework/Nunit/InheritedClasses/AtomsFrameworkTests.vb,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- AtomsFrameworkTests.vb	4 Apr 2005 23:59:52 -0000	1.17
+++ AtomsFrameworkTests.vb	10 Jul 2005 11:35:38 -0000	1.18
@@ -4,11 +4,11 @@
 Namespace InheritedClasses
 	<TestFixture()> Public Class _BasicTests
 
-		Private pbroker As CPersistenceBroker
+		Private pbroker As PersistenceBroker
 		Private emp As CEmployee
 		Private job As CJob
 		Private team As CTeam
-		Dim WithEvents coll As CPersistentCollection
+		Dim WithEvents coll As PersistentObjectCollection
 		Private eventcount As Integer
 
 		<TestFixtureSetUp()> Public Sub Init()
@@ -27,7 +27,7 @@
 				End Try
 			End While
 			System.IO.File.Copy(".\original db1.mdb", ".\db1.mdb")
-			pbroker = New CPersistenceBroker
+			pbroker = New PersistenceBroker
 			pbroker.init()
 		End Sub
 
@@ -125,8 +125,8 @@
 			emp = New CEmployee
 			emp.Name = "DeleteMe3"
 			emp.Save()
-			Dim dc As CDeleteCriteria
-			dc = New CDeleteCriteria
+			Dim dc As DeleteCriteria
+			dc = New DeleteCriteria
 			dc.ClassMap = emp.getClassMap
 			dc.WhereCondition.addSelectLike("Name", "DeleteMe%")
 			Dim i As Integer = dc.perform()
@@ -181,7 +181,7 @@
 			emp2 = New CEmployee
 			emp2.Name = "aa"
 			emp2.Find()
-			Assert.IsTrue(CPersistentObject.Equals(emp2.ReportsTo, emp))
+			Assert.IsTrue(PersistentObject.Equals(emp2.ReportsTo, emp))
 			Assert.IsTrue(emp.Equals(emp2.ReportsTo))
 		End Sub
 
@@ -234,13 +234,13 @@
 		<Test()> Public Sub AutoDelete()
 			Dim a As New TableA
 			Dim b As New TableB
-			Dim cc As CCursor
+			Dim cc As ResultCursor
 			a.Id = "a1"
 			a.Retrieve()
 			Assert.IsTrue(a.Persistent)
 			Assert.AreEqual(2, a.TableBCollection.Count)
 			a.Delete()
-			Dim rc As New CRetrieveCriteria
+			Dim rc As New RetrieveCriteria
 			rc.ClassMap = b.getClassMap
 			rc.WhereCondition.addSelectEqualTo("AId", "a1")
 			cc = rc.perform()
@@ -251,13 +251,13 @@
 		<Test()> Public Sub AutoSave()
 			Dim a As New TableA
 			Dim b As New TableB
-			Dim cc As CCursor
+			Dim cc As ResultCursor
 			a.Id = "a3"
 			b.Id = "b33"
 			b.TableA = a
 			a.TableBCollection.Add(b)
 			a.Save()
-			Dim rc As New CRetrieveCriteria
+			Dim rc As New RetrieveCriteria
 			rc.ClassMap = b.getClassMap
 			rc.WhereCondition.addSelectEqualTo("AId", "a3")
 			cc = rc.perform()
@@ -360,7 +360,7 @@
 		End Sub
 
 		<Test()> Public Sub CheckCollectionEvents()
-			coll = New CPersistentCollection
+			coll = New PersistentObjectCollection
 			eventcount = 0
 			emp = New CEmployee
 			emp.Name = "somename"
@@ -477,7 +477,7 @@
       pbroker.startTransaction()
       a1.Id = "aa1a"
       a1.Retrieve()
-      a1.TableBCollection = New CPersistentCollection
+      a1.TableBCollection = New PersistentObjectCollection
       b.Id = "b1b"
       b.TableA = a1
       a1.TableBCollection.Add(b)