[Jcframework-commits] dotnet AssemblyInfo.vb,1.12,1.13 CJoin.vb,1.7,1.8 CMultiRetrieveCriteria.vb,1.16,1.17 CPersistenceBroker.vb,1.68,1.69 CPersistentObject.vb,1.43,1.44

[Richard B. <rb...@us...>]

Update of /cvsroot/jcframework/dotnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1140

Modified Files:
	AssemblyInfo.vb CJoin.vb CMultiRetrieveCriteria.vb 
	CPersistenceBroker.vb CPersistentObject.vb 
Log Message:
Fix problem with joins in MultiRetrieveCriteria, and problems with saveAutomatic
Assembly Version number changed to 2.0.0.0

Index: AssemblyInfo.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/AssemblyInfo.vb,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- AssemblyInfo.vb	27 Sep 2004 02:39:31 -0000	1.12
+++ AssemblyInfo.vb	19 Oct 2004 03:32:08 -0000	1.13
@@ -25,7 +25,7 @@
 ' by using the '*' as shown below
 
 
-<Assembly: AssemblyVersion("1.24.0.0")> 
+<Assembly: AssemblyVersion("2.0.0.0")> 
 
 ''' -----------------------------------------------------------------------------
 ''' Project	 : AToMSFramework

Index: CPersistenceBroker.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CPersistenceBroker.vb,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- CPersistenceBroker.vb	18 Oct 2004 03:31:51 -0000	1.68
+++ CPersistenceBroker.vb	19 Oct 2004 03:32:08 -0000	1.69
@@ -2127,7 +2127,7 @@
 		If Not checkAssociationsRecursivly Then
 			If Not obj.IsDirty Then Return queue 'Do not save if nothing changed
 			If obj.IsProxy Then Return queue 'Do not save if object is proxied
-			If TypeOf (obj) Is CPersistentObject Then
+			If obj.GetObjectType.IsSubclassOf(GetType(CPersistentObject)) Then
 				If Not CType(obj, CPersistentObject).IsValid Then Return queue 'Do not save if object is not valid
 			End If
 			If obj.IsReadOnly Then
@@ -2145,7 +2145,7 @@
 			'But, countinue to determine if the object's associations need saving
 			If includeBaseObject AndAlso _
 			(obj.IsDirty AndAlso Not obj.IsProxy AndAlso Not obj.IsReadOnly AndAlso Not obj.IsModifyOnly) Then
-				If TypeOf (obj) Is CPersistentObject Then
+				If obj.GetObjectType.IsSubclassOf(GetType(CPersistentObject)) Then
 					If Not CType(obj, CPersistentObject).IsValid Then					'Do not save if object is not valid
 						obj.IsDirty = False						'Added to queue so clear dirty flag
 						queue.Enqueue(obj)
@@ -2181,7 +2181,7 @@
 					If Not col Is Nothing Then
 						For k = 0 To col.Count() - 1
 							tmpObj = col.Item(k)
-							If Not tmpObj.GetType.IsSubclassOf(GetType(IPersistableObject)) Then
+							If Not tmpObj.GetType.IsSubclassOf(GetType(CPersistentObject)) Then
 								value = LocateOrCreateInjObject(tmpObj)
 							Else
 								value = tmpObj
@@ -2212,7 +2212,7 @@
 					If Not col Is Nothing Then
 						For k = 0 To col.Count() - 1
 							tmpObj = col.Item(k)
-							If Not tmpObj.GetType.IsSubclassOf(GetType(IPersistableObject)) Then
+							If Not tmpObj.GetType.IsSubclassOf(GetType(CPersistentObject)) Then
 								value = LocateOrCreateInjObject(tmpObj)
 							Else
 								value = tmpObj
@@ -2233,7 +2233,7 @@
 		If cm.SharedTableField Is Nothing Then
 			If Not cm.SuperClass Is Nothing Then
 				tmpObj = obj.GetObjectByClassMap(cm.SuperClass)
-				If Not tmpObj.GetType.IsSubclassOf(GetType(IPersistableObject)) Then
+				If Not tmpObj.GetType.IsSubclassOf(GetType(CPersistentObject)) Then
 					value = LocateOrCreateInjObject(tmpObj)
 				Else
 					value = tmpObj
@@ -2247,7 +2247,7 @@
 		Else
 			If Not cm.SuperClass Is Nothing Then
 				tmpObj = obj.GetObjectByClassMap(cm.SuperClass)
-				If Not tmpObj.GetType.IsSubclassOf(GetType(IPersistableObject)) Then
+				If Not tmpObj.GetType.IsSubclassOf(GetType(CPersistentObject)) Then
 					value = LocateOrCreateInjObject(tmpObj)
 				Else
 					value = tmpObj

Index: CMultiRetrieveCriteria.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CMultiRetrieveCriteria.vb,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CMultiRetrieveCriteria.vb	19 Oct 2004 01:59:57 -0000	1.16
+++ CMultiRetrieveCriteria.vb	19 Oct 2004 03:32:08 -0000	1.17
@@ -270,9 +270,7 @@
 		If attributeName.IndexOf(".") >= 0 Then
 			Dim Parts() As String
 			Parts = attributeName.Split(".")
-
 			attributeName = Parts(1)
-
 			Dim cm As CClassMap
 			For Each cm In m_fromCMaps
 				If cm.Name.Equals(Parts(0)) Then

Index: CPersistentObject.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CPersistentObject.vb,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- CPersistentObject.vb	15 Oct 2004 06:42:56 -0000	1.43
+++ CPersistentObject.vb	19 Oct 2004 03:32:08 -0000	1.44
@@ -852,7 +852,7 @@
 	'''-----------------------------------------------------------------------------
 	Public Overridable Sub Save(ByVal obj As CPersistentObject, ByVal checkAssociationsRecursivly As Boolean) Implements IPersistentObject.save
 		Dim persistentBroker As CPersistenceBroker
-		Dim value As CPersistentObject
+		Dim value As IPersistableObject
 		Dim queue As Queue
 
 		persistentBroker = getPersistenceBrokerInstance()

Index: CJoin.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CJoin.vb,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CJoin.vb	19 Oct 2004 01:59:57 -0000	1.7
+++ CJoin.vb	19 Oct 2004 03:32:08 -0000	1.8
@@ -152,6 +152,12 @@
 	'''-----------------------------------------------------------------------------
 	Public Property LeftTableAlias() As String
 		Get
+			If m_leftTableAlias Is Nothing OrElse m_leftTableAlias.Length = 0 Then
+				If LeftSide Is Nothing Then
+					Return TableAlias
+				End If
+				Return LeftSide.RootTableAlias
+			End If
 			Return m_leftTableAlias
 		End Get
 		Set(ByVal Value As String)