GitHub-Mirror/x2xmldatabinding
1
0
Fork 0
mirror of synced 2024-09-29 01:56:07 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug in Def properties using the original element name instead of the generated property name

Browse Source
This commit is contained in:
Mark van Renswoude 2020-04-09 10:55:19 +02:00
parent ef361ac9ad
commit 17043551f9
4 changed files with 173 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Units/DelphiXMLDataBindingResources.pas
View File

@ -179,8 +179,8 @@ const
PropertyImplMethodGetOptionalOrDefault = 'function TXML%<Name>:s.%<PropertyName>:sDef(const ADefaultValue: %<DataType>:s): %<DataType>:s;' + CrLf + PropertyImplMethodGetOptionalOrDefault = 'function TXML%<Name>:s.%<PropertyName>:sDef(const ADefaultValue: %<DataType>:s): %<DataType>:s;' + CrLf +
'begin' + CrLf + 'begin' + CrLf +
' if GetHas%<PropertySourceName>:s then' + CrLf + ' if GetHas%<PropertyName>:s then' + CrLf +
' Result := Get%<PropertySourceName>:s' + CrLf + ' Result := Get%<PropertyName>:s' + CrLf +
' else' + CrLf + ' else' + CrLf +
' Result := ADefaultValue;' + CrLf + ' Result := ADefaultValue;' + CrLf +
'end;' + CrLf + 'end;' + CrLf +

306
X2XMLDataBinding.dproj
View File

@ -1,145 +1,161 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{983dfcaf-23ca-48a0-a147-d96769428a71}</ProjectGuid> <ProjectGuid>{983dfcaf-23ca-48a0-a147-d96769428a71}</ProjectGuid>
<MainSource>X2XMLDataBinding.dpr</MainSource> <MainSource>X2XMLDataBinding.dpr</MainSource>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler> <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>bin\X2XMLDataBinding.exe</DCC_DependencyCheckOutputName> <DCC_DependencyCheckOutputName>bin\X2XMLDataBinding.exe</DCC_DependencyCheckOutputName>
<FrameworkType>VCL</FrameworkType> <FrameworkType>VCL</FrameworkType>
<ProjectVersion>13.4</ProjectVersion> <ProjectVersion>18.2</ProjectVersion>
<Base>True</Base> <Base>True</Base>
<Config Condition="'$(Config)'==''">Build</Config> <Config Condition="'$(Config)'==''">Build</Config>
<Platform Condition="'$(Platform)'==''">Win32</Platform> <Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>3</TargetedPlatforms> <TargetedPlatforms>3</TargetedPlatforms>
<AppType>Application</AppType> <AppType>Application</AppType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''"> <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''"> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
<Base_Win64>true</Base_Win64> <Base_Win32>true</Base_Win32>
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''"> <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
<Base_Win32>true</Base_Win32> <Base_Win64>true</Base_Win64>
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Build' or '$(Cfg_2)'!=''"> <PropertyGroup Condition="'$(Config)'=='Build' or '$(Cfg_2)'!=''">
<Cfg_2>true</Cfg_2> <Cfg_2>true</Cfg_2>
<CfgParent>Base</CfgParent> <CfgParent>Base</CfgParent>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''"> <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
<Cfg_2_Win32>true</Cfg_2_Win32> <Cfg_2_Win32>true</Cfg_2_Win32>
<CfgParent>Cfg_2</CfgParent> <CfgParent>Cfg_2</CfgParent>
<Cfg_2>true</Cfg_2> <Cfg_2>true</Cfg_2>
<Base>true</Base> <Base>true</Base>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''"> <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
<DCC_ExeOutput>bin</DCC_ExeOutput> <Cfg_2_Win64>true</Cfg_2_Win64>
<Icon_MainIcon>X2XMLDataBinding_Icon.ico</Icon_MainIcon> <CfgParent>Cfg_2</CfgParent>
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;Xml.Win;System.Win;$(DCC_Namespace)</DCC_Namespace> <Cfg_2>true</Cfg_2>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys> <Base>true</Base>
<DCC_DcuOutput>lib</DCC_DcuOutput> </PropertyGroup>
<VerInfo_Locale>1043</VerInfo_Locale> <PropertyGroup Condition="'$(Base)'!=''">
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File> <DCC_ExeOutput>bin</DCC_ExeOutput>
</PropertyGroup> <Icon_MainIcon>X2XMLDataBinding_Icon.ico</Icon_MainIcon>
<PropertyGroup Condition="'$(Base_Win64)'!=''"> <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;Xml.Win;System.Win;$(DCC_Namespace)</DCC_Namespace>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;$(DCC_Namespace)</DCC_Namespace> <DCC_DcuOutput>lib</DCC_DcuOutput>
<DCC_ExeOutput>bin64</DCC_ExeOutput> <VerInfo_Locale>1043</VerInfo_Locale>
<DCC_DcuOutput>lib64</DCC_DcuOutput> <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
<VerInfo_Locale>1033</VerInfo_Locale> <SanitizedProjectName>X2XMLDataBinding</SanitizedProjectName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''"> <PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Bde;$(DCC_Namespace)</DCC_Namespace> <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
<Debugger_RunParams>&quot;P:\updateserver\xsd\ads111.xsd&quot;</Debugger_RunParams> <Debugger_RunParams>&quot;P:\updateserver\xsd\ads111.xsd&quot;</Debugger_RunParams>
<VerInfo_Locale>1033</VerInfo_Locale> <VerInfo_Locale>1033</VerInfo_Locale>
</PropertyGroup> <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
<PropertyGroup Condition="'$(Cfg_2)'!=''"> <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
<Version>7.0</Version> </PropertyGroup>
<DCC_MapFile>3</DCC_MapFile> <PropertyGroup Condition="'$(Base_Win64)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<DCC_ObjOutput>Lib</DCC_ObjOutput> <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;$(DCC_Namespace)</DCC_Namespace>
<DCC_HppOutput>Lib</DCC_HppOutput> <DCC_ExeOutput>bin64</DCC_ExeOutput>
</PropertyGroup> <DCC_DcuOutput>lib64</DCC_DcuOutput>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''"> <VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo> <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
<VerInfo_Locale>1033</VerInfo_Locale> <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <PropertyGroup Condition="'$(Cfg_2)'!=''">
<Borland.Personality>Delphi.Personality.12</Borland.Personality> <Version>7.0</Version>
<Borland.ProjectType/> <DCC_MapFile>3</DCC_MapFile>
<BorlandProject> <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
<Delphi.Personality> <DCC_ObjOutput>Lib</DCC_ObjOutput>
<Parameters> <DCC_HppOutput>Lib</DCC_HppOutput>
<Parameters Name="UseLauncher">False</Parameters> </PropertyGroup>
<Parameters Name="LoadAllSymbols">True</Parameters> <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters> <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<Parameters Name="RunParams">&quot;P:\updateserver\xsd\ads111.xsd&quot;</Parameters> <VerInfo_Locale>1033</VerInfo_Locale>
</Parameters> <BT_BuildType>Debug</BT_BuildType>
<VersionInfo> </PropertyGroup>
<VersionInfo Name="IncludeVerInfo">False</VersionInfo> <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<VersionInfo Name="AutoIncBuild">False</VersionInfo> <BT_BuildType>Debug</BT_BuildType>
<VersionInfo Name="MajorVer">1</VersionInfo> </PropertyGroup>
<VersionInfo Name="MinorVer">0</VersionInfo> <ProjectExtensions>
<VersionInfo Name="Release">0</VersionInfo> <Borland.Personality>Delphi.Personality.12</Borland.Personality>
<VersionInfo Name="Build">0</VersionInfo> <Borland.ProjectType/>
<VersionInfo Name="Debug">False</VersionInfo> <BorlandProject>
<VersionInfo Name="PreRelease">False</VersionInfo> <Delphi.Personality>
<VersionInfo Name="Special">False</VersionInfo> <Parameters>
<VersionInfo Name="Private">False</VersionInfo> <Parameters Name="UseLauncher">False</Parameters>
<VersionInfo Name="DLL">False</VersionInfo> <Parameters Name="LoadAllSymbols">True</Parameters>
<VersionInfo Name="Locale">1043</VersionInfo> <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
<VersionInfo Name="CodePage">1252</VersionInfo> <Parameters Name="RunParams">&quot;P:\updateserver\xsd\ads111.xsd&quot;</Parameters>
</VersionInfo> </Parameters>
<VersionInfoKeys> <VersionInfo>
<VersionInfoKeys Name="CompanyName"/> <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
<VersionInfoKeys Name="FileDescription"/> <VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys> <VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfoKeys Name="InternalName"/> <VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfoKeys Name="LegalCopyright"/> <VersionInfo Name="Release">0</VersionInfo>
<VersionInfoKeys Name="LegalTrademarks"/> <VersionInfo Name="Build">0</VersionInfo>
<VersionInfoKeys Name="OriginalFilename"/> <VersionInfo Name="Debug">False</VersionInfo>
<VersionInfoKeys Name="ProductName"/> <VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys> <VersionInfo Name="Special">False</VersionInfo>
<VersionInfoKeys Name="Comments"/> <VersionInfo Name="Private">False</VersionInfo>
</VersionInfoKeys> <VersionInfo Name="DLL">False</VersionInfo>
<Source> <VersionInfo Name="Locale">1043</VersionInfo>
<Source Name="MainSource">X2XMLDataBinding.dpr</Source> <VersionInfo Name="CodePage">1252</VersionInfo>
</Source> </VersionInfo>
</Delphi.Personality> <VersionInfoKeys>
<Platforms> <VersionInfoKeys Name="CompanyName"/>
<Platform value="Win64">True</Platform> <VersionInfoKeys Name="FileDescription"/>
<Platform value="Win32">True</Platform> <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
</Platforms> <VersionInfoKeys Name="InternalName"/>
</BorlandProject> <VersionInfoKeys Name="LegalCopyright"/>
<ProjectFileVersion>12</ProjectFileVersion> <VersionInfoKeys Name="LegalTrademarks"/>
</ProjectExtensions> <VersionInfoKeys Name="OriginalFilename"/>
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/> <VersionInfoKeys Name="ProductName"/>
<ItemGroup> <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
<DelphiCompile Include="$(MainSource)"> <VersionInfoKeys Name="Comments"/>
<MainSource>MainSource</MainSource> </VersionInfoKeys>
</DelphiCompile> <Source>
<DCCReference Include="Forms\MainFrm.pas"> <Source Name="MainSource">X2XMLDataBinding.dpr</Source>
<Form>MainForm</Form> </Source>
</DCCReference> </Delphi.Personality>
<DCCReference Include="Units\XMLDataBindingGenerator.pas"/> <Platforms>
<DCCReference Include="Units\DelphiXMLDataBindingGenerator.pas"/> <Platform value="Win32">True</Platform>
<DCCReference Include="Units\XMLDataBindingHelpers.pas"/> <Platform value="Win64">True</Platform>
<DCCReference Include="Units\DelphiXMLDataBindingResources.pas"/> </Platforms>
<DCCReference Include="Units\DataBindingSettingsXML.pas"/> </BorlandProject>
<DCCReference Include="Units\DataBindingHintsXML.pas"/> <ProjectFileVersion>12</ProjectFileVersion>
<DCCReference Include="Units\MSXML2_TLB.pas"/> </ProjectExtensions>
<BuildConfiguration Include="Build"> <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
<Key>Cfg_2</Key> <ItemGroup>
<CfgParent>Base</CfgParent> <DelphiCompile Include="$(MainSource)">
</BuildConfiguration> <MainSource>MainSource</MainSource>
<BuildConfiguration Include="Base"> </DelphiCompile>
<Key>Base</Key> <DCCReference Include="Forms\MainFrm.pas">
</BuildConfiguration> <Form>MainForm</Form>
</ItemGroup> </DCCReference>
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/> <DCCReference Include="Units\XMLDataBindingGenerator.pas"/>
</Project> <DCCReference Include="Units\DelphiXMLDataBindingGenerator.pas"/>
<DCCReference Include="Units\XMLDataBindingHelpers.pas"/>
<DCCReference Include="Units\DelphiXMLDataBindingResources.pas"/>
<DCCReference Include="Units\DataBindingSettingsXML.pas"/>
<DCCReference Include="Units\DataBindingHintsXML.pas"/>
<DCCReference Include="Units\MSXML2_TLB.pas"/>
<BuildConfiguration Include="Build">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
</BuildConfiguration>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
</ItemGroup>
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
</Project>

BIN
X2XMLDataBinding.res
View File

Binary file not shown.

10
X2XMLDataBinding.stat Normal file
View File

@ -0,0 +1,10 @@
[Stats]
EditorSecs=37
DesignerSecs=5
InspectorSecs=1
CompileSecs=620
OtherSecs=5
StartTime=09/04/2020 10:52:32
RealKeys=0
EffectiveKeys=0
DebugSecs=20