Merge branch 'FixElementRef' of https://github.com/LokiMidgard/XmlSch…

…emaClassGenerator into LokiMidgard-FixElementRef
mganss · May 23, 2017 · 93bcb1d · 93bcb1d
2 parents 98e06e6 + 1ede289
commit 93bcb1d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
@@ -924,13 +924,13 @@ private IEnumerable<CodeAttributeDeclaration> GetAttributes(bool isArray)
 
  foreach (var attribute in attributes)
  {
- if (Form == XmlSchemaForm.Qualified)
+ if (XmlNamespace != null)
  {
- attribute.Arguments.Add(new CodeAttributeArgument("Namespace", new CodePrimitiveExpression(OwningType.XmlSchemaName.Namespace)));
+ attribute.Arguments.Add(new CodeAttributeArgument("Namespace", new CodePrimitiveExpression(XmlNamespace)));
  }
- else if (XmlNamespace != null)
+ else if (Form == XmlSchemaForm.Qualified)
  {
- attribute.Arguments.Add(new CodeAttributeArgument("Namespace", new CodePrimitiveExpression(XmlNamespace)));
+ attribute.Arguments.Add(new CodeAttributeArgument("Namespace", new CodePrimitiveExpression(OwningType.XmlSchemaName.Namespace)));
  }
  else if (!IsAny)
  {