New tests.

[mono.git] / mcs / class / System.Data.Linq / src / DbMetal / Generator / Implementation / CodeTextGenerator / CodeGenerator.cs

diff --git a/mcs/class/System.Data.Linq/src/DbMetal/Generator/Implementation/CodeTextGenerator/CodeGenerator.cs b/mcs/class/System.Data.Linq/src/DbMetal/Generator/Implementation/CodeTextGenerator/CodeGenerator.cs
index bc3a7e28b7084e176bace17f84177ad590ac035b..690f04702f9cbd6ee48a82ca654dff81ffeea756 100644 (file)
--- a/mcs/class/System.Data.Linq/src/DbMetal/Generator/Implementation/CodeTextGenerator/CodeGenerator.cs
+++ b/mcs/class/System.Data.Linq/src/DbMetal/Generator/Implementation/CodeTextGenerator/CodeGenerator.cs
@@ -177,12 +177,8 @@ namespace DbMetal.Generator.Implementation.CodeTextGenerator
                 implementation.WriteHeader(writer, context);\r
 \r
             // write namespaces for members attributes\r
-            foreach (var memberExposedAttribute in context.Parameters.MemberExposedAttributes)\r
-                WriteUsingNamespace(writer, GetNamespace(memberExposedAttribute));\r
-\r
-            // write namespaces for clases attributes\r
-            foreach (var entityExposedAttribute in context.Parameters.EntityExposedAttributes)\r
-                WriteUsingNamespace(writer, GetNamespace(entityExposedAttribute));\r
+            foreach (var memberAttribute in context.Parameters.MemberAttributes)\r
+                WriteUsingNamespace(writer, GetNamespace(memberAttribute));\r
 \r
             writer.WriteLine();\r
         }\r
@@ -224,12 +220,10 @@ namespace DbMetal.Generator.Implementation.CodeTextGenerator
 \r
 \r
             string contextBase = schema.BaseType;\r
-            var contextBaseType = TypeLoader.Load(contextBase);\r
-            // if we don't specify a base type, use the default\r
-            if (string.IsNullOrEmpty(contextBase))\r
-            {\r
-                contextBaseType = typeof(DataContext);\r
-            }\r
+            var contextBaseType = string.IsNullOrEmpty(contextBase)\r
+                ? typeof(DataContext)\r
+                : TypeLoader.Load(contextBase);\r
+\r
             // in all cases, get the literal type name from loaded type\r
             contextBase = writer.GetLiteralType(contextBaseType);\r
 \r