GitHub-Mirror/x2xmldatabinding
1
0
Fork 0
mirror of synced 2024-11-15 03:23:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from selectline-software/NestedCompositorsAndRequiredElements

Browse Source 
Elements in choices with nested compositors (sequences or choices) are now recognized as optional
This commit is contained in:
Mark van Renswoude 2022-06-16 10:07:08 +02:00 committed by GitHub
commit 1d5af8a7b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Units/XMLDataBindingGenerator.pas
View File

@ -790,13 +790,23 @@ end;
function TXMLDataBindingGenerator.IsChoice(AElement: IXMLElementDef): Boolean; function TXMLDataBindingGenerator.IsChoice(AElement: IXMLElementDef): Boolean;
var var
compositor: IXMLElementCompositor; compositor: IXMLElementCompositor;
parent: IXMLNode;
begin begin
Result := False; Result := False;
if Supports(AElement.ParentNode, IXMLElementCompositor, compositor) then parent := AElement.ParentNode;
Result := (compositor.CompositorType = ctChoice) and while Supports(parent, IXMLElementCompositor, compositor) do
(compositor.ElementDefs.Count > 1); begin
if compositor.CompositorType = ctSequence then
begin
parent := compositor.ParentNode;
end else
begin
Result := (compositor.CompositorType = ctChoice) and
(compositor.ElementDefs.Count + compositor.Compositors.Count > 1);
Exit;
end;
end;
end; end;