pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

xsd_generator : Move duplicated code to a function (Thanks Juha Maninnen)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3177 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2014-06-16 15:16:14 +00:00
parent 31bbc5c053
commit af326242a5
1 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
wst/trunk/ws_helper/xsd_generator.pas
View File

@ -943,17 +943,30 @@ procedure TClassTypeDefinition_TypeHandler.Generate(
end; end;
var var
cplxNode, sqcNode, derivationNode, defSchemaNode : TDOMElement; cplxNode, sqcNode, derivationNode, defSchemaNode, propNode : TDOMElement;
procedure DoTypeUsage(ItmType: TPasType);
var
typeHelper : IXsdSpecialTypeHelper;
names: TStrings;
ExtName, shortName, nameSpace : string;
begin
ExtName := AContainer.GetExternalName(ItmType);
nameSpace := GetTypeNameSpace(AContainer,ItmType);
names := GetOwner().GetPreferedShortNames();
shortName := GetNameSpaceShortName(nameSpace, GetSchemaNode(ADocument), names);
propNode.SetAttribute(s_type,Format('%s:%s',[shortName,ExtName]));
if ItmType.InheritsFrom(TPasNativeSpecialSimpleType) then
if GetRegistry().FindHelper(ItmType,typeHelper) then
typeHelper.HandleTypeUsage(propNode,defSchemaNode);
end;
procedure ProcessProperty(const AProp : TPasProperty); procedure ProcessProperty(const AProp : TPasProperty);
var var
p : TPasProperty; p : TPasProperty;
s : string; s : string;
propNode : TDOMElement; propTypItm, propItmUltimeType : TPasType;
propTypItm, propItmUltimeType, arrayItemType : TPasType;
prop_ns_shortName : string;
isEmbeddedArray : Boolean; isEmbeddedArray : Boolean;
typeHelper : IXsdSpecialTypeHelper;
begin begin
p := AProp; p := AProp;
if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX))) or if AnsiSameText(sWST_PROP_STORE_PREFIX,Copy(p.StoredAccessorName,1,Length(sWST_PROP_STORE_PREFIX))) or
@ -978,29 +991,10 @@ var
propItmUltimeType := GetUltimeType(propTypItm); propItmUltimeType := GetUltimeType(propTypItm);
isEmbeddedArray := propItmUltimeType.InheritsFrom(TPasArrayType) and isEmbeddedArray := propItmUltimeType.InheritsFrom(TPasArrayType) and
( AContainer.GetArrayStyle(TPasArrayType(propItmUltimeType)) = asEmbeded ); ( AContainer.GetArrayStyle(TPasArrayType(propItmUltimeType)) = asEmbeded );
if isEmbeddedArray then begin if isEmbeddedArray then
s := AContainer.GetExternalName(TPasArrayType(propItmUltimeType).ElType); DoTypeUsage(TPasArrayType(propItmUltimeType).ElType)
arrayItemType := TPasArrayType(propItmUltimeType).ElType; else
prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,arrayItemType),GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames()); DoTypeUsage(propTypItm);
propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,s]));
if arrayItemType.InheritsFrom(TPasNativeSpecialSimpleType) then begin
if GetRegistry().FindHelper(arrayItemType,typeHelper) then
typeHelper.HandleTypeUsage(propNode,defSchemaNode);
end;
end else begin
s := AContainer.GetExternalName(propTypItm);
prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,propTypItm),GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,s]));
if propTypItm.InheritsFrom(TPasNativeSpecialSimpleType) then begin
if GetRegistry().FindHelper(propTypItm,typeHelper) then
typeHelper.HandleTypeUsage(propNode,defSchemaNode);
end;
end;
{propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,s]));
if propTypItm.InheritsFrom(TPasNativeSpecialSimpleType) then begin
if GetRegistry().FindHelper(propTypItm,typeHelper) then
typeHelper.HandleTypeUsage(propNode,defSchemaNode);
end; }
if ( Length(p.DefaultValue) > 0 ) then if ( Length(p.DefaultValue) > 0 ) then
propNode.SetAttribute(s_default,p.DefaultValue); propNode.SetAttribute(s_default,p.DefaultValue);
if AContainer.IsAttributeProperty(p) then begin if AContainer.IsAttributeProperty(p) then begin