Menu
▾
▴
nhibernate-commit
|
From: <fab...@us...> - 2011-04-03 17:53:18
|
Revision: 5598
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5598&view=rev
Author: fabiomaulo
Date: 2011-04-03 17:53:11 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
Minor (changed method name)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ExplicitlyDeclaredModel.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IModelInspector.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ExplicitlyDeclaredModel.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ExplicitlyDeclaredModel.cs 2011-04-03 17:03:44 UTC (rev 5597)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ExplicitlyDeclaredModel.cs 2011-04-03 17:53:11 UTC (rev 5598)
@@ -447,7 +447,7 @@
return oneToManyRelations.Contains(member);
}
- public bool IsHeterogeneousAssociation(MemberInfo member)
+ public bool IsAny(MemberInfo member)
{
return any.Contains(member);
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IModelInspector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IModelInspector.cs 2011-04-03 17:03:44 UTC (rev 5597)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IModelInspector.cs 2011-04-03 17:53:11 UTC (rev 5598)
@@ -17,7 +17,7 @@
bool IsManyToOne(MemberInfo member);
bool IsManyToMany(MemberInfo member);
bool IsOneToMany(MemberInfo member);
- bool IsHeterogeneousAssociation(MemberInfo member);
+ bool IsAny(MemberInfo member);
bool IsPersistentId(MemberInfo member);
bool IsVersion(MemberInfo member);
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-03 17:03:44 UTC (rev 5597)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-04-03 17:53:11 UTC (rev 5598)
@@ -730,7 +730,7 @@
{
MapProperty(member, memberPath, naturalIdMapper);
}
- else if (modelInspector.IsHeterogeneousAssociation(member))
+ else if (modelInspector.IsAny(member))
{
MapAny(member, memberPath, naturalIdMapper);
}
@@ -774,7 +774,7 @@
{
MapProperty(member, memberPath, propertiesContainer);
}
- else if (modelInspector.IsHeterogeneousAssociation(member))
+ else if (modelInspector.IsAny(member))
{
MapAny(member, memberPath, propertiesContainer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-04 20:33:56
|
Revision: 5608
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5608&view=rev
Author: fabiomaulo
Date: 2011-04-04 20:33:50 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
Minor
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs 2011-04-04 19:47:46 UTC (rev 5607)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs 2011-04-04 20:33:50 UTC (rev 5608)
@@ -24,7 +24,12 @@
public interface IClassMapper : IClassAttributesMapper, IPropertyContainerMapper
{
- void Join(string tableName, Action<IJoinMapper> splittedMapping);
+ /// <summary>
+ /// Using the Join, it is possible to split properties of one class to several tables, when there's a 1-to-1 relationship between the table
+ /// </summary>
+ /// <param name="splitGroupId">The split-group identifier. By default it is assigned to the join-table-name</param>
+ /// <param name="splittedMapping">The lambda to map the join.</param>
+ void Join(string splitGroupId, Action<IJoinMapper> splittedMapping);
}
public interface IClassAttributesMapper<TEntity> : IEntityAttributesMapper, IEntitySqlsMapper where TEntity : class
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs 2011-04-04 19:47:46 UTC (rev 5607)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs 2011-04-04 20:33:50 UTC (rev 5608)
@@ -174,15 +174,15 @@
classMapping.schemaaction = action.ToSchemaActionString();
}
- public void Join(string tableName, Action<IJoinMapper> splittedMapping)
+ public void Join(string splitGroupId, Action<IJoinMapper> splittedMapping)
{
IJoinMapper splitGroup;
- if(!JoinMappers.TryGetValue(tableName, out splitGroup))
+ if(!JoinMappers.TryGetValue(splitGroupId, out splitGroup))
{
var hbmJoin = new HbmJoin();
- splitGroup = new JoinMapper(Container, tableName, hbmJoin, MapDoc);
+ splitGroup = new JoinMapper(Container, splitGroupId, hbmJoin, MapDoc);
var toAdd = new[] { hbmJoin };
- JoinMappers.Add(tableName, splitGroup);
+ JoinMappers.Add(splitGroupId, splitGroup);
classMapping.Items1 = classMapping.Items1 == null ? toAdd : classMapping.Items1.Concat(toAdd).ToArray();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2011-04-14 19:50:44
|
Revision: 5703
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5703&view=rev
Author: fabiomaulo
Date: 2011-04-14 19:50:38 +0000 (Thu, 14 Apr 2011)
Log Message:
-----------
Minor (API simplified)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs 2011-04-14 19:31:59 UTC (rev 5702)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs 2011-04-14 19:50:38 UTC (rev 5703)
@@ -31,14 +31,20 @@
void Set<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
+ void Set<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
+ Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping);
void Bag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
+ void Bag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
+ Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping);
void List<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
+ void List<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
+ Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping);
void Map<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property,
Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping,
@@ -48,10 +54,14 @@
void Map<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property,
Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
+ void Map<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property,
+ Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping);
void IdBag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
+ void IdBag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
+ Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping);
}
public interface IPropertyContainerMapper<TEntity> : ICollectionPropertiesContainerMapper<TEntity>, IPlainPropertyContainerMapper<TEntity> where TEntity : class {}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs 2011-04-14 19:31:59 UTC (rev 5702)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs 2011-04-14 19:50:38 UTC (rev 5703)
@@ -133,6 +133,12 @@
RegisterSetMapping(property, collectionMapping, mapping);
}
+ public void Set<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
+ Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping)
+ {
+ Set(property, collectionMapping, x => { });
+ }
+
protected virtual void RegisterSetMapping<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property, Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
MemberInfo member = TypeExtensions.DecodeMemberAccessExpression(property);
@@ -150,6 +156,11 @@
{
RegisterBagMapping(property, collectionMapping, mapping);
}
+ public void Bag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
+ Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping)
+ {
+ Bag(property, collectionMapping, x => { });
+ }
protected virtual void RegisterBagMapping<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property, Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
@@ -168,6 +179,11 @@
{
RegisterListMapping(property, collectionMapping, mapping);
}
+ public void List<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
+ Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping)
+ {
+ List(property, collectionMapping, x => { });
+ }
protected virtual void RegisterListMapping<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property, Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
@@ -187,6 +203,11 @@
{
RegisterMapMapping(property, collectionMapping, keyMapping, mapping);
}
+ public void Map<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property,
+ Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping)
+ {
+ Map(property, collectionMapping, keyMapping => { }, x => { });
+ }
protected virtual void RegisterMapMapping<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property, Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping, Action<IMapKeyRelation<TKey>> keyMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
@@ -217,6 +238,12 @@
RegisterIdBagMapping(property, collectionMapping, mapping);
}
+ public void IdBag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
+ Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping)
+ {
+ RegisterIdBagMapping(property, collectionMapping, x => { });
+ }
+
protected virtual void RegisterIdBagMapping<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property, Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
MemberInfo member = TypeExtensions.DecodeMemberAccessExpression(property);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <fab...@us...> - 2011-05-06 14:14:47
|
Revision: 5799
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5799&view=rev
Author: fabiomaulo
Date: 2011-05-06 14:14:41 +0000 (Fri, 06 May 2011)
Log Message:
-----------
cleaned public API
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/CacheInclude.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/CacheUsage.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/CollectionFetchMode.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchKind.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/CacheInclude.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/CacheInclude.cs 2011-05-06 12:28:17 UTC (rev 5798)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/CacheInclude.cs 2011-05-06 14:14:41 UTC (rev 5799)
@@ -7,13 +7,13 @@
public static CacheInclude All = new AllCacheInclude();
public static CacheInclude NonLazy = new NonLazyCacheInclude();
- public abstract HbmCacheInclude ToHbm();
+ internal abstract HbmCacheInclude ToHbm();
#region Nested type: AllCacheInclude
public class AllCacheInclude : CacheInclude
{
- public override HbmCacheInclude ToHbm()
+ internal override HbmCacheInclude ToHbm()
{
return HbmCacheInclude.All;
}
@@ -25,7 +25,7 @@
public class NonLazyCacheInclude : CacheInclude
{
- public override HbmCacheInclude ToHbm()
+ internal override HbmCacheInclude ToHbm()
{
return HbmCacheInclude.NonLazy;
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/CacheUsage.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/CacheUsage.cs 2011-05-06 12:28:17 UTC (rev 5798)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/CacheUsage.cs 2011-05-06 14:14:41 UTC (rev 5799)
@@ -9,13 +9,13 @@
public static CacheUsage NonstrictReadWrite = new NonstrictReadWriteUsage();
public static CacheUsage Transactional = new TransactionalUsage();
- public abstract HbmCacheUsage ToHbm();
+ internal abstract HbmCacheUsage ToHbm();
#region Nested type: NonstrictReadWriteUsage
private class NonstrictReadWriteUsage : CacheUsage
{
- public override HbmCacheUsage ToHbm()
+ internal override HbmCacheUsage ToHbm()
{
return HbmCacheUsage.NonstrictReadWrite;
}
@@ -27,7 +27,7 @@
private class ReadOnlyUsage : CacheUsage
{
- public override HbmCacheUsage ToHbm()
+ internal override HbmCacheUsage ToHbm()
{
return HbmCacheUsage.ReadOnly;
}
@@ -39,7 +39,7 @@
private class ReadWriteUsage : CacheUsage
{
- public override HbmCacheUsage ToHbm()
+ internal override HbmCacheUsage ToHbm()
{
return HbmCacheUsage.ReadWrite;
}
@@ -51,7 +51,7 @@
private class TransactionalUsage : CacheUsage
{
- public override HbmCacheUsage ToHbm()
+ internal override HbmCacheUsage ToHbm()
{
return HbmCacheUsage.Transactional;
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/CollectionFetchMode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/CollectionFetchMode.cs 2011-05-06 12:28:17 UTC (rev 5798)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/CollectionFetchMode.cs 2011-05-06 14:14:41 UTC (rev 5799)
@@ -8,13 +8,13 @@
public static CollectionFetchMode Join = new JoinFetchMode();
public static CollectionFetchMode Subselect = new SubselectFetchMode();
- public abstract HbmCollectionFetchMode ToHbm();
+ internal abstract HbmCollectionFetchMode ToHbm();
#region Nested type: JoinFetchMode
private class JoinFetchMode : CollectionFetchMode
{
- public override HbmCollectionFetchMode ToHbm()
+ internal override HbmCollectionFetchMode ToHbm()
{
return HbmCollectionFetchMode.Join;
}
@@ -26,7 +26,7 @@
private class SelectFetchMode : CollectionFetchMode
{
- public override HbmCollectionFetchMode ToHbm()
+ internal override HbmCollectionFetchMode ToHbm()
{
return HbmCollectionFetchMode.Select;
}
@@ -38,7 +38,7 @@
private class SubselectFetchMode : CollectionFetchMode
{
- public override HbmCollectionFetchMode ToHbm()
+ internal override HbmCollectionFetchMode ToHbm()
{
return HbmCollectionFetchMode.Subselect;
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchKind.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchKind.cs 2011-05-06 12:28:17 UTC (rev 5798)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchKind.cs 2011-05-06 14:14:41 UTC (rev 5799)
@@ -7,19 +7,19 @@
public static FetchKind Select = new SelectFetchMode();
public static FetchKind Join = new JoinFetchMode();
- public abstract HbmFetchMode ToHbm();
- public abstract HbmJoinFetch ToHbmJoinFetch();
+ internal abstract HbmFetchMode ToHbm();
+ internal abstract HbmJoinFetch ToHbmJoinFetch();
#region Nested type: JoinFetchMode
private class JoinFetchMode : FetchKind
{
- public override HbmFetchMode ToHbm()
+ internal override HbmFetchMode ToHbm()
{
return HbmFetchMode.Join;
}
- public override HbmJoinFetch ToHbmJoinFetch()
+ internal override HbmJoinFetch ToHbmJoinFetch()
{
return HbmJoinFetch.Join;
}
@@ -31,12 +31,12 @@
private class SelectFetchMode : FetchKind
{
- public override HbmFetchMode ToHbm()
+ internal override HbmFetchMode ToHbm()
{
return HbmFetchMode.Select;
}
- public override HbmJoinFetch ToHbmJoinFetch()
+ internal override HbmJoinFetch ToHbmJoinFetch()
{
return HbmJoinFetch.Select;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jul...@us...> - 2011-06-18 15:58:06
|
Revision: 5951
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5951&view=rev
Author: julian-maughan
Date: 2011-06-18 15:57:58 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
Corrected a few spelling, grammatical and typographical mistakes in the ByCode namespace
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/AbstractExplicitlyDeclaredModel.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/FakeModelExplicitDeclarationsHolder.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IKeyMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IManyToManyMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ISubclassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionKeyCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinKeyCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassKeyCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ManyToManyCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/NaturalIdCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/KeyMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ManyToManyMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/PropertyToField.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/TypeExtensions.cs
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/AbstractExplicitlyDeclaredModel.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/AbstractExplicitlyDeclaredModel.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/AbstractExplicitlyDeclaredModel.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -173,10 +173,10 @@
public IEnumerable<string> GetSplitGroupsFor(System.Type type)
{
- HashSet<string> splitsGroupsIds;
- if (typeSplitGroups.TryGetValue(type, out splitsGroupsIds))
+ HashSet<string> splitGroupIds;
+ if (typeSplitGroups.TryGetValue(type, out splitGroupIds))
{
- return splitsGroupsIds;
+ return splitGroupIds;
}
return Enumerable.Empty<string>();
}
@@ -222,7 +222,7 @@
{
if(!rootEntityMustExists)
{
- delayedRootEntityRegistrations.Enqueue(() => System.Array.ForEach(GetRootEntitentitiesOf(type).ToArray(), root=> tablePerClassEntities.Add(root)));
+ delayedRootEntityRegistrations.Enqueue(() => System.Array.ForEach(GetRootEntitiesOf(type).ToArray(), root=> tablePerClassEntities.Add(root)));
EnlistTypeRegistration(type, t => AddAsTablePerClassEntity(t, true));
return;
}
@@ -257,7 +257,7 @@
{
if (!rootEntityMustExists)
{
- delayedRootEntityRegistrations.Enqueue(() => System.Array.ForEach(GetRootEntitentitiesOf(type).ToArray(), root => tablePerClassHierarchyEntities.Add(root)));
+ delayedRootEntityRegistrations.Enqueue(() => System.Array.ForEach(GetRootEntitiesOf(type).ToArray(), root => tablePerClassHierarchyEntities.Add(root)));
EnlistTypeRegistration(type, t => AddAsTablePerClassHierarchyEntity(t, true));
return;
}
@@ -293,7 +293,7 @@
{
if (!rootEntityMustExists)
{
- delayedRootEntityRegistrations.Enqueue(() => System.Array.ForEach(GetRootEntitentitiesOf(type).ToArray(), root => tablePerConcreteClassEntities.Add(root)));
+ delayedRootEntityRegistrations.Enqueue(() => System.Array.ForEach(GetRootEntitiesOf(type).ToArray(), root => tablePerConcreteClassEntities.Add(root)));
EnlistTypeRegistration(type, t => AddAsTablePerConcreteClassEntity(t, true));
return;
}
@@ -477,7 +477,7 @@
protected System.Type GetSingleRootEntityOrNull(System.Type entityType)
{
- var rootTypes = GetRootEntitentitiesOf(entityType).ToList();
+ var rootTypes = GetRootEntitiesOf(entityType).ToList();
if(rootTypes.Count > 1)
{
var sb = new StringBuilder(1024);
@@ -494,7 +494,7 @@
return rootTypes.SingleOrDefault(IsRootEntity);
}
- protected IEnumerable<System.Type> GetRootEntitentitiesOf(System.Type entityType)
+ protected IEnumerable<System.Type> GetRootEntitiesOf(System.Type entityType)
{
if (entityType == null)
{
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ConventionModelMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -57,7 +57,7 @@
BeforeMapAny += MemberReadOnlyAccessor;
}
- protected virtual void ComponentParentToFieldAccessor(IModelInspector modelinspector, PropertyPath member, IComponentAttributesMapper componentMapper)
+ protected virtual void ComponentParentToFieldAccessor(IModelInspector modelInspector, PropertyPath member, IComponentAttributesMapper componentMapper)
{
System.Type componentType = member.LocalMember.GetPropertyOrFieldType();
IEnumerable<MemberInfo> persistentProperties =
@@ -70,7 +70,7 @@
}
}
- protected virtual void ComponentParentNoSetterToField(IModelInspector modelinspector, PropertyPath member, IComponentAttributesMapper componentMapper)
+ protected virtual void ComponentParentNoSetterToField(IModelInspector modelInspector, PropertyPath member, IComponentAttributesMapper componentMapper)
{
System.Type componentType = member.LocalMember.GetPropertyOrFieldType();
IEnumerable<MemberInfo> persistentProperties =
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/FakeModelExplicitDeclarationsHolder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/FakeModelExplicitDeclarationsHolder.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/FakeModelExplicitDeclarationsHolder.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -198,11 +198,13 @@
public void AddAsManyToManyRelation(MemberInfo member) {}
public void AddAsOneToManyRelation(MemberInfo member) {}
+
public void AddAsManyToAnyRelation(MemberInfo member) {}
public void AddAsAny(MemberInfo member) {}
public void AddAsPoid(MemberInfo member) {}
+
public void AddAsPartOfComposedId(MemberInfo member) {}
public void AddAsVersionProperty(MemberInfo member) {}
@@ -222,9 +224,13 @@
public void AddAsMap(MemberInfo member) {}
public void AddAsProperty(MemberInfo member) {}
- public void AddAsPersistentMember(MemberInfo member){}
+
+ public void AddAsPersistentMember(MemberInfo member) {}
+
public void AddAsPropertySplit(SplitDefinition definition) {}
+
public void AddAsDynamicComponent(MemberInfo member, System.Type componentTemplate) {}
+
#endregion
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IClassMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -32,20 +32,20 @@
/// Using the Join, it is possible to split properties of one class to several tables, when there's a 1-to-1 relationship between the table
/// </summary>
/// <param name="splitGroupId">The split-group identifier. By default it is assigned to the join-table-name</param>
- /// <param name="splittedMapping">The lambda to map the join.</param>
- void Join(string splitGroupId, Action<IJoinMapper> splittedMapping);
+ /// <param name="splitMapping">The lambda to map the join.</param>
+ void Join(string splitGroupId, Action<IJoinMapper> splitMapping);
}
public interface IClassAttributesMapper<TEntity> : IEntityAttributesMapper, IEntitySqlsMapper where TEntity : class
{
void Id<TProperty>(Expression<Func<TEntity, TProperty>> idProperty);
void Id<TProperty>(Expression<Func<TEntity, TProperty>> idProperty, Action<IIdMapper> idMapper);
- void Id(string notVidiblePropertyOrFieldName, Action<IIdMapper> idMapper);
+ void Id(string notVisiblePropertyOrFieldName, Action<IIdMapper> idMapper);
void ComponentAsId<TComponent>(Expression<Func<TEntity, TComponent>> idProperty) where TComponent : class;
void ComponentAsId<TComponent>(Expression<Func<TEntity, TComponent>> idProperty, Action<IComponentAsIdMapper<TComponent>> idMapper) where TComponent : class;
- void ComponentAsId<TComponent>(string notVidiblePropertyOrFieldName) where TComponent : class;
- void ComponentAsId<TComponent>(string notVidiblePropertyOrFieldName, Action<IComponentAsIdMapper<TComponent>> idMapper) where TComponent : class;
+ void ComponentAsId<TComponent>(string notVisiblePropertyOrFieldName) where TComponent : class;
+ void ComponentAsId<TComponent>(string notVisiblePropertyOrFieldName, Action<IComponentAsIdMapper<TComponent>> idMapper) where TComponent : class;
void ComposedId(Action<IComposedIdMapper<TEntity>> idPropertiesMapping);
@@ -56,7 +56,7 @@
void Schema(string schemaName);
void Mutable(bool isMutable);
void Version<TProperty>(Expression<Func<TEntity, TProperty>> versionProperty, Action<IVersionMapper> versionMapping);
- void Version(string notVidiblePropertyOrFieldName, Action<IVersionMapper> versionMapping);
+ void Version(string notVisiblePropertyOrFieldName, Action<IVersionMapper> versionMapping);
void NaturalId(Action<IBasePlainPropertyContainerMapper<TEntity>> naturalIdPropertiesMapping, Action<INaturalIdAttributesMapper> naturalIdMapping);
void NaturalId(Action<IBasePlainPropertyContainerMapper<TEntity>> naturalIdPropertiesMapping);
void Cache(Action<ICacheMapper> cacheMapping);
@@ -67,6 +67,6 @@
public interface IClassMapper<TEntity> : IClassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class
{
- void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splittedMapping);
+ void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splitMapping);
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IKeyMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IKeyMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IKeyMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -19,14 +19,14 @@
void Unique(bool unique);
/// <summary>
- /// Set the Foreing-Key name
+ /// Set the Foreign-Key name
/// </summary>
- /// <param name="foreingKeyName">The name of the Foreing-Key</param>
+ /// <param name="foreignKeyName">The name of the Foreign-Key</param>
/// <remarks>
- /// Where the <paramref name="foreingKeyName"/> is "none" or <see cref="string.Empty"/> or all white-spaces the FK won't be created.
+ /// Where the <paramref name="foreignKeyName"/> is "none" or <see cref="string.Empty"/> or all white-spaces the FK won't be created.
/// Use null to reset the default NHibernate's behavior.
/// </remarks>
- void ForeignKey(string foreingKeyName);
+ void ForeignKey(string foreignKeyName);
}
public interface IKeyMapper<TEntity> : IColumnsMapper where TEntity : class
@@ -34,7 +34,7 @@
void OnDelete(OnDeleteAction deleteAction);
void PropertyRef<TProperty>(Expression<Func<TEntity, TProperty>> propertyGetter);
void Update(bool consideredInUpdateQuery);
- void ForeignKey(string foreingKeyName);
+ void ForeignKey(string foreignKeyName);
void NotNullable(bool notnull);
void Unique(bool unique);
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IManyToManyMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IManyToManyMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IManyToManyMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -7,6 +7,6 @@
void NotFound(NotFoundMode mode);
void Formula(string formula);
void Lazy(LazyRelation lazyRelation);
- void ForeignKey(string foreingKeyName);
+ void ForeignKey(string foreignKeyName);
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPlainPropertyContainerMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -28,11 +28,11 @@
{
void Property<TProperty>(Expression<Func<TContainer, TProperty>> property);
void Property<TProperty>(Expression<Func<TContainer, TProperty>> property, Action<IPropertyMapper> mapping);
- void Property(string notVidiblePropertyOrFieldName, Action<IPropertyMapper> mapping);
+ void Property(string notVisiblePropertyOrFieldName, Action<IPropertyMapper> mapping);
void ManyToOne<TProperty>(Expression<Func<TContainer, TProperty>> property, Action<IManyToOneMapper> mapping) where TProperty : class;
void ManyToOne<TProperty>(Expression<Func<TContainer, TProperty>> property) where TProperty : class;
- void ManyToOne<TProperty>(string notVidiblePropertyOrFieldName, Action<IManyToOneMapper> mapping) where TProperty : class;
+ void ManyToOne<TProperty>(string notVisiblePropertyOrFieldName, Action<IManyToOneMapper> mapping) where TProperty : class;
}
public interface IBasePlainPropertyContainerMapper<TContainer> : IMinimalPlainPropertyContainerMapper<TContainer>
@@ -44,20 +44,20 @@
TComponent dynamicComponentTemplate,
Action<IDynamicComponentMapper<TComponent>> mapping) where TComponent : class;
- void Component<TComponent>(string notVidiblePropertyOrFieldName,
+ void Component<TComponent>(string notVisiblePropertyOrFieldName,
Action<IComponentMapper<TComponent>> mapping) where TComponent : class;
- void Component<TComponent>(string notVidiblePropertyOrFieldName) where TComponent : class;
- void Component<TComponent>(string notVidiblePropertyOrFieldName,
+ void Component<TComponent>(string notVisiblePropertyOrFieldName) where TComponent : class;
+ void Component<TComponent>(string notVisiblePropertyOrFieldName,
TComponent dynamicComponentTemplate,
Action<IDynamicComponentMapper<TComponent>> mapping) where TComponent : class;
void Any<TProperty>(Expression<Func<TContainer, TProperty>> property, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping) where TProperty : class;
- void Any<TProperty>(string notVidiblePropertyOrFieldName, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping) where TProperty : class;
+ void Any<TProperty>(string notVisiblePropertyOrFieldName, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping) where TProperty : class;
}
public interface IPlainPropertyContainerMapper<TContainer> : IBasePlainPropertyContainerMapper<TContainer>
{
void OneToOne<TProperty>(Expression<Func<TContainer, TProperty>> property, Action<IOneToOneMapper> mapping) where TProperty : class;
- void OneToOne<TProperty>(string notVidiblePropertyOrFieldName, Action<IOneToOneMapper> mapping) where TProperty : class;
+ void OneToOne<TProperty>(string notVisiblePropertyOrFieldName, Action<IOneToOneMapper> mapping) where TProperty : class;
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -33,10 +33,10 @@
Action<ICollectionElementRelation<TElement>> mapping);
void Set<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping);
- void Set<TElement>(string notVidiblePropertyOrFieldName,
+ void Set<TElement>(string notVisiblePropertyOrFieldName,
Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
- void Set<TElement>(string notVidiblePropertyOrFieldName,
+ void Set<TElement>(string notVisiblePropertyOrFieldName,
Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping);
void Bag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
@@ -44,10 +44,10 @@
Action<ICollectionElementRelation<TElement>> mapping);
void Bag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping);
- void Bag<TElement>(string notVidiblePropertyOrFieldName,
+ void Bag<TElement>(string notVisiblePropertyOrFieldName,
Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
- void Bag<TElement>(string notVidiblePropertyOrFieldName,
+ void Bag<TElement>(string notVisiblePropertyOrFieldName,
Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping);
void List<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
@@ -55,10 +55,10 @@
Action<ICollectionElementRelation<TElement>> mapping);
void List<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping);
- void List<TElement>(string notVidiblePropertyOrFieldName,
+ void List<TElement>(string notVisiblePropertyOrFieldName,
Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
- void List<TElement>(string notVidiblePropertyOrFieldName,
+ void List<TElement>(string notVisiblePropertyOrFieldName,
Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping);
void Map<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property,
@@ -70,14 +70,14 @@
Action<ICollectionElementRelation<TElement>> mapping);
void Map<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property,
Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping);
- void Map<TKey, TElement>(string notVidiblePropertyOrFieldName,
+ void Map<TKey, TElement>(string notVisiblePropertyOrFieldName,
Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping,
Action<IMapKeyRelation<TKey>> keyMapping,
Action<ICollectionElementRelation<TElement>> mapping);
- void Map<TKey, TElement>(string notVidiblePropertyOrFieldName,
+ void Map<TKey, TElement>(string notVisiblePropertyOrFieldName,
Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
- void Map<TKey, TElement>(string notVidiblePropertyOrFieldName,
+ void Map<TKey, TElement>(string notVisiblePropertyOrFieldName,
Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping);
void IdBag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
@@ -85,10 +85,10 @@
Action<ICollectionElementRelation<TElement>> mapping);
void IdBag<TElement>(Expression<Func<TEntity, IEnumerable<TElement>>> property,
Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping);
- void IdBag<TElement>(string notVidiblePropertyOrFieldName,
+ void IdBag<TElement>(string notVisiblePropertyOrFieldName,
Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping,
Action<ICollectionElementRelation<TElement>> mapping);
- void IdBag<TElement>(string notVidiblePropertyOrFieldName,
+ void IdBag<TElement>(string notVisiblePropertyOrFieldName,
Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping);
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ISubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ISubclassMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ISubclassMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -10,7 +10,7 @@
public interface ISubclassMapper : ISubclassAttributesMapper, IPropertyContainerMapper
{
- void Join(string splitGroupId, Action<IJoinMapper> splittedMapping);
+ void Join(string splitGroupId, Action<IJoinMapper> splitMapping);
}
public interface ISubclassAttributesMapper<TEntity> : IEntityAttributesMapper, IEntitySqlsMapper where TEntity : class
@@ -20,6 +20,6 @@
public interface ISubclassMapper<TEntity> : ISubclassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class
{
- void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splittedMapping);
+ void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splitMapping);
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ClassMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -236,7 +236,7 @@
classMapping.schemaaction = action.ToSchemaActionString();
}
- public void Join(string splitGroupId, Action<IJoinMapper> splittedMapping)
+ public void Join(string splitGroupId, Action<IJoinMapper> splitMapping)
{
IJoinMapper splitGroup;
if(!JoinMappers.TryGetValue(splitGroupId, out splitGroup))
@@ -248,7 +248,7 @@
classMapping.Items1 = classMapping.Items1 == null ? toAdd : classMapping.Items1.Concat(toAdd).ToArray();
}
- splittedMapping(splitGroup);
+ splitMapping(splitGroup);
}
#endregion
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ClassCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -46,12 +46,12 @@
CustomizersHolder.AddCustomizer(typeof (TEntity), m => m.Id(member, idMapper));
}
- public void Id(string notVidiblePropertyOrFieldName, Action<IIdMapper> idMapper)
+ public void Id(string notVisiblePropertyOrFieldName, Action<IIdMapper> idMapper)
{
MemberInfo member = null;
- if (notVidiblePropertyOrFieldName != null)
+ if (notVisiblePropertyOrFieldName != null)
{
- member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+ member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVisiblePropertyOrFieldName);
ExplicitDeclarationsHolder.AddAsPoid(member);
}
CustomizersHolder.AddCustomizer(typeof(TEntity), m => m.Id(member, idMapper));
@@ -69,14 +69,14 @@
idMapper(new ComponentAsIdCustomizer<TComponent>(ExplicitDeclarationsHolder, CustomizersHolder, propertyPath));
}
- public void ComponentAsId<TComponent>(string notVidiblePropertyOrFieldName) where TComponent : class
+ public void ComponentAsId<TComponent>(string notVisiblePropertyOrFieldName) where TComponent : class
{
- ComponentAsId<TComponent>(notVidiblePropertyOrFieldName, x => { });
+ ComponentAsId<TComponent>(notVisiblePropertyOrFieldName, x => { });
}
- public void ComponentAsId<TComponent>(string notVidiblePropertyOrFieldName, Action<IComponentAsIdMapper<TComponent>> idMapper) where TComponent : class
+ public void ComponentAsId<TComponent>(string notVisiblePropertyOrFieldName, Action<IComponentAsIdMapper<TComponent>> idMapper) where TComponent : class
{
- var member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+ var member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVisiblePropertyOrFieldName);
var propertyPath = new PropertyPath(null, member);
idMapper(new ComponentAsIdCustomizer<TComponent>(ExplicitDeclarationsHolder, CustomizersHolder, propertyPath));
}
@@ -127,9 +127,9 @@
CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Version(member, versionMapping));
}
- public void Version(string notVidiblePropertyOrFieldName, Action<IVersionMapper> versionMapping)
+ public void Version(string notVisiblePropertyOrFieldName, Action<IVersionMapper> versionMapping)
{
- var member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+ var member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVisiblePropertyOrFieldName);
ExplicitDeclarationsHolder.AddAsVersionProperty(member);
CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Version(member, versionMapping));
}
@@ -165,7 +165,7 @@
CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.SchemaAction(action));
}
- public void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splittedMapping)
+ public void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splitMapping)
{
// add the customizer only to create the JoinMapper instance
CustomizersHolder.AddCustomizer(typeof(TEntity), (IClassMapper m) => m.Join(splitGroupId, j => { }));
@@ -176,7 +176,7 @@
joinCustomizer = new JoinCustomizer<TEntity>(splitGroupId, ExplicitDeclarationsHolder, CustomizersHolder);
JoinCustomizers.Add(splitGroupId, joinCustomizer);
}
- splittedMapping(joinCustomizer);
+ splitMapping(joinCustomizer);
}
public void EntityName(string value)
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionKeyCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionKeyCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/CollectionKeyCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -50,9 +50,9 @@
CustomizersHolder.AddCustomizer(propertyPath, (ICollectionPropertiesMapper m) => m.Key(x => x.Update(consideredInUpdateQuery)));
}
- public void ForeignKey(string foreingKeyName)
+ public void ForeignKey(string foreignKeyName)
{
- CustomizersHolder.AddCustomizer(propertyPath, (ICollectionPropertiesMapper m) => m.Key(x => x.ForeignKey(foreingKeyName)));
+ CustomizersHolder.AddCustomizer(propertyPath, (ICollectionPropertiesMapper m) => m.Key(x => x.ForeignKey(foreignKeyName)));
}
public void NotNullable(bool notnull)
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -117,12 +117,12 @@
base.RegisterPropertyMapping(property, mapping);
}
- protected override void RegisterNoVisiblePropertyMapping(string notVidiblePropertyOrFieldName, System.Action<IPropertyMapper> mapping)
+ protected override void RegisterNoVisiblePropertyMapping(string notVisiblePropertyOrFieldName, System.Action<IPropertyMapper> mapping)
{
- MemberInfo member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+ MemberInfo member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVisiblePropertyOrFieldName);
ExplicitDeclarationsHolder.AddAsPropertySplit(new SplitDefinition(typeof(TEntity), splitGroupId, member));
- base.RegisterNoVisiblePropertyMapping(notVidiblePropertyOrFieldName, mapping);
+ base.RegisterNoVisiblePropertyMapping(notVisiblePropertyOrFieldName, mapping);
}
protected override void RegisterComponentMapping<TComponent>(Expression<Func<TEntity, TComponent>> property, Action<IComponentMapper<TComponent>> mapping)
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinKeyCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinKeyCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinKeyCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -47,9 +47,9 @@
CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.Key(x => x.Update(consideredInUpdateQuery)));
}
- public void ForeignKey(string foreingKeyName)
+ public void ForeignKey(string foreignKeyName)
{
- CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.Key(x => x.ForeignKey(foreingKeyName)));
+ CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinAttributesMapper m) => m.Key(x => x.ForeignKey(foreignKeyName)));
}
public void NotNullable(bool notnull)
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassKeyCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassKeyCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassKeyCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -47,9 +47,9 @@
CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.Key(x => x.Update(consideredInUpdateQuery)));
}
- public void ForeignKey(string foreingKeyName)
+ public void ForeignKey(string foreignKeyName)
{
- CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.Key(x => x.ForeignKey(foreingKeyName)));
+ CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.Key(x => x.ForeignKey(foreignKeyName)));
}
public void NotNullable(bool notnull)
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ManyToManyCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ManyToManyCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/ManyToManyCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -60,9 +60,9 @@
customizersHolder.AddCustomizer(propertyPath, (IManyToManyMapper x) => x.Lazy(lazyRelation));
}
- public void ForeignKey(string foreingKeyName)
+ public void ForeignKey(string foreignKeyName)
{
- customizersHolder.AddCustomizer(propertyPath, (IManyToManyMapper x) => x.ForeignKey(foreingKeyName));
+ customizersHolder.AddCustomizer(propertyPath, (IManyToManyMapper x) => x.ForeignKey(foreignKeyName));
}
#endregion
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/NaturalIdCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/NaturalIdCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/NaturalIdCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -16,14 +16,14 @@
base.RegisterPropertyMapping(property, mapping);
}
- protected override void RegisterNoVisiblePropertyMapping(string notVidiblePropertyOrFieldName, System.Action<IPropertyMapper> mapping)
+ protected override void RegisterNoVisiblePropertyMapping(string notVisiblePropertyOrFieldName, System.Action<IPropertyMapper> mapping)
{
- MemberInfo member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVidiblePropertyOrFieldName);
+ MemberInfo member = typeof(TEntity).GetPropertyOrFieldMatchingName(notVisiblePropertyOrFieldName);
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
ExplicitDeclarationsHolder.AddAsNaturalId(member);
ExplicitDeclarationsHolder.AddAsNaturalId(memberOf);
- base.RegisterNoVisiblePropertyMapping(notVidiblePropertyOrFieldName, mapping);
+ base.RegisterNoVisiblePropertyMapping(notVisiblePropertyOrFieldName, mapping);
}
protected override void RegisterComponentMapping<TComponent>(System.Linq.Expressions.Expression<System.Func<TEntity, TComponent>> property, System.Action<IComponentMapper<TComponent>> mapping)
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -46,16 +46,16 @@
RegistePropertyMapping(mapping, member, memberOf);
}
- public void Property(string notVidiblePropertyOrFieldName, Action<IPropertyMapper> mapping)
+ public void Property(string notVisiblePropertyOrFieldName, Action<IPropertyMapper> mapping)
{
- RegisterNoVisiblePropertyMapping(notVidiblePropertyOrFieldName, mapping);
+ RegisterNoVisiblePropertyMapping(notVisiblePropertyOrFieldName, mapping);
}
- protected virtual void RegisterNoVisiblePropertyMapping(string notVidiblePropertyOrFieldName, Action<IPropertyMapper> mapping)
+ protected virtual void RegisterNoVisiblePropertyMapping(string notVisiblePropertyOrFieldName, Action<IPropertyMapper> mapping)
{
// even seems repetitive, before unify this registration with the registration using Expression take in account that reflection operations
// done unsing expressions are faster than those done with pure reflection.
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegistePropertyMapping(mapping, member, memberOf);
}
@@ -344,162 +344,162 @@
}
}
- public void Set<TElement>(string notVidiblePropertyOrFieldName, Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
+ public void Set<TElement>(string notVisiblePropertyOrFieldName, Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var collectionElementType = member.GetPropertyOrFieldType().DetermineCollectionElementType();
if(!typeof(TElement).Equals(collectionElementType))
{
throw new MappingException(string.Format("Wrong collection element type. For the property/field '{0}' of {1} was expected a collection of {2} but was {3}",
- notVidiblePropertyOrFieldName, typeof (TEntity).FullName, typeof (TElement).Name, collectionElementType.Name));
+ notVisiblePropertyOrFieldName, typeof (TEntity).FullName, typeof (TElement).Name, collectionElementType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterSetMapping<TElement>(collectionMapping, mapping, member, memberOf);
}
- public void Set<TElement>(string notVidiblePropertyOrFieldName, Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping)
+ public void Set<TElement>(string notVisiblePropertyOrFieldName, Action<ISetPropertiesMapper<TEntity, TElement>> collectionMapping)
{
- Set(notVidiblePropertyOrFieldName, collectionMapping, x => { });
+ Set(notVisiblePropertyOrFieldName, collectionMapping, x => { });
}
- public void Bag<TElement>(string notVidiblePropertyOrFieldName, Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
+ public void Bag<TElement>(string notVisiblePropertyOrFieldName, Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var collectionElementType = member.GetPropertyOrFieldType().DetermineCollectionElementType();
if (!typeof(TElement).Equals(collectionElementType))
{
throw new MappingException(string.Format("Wrong collection element type. For the property/field '{0}' of {1} was expected a collection of {2} but was {3}",
- notVidiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TElement).Name, collectionElementType.Name));
+ notVisiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TElement).Name, collectionElementType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterBagMapping<TElement>(collectionMapping, mapping, member, memberOf);
}
- public void Bag<TElement>(string notVidiblePropertyOrFieldName, Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping)
+ public void Bag<TElement>(string notVisiblePropertyOrFieldName, Action<IBagPropertiesMapper<TEntity, TElement>> collectionMapping)
{
- Bag(notVidiblePropertyOrFieldName, collectionMapping, x => { });
+ Bag(notVisiblePropertyOrFieldName, collectionMapping, x => { });
}
- public void List<TElement>(string notVidiblePropertyOrFieldName, Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
+ public void List<TElement>(string notVisiblePropertyOrFieldName, Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var collectionElementType = member.GetPropertyOrFieldType().DetermineCollectionElementType();
if (!typeof(TElement).Equals(collectionElementType))
{
throw new MappingException(string.Format("Wrong collection element type. For the property/field '{0}' of {1} was expected a collection of {2} but was {3}",
- notVidiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TElement).Name, collectionElementType.Name));
+ notVisiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TElement).Name, collectionElementType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterListMapping<TElement>(collectionMapping, mapping, member, memberOf);
}
- public void List<TElement>(string notVidiblePropertyOrFieldName, Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping)
+ public void List<TElement>(string notVisiblePropertyOrFieldName, Action<IListPropertiesMapper<TEntity, TElement>> collectionMapping)
{
- List(notVidiblePropertyOrFieldName, collectionMapping, x => { });
+ List(notVisiblePropertyOrFieldName, collectionMapping, x => { });
}
- public void Map<TKey, TElement>(string notVidiblePropertyOrFieldName, Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping, Action<IMapKeyRelation<TKey>> keyMapping, Action<ICollectionElementRelation<TElement>> mapping)
+ public void Map<TKey, TElement>(string notVisiblePropertyOrFieldName, Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping, Action<IMapKeyRelation<TKey>> keyMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var propertyOrFieldType = member.GetPropertyOrFieldType();
var keyType = propertyOrFieldType.DetermineDictionaryKeyType();
var collectionElementType = propertyOrFieldType.DetermineDictionaryValueType();
if (!typeof(TElement).Equals(collectionElementType) || !typeof(TKey).Equals(keyType))
{
throw new MappingException(string.Format("Wrong collection element type. For the property/field '{0}' of {1} was expected a dictionary of {2}/{3} but was {4}/{5}",
- notVidiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TKey).Name, keyType.Name ,typeof(TElement).Name, collectionElementType.Name));
+ notVisiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TKey).Name, keyType.Name ,typeof(TElement).Name, collectionElementType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterMapMapping<TKey, TElement>(collectionMapping, keyMapping, mapping, member, memberOf);
}
- public void Map<TKey, TElement>(string notVidiblePropertyOrFieldName, Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
+ public void Map<TKey, TElement>(string notVisiblePropertyOrFieldName, Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
- Map(notVidiblePropertyOrFieldName, collectionMapping, x => { }, mapping);
+ Map(notVisiblePropertyOrFieldName, collectionMapping, x => { }, mapping);
}
- public void Map<TKey, TElement>(string notVidiblePropertyOrFieldName, Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping)
+ public void Map<TKey, TElement>(string notVisiblePropertyOrFieldName, Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping)
{
- Map(notVidiblePropertyOrFieldName, collectionMapping, x => { }, y => { });
+ Map(notVisiblePropertyOrFieldName, collectionMapping, x => { }, y => { });
}
- public void IdBag<TElement>(string notVidiblePropertyOrFieldName, Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
+ public void IdBag<TElement>(string notVisiblePropertyOrFieldName, Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping, Action<ICollectionElementRelation<TElement>> mapping)
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var collectionElementType = member.GetPropertyOrFieldType().DetermineCollectionElementType();
if (!typeof(TElement).Equals(collectionElementType))
{
throw new MappingException(string.Format("Wrong collection element type. For the property/field '{0}' of {1} was expected a collection of {2} but was {3}",
- notVidiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TElement).Name, collectionElementType.Name));
+ notVisiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TElement).Name, collectionElementType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterIdBagMapping<TElement>(collectionMapping, mapping, member, memberOf);
}
- public void IdBag<TElement>(string notVidiblePropertyOrFieldName, Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping)
+ public void IdBag<TElement>(string notVisiblePropertyOrFieldName, Action<IIdBagPropertiesMapper<TEntity, TElement>> collectionMapping)
{
- IdBag(notVidiblePropertyOrFieldName, collectionMapping, x => { });
+ IdBag(notVisiblePropertyOrFieldName, collectionMapping, x => { });
}
- public void ManyToOne<TProperty>(string notVidiblePropertyOrFieldName, Action<IManyToOneMapper> mapping) where TProperty : class
+ public void ManyToOne<TProperty>(string notVisiblePropertyOrFieldName, Action<IManyToOneMapper> mapping) where TProperty : class
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var propertyOrFieldType = member.GetPropertyOrFieldType();
if (!typeof(TProperty).Equals(propertyOrFieldType))
{
throw new MappingException(string.Format("Wrong relation type. For the property/field '{0}' of {1} was expected a many-to-one with {2} but was {3}",
- notVidiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TProperty).Name, propertyOrFieldType.Name));
+ notVisiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TProperty).Name, propertyOrFieldType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterManyToOneMapping<TProperty>(mapping, member, memberOf);
}
- public void Component<TComponent>(string notVidiblePropertyOrFieldName, Action<IComponentMapper<TComponent>> mapping) where TComponent : class
+ public void Component<TComponent>(string notVisiblePropertyOrFieldName, Action<IComponentMapper<TComponent>> mapping) where TComponent : class
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var propertyOrFieldType = member.GetPropertyOrFieldType();
if (!typeof(TComponent).Equals(propertyOrFieldType))
{
throw new MappingException(string.Format("Wrong relation type. For the property/field '{0}' of {1} was expected a component of {2} but was {3}",
- notVidiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TComponent).Name, propertyOrFieldType.Name));
+ notVisiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TComponent).Name, propertyOrFieldType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterComponentMapping<TComponent>(mapping, member, memberOf);
}
- public void Component<TComponent>(string notVidiblePropertyOrFieldName) where TComponent : class
+ public void Component<TComponent>(string notVisiblePropertyOrFieldName) where TComponent : class
{
- Component<TComponent>(notVidiblePropertyOrFieldName, x => { });
+ Component<TComponent>(notVisiblePropertyOrFieldName, x => { });
}
- public void Component<TComponent>(string notVidiblePropertyOrFieldName, TComponent dynamicComponentTemplate, Action<IDynamicComponentMapper<TComponent>> mapping) where TComponent : class
+ public void Component<TComponent>(string notVisiblePropertyOrFieldName, TComponent dynamicComponentTemplate, Action<IDynamicComponentMapper<TComponent>> mapping) where TComponent : class
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterDynamicComponentMapping<TComponent>(mapping, member, memberOf);
}
- public void Any<TProperty>(string notVidiblePropertyOrFieldName, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping) where TProperty : class
+ public void Any<TProperty>(string notVisiblePropertyOrFieldName, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping) where TProperty : class
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var propertyOrFieldType = member.GetPropertyOrFieldType();
if (!typeof(TProperty).Equals(propertyOrFieldType))
{
throw new MappingException(string.Format("Wrong relation type. For the property/field '{0}' of {1} was expected a heterogeneous (any) of type {2} but was {3}",
- notVidiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TProperty).Name, propertyOrFieldType.Name));
+ notVisiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TProperty).Name, propertyOrFieldType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterAnyMapping<TProperty>(mapping, idTypeOfMetaType, member, memberOf);
}
- public void OneToOne<TProperty>(string notVidiblePropertyOrFieldName, Action<IOneToOneMapper> mapping) where TProperty : class
+ public void OneToOne<TProperty>(string notVisiblePropertyOrFieldName, Action<IOneToOneMapper> mapping) where TProperty : class
{
- MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVidiblePropertyOrFieldName);
+ MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
var propertyOrFieldType = member.GetPropertyOrFieldType();
if (!typeof(TProperty).Equals(propertyOrFieldType))
{
throw new MappingException(string.Format("Wrong relation type. For the property/field '{0}' of {1} was expected a one-to-one with {2} but was {3}",
- notVidiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TProperty).Name, propertyOrFieldType.Name));
+ notVisiblePropertyOrFieldName, typeof(TEntity).FullName, typeof(TProperty).Name, propertyOrFieldType.Name));
}
MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
RegisterOneToOneMapping<TProperty>(mapping, member, memberOf);
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -35,7 +35,7 @@
get { return joinCustomizers ?? (joinCustomizers = new Dictionary<string, IJoinMapper<TEntity>>()); }
}
- public void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splittedMapping)
+ public void Join(string splitGroupId, Action<IJoinMapper<TEntity>> splitMapping)
{
// add the customizer only to ensure the creation of the JoinMapper instance for the group
CustomizersHolder.AddCustomizer(typeof(TEntity), (ISubclassMapper m) => m.Join(splitGroupId, j => { }));
@@ -46,7 +46,7 @@
joinCustomizer = new JoinCustomizer<TEntity>(splitGroupId, ExplicitDeclarationsHolder, CustomizersHolder);
JoinCustomizers.Add(splitGroupId, joinCustomizer);
}
- splittedMapping(joinCustomizer);
+ splitMapping(joinCustomizer);
}
#region Implementation of IEntityAttributesMapper
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/KeyMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/KeyMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/KeyMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -119,14 +119,14 @@
mapping.unique = mapping.uniqueSpecified = unique;
}
- public void ForeignKey(string foreingKeyName)
+ public void ForeignKey(string foreignKeyName)
{
- if (foreingKeyName == null)
+ if (foreignKeyName == null)
{
mapping.foreignkey = null;
return;
}
- string nameToAssign = foreingKeyName.Trim();
+ string nameToAssign = foreignKeyName.Trim();
if (string.Empty.Equals(nameToAssign))
{
mapping.foreignkey = "none";
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ManyToManyMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ManyToManyMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ManyToManyMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -161,9 +161,9 @@
}
}
- public void ForeignKey(string foreingKeyName)
+ public void ForeignKey(string foreignKeyName)
{
- manyToMany.foreignkey = foreingKeyName;
+ manyToMany.foreignkey = foreignKeyName;
}
#endregion
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -59,7 +59,7 @@
classMapping.extends = baseType.GetShortClassName(MapDoc);
}
- public void Join(string splitGroupId, Action<IJoinMapper> splittedMapping)
+ public void Join(string splitGroupId, Action<IJoinMapper> splitMapping)
{
IJoinMapper splitGroup;
if (!JoinMappers.TryGetValue(splitGroupId, out splitGroup))
@@ -71,7 +71,7 @@
classMapping.join = classMapping.join == null ? toAdd : classMapping.join.Concat(toAdd).ToArray();
}
- splittedMapping(splitGroup);
+ splitMapping(splitGroup);
}
#endregion
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -667,7 +667,7 @@
IJoinMapper joinMapper;
if (propertiesOfTheGroup.Count > 0 && classMapper.JoinMappers.TryGetValue(groupId, out joinMapper))
{
- MapSplittedProperties(type, propertiesOfTheGroup, joinMapper);
+ MapSplitProperties(type, propertiesOfTheGroup, joinMapper);
propertiesInSplits.UnionWith(propertiesOfTheGroup);
}
}
@@ -704,13 +704,13 @@
private System.Type GetEntityBaseType(System.Type type)
{
- System.Type analizingType = type;
- while (analizingType != null && analizingType != typeof (object))
+ System.Type analyzingType = type;
+ while (analyzingType != null && analyzingType != typeof (object))
{
- analizingType = analizingType.BaseType;
- if (modelInspector.IsEntity(analizingType))
+ analyzingType = analyzingType.BaseType;
+ if (modelInspector.IsEntity(analyzingType))
{
- return analizingType;
+ return analyzingType;
}
}
return type.GetInterfaces().FirstOrDefault(i => modelInspector.IsEntity(i));
@@ -787,7 +787,7 @@
IJoinMapper joinMapper;
if (propertiesOfTheGroup.Count > 0 && classMapper.JoinMappers.TryGetValue(groupId, out joinMapper))
{
- MapSplittedProperties(type, propertiesOfTheGroup, joinMapper);
+ MapSplitProperties(type, propertiesOfTheGroup, joinMapper);
propertiesInSplits.UnionWith(propertiesOfTheGroup);
}
}
@@ -796,7 +796,7 @@
InvokeAfterMapClass(type, classMapper);
}
- private void MapSplittedProperties(System.Type propertiesContainerType, IEnumerable<MemberInfo> propertiesToMap, IJoinMapper propertiesContainer)
+ private void MapSplitProperties(System.Type propertiesContainerType, IEnumerable<MemberInfo> propertiesToMap, IJoinMapper propertiesContainer)
{
foreach (var property in propertiesToMap)
{
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/PropertyToField.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/PropertyToField.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/PropertyToField.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -7,7 +7,7 @@
{
public class PropertyToField
{
- private static readonly Dictionary<string, IFieldNamingStrategy> FieldNamningStrategies = new Dictionary<string, IFieldNamingStrategy>
+ private static readonly Dictionary<string, IFieldNamingStrategy> FieldNamingStrategies = new Dictionary<string, IFieldNamingStrategy>
{
{"camelcase", new CamelCaseStrategy()},
{"camelcase-underscore", new CamelCaseUnderscoreStrategy()},
@@ -27,14 +27,14 @@
get
{
// please leave it as no read-only; the user may need to add his strategies or remove existing if he no want his people use it.
- return FieldNamningStrategies;
+ return FieldNamingStrategies;
}
}
public static FieldInfo GetBackFieldInfo(PropertyInfo subject)
{
const BindingFlags defaultBinding = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.DeclaredOnly;
- return (from s in FieldNamningStrategies.Values
+ return (from s in FieldNamingStrategies.Values
let field = subject.DeclaringType.GetField(s.GetFieldName(subject.Name), defaultBinding)
where field != null
select field).FirstOrDefault();
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/SimpleModelInspector.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -259,7 +259,7 @@
}
if (memberType.IsGenericType)
{
- return memberType.GetGenericIntercafesTypeDefinitions().Contains(typeof(IDictionary<,>));
+ return memberType.GetGenericInterfaceTypeDefinitions().Contains(typeof(IDictionary<,>));
}
return false;
}
@@ -300,7 +300,7 @@
}
if (memberType.IsGenericType)
{
- return memberType.GetGenericIntercafesTypeDefinitions().Contains(typeof(Iesi.Collections.Generic.ISet<>));
+ return memberType.GetGenericInterfaceTypeDefinitions().Contains(typeof(Iesi.Collections.Generic.ISet<>));
}
return false;
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/TypeExtensions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/TypeExtensions.cs 2011-06-18 13:38:07 UTC (rev 5950)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/TypeExtensions.cs 2011-06-18 15:57:58 UTC (rev 5951)
@@ -30,11 +30,11 @@
public static IEnumerable<System.Type> GetHierarchyFromBase(this System.Type type)
{
var typeHierarchy = new List<System.Type>();
- System.Type analizingType = type;
- while (analizingType != null && analizingType != typeof (object))
+ System.Type analyzingType = type;
+ while (analyzingType != null && analyzingType != typeof (object))
{
- typeHierarchy.Add(analizingType);
- analizingType = analizingType.BaseType;
+ typeHierarchy.Add(analyzingType);
+ analyzingType = analyzingTy...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X