GitHub-Mirror
/
x2xmldatabinding
mirror of
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Empty check only simple types

This commit is contained in:
Mark van Renswoude 2017-07-21 09:47:14 +02:00
parent e8ef5ff1bc
commit 3c9f47f80e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Units/DelphiXMLDataBindingGenerator.pas
View File

@ -1144,7 +1144,6 @@ var
writeStream: Boolean;
typeMapping: TTypeMapping;
nodeType: TDelphiNodeType;
elementType: TDelphiElementType;
begin
Result := False;
@ -1298,13 +1297,21 @@ begin
WriteNewLine;
if writeOptional then
if AProperty.IsAttribute then
sourceCode.Add(IfThen(HasChecksEmpty, PropertyImplMethodGetOptionalAttrEmpty, PropertyImplMethodGetOptionalAttr))
else
begin
if HasChecksEmpty and (AProperty.PropertyType = ptSimple) and (not Assigned(AProperty.Collection)) then
begin
elementType := GetDelphiElementType(nodeType);
sourceCode.Add(IfThen(HasChecksEmpty, PropertyImplMethodGetOptionalEmpty[elementType], PropertyImplMethodGetOptional[elementType]));
if AProperty.IsAttribute then
sourceCode.Add(PropertyImplMethodGetOptionalAttrEmpty)
else
sourceCode.Add(PropertyImplMethodGetOptionalEmpty[GetDelphiElementType(nodeType)]);
end else
begin
if AProperty.IsAttribute then
sourceCode.Add(PropertyImplMethodGetOptionalAttr)
else
sourceCode.Add(PropertyImplMethodGetOptional[GetDelphiElementType(nodeType)]);
end;
end;
if writeNil then
sourceCode.Add(PropertyImplMethodGetNil[GetDelphiElementType(nodeType)]);