[Dotnetmock-commits] dotnetmock/DotNetMock/Dynamic/Generate ClassGenerator.cs,1.6.2.7,1.6.2.8

[Griffin C. <gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock/Dynamic/Generate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15586/DotNetMock/Dynamic/Generate

Modified Files:
      Tag: RFE_1001778
	ClassGenerator.cs 
Log Message:
- Refactored to std naming conventions
- removed unused Type parameter from implementMethod()

Index: ClassGenerator.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/Dynamic/Generate/ClassGenerator.cs,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -C2 -d -r1.6.2.7 -r1.6.2.8
*** ClassGenerator.cs	27 Dec 2004 00:45:28 -0000	1.6.2.7
--- ClassGenerator.cs	1 Jan 2005 01:38:33 -0000	1.6.2.8
***************
*** 7,11 ****
  using System.Reflection;
  using System.Reflection.Emit;
- using System.Security;
  
  using DotNetMock.Dynamic;
--- 7,10 ----
***************
*** 25,30 ****
  		public ClassGenerator() 
  		{
! 			_assemblyBuilder =
! 				NewAssemblyBuilder(AssemblyBuilderAccess.Run);
  			_moduleBuilder = _assemblyBuilder.DefineDynamicModule("MockModule");
  		}
--- 24,28 ----
  		public ClassGenerator() 
  		{
! 			_assemblyBuilder = newAssemblyBuilder(AssemblyBuilderAccess.Run);
  			_moduleBuilder = _assemblyBuilder.DefineDynamicModule("MockModule");
  		}
***************
*** 36,56 ****
  		public ClassGenerator(string filename) 
  		{
! 			_assemblyBuilder =
! 				NewAssemblyBuilder(AssemblyBuilderAccess.RunAndSave);
  			_moduleBuilder = _assemblyBuilder.DefineDynamicModule("MockModule", filename);
  			_assemblyFilename = filename;
  		}
- 
- 		private static AssemblyBuilder NewAssemblyBuilder(AssemblyBuilderAccess access) 
- 		{
- 			AppDomain appDomain = AppDomain.CurrentDomain;
- 			AssemblyName assemblyName = new AssemblyName();
- 			assemblyName.Name = "DynamicMockAssembly";
- 			return appDomain.DefineDynamicAssembly(
- 				assemblyName,
- 				access
- 				);
- 		}
- 		
  		public object Generate(Type type, IMockedCallHandler mock)
  		{
--- 34,41 ----
  		public ClassGenerator(string filename) 
  		{
! 			_assemblyBuilder = newAssemblyBuilder(AssemblyBuilderAccess.RunAndSave);
  			_moduleBuilder = _assemblyBuilder.DefineDynamicModule("MockModule", filename);
  			_assemblyFilename = filename;
  		}
  		public object Generate(Type type, IMockedCallHandler mock)
  		{
***************
*** 60,64 ****
  			foreach ( MethodInfo m in methods ) 
  			{
! 				implementMethod(type, typeBuilder, m, mockFieldBuilder);
  			}
  			Type proxyType = typeBuilder.CreateType();
--- 45,49 ----
  			foreach ( MethodInfo m in methods ) 
  			{
! 				implementMethod(typeBuilder, m, mockFieldBuilder);
  			}
  			Type proxyType = typeBuilder.CreateType();
***************
*** 113,117 ****
  		}
  		
! 		private void implementMethod(Type type, TypeBuilder typeBuilder, MethodInfo m, FieldBuilder mockFieldBuilder)
  		{
  			Type returnType = m.ReturnType;
--- 98,102 ----
  		}
  		
! 		private void implementMethod(TypeBuilder typeBuilder, MethodInfo m, FieldBuilder mockFieldBuilder)
  		{
  			Type returnType = m.ReturnType;
***************
*** 219,222 ****
--- 204,214 ----
  			il.Emit(OpCodes.Ret);
  		}
+ 		private static AssemblyBuilder newAssemblyBuilder(AssemblyBuilderAccess access) 
+ 		{
+ 			AppDomain appDomain = AppDomain.CurrentDomain;
+ 			AssemblyName assemblyName = new AssemblyName();
+ 			assemblyName.Name = "DynamicMockAssembly";
+ 			return appDomain.DefineDynamicAssembly( assemblyName, access );
+ 		}
  	}