Changeset 138 for trunk/Packages/CoolWeb/Common/UXmlClasses.pas

Timestamp:

Sep 9, 2022, 8:20:25 PM (21 months ago)

Author:

chronos

Message:

• Modified: Removed TemplateGenerics package. Generics usage replaced by standard Generics.Collections.

File:

• trunk/Packages/CoolWeb/Common/UXmlClasses.pas (modified) (9 diffs)

trunk/Packages/CoolWeb/Common/UXmlClasses.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, StrUtils, SpecializedList, SpecializedDictionary;
+  Classes, SysUtils, StrUtils, Generics.Collections, UGenerics;
 
 type
@@ -12 +12 @@
   public
     property AsString: string read GetAsString;
+  end;
+
+  TXmlTag = class;
+  TXmlString = class;
+
+  { TXmlElements }
+
+  TXmlElements = class(TObjectList<TXmlElement>)
+    function AddTag(Name: string): TXmlTag;
+    function AddString(Text: string): TXmlString;
   end;
 
@@ -29 +39 @@
     Name: string;
     Attributes: TDictionaryStringString;
-    SubElements: TListObject; // TListObject<TXmlElement>;
+    SubElements: TXmlElements;
     constructor Create;
     destructor Destroy; override;
@@ -52 +62 @@
 implementation
 
+{ TXmlElements }
+
+function TXmlElements.AddTag(Name: string): TXmlTag;
+begin
+  Result := TXmlTag.Create;
+  Result.Name := Name;
+  Add(Result);
+end;
+
+function TXmlElements.AddString(Text: string): TXmlString;
+begin
+  Result := TXmlString.Create;
+  Result.Text := Text;
+  Add(Result);
+end;
+
 { THtmlElement }
 
@@ -58 +84 @@
   ShringEmpty := True;
   Attributes := TDictionaryStringString.Create;
-  SubElements := TListObject.Create;
+  SubElements := TXmlElements.Create;
   EndTagSymbol := '/';
 end;
@@ -64 +90 @@
 destructor TXmlTag.Destroy;
 begin
-  Attributes.Free;
-  SubElements.Free;
+  FreeAndNil(Attributes);
+  FreeAndNil(SubElements);
   inherited;
 end;
@@ -74 +100 @@
   I: Integer;
   Content: string;
+  Attribute: TPair<string, string>;
 begin
   Content := '';
@@ -80 +107 @@
 
   AttributesText := '';
-  for I := 0 to Attributes.Count - 1 do
-    AttributesText := AttributesText + ' ' + Attributes.Keys[I] + '="' + Attributes[I].Value + '"';
+  for Attribute in Attributes do
+    AttributesText := AttributesText + ' ' + Attribute.Key + '="' + Attribute.Value + '"';
 
   if Name <> '' then begin
@@ -123 +150 @@
 destructor TXmlDocument.Destroy;
 begin
-  Content.Free;
-  MainTag.Free;
+  FreeAndNil(Content);
+  FreeAndNil(MainTag);
   inherited;
 end;