Improved support for default values

mganss · Aug 14, 2018 · 75c07fd · 75c07fd
1 parent 20919f5
commit 75c07fd
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
@@ -222,6 +222,19 @@ public IEnumerable<ClassModel> AllBaseClasses
  }
  }
 
+ public IEnumerable<TypeModel> AllBaseTypes
+ {
+ get
+ {
+ var baseType = BaseClass;
+ while (baseType != null)
+ {
+ yield return baseType;
+ baseType = (baseType as ClassModel)?.BaseClass;
+ }
+ }
+ }
+
  public override CodeTypeDeclaration Generate()
  {
  var classDeclaration = base.Generate();
@@ -399,13 +412,15 @@ public List<ClassModel> GetAllDerivedTypes()
 
  public override CodeExpression GetDefaultValueFor(string defaultString)
  {
- if (BaseClass is SimpleModel)
+ var rootClass = AllBaseTypes.LastOrDefault();
+
+ if (rootClass is SimpleModel)
  {
  string reference, val;
 
  using (var writer = new System.IO.StringWriter())
  {
- CSharpProvider.GenerateCodeFromExpression(BaseClass.GetDefaultValueFor(defaultString), writer, new CodeGeneratorOptions());
+ CSharpProvider.GenerateCodeFromExpression(rootClass.GetDefaultValueFor(defaultString), writer, new CodeGeneratorOptions());
  val = writer.ToString();
  }