From: <fab...@us...> - 2009-11-28 13:15:12
|
Revision: 4866 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4866&view=rev Author: fabiomaulo Date: 2009-11-28 13:15:02 +0000 (Sat, 28 Nov 2009) Log Message: ----------- Binders refactoring (explicit properties in HbmMapping) Modified Paths: -------------- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/AbstractDecoratable.cs trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapping.cs trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmTimestamp.cs trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmVersion.cs trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/AbstractDecoratable.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/AbstractDecoratable.cs 2009-11-28 12:57:59 UTC (rev 4865) +++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/AbstractDecoratable.cs 2009-11-28 13:15:02 UTC (rev 4866) @@ -26,7 +26,7 @@ { if (mappedMetaData == null) { - CreateMappedMetadata(GetMetadataField()); + CreateMappedMetadata(Metadatas); } return mappedMetaData; } @@ -39,7 +39,7 @@ { if (mappedMetaData == null) { - CreateMappedMetadata(GetMetadataField()); + CreateMappedMetadata(Metadatas); } return inheritableMetaData; } @@ -75,6 +75,6 @@ } } - protected abstract HbmMeta[] GetMetadataField(); + protected abstract HbmMeta[] Metadatas { get; } } } \ No newline at end of file Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2009-11-28 12:57:59 UTC (rev 4865) +++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2009-11-28 13:15:02 UTC (rev 4866) @@ -24,9 +24,9 @@ get { return Item1 as HbmTimestamp; } } - protected override HbmMeta[] GetMetadataField() + protected override HbmMeta[] Metadatas { - return meta; + get { return meta ?? new HbmMeta[0]; } } } } \ No newline at end of file Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapping.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapping.cs 2009-11-28 12:57:59 UTC (rev 4865) +++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapping.cs 2009-11-28 13:15:02 UTC (rev 4866) @@ -4,21 +4,36 @@ { partial class HbmMapping : AbstractDecoratable { - public HbmDatabaseObject[] ListDatabaseObjects() + public HbmDatabaseObject[] DatabaseObjects { - return databaseobject ?? new HbmDatabaseObject[0]; + get { return databaseobject ?? new HbmDatabaseObject[0]; } } - public HbmFilterDef[] ListFilterDefs() + public HbmFilterDef[] FilterDefinitions { - return filterdef ?? new HbmFilterDef[0]; + get { return filterdef ?? new HbmFilterDef[0]; } } - protected override HbmMeta[] GetMetadataField() + public HbmResultSet[] ResultSets { - return meta; + get { return resultset ?? new HbmResultSet[0]; } } + public HbmTypedef[] TypeDefinitions + { + get { return typedef ?? new HbmTypedef[0]; } + } + + public HbmImport[] Imports + { + get { return import ?? new HbmImport[0]; } + } + + protected override HbmMeta[] Metadatas + { + get { return meta ?? new HbmMeta[0]; } + } + public HbmClass[] RootClasses { get { return Items != null ? Items.OfType<HbmClass>().ToArray():new HbmClass[0]; } Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmTimestamp.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmTimestamp.cs 2009-11-28 12:57:59 UTC (rev 4865) +++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmTimestamp.cs 2009-11-28 13:15:02 UTC (rev 4866) @@ -2,9 +2,9 @@ { partial class HbmTimestamp : AbstractDecoratable { - protected override HbmMeta[] GetMetadataField() + protected override HbmMeta[] Metadatas { - return meta; + get { return meta ?? new HbmMeta[0]; } } } } \ No newline at end of file Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmVersion.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmVersion.cs 2009-11-28 12:57:59 UTC (rev 4865) +++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmVersion.cs 2009-11-28 13:15:02 UTC (rev 4866) @@ -2,9 +2,9 @@ { partial class HbmVersion : AbstractDecoratable { - protected override HbmMeta[] GetMetadataField() + protected override HbmMeta[] Metadatas { - return meta; + get { return meta ?? new HbmMeta[0]; } } } } \ No newline at end of file Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs 2009-11-28 12:57:59 UTC (rev 4865) +++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs 2009-11-28 13:15:02 UTC (rev 4866) @@ -72,7 +72,7 @@ private void AddFilterDefinitions(HbmMapping mappingSchema) { - foreach (HbmFilterDef filterDefSchema in mappingSchema.ListFilterDefs()) + foreach (HbmFilterDef filterDefSchema in mappingSchema.FilterDefinitions) { FilterDefinition definition = FilterDefinitionFactory.CreateFilterDefinition(filterDefSchema); mappings.AddFilterDefinition(definition); @@ -123,7 +123,7 @@ public void AddImports(HbmMapping mappingSchema) { - foreach (HbmImport importSchema in mappingSchema.import ?? new HbmImport[0]) + foreach (HbmImport importSchema in mappingSchema.Imports) { string fullClassName = FullQualifiedClassName(importSchema.@class, mappings); string rename = importSchema.rename ?? StringHelper.GetClassname(fullClassName); @@ -135,7 +135,7 @@ public void AddTypeDefs(HbmMapping mappingSchema) { - foreach (HbmTypedef typedef in mappingSchema.typedef ?? new HbmTypedef[0]) + foreach (HbmTypedef typedef in mappingSchema.TypeDefinitions) { string typeClass = FullQualifiedClassName(typedef.@class, mappings); string typeName = typedef.name; @@ -151,7 +151,7 @@ private void AddAuxiliaryDatabaseObjects(HbmMapping mappingSchema) { - foreach (HbmDatabaseObject objectSchema in mappingSchema.ListDatabaseObjects()) + foreach (HbmDatabaseObject objectSchema in mappingSchema.DatabaseObjects) { IAuxiliaryDatabaseObject dbObject = AuxiliaryDatabaseObjectFactory.Create(mappings, objectSchema); mappings.AddAuxiliaryDatabaseObject(dbObject); @@ -162,7 +162,7 @@ { var binder = new ResultSetMappingBinder(this); - foreach (HbmResultSet resultSetSchema in mappingSchema.resultset ?? new HbmResultSet[0]) + foreach (HbmResultSet resultSetSchema in mappingSchema.ResultSets) { // Do not inline this variable or the anonymous method will not work correctly. HbmResultSet tempResultSetSchema = resultSetSchema; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |