Updated HbmXsd tool to add root element name to generated classes, if missing.

SVN: trunk@2933

Author: Jim Bolla

src/NHibernate.Tool.HbmXsd/ImproveTypeNamesCommand.cs

@@ -36,10 +36,25 @@ private void ChangeDeclaredTypeNames()
 				string rootElementName = GetRootElementName(type);
 				string newTypeName = GetNewTypeName(type.Name, rootElementName);
 				changedTypeNames[type.Name] = newTypeName;
+
+				if (string.IsNullOrEmpty(rootElementName))
+					AddRootElementName(type);
+
 				type.Name = newTypeName;
 			}
 		}
 
+		private static void AddRootElementName(CodeTypeMember type)
+		{
+			foreach (CodeAttributeDeclaration attribute in type.CustomAttributes)
+				if (attribute.Name == typeof (XmlRootAttribute).FullName)
+				{
+					CodePrimitiveExpression value = new CodePrimitiveExpression(type.Name);
+					CodeAttributeArgument argument = new CodeAttributeArgument("", value);
+					attribute.Arguments.Insert(0, argument);
+				}
+		}
+
 		private void UpdateTypeReferences()
 		{
 			foreach (CodeTypeDeclaration type in code.Types)
@@ -91,7 +106,7 @@ private void UpdateFieldTypeReferences(CodeMemberField field)
 				else if (attribute.Name == typeof (DefaultValueAttribute).FullName)
 				{
 					CodeFieldReferenceExpression reference = attribute.Arguments[0].Value
-						as CodeFieldReferenceExpression;
+					                                         as CodeFieldReferenceExpression;
 
 					if (reference != null)
 						UpdateTypeReference(((CodeTypeReferenceExpression) reference.TargetObject).Type);