Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5603] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2011-04-04 17:31:22
|
Revision: 5603
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5603&view=rev
Author: fabiomaulo
Date: 2011-04-04 17:31:15 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
Renamed class to avoid namespace conflicts
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IJoinMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/IManyToOneMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs
trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/JoinMapperTests.cs
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchKind.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchMode.cs
Copied: trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchKind.cs (from rev 5602, trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchMode.cs)
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchKind.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchKind.cs 2011-04-04 17:31:15 UTC (rev 5603)
@@ -0,0 +1,47 @@
+using NHibernate.Cfg.MappingSchema;
+
+namespace NHibernate.Mapping.ByCode
+{
+ public abstract class FetchKind
+ {
+ public static FetchKind Select = new SelectFetchMode();
+ public static FetchKind Join = new JoinFetchMode();
+
+ public abstract HbmFetchMode ToHbm();
+ public abstract HbmJoinFetch ToHbmJoinFetch();
+
+ #region Nested type: JoinFetchMode
+
+ private class JoinFetchMode : FetchKind
+ {
+ public override HbmFetchMode ToHbm()
+ {
+ return HbmFetchMode.Join;
+ }
+
+ public override HbmJoinFetch ToHbmJoinFetch()
+ {
+ return HbmJoinFetch.Join;
+ }
+ }
+
+ #endregion
+
+ #region Nested type: SelectFetchMode
+
+ private class SelectFetchMode : FetchKind
+ {
+ public override HbmFetchMode ToHbm()
+ {
+ return HbmFetchMode.Select;
+ }
+
+ public override HbmJoinFetch ToHbmJoinFetch()
+ {
+ return HbmJoinFetch.Select;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchMode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchMode.cs 2011-04-04 17:27:54 UTC (rev 5602)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/FetchMode.cs 2011-04-04 17:31:15 UTC (rev 5603)
@@ -1,47 +0,0 @@
-using NHibernate.Cfg.MappingSchema;
-
-namespace NHibernate.Mapping.ByCode
-{
- public abstract class FetchMode
- {
- public static FetchMode Select = new SelectFetchMode();
- public static FetchMode Join = new JoinFetchMode();
-
- public abstract HbmFetchMode ToHbm();
- public abstract HbmJoinFetch ToHbmJoinFetch();
-
- #region Nested type: JoinFetchMode
-
- private class JoinFetchMode : FetchMode
- {
- public override HbmFetchMode ToHbm()
- {
- return HbmFetchMode.Join;
- }
-
- public override HbmJoinFetch ToHbmJoinFetch()
- {
- return HbmJoinFetch.Join;
- }
- }
-
- #endregion
-
- #region Nested type: SelectFetchMode
-
- private class SelectFetchMode : FetchMode
- {
- public override HbmFetchMode ToHbm()
- {
- return HbmFetchMode.Select;
- }
-
- public override HbmJoinFetch ToHbmJoinFetch()
- {
- return HbmJoinFetch.Select;
- }
- }
-
- #endregion
- }
-}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IJoinMapper.cs
===================================================================
(Binary files differ)
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IManyToOneMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IManyToOneMapper.cs 2011-04-04 17:27:54 UTC (rev 5602)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IManyToOneMapper.cs 2011-04-04 17:31:15 UTC (rev 5603)
@@ -16,7 +16,7 @@
void Unique(bool unique);
void UniqueKey(string uniquekeyName);
void Index(string indexName);
- void Fetch(FetchMode fetchMode);
+ void Fetch(FetchKind fetchMode);
void Formula(string formula);
void Lazy(LazyRelation lazyRelation);
void Update(bool consideredInUpdateQuery);
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinMapper.cs 2011-04-04 17:27:54 UTC (rev 5602)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/JoinMapper.cs 2011-04-04 17:31:15 UTC (rev 5603)
@@ -137,7 +137,7 @@
hbmJoin.optional = isOptional;
}
- public void Fetch(FetchMode fetchMode)
+ public void Fetch(FetchKind fetchMode)
{
hbmJoin.fetch = fetchMode.ToHbmJoinFetch();
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs 2011-04-04 17:27:54 UTC (rev 5602)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/KeyManyToOneMapper.cs 2011-04-04 17:31:15 UTC (rev 5603)
@@ -70,7 +70,7 @@
Column(x => x.Index(indexName));
}
- public void Fetch(FetchMode fetchMode)
+ public void Fetch(FetchKind fetchMode)
{
// not supported by HbmKeyManyToOne
}
Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs 2011-04-04 17:27:54 UTC (rev 5602)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/ManyToOneMapper.cs 2011-04-04 17:31:15 UTC (rev 5603)
@@ -70,7 +70,7 @@
Column(x => x.Index(indexName));
}
- public void Fetch(FetchMode fetchMode)
+ public void Fetch(FetchKind fetchMode)
{
manyToOne.fetch = fetchMode.ToHbm();
manyToOne.fetchSpecified = manyToOne.fetch == HbmFetchMode.Join;
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-04 17:27:54 UTC (rev 5602)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2011-04-04 17:31:15 UTC (rev 5603)
@@ -282,7 +282,7 @@
<Compile Include="Mapping\ByCode\CollectionLazy.cs" />
<Compile Include="Mapping\ByCode\ExplicitlyDeclaredModel.cs" />
<Compile Include="Mapping\ByCode\FakeModelExplicitDeclarationsHolder.cs" />
- <Compile Include="Mapping\ByCode\FetchMode.cs" />
+ <Compile Include="Mapping\ByCode\FetchKind.cs" />
<Compile Include="Mapping\ByCode\ForClass.cs" />
<Compile Include="Mapping\ByCode\IAccessorPropertyMapper.cs" />
<Compile Include="Mapping\ByCode\IAnyMapper.cs" />
Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/JoinMapperTests.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/JoinMapperTests.cs 2011-04-04 17:27:54 UTC (rev 5602)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/MappersTests/JoinMapperTests.cs 2011-04-04 17:31:15 UTC (rev 5603)
@@ -1,5 +1,6 @@
using System;
using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
using NHibernate.Mapping.ByCode.Impl;
using NUnit.Framework;
using SharpTestsEx;
@@ -172,7 +173,7 @@
var mapdoc = new HbmMapping();
var hbmJoin = new HbmJoin();
var mapper = new JoinMapper(typeof(MyClass), "AA", hbmJoin, mapdoc);
- mapper.Fetch(Mapping.ByCode.FetchMode.Select);
+ mapper.Fetch(FetchKind.Select);
hbmJoin.fetch.Should().Be(HbmJoinFetch.Select);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
