Changeset 138 for trunk/Packages/PersistentData/Backend

Timestamp:

Sep 9, 2022, 8:20:25 PM (2 years ago)

Author:

chronos

Message:

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

Location:

trunk/Packages/PersistentData/Backend

Files:

• UPDClientMemory.pas (modified) (6 diffs)
• UPDClientMySQL.pas (modified) (1 diff)

trunk/Packages/PersistentData/Backend/UPDClientMemory.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, UPDClient, SpecializedList;
+  Classes, SysUtils, UPDClient, Generics.Collections;
 
 type
@@ -19 +19 @@
     function SearchObject(Id: Integer): TObjectProxy;
   public
-    Objects: TListObject;
+    Objects: TObjectList<TObjectProxy>;
     procedure ObjectLoad(AObject: TObjectProxy); override;
     procedure ObjectSave(AObject: TObjectProxy); override;
@@ -96 +96 @@
     else begin
       AObject.Id := GetNewObjectId;
-      Obj := TObjectProxy(Objects.AddNew(TObjectProxy.Create));
+      Obj := TObjectProxy(Objects.Add(TObjectProxy.Create));
       Obj.Assign(AObject);
     end;
@@ -118 +118 @@
   NewObject: TObjectProxy;
   Table: string;
+  Item: TPair<string, string>;
 begin
   AList.Objects.Clear;
@@ -131 +132 @@
 
       if AList.ColummsFilterUse then begin
-        for P := 0 to Properties.Count - 1 do
-        if AList.ColumnsFilter.IndexOf(Properties.Keys[I]) <> -1 then
-          NewObject.Properties.Add(Properties.Keys[I], Properties[I].Value);
+        for Item in Properties do
+        if AList.ColumnsFilter.IndexOf(Item.Key) <> -1 then
+          NewObject.Properties.Add(Item.Key, Item.Value);
       end else NewObject.Properties.Assign(Properties);
     end;
@@ -172 +173 @@
 begin
   inherited;
-  Objects := TListObject.Create;
+  Objects := TObjectList<TObjectProxy>.Create;
   BackendName := 'Memory';
 end;

trunk/Packages/PersistentData/Backend/UPDClientMySQL.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, USqlDatabase, UPDClient, SpecializedDictionary;
+  Classes, SysUtils, USqlDatabase, UPDClient, UGenerics;
 
 type