Merge pull request #22 from flcdrg/MemberVisitor

Implement #21
mganss · Apr 5, 2017 · 39dec11 · 39dec11
2 parents 7e71bf8 + 5fbae58
commit 39dec11
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/XmlSchemaClassGenerator.Tests/XmlTests.cs b/XmlSchemaClassGenerator.Tests/XmlTests.cs
@@ -39,7 +39,7 @@ private Assembly Compile(string name, string pattern, Generator generatorPrototy
  GenerateDesignerCategoryAttribute = false,
  EntityFramework = false,
  GenerateInterfaces = true,
- NamespacePrefix = name,
+ NamespacePrefix = name
  };
 
  var gen = new Generator
@@ -52,7 +52,8 @@ private Assembly Compile(string name, string pattern, Generator generatorPrototy
  DataAnnotationMode = generatorPrototype.DataAnnotationMode,
  GenerateDesignerCategoryAttribute = generatorPrototype.GenerateDesignerCategoryAttribute,
  EntityFramework = generatorPrototype.EntityFramework,
- GenerateInterfaces = generatorPrototype.GenerateInterfaces
+ GenerateInterfaces = generatorPrototype.GenerateInterfaces,
+ MemberVisitor = generatorPrototype.MemberVisitor
  };
 
  var files = Glob.Glob.ExpandNames(pattern);
@@ -103,7 +104,8 @@ public void CanDeserializeSampleXml()
  {
  EntityFramework = true,
  DataAnnotationMode = DataAnnotationMode.All,
- NamespaceProvider = new Dictionary<NamespaceKey, string> { { new NamespaceKey("http://wadl.dev.java.net/2009/02"), "Wadl" } }.ToNamespaceProvider(new GeneratorConfiguration { NamespacePrefix = "Wadl" }.NamespaceProvider.GenerateNamespace)
+ NamespaceProvider = new Dictionary<NamespaceKey, string> { { new NamespaceKey("http://wadl.dev.java.net/2009/02"), "Wadl" } }.ToNamespaceProvider(new GeneratorConfiguration { NamespacePrefix = "Wadl" }.NamespaceProvider.GenerateNamespace),
+ MemberVisitor = (member, model) => { }
  });
  TestSamples("Wadl", WadlPattern);
  Compile("IS24ImmoTransfer", IS24ImmoTransferPattern);

diff --git a/XmlSchemaClassGenerator/Generator.cs b/XmlSchemaClassGenerator/Generator.cs
@@ -145,6 +145,15 @@ public CodeTypeReferenceOptions CodeTypeReferenceOptions
  set { _configuration.CodeTypeReferenceOptions = value; }
  }
 
+ /// <summary>
+ /// Optional delegate that is called for each generated type member
+ /// </summary>
+ public Action<CodeTypeMember, PropertyModel> MemberVisitor
+ {
+ get { return _configuration.MemberVisitor; }
+ set { _configuration.MemberVisitor = value;}
+ }
+
  private readonly XmlSchemaSet Set = new XmlSchemaSet();
  private Dictionary<XmlQualifiedName, XmlSchemaAttributeGroup> AttributeGroups;
  private Dictionary<XmlQualifiedName, XmlSchemaGroup> Groups;

diff --git a/XmlSchemaClassGenerator/GeneratorConfiguration.cs b/XmlSchemaClassGenerator/GeneratorConfiguration.cs
@@ -33,6 +33,7 @@ public GeneratorConfiguration()
  DataAnnotationMode = DataAnnotationMode.All;
  GenerateSerializableAttribute = GenerateDesignerCategoryAttribute = true;
  CollectionType = typeof(Collection<>);
+ MemberVisitor = (member, model) => { };
  }
 
  /// <summary>
@@ -139,5 +140,10 @@ public void WriteLog(string message)
  Log(message);
  }
  }
+
+ /// <summary>
+ /// Optional delegate that is called for each generated type member
+ /// </summary>
+ public Action<CodeTypeMember, PropertyModel> MemberVisitor { get; set; }
  }
 }
diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
@@ -696,6 +696,13 @@ public void AddMembersTo(CodeTypeDeclaration typeDeclaration, bool withDataBindi
  specifiedMember.Comments.AddRange(DocumentationModel.GetComments(specifiedDocs).ToArray());
  typeDeclaration.Members.Add(specifiedMember);
 
+ var specifiedMemberPropertyModel = new PropertyModel(Configuration)
+ {
+ Name = specifiedName + "Specified"
+ };
+
+ Configuration.MemberVisitor(specifiedMember, specifiedMemberPropertyModel);
+
  if (Configuration.GenerateNullables)
  {
  // public X? Name
@@ -789,6 +796,8 @@ public void AddMembersTo(CodeTypeDeclaration typeDeclaration, bool withDataBindi
  new DocumentationModel { Language = "de", Text = string.Format("Ruft einen Wert ab, der angibt, ob die {0}-Collection leer ist.", Name) } };
  specifiedProperty.Comments.AddRange(DocumentationModel.GetComments(specifiedDocs).ToArray());
 
+ Configuration.MemberVisitor(specifiedProperty, this);
+
  typeDeclaration.Members.Add(specifiedProperty);
  }
 
@@ -837,6 +846,8 @@ public void AddMembersTo(CodeTypeDeclaration typeDeclaration, bool withDataBindi
  {
  member.CustomAttributes.Add(notMappedAttribute);
  }
+
+ Configuration.MemberVisitor(member, this);
  }
 
  private IEnumerable<CodeAttributeDeclaration> GetAttributes(bool isArray)