From: <fab...@us...> - 2011-04-27 13:53:25
|
Revision: 5773 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5773&view=rev Author: fabiomaulo Date: 2011-04-27 13:53:14 +0000 (Wed, 27 Apr 2011) Log Message: ----------- Minor (fixed TYPO) Modified Paths: -------------- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ExplicitlyDeclaredModel.cs trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ExplicitlyDeclaredModel.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ExplicitlyDeclaredModel.cs 2011-04-27 13:51:34 UTC (rev 5772) +++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ExplicitlyDeclaredModel.cs 2011-04-27 13:53:14 UTC (rev 5773) @@ -177,7 +177,7 @@ { if (IsComponent(type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered as entity and as component", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered as entity and as component", type.FullName)); } rootEntities.Add(type); } @@ -187,7 +187,7 @@ var rootEntity = GetRootEntityOrNull(type); if (rootEntity != null) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered as entity and as component", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered as entity and as component", type.FullName)); } components.Add(type); } @@ -201,18 +201,18 @@ { if (IsComponent(type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered as entity and as component", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered as entity and as component", type.FullName)); } var rootEntity = GetRootEntityOrNull(type); if (rootEntity != null) { if (rootEntity.Equals(type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered as root-entity and as subclass for table-per-class strategy", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered as root-entity and as subclass for table-per-class strategy", type.FullName)); } if (IsMappedFor(tablePerClassHierarchyEntities, type) || IsMappedFor(tablePerConcreteClassEntities, type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered with more than one class-hierarchy strategy", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered with more than one class-hierarchy strategy", type.FullName)); } tablePerClassEntities.Add(rootEntity); } @@ -235,18 +235,18 @@ { if (IsComponent(type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered as entity and as component", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered as entity and as component", type.FullName)); } var rootEntity = GetRootEntityOrNull(type); if (rootEntity != null) { if (rootEntity.Equals(type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered as root-entity and as subclass for table-per-class-hierarchy strategy", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered as root-entity and as subclass for table-per-class-hierarchy strategy", type.FullName)); } if (IsMappedFor(tablePerClassEntities, type) || IsMappedFor(tablePerConcreteClassEntities, type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered with more than one class-hierarchy strategy", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered with more than one class-hierarchy strategy", type.FullName)); } tablePerClassHierarchyEntities.Add(rootEntity); } @@ -269,18 +269,18 @@ { if (IsComponent(type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered as entity and as component", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered as entity and as component", type.FullName)); } var rootEntity = GetRootEntityOrNull(type); if (rootEntity != null) { if (rootEntity.Equals(type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered as root-entity and as subclass for table-per-concrete-class strategy", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered as root-entity and as subclass for table-per-concrete-class strategy", type.FullName)); } if (IsMappedFor(tablePerClassEntities, type) || IsMappedFor(tablePerClassHierarchyEntities, type)) { - throw new MappingException(string.Format("Abiguous mapping of {0}. It was registered with more than one class-hierarchy strategy", type.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0}. It was registered with more than one class-hierarchy strategy", type.FullName)); } tablePerConcreteClassEntities.Add(rootEntity); } Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs 2011-04-27 13:51:34 UTC (rev 5772) +++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs 2011-04-27 13:53:14 UTC (rev 5773) @@ -71,7 +71,7 @@ if(id == null) { var propertyDescription = idProperty != null ? " '" + idProperty.Name + "'" : ", with generator, "; - throw new MappingException(string.Format("Abiguous mapping of {0} id. A ComponentAsId or a ComposedId was used and you are trying to map the property{1} as id.", + throw new MappingException(string.Format("Ambiguous mapping of {0} id. A ComponentAsId or a ComposedId was used and you are trying to map the property{1} as id.", Container.FullName, propertyDescription)); } mapper(new IdMapper(idProperty, id)); @@ -93,12 +93,12 @@ } if (composedIdWasUsed) { - throw new MappingException(string.Format("Abiguous mapping of {0} id. A composed id was defined and you are trying to map the component {1}, of property '{2}', as id for {0}." + throw new MappingException(string.Format("Ambiguous mapping of {0} id. A composed id was defined and you are trying to map the component {1}, of property '{2}', as id for {0}." , Container.FullName, idProperty.GetPropertyOrFieldType().FullName, idProperty.Name)); } if (simpleIdPropertyWasUsed) { - throw new MappingException(string.Format("Abiguous mapping of {0} id. An id property, with generator, was defined and you are trying to map the component {1}, of property '{2}', as id for {0}." + throw new MappingException(string.Format("Ambiguous mapping of {0} id. An id property, with generator, was defined and you are trying to map the component {1}, of property '{2}', as id for {0}." , Container.FullName, idProperty.GetPropertyOrFieldType().FullName, idProperty.Name)); } var id = classMapping.Item as HbmCompositeId; @@ -115,11 +115,11 @@ { if(componentAsIdWasUsed) { - throw new MappingException(string.Format("Abiguous mapping of {0} id. A Component as id was used and you are trying to map an id composed by various properties of {0}.", Container.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0} id. A Component as id was used and you are trying to map an id composed by various properties of {0}.", Container.FullName)); } if (simpleIdPropertyWasUsed) { - throw new MappingException(string.Format("Abiguous mapping of {0} id. An id property, with generator, was defined and you are trying to map an id composed by various properties of {0}.", Container.FullName)); + throw new MappingException(string.Format("Ambiguous mapping of {0} id. An id property, with generator, was defined and you are trying to map an id composed by various properties of {0}.", Container.FullName)); } var id = classMapping.Item as HbmCompositeId; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |