[fdo-commits] r763 - in branches/3.2.x/Fdo/Unmanaged/Src: Fdo/Schema Message

[svn_fdo at osgeo.org]

Author: brentrobinson
Date: 2007-02-12 13:17:11 -0500 (Mon, 12 Feb 2007)
New Revision: 763

Modified:
   branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Schema/AssociationPropertyDefinition.cpp
   branches/3.2.x/Fdo/Unmanaged/Src/Message/FDOMessage.mc
Log:
Added property name to FdoAssociationPropertyDefinition exception messages

Modified: branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Schema/AssociationPropertyDefinition.cpp
===================================================================
--- branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Schema/AssociationPropertyDefinition.cpp	2007-02-12 18:15:23 UTC (rev 762)
+++ branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Schema/AssociationPropertyDefinition.cpp	2007-02-12 18:17:11 UTC (rev 763)
@@ -346,13 +346,13 @@
     // Cannot create an association property without the associated class
     if( m_associatedClass == NULL )
     {
-        throw FdoSchemaException::Create(FdoException::NLSGetMessage(FDO_NLSID(SCHEMA_55_ASSOCIATEDCLASSREQUIRED), GetName() ));
+        throw FdoSchemaException::Create(FdoException::NLSGetMessage(FDO_NLSID(SCHEMA_55_ASSOCIATEDCLASSREQUIRED), (FdoString*) GetQualifiedName() ));
     }
 
     if( m_identityProperties && m_identityReverseProperties )
     {
         if( m_identityProperties->GetCount() != m_identityReverseProperties->GetCount() )
-            throw FdoSchemaException::Create(FdoException::NLSGetMessage(FDO_NLSID(SCHEMA_17_ASSOCIATIONMISSMATCHERROR)));
+            throw FdoSchemaException::Create(FdoException::NLSGetMessage(FDO_NLSID(SCHEMA_17_ASSOCIATIONMISSMATCHERROR), (FdoString*) GetQualifiedName() ));
         
         // Make sure that the identity properties and reverse properties are of the same types
         for( int i=0; i<m_identityProperties->GetCount(); i++ )
@@ -361,7 +361,7 @@
             FdoPtr<FdoDataPropertyDefinition> revprop = m_identityReverseProperties->GetItem( i );
             if( indprop->GetDataType() != revprop->GetDataType() )
             {
-                throw FdoSchemaException::Create(FdoException::NLSGetMessage(FDO_NLSID(SCHEMA_17_ASSOCIATIONMISSMATCHERROR)));
+                throw FdoSchemaException::Create(FdoException::NLSGetMessage(FDO_NLSID(SCHEMA_17_ASSOCIATIONMISSMATCHERROR), (FdoString*) GetQualifiedName() ));
             }
         }
 
@@ -373,7 +373,7 @@
                 FdoPtr<FdoDataPropertyDefinition> revprop = m_identityReverseProperties->GetItem( i );
                 if( revprop->GetIsAutoGenerated() || revprop->GetIsSystem() )
                 {
-                    throw FdoSchemaException::Create(FdoException::NLSGetMessage(FDO_NLSID(SCHEMA_53_BADASSOCREVERSEPROP)));
+                    throw FdoSchemaException::Create(FdoException::NLSGetMessage(FDO_NLSID(SCHEMA_53_BADASSOCREVERSEPROP), (FdoString*) GetQualifiedName() ));
                 }
             }
         }

Modified: branches/3.2.x/Fdo/Unmanaged/Src/Message/FDOMessage.mc
===================================================================
--- branches/3.2.x/Fdo/Unmanaged/Src/Message/FDOMessage.mc	2007-02-12 18:15:23 UTC (rev 762)
+++ branches/3.2.x/Fdo/Unmanaged/Src/Message/FDOMessage.mc	2007-02-12 18:17:11 UTC (rev 763)
@@ -159,7 +159,7 @@
 MessageId=1017
 SymbolicName=SCHEMA_17_ASSOCIATIONMISSMATCHERROR
 Language=English
-Type or number missmatch between the identity properties and the reverse identity properties. 
+Association Property '%1$ls' has type or number missmatch between the identity properties and the reverse identity properties. 
 .
 MessageId=1018
 SymbolicName=SCHEMA_18_ASSOCIATIONIDENTITYERROR
@@ -339,7 +339,7 @@
 MessageId=1053
 SymbolicName=SCHEMA_53_BADASSOCREVERSEPROP
 Language=English
-Cannot use auto-generated or system properties as reverse identity properties
+Cannot use auto-generated or system properties as reverse identity properties for association property '%1$ls'
 .
 MessageId=1054
 SymbolicName=SCHEMA_54_AUTOGENREADONLY