Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4901] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2010-01-05 22:56:46
|
Revision: 4901
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4901&view=rev
Author: fabiomaulo
Date: 2010-01-05 22:56:37 +0000 (Tue, 05 Jan 2010)
Log Message:
-----------
Refactoring
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/NamedQueryBinder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/NamedSQLQueryBinder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CacheModeConverter.cs
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs 2010-01-05 22:56:37 UTC (rev 4901)
@@ -1,3 +1,4 @@
+using System;
using NHibernate.Engine;
namespace NHibernate.Cfg.MappingSchema
@@ -20,5 +21,56 @@
return Versioning.OptimisticLock.Version;
}
}
+
+ public static string ToNullValue(this HbmUnsavedValueType unsavedValueType)
+ {
+ switch (unsavedValueType)
+ {
+ case HbmUnsavedValueType.Undefined:
+ return "undefined";
+ case HbmUnsavedValueType.Any:
+ return "any";
+ case HbmUnsavedValueType.None:
+ return "none";
+ default:
+ throw new ArgumentOutOfRangeException("unsavedValueType");
+ }
+ }
+
+ public static string ToCacheConcurrencyStrategy(this HbmCacheUsage cacheUsage)
+ {
+ switch (cacheUsage)
+ {
+ case HbmCacheUsage.ReadOnly:
+ return "read-only";
+ case HbmCacheUsage.ReadWrite:
+ return "read-write";
+ case HbmCacheUsage.NonstrictReadWrite:
+ return "nonstrict-read-write";
+ case HbmCacheUsage.Transactional:
+ return "transactional";
+ default:
+ throw new ArgumentOutOfRangeException("cacheUsage");
+ }
+ }
+
+ public static CacheMode? ToCacheMode(this HbmCacheMode cacheMode)
+ {
+ switch (cacheMode)
+ {
+ case HbmCacheMode.Get:
+ return CacheMode.Get;
+ case HbmCacheMode.Ignore:
+ return CacheMode.Ignore;
+ case HbmCacheMode.Normal:
+ return CacheMode.Normal;
+ case HbmCacheMode.Put:
+ return CacheMode.Put;
+ case HbmCacheMode.Refresh:
+ return CacheMode.Refresh;
+ default:
+ throw new ArgumentOutOfRangeException("cacheMode");
+ }
+ }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs 2010-01-05 22:56:37 UTC (rev 4901)
@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Reflection;
-using System.Xml.Serialization;
-
using log4net;
using NHibernate.Mapping;
using NHibernate.Type;
@@ -134,21 +131,6 @@
return ClassForNameChecked(unqualifiedName, mappings, "unknown class {0}").AssemblyQualifiedName;
}
- protected static string GetXmlEnumAttribute(Enum cascadeStyle)
- {
- MemberInfo[] memberInfo = cascadeStyle.GetType().GetMember(cascadeStyle.ToString());
-
- if (memberInfo != null && memberInfo.Length == 1)
- {
- object[] customAttributes = memberInfo[0].GetCustomAttributes(typeof(XmlEnumAttribute), false);
-
- if (customAttributes.Length == 1)
- return ((XmlEnumAttribute)customAttributes[0]).Name;
- }
-
- return null;
- }
-
public static IDictionary<string, MetaAttribute> GetMetas(IDecoratable decoratable, IDictionary<string, MetaAttribute> inheritedMeta)
{
return GetMetas(decoratable, inheritedMeta, false);
Deleted: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CacheModeConverter.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CacheModeConverter.cs 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CacheModeConverter.cs 2010-01-05 22:56:37 UTC (rev 4901)
@@ -1,27 +0,0 @@
-using System;
-using NHibernate.Cfg.MappingSchema;
-
-namespace NHibernate.Cfg.XmlHbmBinding
-{
- internal static class CacheModeConverter
- {
- public static CacheMode? GetCacheMode(HbmCacheMode cacheMode)
- {
- switch (cacheMode)
- {
- case HbmCacheMode.Get:
- return CacheMode.Get;
- case HbmCacheMode.Ignore:
- return CacheMode.Ignore;
- case HbmCacheMode.Normal:
- return CacheMode.Normal;
- case HbmCacheMode.Put:
- return CacheMode.Put;
- case HbmCacheMode.Refresh:
- return CacheMode.Refresh;
- default:
- throw new ArgumentOutOfRangeException("cacheMode");
- }
- }
- }
-}
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/ClassCompositeIdBinder.cs 2010-01-05 22:56:37 UTC (rev 4901)
@@ -37,7 +37,7 @@
}
compositeId.Table.SetIdentifierValue(compositeId);
- compositeId.NullValue = GetXmlEnumAttribute(idSchema.unsavedvalue);
+ compositeId.NullValue = idSchema.unsavedvalue.ToNullValue();
System.Type compIdClass = compositeId.ComponentClass;
if (!ReflectHelper.OverridesEquals(compIdClass))
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs 2010-01-05 22:56:37 UTC (rev 4901)
@@ -823,7 +823,7 @@
{
if (cacheSchema != null)
{
- collection.CacheConcurrencyStrategy = GetXmlEnumAttribute(cacheSchema.usage);
+ collection.CacheConcurrencyStrategy = cacheSchema.usage.ToCacheConcurrencyStrategy();
collection.CacheRegionName = cacheSchema.region;
}
}
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/NamedQueryBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/NamedQueryBinder.cs 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/NamedQueryBinder.cs 2010-01-05 22:56:37 UTC (rev 4901)
@@ -28,7 +28,7 @@
FlushMode flushMode = FlushModeConverter.GetFlushMode(querySchema);
CacheMode? cacheMode = (querySchema.cachemodeSpecified)
- ? CacheModeConverter.GetCacheMode(querySchema.cachemode)
+ ? querySchema.cachemode.ToCacheMode()
: null;
IDictionary<string,string> parameterTypes = new LinkedHashMap<string,string>();
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/NamedSQLQueryBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/NamedSQLQueryBinder.cs 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/NamedSQLQueryBinder.cs 2010-01-05 22:56:37 UTC (rev 4901)
@@ -29,7 +29,7 @@
FlushMode flushMode = FlushModeConverter.GetFlushMode(querySchema);
CacheMode? cacheMode = (querySchema.cachemodeSpecified)
- ? CacheModeConverter.GetCacheMode(querySchema.cachemode)
+ ? querySchema.cachemode.ToCacheMode()
: null;
IDictionary<string,string> parameterTypes = new LinkedHashMap<string,string>();
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2010-01-05 22:56:37 UTC (rev 4901)
@@ -259,7 +259,7 @@
{
if (cacheSchema != null)
{
- rootClass.CacheConcurrencyStrategy = GetXmlEnumAttribute(cacheSchema.usage);
+ rootClass.CacheConcurrencyStrategy = cacheSchema.usage.ToCacheConcurrencyStrategy();
rootClass.CacheRegionName = cacheSchema.region;
}
}
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2010-01-05 22:16:33 UTC (rev 4900)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2010-01-05 22:56:37 UTC (rev 4901)
@@ -881,7 +881,6 @@
<Compile Include="Cfg\MappingSchema\MappingDocumentParser.cs" />
<Compile Include="Cfg\XmlHbmBinding\AuxiliaryDatabaseObjectFactory.cs" />
<Compile Include="Cfg\MappingSchema\HbmFilterDef.cs" />
- <Compile Include="Cfg\XmlHbmBinding\CacheModeConverter.cs" />
<Compile Include="Cfg\XmlHbmBinding\ClassCompositeIdBinder.cs" />
<Compile Include="Cfg\XmlHbmBinding\ClassDiscriminatorBinder.cs" />
<Compile Include="Cfg\XmlHbmBinding\ClassIdBinder.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
