Changeset 138 for trunk/Packages/PersistentData/UPDClient.pas

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.

File:

• trunk/Packages/PersistentData/UPDClient.pas (modified) (10 diffs)

trunk/Packages/PersistentData/UPDClient.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, SpecializedList, SpecializedDictionary;
+  Classes, SysUtils, Generics.Collections, UGenerics;
 
 const
@@ -57 +57 @@
     ObjectName: string;
     Path: string;
-    Objects: TListObject; // TListObject<TObjectProxy>
+    Objects: TObjectList<TObjectProxy>;
     procedure Clear;
     constructor Create;
@@ -74 +74 @@
   { TPDTypePropertyList }
 
-  TPDTypePropertyList = class(TListObject)
+  TPDTypePropertyList = class(TObjectList<TPDTypeProperty>)
     Client: TPDClient;
     procedure AddSimple(Name: string; TypeName: string; Unique: Boolean = False;
@@ -100 +100 @@
   { TPDTypeList }
 
-  TPDTypeList = class(TListObject)
+  TPDTypeList = class(TObjectList<TPDType>)
     Client: TPDClient;
     function AddType(Name: string; DbType: string = ''): TPDType;
@@ -147 +147 @@
   TPDClientClass = class of TPDClient;
 
-  resourcestring
-    SClientNotSet = 'Client not set';
-    SNotSupported = 'Not supported';
-    SVersionMismatch = 'Version mismatch, client: %0:s, server: %1:s. Please upgrade database.';
-    SCantLoadObjectWithoutId = 'Can''t load object without id';
+resourcestring
+  SClientNotSet = 'Client not set';
+  SNotSupported = 'Not supported';
+  SVersionMismatch = 'Version mismatch, client: %0:s, server: %1:s. Please upgrade database.';
+  SCantLoadObjectWithoutId = 'Can''t load object without id';
 
 
@@ -163 +163 @@
   NewProperty: TPDTypeProperty;
 begin
-  NewProperty := TPDTypeProperty(AddNew(TPDTypeProperty.Create));
+  NewProperty := TPDTypeProperty(Add(TPDTypeProperty.Create));
   NewProperty.Name := Name;
   NewProperty.DbType := Client.Types.SearchByName(TypeName);
@@ -175 +175 @@
 function TPDTypeList.AddType(Name: string; DbType: string = ''): TPDType;
 begin
-  Result := TPDType(AddNew(TPDType.Create));
+  Result := TPDType(Add(TPDType.Create));
   Result.Client := Client;
   Result.Name := Name;
@@ -280 +280 @@
 begin
   ColumnsFilter := TListString.Create;
-  Objects := TListObject.Create;
+  Objects := TObjectList<TObjectProxy>.Create;
 end;
 
@@ -345 +345 @@
     NewObject.Load;
 
-    DbVersion := NewObject.Properties.Values['Version'];
+    DbVersion := NewObject.Properties.Items['Version'];
     if Version <> DbVersion then
       raise Exception.Create(Format(SVersionMismatch, [Version, DbVersion]));
@@ -395 +395 @@
     Tables.Count := NewProxy.Objects.Count;
     for I := 0 to NewProxy.Objects.Count - 1 do
-      Tables[I] := TObjectProxy(NewProxy.Objects[I]).Properties.Values['TABLE_NAME'];
+      Tables[I] := TObjectProxy(NewProxy.Objects[I]).Properties.Items['TABLE_NAME'];
 
     for I := 0 to Types.Count - 1 do