From: Jens F. <jfu...@us...> - 2005-02-27 16:58:16
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16706/JVCL3/run Modified Files: JvAppIniStorage.pas JvAppXMLStorage.pas Log Message: 0002655: JvAppXMLStorage.WhiteSpaceReplacement doesn't work with JVCL 3.00 RC 1- Finaly fixed Index: JvAppXMLStorage.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAppXMLStorage.pas,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** JvAppXMLStorage.pas 25 Feb 2005 11:35:09 -0000 1.50 --- JvAppXMLStorage.pas 27 Feb 2005 16:57:57 -0000 1.51 *************** *** 75,80 **** TJvCustomAppXMLStorage = class(TJvCustomAppMemoryFileStorage) private ! function GetWhiteSpaceReplacement: string; ! procedure SetWhiteSpaceReplacement(const Value: string); protected FXml: TJvSimpleXML; --- 75,80 ---- TJvCustomAppXMLStorage = class(TJvCustomAppMemoryFileStorage) private ! function GetStorageOptions : TJvAppXMLStorageOptions; ! procedure SetStorageOptions (Value: TJvAppXMLStorageOptions); protected FXml: TJvSimpleXML; *************** *** 93,97 **** procedure SetOnDecodeValue(const Value: TJvSimpleXMLEncodeEvent); procedure SetOnEncodeValue(const Value: TJvSimpleXMLEncodeEvent); ! function GetRootNodeName: string; procedure SetRootNodeName(const Value: string); --- 93,97 ---- procedure SetOnDecodeValue(const Value: TJvSimpleXMLEncodeEvent); procedure SetOnEncodeValue(const Value: TJvSimpleXMLEncodeEvent); ! function GetRootNodeName: string; procedure SetRootNodeName(const Value: string); *************** *** 131,137 **** constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! ! // Just here for legacy reasons, use the Options.WhiteSpaceReplacement ! property WhiteSpaceReplacement: string read GetWhiteSpaceReplacement write SetWhiteSpaceReplacement; end; --- 131,136 ---- constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! published ! property StorageOptions: TJvAppXMLStorageOptions read GetStorageOptions write SetStorageOptions; end; *************** *** 788,800 **** end; ! function TJvCustomAppXMLStorage.GetWhiteSpaceReplacement: string; begin ! Result := TJvAppXMLStorageOptions(StorageOptions).WhiteSpaceReplacement; end; ! procedure TJvCustomAppXMLStorage.SetWhiteSpaceReplacement( ! const Value: string); begin ! TJvAppXMLStorageOptions(StorageOptions).WhiteSpaceReplacement := Value; end; --- 787,798 ---- end; ! function TJvCustomAppXMLStorage.GetStorageOptions : TJvAppXMLStorageOptions; begin ! Result := TJvAppXMLStorageOptions(inherited StorageOptions); end; ! procedure TJvCustomAppXMLStorage.SetStorageOptions (Value: TJvAppXMLStorageOptions); begin ! (Inherited StorageOptions).Assign(Value); end; Index: JvAppIniStorage.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvAppIniStorage.pas,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** JvAppIniStorage.pas 23 Feb 2005 23:04:45 -0000 1.54 --- JvAppIniStorage.pas 27 Feb 2005 16:57:55 -0000 1.55 *************** *** 65,68 **** --- 65,70 ---- FDefaultSection: string; function CalcDefaultSection(Section: string): string; + function GetStorageOptions : TJvAppIniStorageOptions; + procedure SetStorageOptions (Value: TJvAppIniStorageOptions); protected class function GetStorageOptionsClass: TJvAppStorageOptionsClass; override; *************** *** 108,111 **** --- 110,115 ---- constructor Create(AOwner: TComponent); override; destructor Destroy; override; + published + property StorageOptions: TJvAppIniStorageOptions read GetStorageOptions write SetStorageOptions; end; *************** *** 463,468 **** function TJvCustomAppIniStorage.CalcDefaultSection(Section: string): string; begin - // Changed by Jens Fudickar to support DefaultSections; Similar to ReadValue - // (rom) made it a private method if (Section = '') or (Section[1] = '.') then Result := DefaultSection + Section --- 467,470 ---- *************** *** 473,476 **** --- 475,488 ---- end; + function TJvCustomAppIniStorage.GetStorageOptions : TJvAppIniStorageOptions; + begin + Result := TJvAppIniStorageOptions(inherited StorageOptions); + end; + + procedure TJvCustomAppIniStorage.SetStorageOptions (Value: TJvAppIniStorageOptions); + begin + (Inherited StorageOptions).Assign(Value); + end; + function TJvCustomAppIniStorage.ValueExists(const Section, Key: string): Boolean; begin |