Loader namespace hierarchy

Sergey Koshcheyev · Sergey Koshcheyev · commit 9ef41a77627a · 2006-03-03T15:02:54.000Z
SVN: trunk@1984
diff --git a/src/NHibernate/Impl/SessionImpl.cs b/src/NHibernate/Impl/SessionImpl.cs
@@ -13,7 +13,10 @@
 using NHibernate.Exceptions;
 using NHibernate.Hql;
 using NHibernate.Id;
-using NHibernate.Loader;
+using NHibernate.Loader.Entity;
+using NHibernate.Loader.Collection;
+using NHibernate.Loader.Criteria;
+using NHibernate.Loader.Custom;
 using NHibernate.Persister.Collection;
 using NHibernate.Persister.Entity;
 using NHibernate.Proxy;
diff --git a/src/NHibernate/Loader/Collection/BatchingCollectionInitializer.cs b/src/NHibernate/Loader/Collection/BatchingCollectionInitializer.cs
@@ -4,7 +4,7 @@
 using NHibernate.Engine;
 using NHibernate.Persister.Collection;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Collection
 {
 	/// <summary>
 	/// "Batch" loads collections, using multiple foreign key values in the SQL Where clause
diff --git a/src/NHibernate/Loader/Collection/CollectionLoader.cs b/src/NHibernate/Loader/Collection/CollectionLoader.cs
@@ -9,7 +9,7 @@
 using NHibernate.Type;
 using NHibernate.Util;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Collection
 {
 	/// <summary>
 	/// Loads a collection of values or a many-to-many association
diff --git a/src/NHibernate/Loader/Collection/ICollectionInitializer.cs b/src/NHibernate/Loader/Collection/ICollectionInitializer.cs
@@ -1,6 +1,6 @@
 using NHibernate.Engine;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Collection
 {
 	/// <summary>
 	/// An interface for collection loaders
diff --git a/src/NHibernate/Loader/Collection/OneToManyLoader.cs b/src/NHibernate/Loader/Collection/OneToManyLoader.cs
@@ -2,14 +2,15 @@
 using System.Collections;
 using NHibernate.Collection;
 using NHibernate.Engine;
+using NHibernate.Loader.Collection;
 using NHibernate.Persister;
 using NHibernate.Persister.Collection;
 using NHibernate.Persister.Entity;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
 using NHibernate.Util;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Collection
 {
 	/// <summary>
 	/// Loads one-to-many associations
diff --git a/src/NHibernate/Loader/Criteria/CriteriaLoader.cs b/src/NHibernate/Loader/Criteria/CriteriaLoader.cs
@@ -6,13 +6,14 @@
 using NHibernate.Engine;
 using NHibernate.Expression;
 using NHibernate.Impl;
+using NHibernate.Loader.Entity;
 using NHibernate.Persister;
 using NHibernate.Persister.Entity;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
 using NHibernate.Util;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Criteria
 {
 	/// <summary>
 	/// A <c>Loader</c> for <see cref="ICriteria"/> queries. 
diff --git a/src/NHibernate/Loader/Custom/SqlLoader.cs b/src/NHibernate/Loader/Custom/SqlLoader.cs
@@ -13,7 +13,7 @@
 using NHibernate.Type;
 using NHibernate.Util;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Custom
 {
 	/// <summary>
 	/// Summary description for SqlLoader.
diff --git a/src/NHibernate/Loader/Entity/AbstractEntityLoader.cs b/src/NHibernate/Loader/Entity/AbstractEntityLoader.cs
@@ -10,7 +10,7 @@
 using NHibernate.Type;
 using NHibernate.Util;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Entity
 {
 	/// <summary>
 	/// Abstract superclass for entity loaders that use outer joins
diff --git a/src/NHibernate/Loader/Entity/BatchingEntityLoader.cs b/src/NHibernate/Loader/Entity/BatchingEntityLoader.cs
@@ -7,7 +7,7 @@
 using NHibernate.Persister.Entity;
 using NHibernate.Type;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Entity
 {
 	/// <summary>
 	/// "Batch" loads entities, using multiple primary key values in the
diff --git a/src/NHibernate/Loader/Entity/EntityLoader.cs b/src/NHibernate/Loader/Entity/EntityLoader.cs
@@ -1,12 +1,13 @@
 using System.Collections;
 using System.Data;
 using NHibernate.Engine;
+using NHibernate.Loader.Entity;
 using NHibernate.Persister;
 using NHibernate.Persister.Entity;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Entity
 {
 	/// <summary>
 	/// Load an entity using outerjoin fetching to fetch associated entities.
diff --git a/src/NHibernate/Loader/Entity/IUniqueEntityLoader.cs b/src/NHibernate/Loader/Entity/IUniqueEntityLoader.cs
@@ -1,6 +1,6 @@
 using NHibernate.Engine;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Entity
 {
 	/// <summary></summary>
 	public interface IUniqueEntityLoader
diff --git a/src/NHibernate/Loader/Entity/SimpleEntityLoader.cs b/src/NHibernate/Loader/Entity/SimpleEntityLoader.cs
@@ -2,12 +2,13 @@
 using System.Collections;
 using System.Data;
 using NHibernate.Engine;
+using NHibernate.Loader.Entity;
 using NHibernate.Persister.Collection;
 using NHibernate.Persister.Entity;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
 
-namespace NHibernate.Loader
+namespace NHibernate.Loader.Entity
 {
 	/// <summary>
 	/// Loads entity instances one instance per select (ie without outerjoin fetching)
diff --git a/src/NHibernate/NHibernate-1.1.csproj b/src/NHibernate/NHibernate-1.1.csproj
@@ -1329,90 +1329,91 @@
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\AbstractEntityLoader.cs"
+                    RelPath = "Loader\BasicLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\BasicLoader.cs"
+                    RelPath = "Loader\ICollectionAliases.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\BatchingCollectionInitializer.cs"
+                    RelPath = "Loader\IEntityAliases.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\BatchingEntityLoader.cs"
+                    RelPath = "Loader\Loader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\CollectionLoader.cs"
+                    RelPath = "Loader\OuterJoinableAssociation.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\CriteriaLoader.cs"
+                    RelPath = "Loader\OuterJoinLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\EntityLoader.cs"
+                    RelPath = "Loader\Collection\BatchingCollectionInitializer.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\ICollectionAliases.cs"
+                    RelPath = "Loader\Collection\CollectionLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\ICollectionInitializer.cs"
+                    RelPath = "Loader\Collection\ICollectionInitializer.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\IEntityAliases.cs"
+                    RelPath = "Loader\Collection\OneToManyLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\IUniqueEntityLoader.cs"
+                    RelPath = "Loader\Criteria\CriteriaLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\Loader.cs"
+                    RelPath = "Loader\Custom\SqlLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\OneToManyLoader.cs"
+                    RelPath = "Loader\Entity\AbstractEntityLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\OuterJoinableAssociation.cs"
+                    RelPath = "Loader\Entity\BatchingEntityLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\OuterJoinLoader.cs"
+                    RelPath = "Loader\Entity\EntityLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\SimpleEntityLoader.cs"
+                    RelPath = "Loader\Entity\IUniqueEntityLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "Loader\SqlLoader.cs"
+                    RelPath = "Loader\Entity\SimpleEntityLoader.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <Folder RelPath = "Loader\Hql\" />
                 <File
                     RelPath = "Mapping\Any.cs"
                     SubType = "Code"
diff --git a/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs b/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs
@@ -9,7 +9,7 @@
 using NHibernate.Exceptions;
 using NHibernate.Id;
 using NHibernate.Impl;
-using NHibernate.Loader;
+using NHibernate.Loader.Collection;
 using NHibernate.Mapping;
 using NHibernate.Metadata;
 using NHibernate.Persister.Entity;
diff --git a/src/NHibernate/Persister/Collection/BasicCollectionPersister.cs b/src/NHibernate/Persister/Collection/BasicCollectionPersister.cs
@@ -5,6 +5,7 @@
 using NHibernate.Engine;
 using NHibernate.Impl;
 using NHibernate.Loader;
+using NHibernate.Loader.Collection;
 using NHibernate.Persister.Collection;
 using NHibernate.SqlCommand;
 
diff --git a/src/NHibernate/Persister/Collection/OneToManyPersister.cs b/src/NHibernate/Persister/Collection/OneToManyPersister.cs
@@ -5,6 +5,7 @@
 using NHibernate.Engine;
 using NHibernate.Impl;
 using NHibernate.Loader;
+using NHibernate.Loader.Collection;
 using NHibernate.Persister;
 using NHibernate.Persister.Collection;
 using NHibernate.Persister.Entity;
diff --git a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs
@@ -14,6 +14,7 @@
 using NHibernate.Id;
 using NHibernate.Impl;
 using NHibernate.Loader;
+using NHibernate.Loader.Entity;
 using NHibernate.Mapping;
 using NHibernate.Metadata;
 using NHibernate.Property;
diff --git a/src/NHibernate/Persister/Entity/JoinedSubclassEntityPersister.cs b/src/NHibernate/Persister/Entity/JoinedSubclassEntityPersister.cs
@@ -7,7 +7,7 @@
 using NHibernate.Engine;
 using NHibernate.Hql;
 using NHibernate.Impl;
-using NHibernate.Loader;
+using NHibernate.Loader.Entity;
 using NHibernate.Mapping;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
diff --git a/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs b/src/NHibernate/Persister/Entity/SingleTableEntityPersister.cs
@@ -9,6 +9,7 @@
 using NHibernate.Engine;
 using NHibernate.Impl;
 using NHibernate.Loader;
+using NHibernate.Loader.Entity;
 using NHibernate.Mapping;
 using NHibernate.SqlCommand;
 using NHibernate.Type;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using NHibernate.Engine;`
`5`	`5`	`using NHibernate.Persister.Collection;`
`6`	`6`
`7`		`-namespace NHibernate.Loader`
	`7`	`+namespace NHibernate.Loader.Collection`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// "Batch" loads collections, using multiple foreign key values in the SQL Where clause`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`using NHibernate.Type;`
`10`	`10`	`using NHibernate.Util;`
`11`	`11`
`12`		`-namespace NHibernate.Loader`
	`12`	`+namespace NHibernate.Loader.Collection`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// Loads a collection of values or a many-to-many association`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using NHibernate.Engine;`
`2`	`2`
`3`		`-namespace NHibernate.Loader`
	`3`	`+namespace NHibernate.Loader.Collection`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// An interface for collection loaders`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`using NHibernate.Type;`
`14`	`14`	`using NHibernate.Util;`
`15`	`15`
`16`		`-namespace NHibernate.Loader`
	`16`	`+namespace NHibernate.Loader.Custom`
`17`	`17`	`{`
`18`	`18`	`/// <summary>`
`19`	`19`	`/// Summary description for SqlLoader.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`using NHibernate.Type;`
`11`	`11`	`using NHibernate.Util;`
`12`	`12`
`13`		`-namespace NHibernate.Loader`
	`13`	`+namespace NHibernate.Loader.Entity`
`14`	`14`	`{`
`15`	`15`	`/// <summary>`
`16`	`16`	`/// Abstract superclass for entity loaders that use outer joins`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using NHibernate.Persister.Entity;`
`8`	`8`	`using NHibernate.Type;`
`9`	`9`
`10`		`-namespace NHibernate.Loader`
	`10`	`+namespace NHibernate.Loader.Entity`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// "Batch" loads entities, using multiple primary key values in the`