Changeset 26 for trunk/UXmlClasses.pas

Timestamp:

Sep 10, 2022, 8:03:08 PM (2 years ago)

Author:

chronos

Message:

• Removed: TemplateGenerics as required package. Used Generics.Collections instead.

Location:

trunk

Files:

• . (modified) (1 prop)
• UXmlClasses.pas (modified) (9 diffs)

trunk

@@ -7 +7 @@
 heaptrclog.trc
 MyData.exe
+MyData.dbg
+

@@ -7 +7 @@
 heaptrclog.trc
 MyData.exe
+MyData.dbg
+

trunk/UXmlClasses.pas

@@ -1 +1 @@
 unit UXmlClasses;
-
-{$mode delphi}{$H+}
 
 interface
 
-uses Classes, SysUtils, StrUtils, SpecializedList,
-  SpecializedDictionary;
+uses
+  Classes, SysUtils, StrUtils, Generics.Collections, UGenerics;
 
 type
@@ -14 +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;
 
@@ -31 +39 @@
     Name: string;
     Attributes: TDictionaryStringString;
-    SubElements: TListObject; // TListObject<TXmlElement>;
+    SubElements: TXmlElements;
     constructor Create;
     destructor Destroy; override;
@@ -51 +59 @@
   end;
 
+
 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 }
@@ -59 +84 @@
   ShringEmpty := True;
   Attributes := TDictionaryStringString.Create;
-  SubElements := TListObject.Create;
+  SubElements := TXmlElements.Create;
   EndTagSymbol := '/';
 end;
@@ -65 +90 @@
 destructor TXmlTag.Destroy;
 begin
-  Attributes.Free;
-  SubElements.Free;
+  FreeAndNil(Attributes);
+  FreeAndNil(SubElements);
   inherited;
 end;
@@ -75 +100 @@
   I: Integer;
   Content: string;
+  Attribute: TPair<string, string>;
 begin
   Content := '';
@@ -81 +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
@@ -124 +150 @@
 destructor TXmlDocument.Destroy;
 begin
-  Content.Free;
-  MainTag.Free;
+  FreeAndNil(Content);
+  FreeAndNil(MainTag);
   inherited;
 end;

@@ -7 +7 @@
 heaptrclog.trc
 MyData.exe
+MyData.dbg
+