Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[3929] trunk/nhibernate/src/NHibernate/Tuple/Entity
|
From: <fab...@us...> - 2008-11-25 22:11:03
|
Revision: 3929
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3929&view=rev
Author: fabiomaulo
Date: 2008-11-25 22:10:57 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
Fix NH-1588
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs
trunk/nhibernate/src/NHibernate/Tuple/Entity/DynamicMapEntityTuplizer.cs
trunk/nhibernate/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs
Modified: trunk/nhibernate/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs 2008-11-25 21:50:57 UTC (rev 3928)
+++ trunk/nhibernate/src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs 2008-11-25 22:10:57 UTC (rev 3929)
@@ -19,10 +19,10 @@
private readonly IGetter idGetter;
private readonly ISetter idSetter;
- protected internal int propertySpan;
- protected internal IGetter[] getters;
- protected internal ISetter[] setters;
- protected internal bool hasCustomAccessors;
+ protected int propertySpan;
+ protected IGetter[] getters;
+ protected ISetter[] setters;
+ protected bool hasCustomAccessors;
protected IInstantiator instantiator;
private readonly IProxyFactory proxyFactory;
private readonly IAbstractComponentType identifierMapperType;
@@ -30,7 +30,7 @@
/// <summary> Constructs a new AbstractEntityTuplizer instance. </summary>
/// <param name="entityMetamodel">The "interpreted" information relating to the mapped entity. </param>
/// <param name="mappingInfo">The parsed "raw" mapping data relating to the given entity. </param>
- public AbstractEntityTuplizer(EntityMetamodel entityMetamodel, PersistentClass mappingInfo)
+ protected AbstractEntityTuplizer(EntityMetamodel entityMetamodel, PersistentClass mappingInfo)
{
this.entityMetamodel = entityMetamodel;
@@ -303,13 +303,13 @@
/// <summary> Return the entity-mode handled by this tuplizer instance. </summary>
public abstract EntityMode EntityMode { get;}
- protected internal virtual IInstantiator Instantiator
+ protected virtual IInstantiator Instantiator
{
get { return instantiator; }
}
/// <summary>Retrieves the defined entity-name for the tuplized entity. </summary>
- protected internal virtual string EntityName
+ protected virtual string EntityName
{
get { return entityMetamodel.Name; }
}
@@ -317,7 +317,7 @@
/// <summary>
/// Retrieves the defined entity-names for any subclasses defined for this entity.
/// </summary>
- protected internal virtual ISet<string> SubclassEntityNames
+ protected virtual ISet<string> SubclassEntityNames
{
get { return entityMetamodel.SubclassEntityNames; }
}
@@ -326,32 +326,32 @@
/// <param name="mappedProperty">The property to be accessed via the built Getter. </param>
/// <param name="mappedEntity">The entity information regarding the mapped entity owning this property. </param>
/// <returns> An appropriate Getter instance. </returns>
- protected internal abstract IGetter BuildPropertyGetter(Mapping.Property mappedProperty, PersistentClass mappedEntity);
+ protected abstract IGetter BuildPropertyGetter(Mapping.Property mappedProperty, PersistentClass mappedEntity);
/// <summary> Build an appropriate Setter for the given property. </summary>
/// <param name="mappedProperty">The property to be accessed via the built Setter. </param>
/// <param name="mappedEntity">The entity information regarding the mapped entity owning this property. </param>
/// <returns> An appropriate Setter instance. </returns>
- protected internal abstract ISetter BuildPropertySetter(Mapping.Property mappedProperty, PersistentClass mappedEntity);
+ protected abstract ISetter BuildPropertySetter(Mapping.Property mappedProperty, PersistentClass mappedEntity);
/// <summary> Build an appropriate Instantiator for the given mapped entity. </summary>
/// <param name="mappingInfo">The mapping information regarding the mapped entity. </param>
/// <returns> An appropriate Instantiator instance. </returns>
- protected internal abstract IInstantiator BuildInstantiator(PersistentClass mappingInfo);
+ protected abstract IInstantiator BuildInstantiator(PersistentClass mappingInfo);
/// <summary> Build an appropriate ProxyFactory for the given mapped entity. </summary>
/// <param name="mappingInfo">The mapping information regarding the mapped entity. </param>
/// <param name="idGetter">The constructed Getter relating to the entity's id property. </param>
/// <param name="idSetter">The constructed Setter relating to the entity's id property. </param>
/// <returns> An appropriate ProxyFactory instance. </returns>
- protected internal abstract IProxyFactory BuildProxyFactory(PersistentClass mappingInfo, IGetter idGetter, ISetter idSetter);
+ protected abstract IProxyFactory BuildProxyFactory(PersistentClass mappingInfo, IGetter idGetter, ISetter idSetter);
/// <summary> Extract a component property value. </summary>
/// <param name="type">The component property types. </param>
/// <param name="component">The component instance itself. </param>
/// <param name="propertyPath">The property path for the property to be extracted. </param>
/// <returns> The property value extracted. </returns>
- protected internal virtual object GetComponentValue(ComponentType type, object component, string propertyPath)
+ protected virtual object GetComponentValue(ComponentType type, object component, string propertyPath)
{
int loc = propertyPath.IndexOf('.');
string basePropertyName = loc > 0 ? propertyPath.Substring(0, (loc) - (0)) : propertyPath;
@@ -381,17 +381,17 @@
}
}
- protected internal virtual IProxyFactory ProxyFactory
+ protected virtual IProxyFactory ProxyFactory
{
get { return proxyFactory; }
}
- protected internal virtual bool ShouldGetAllProperties(object entity)
+ protected virtual bool ShouldGetAllProperties(object entity)
{
return !HasUninitializedLazyProperties(entity);
}
- protected internal EntityMetamodel EntityMetamodel
+ protected EntityMetamodel EntityMetamodel
{
get { return entityMetamodel; }
}
Modified: trunk/nhibernate/src/NHibernate/Tuple/Entity/DynamicMapEntityTuplizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Tuple/Entity/DynamicMapEntityTuplizer.cs 2008-11-25 21:50:57 UTC (rev 3928)
+++ trunk/nhibernate/src/NHibernate/Tuple/Entity/DynamicMapEntityTuplizer.cs 2008-11-25 22:10:57 UTC (rev 3929)
@@ -40,7 +40,7 @@
get { return EntityMode.Map; }
}
- protected internal override IGetter BuildPropertyGetter(Mapping.Property mappedProperty, PersistentClass mappedEntity)
+ protected override IGetter BuildPropertyGetter(Mapping.Property mappedProperty, PersistentClass mappedEntity)
{
return BuildPropertyAccessor(mappedProperty).GetGetter(null, mappedProperty.Name);
}
@@ -50,17 +50,17 @@
return PropertyAccessorFactory.DynamicMapPropertyAccessor;
}
- protected internal override ISetter BuildPropertySetter(Mapping.Property mappedProperty, PersistentClass mappedEntity)
+ protected override ISetter BuildPropertySetter(Mapping.Property mappedProperty, PersistentClass mappedEntity)
{
return BuildPropertyAccessor(mappedProperty).GetSetter(null, mappedProperty.Name);
}
- protected internal override IInstantiator BuildInstantiator(PersistentClass mappingInfo)
+ protected override IInstantiator BuildInstantiator(PersistentClass mappingInfo)
{
return new DynamicMapInstantiator(mappingInfo);
}
- protected internal override IProxyFactory BuildProxyFactory(PersistentClass mappingInfo, IGetter idGetter,
+ protected override IProxyFactory BuildProxyFactory(PersistentClass mappingInfo, IGetter idGetter,
ISetter idSetter)
{
IProxyFactory pf = new MapProxyFactory();
Modified: trunk/nhibernate/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs 2008-11-25 21:50:57 UTC (rev 3928)
+++ trunk/nhibernate/src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs 2008-11-25 22:10:57 UTC (rev 3929)
@@ -70,17 +70,17 @@
get { return mappedClass; }
}
- protected internal override IGetter BuildPropertyGetter(Mapping.Property mappedProperty, PersistentClass mappedEntity)
+ protected override IGetter BuildPropertyGetter(Mapping.Property mappedProperty, PersistentClass mappedEntity)
{
return mappedProperty.GetGetter(mappedEntity.MappedClass);
}
- protected internal override ISetter BuildPropertySetter(Mapping.Property mappedProperty, PersistentClass mappedEntity)
+ protected override ISetter BuildPropertySetter(Mapping.Property mappedProperty, PersistentClass mappedEntity)
{
return mappedProperty.GetSetter(mappedEntity.MappedClass);
}
- protected internal override IInstantiator BuildInstantiator(PersistentClass persistentClass)
+ protected override IInstantiator BuildInstantiator(PersistentClass persistentClass)
{
if (optimizer == null)
{
@@ -94,7 +94,7 @@
}
}
- protected internal override IProxyFactory BuildProxyFactory(PersistentClass persistentClass, IGetter idGetter,
+ protected override IProxyFactory BuildProxyFactory(PersistentClass persistentClass, IGetter idGetter,
ISetter idSetter)
{
bool needAccesorCheck = true; // NH specific (look the comment below)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
