[Jcframework-commits] dotnet CPersistenceBroker.vb,1.71,1.72

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

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

Modified Files:
	CPersistenceBroker.vb 
Log Message:
Fixed small problem in Reflect() with association names and AFAssociation attribute processing

Index: CPersistenceBroker.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CPersistenceBroker.vb,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- CPersistenceBroker.vb	21 Oct 2004 23:35:23 -0000	1.71
+++ CPersistenceBroker.vb	22 Oct 2004 05:33:17 -0000	1.72
@@ -1694,7 +1694,7 @@
 		Dim propAtt, propAttributes() As Object
 		Dim afTable As AFTableAttribute
 		Dim afColumn As AFColumnAttribute
-		Dim afAssocation As AFAssociationAttribute
+		Dim afAssociation As AFAssociationAttribute
 		Dim afAssocEntry As AFAssociationEntryAttribute
 		Dim ClassMap As CClassMap
 		Dim dbMap As CDatabaseMap
@@ -1930,18 +1930,22 @@
 				Dim amFromAttribute As CAttributeMap
 				Dim amToAttribute As CAttributeMap
 
-				For Each afAssocation In attributes
+				For Each afAssociation In attributes
 					fromClassMap = m_classMaps.Item(types(i).Name)
-					toClassMap = m_classMaps.Item(afAssocation.TargetClass.Name)
+					toClassMap = m_classMaps.Item(afAssociation.TargetClass.Name)
 					udaAm = New CUDAMap
 					udaAm.ForClass = toClassMap
-					udaAm.Target = afAssocation.TargetProperty
-					udaAm.DeleteAutomatic = afAssocation.Delete
-					udaAm.SaveAutomatic = afAssocation.Save
-					udaAm.RetrieveAutomatic = afAssocation.Retrieve
-					udaAm.Name = afAssocation.Name
+					udaAm.Target = afAssociation.TargetProperty
+					udaAm.DeleteAutomatic = afAssociation.Delete
+					udaAm.SaveAutomatic = afAssociation.Save
+					udaAm.RetrieveAutomatic = afAssociation.Retrieve
+					If afAssociation.Name Is Nothing OrElse afAssociation.Name = [String].Empty Then
+						udaAm.Name = udaAm.Target
+					Else
+						udaAm.Name = afAssociation.Name
+					End If
 					udaAm.Inverse = False
-					udaAm.Cardinality = afAssocation.Cardinality
+					udaAm.Cardinality = afAssociation.Cardinality
 					att = types(i).GetCustomAttributes(GetType(AFAssociationEntryAttribute), False)
 					If att.Length > 0 Then
 						For Each afAssocEntry In att