Changeset 142 for trunk

Timestamp:

Sep 10, 2022, 6:24:58 PM (2 years ago)

Author:

chronos

Message:

• Fixed: PersistentData package wrong list Add method usage.

Location:

trunk

Files:

• Packages/Common/Common.pas (modified) (1 diff)
• Packages/PersistentData/Backend/UPDClientMemory.pas (modified) (5 diffs)
• Packages/PersistentData/Backend/UPDClientMySQL.pas (modified) (1 diff)
• Packages/PersistentData/PersistentData.lpk (modified) (3 diffs)
• Packages/PersistentData/UPDClient.pas (modified) (14 diffs)
• Packages/PersistentData/UPersistentData.pas (modified) (2 diffs)
• ZdechovNET.lpi (modified) (1 diff)

trunk/Packages/Common/Common.pas

@@ -36 +36 @@
 initialization
   RegisterPackage('Common', @Register);
+
 end.

trunk/Packages/PersistentData/Backend/UPDClientMemory.pas

@@ -19 +19 @@
     function SearchObject(Id: Integer): TObjectProxy;
   public
-    Objects: TObjectList<TObjectProxy>;
+    Objects: TObjectProxies;
     procedure ObjectLoad(AObject: TObjectProxy); override;
     procedure ObjectSave(AObject: TObjectProxy); override;
@@ -96 +96 @@
     else begin
       AObject.Id := GetNewObjectId;
-      Obj := TObjectProxy(Objects.Add(TObjectProxy.Create));
+      Obj := Objects.AddProxy;
       Obj.Assign(AObject);
     end;
@@ -173 +173 @@
 begin
   inherited;
-  Objects := TObjectList<TObjectProxy>.Create;
+  Objects := TObjectProxies.Create;
   BackendName := 'Memory';
 end;
@@ -179 +179 @@
 destructor TPDClientMemory.Destroy;
 begin
-  Objects.Free;
+  FreeAndNil(Objects);
   inherited;
 end;
@@ -185 +185 @@
 procedure TPDClientMemory.Connect;
 begin
-  inherited Connect;
+  inherited;
 end;
 
 procedure TPDClientMemory.Disconnect;
 begin
-  inherited Disconnect;
+  inherited;
 end;
 

trunk/Packages/PersistentData/Backend/UPDClientMySQL.pas

@@ -153 +153 @@
 procedure TPDClientMySQL.ListSave(AList: TListProxy);
 begin
-
 end;
 

trunk/Packages/PersistentData/PersistentData.lpk

@@ -11 +11 @@
       <SearchPaths>
         <OtherUnitFiles Value="Backend"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
       </SearchPaths>
       <Parsing>
@@ -21 +21 @@
         </SyntaxOptions>
       </Parsing>
-      <CodeGeneration>
-        <Checks>
-          <IOChecks Value="True"/>
-          <RangeChecks Value="True"/>
-          <OverflowChecks Value="True"/>
-          <StackChecks Value="True"/>
-        </Checks>
-      </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="False"/>
+        </Debugging>
+      </Linking>
     </CompilerOptions>
     <Description Value="Generic data persistence layer"/>
     <License Value="GNU/GPL"/>
-    <Version Minor="1"/>
+    <Version Minor="2"/>
     <Files Count="8">
       <Item1>
@@ -69 +66 @@
     </Files>
     <CompatibilityMode Value="True"/>
+    <i18n>
+      <EnableI18N Value="True"/>
+    </i18n>
     <RequiredPkgs Count="2">
       <Item1>

trunk/Packages/PersistentData/UPDClient.pas

@@ -31 +31 @@
     destructor Destroy; override;
     procedure Assign(Source: TObjectProxy);
+  end;
+
+  { TObjectProxies }
+
+  TObjectProxies = class(TObjectList<TObjectProxy>)
+    function AddProxy: TObjectProxy;
   end;
 
@@ -72 +78 @@
   end;
 
-  { TPDTypePropertyList }
-
-  TPDTypePropertyList = class(TObjectList<TPDTypeProperty>)
+  { TPDTypeProperties }
+
+  TPDTypeProperties = class(TObjectList<TPDTypeProperty>)
     Client: TPDClient;
-    procedure AddSimple(Name: string; TypeName: string; Unique: Boolean = False;
-      Index: Boolean = False);
+    function AddSimple(Name: string; TypeName: string; Unique: Boolean = False;
+      Index: Boolean = False): TPDTypeProperty;
   end;
 
@@ -89 +95 @@
     Name: string;
     DbType: string;
-    Properties: TPDTypePropertyList;
+    Properties: TPDTypeProperties;
     function IsDefined: Boolean;
     procedure Define;
@@ -98 +104 @@
   end;
 
-  { TPDTypeList }
-
-  TPDTypeList = class(TObjectList<TPDType>)
+  { TPDTypes }
+
+  TPDTypes = class(TObjectList<TPDType>)
     Client: TPDClient;
     function AddType(Name: string; DbType: string = ''): TPDType;
@@ -119 +125 @@
     procedure SetConnectionString(AValue: string); virtual;
   public
-    Types: TPDTypeList;
+    Types: TPDTypes;
     Version: string;
     BackendName: string;
@@ -156 +162 @@
 implementation
 
-{ TPDTypePropertyList }
-
-procedure TPDTypePropertyList.AddSimple(Name: string; TypeName: string;
-  Unique: Boolean = False; Index: Boolean = False);
-var
-  NewProperty: TPDTypeProperty;
-begin
-  NewProperty := TPDTypeProperty(Add(TPDTypeProperty.Create));
-  NewProperty.Name := Name;
-  NewProperty.DbType := Client.Types.SearchByName(TypeName);
-  NewProperty.Unique := Unique;
-  NewProperty.Index := Index;
-end;
-
-
-{ TPDTypeList }
-
-function TPDTypeList.AddType(Name: string; DbType: string = ''): TPDType;
-begin
-  Result := TPDType(Add(TPDType.Create));
+{ TObjectProxies }
+
+function TObjectProxies.AddProxy: TObjectProxy;
+begin
+  Result := TObjectProxy.Create;
+  Add(Result);
+end;
+
+{ TPDTypeProperties }
+
+function TPDTypeProperties.AddSimple(Name: string; TypeName: string;
+  Unique: Boolean = False; Index: Boolean = False): TPDTypeProperty;
+begin
+  Result := TPDTypeProperty.Create;
+  Result.Name := Name;
+  Result.DbType := Client.Types.SearchByName(TypeName);
+  Result.Unique := Unique;
+  Result.Index := Index;
+  Add(Result);
+end;
+
+{ TPDTypes }
+
+function TPDTypes.AddType(Name: string; DbType: string = ''): TPDType;
+begin
+  Result := TPDType.Create;
   Result.Client := Client;
   Result.Name := Name;
   Result.DbType := DbType;
-end;
-
-function TPDTypeList.SearchByName(Name: string): TPDType;
+  Add(Result);
+end;
+
+function TPDTypes.SearchByName(Name: string): TPDType;
 var
   I: Integer;
@@ -218 +231 @@
 constructor TPDType.Create;
 begin
-  Properties := TPDTypePropertyList.Create;
+  Properties := TPDTypeProperties.Create;
 end;
 
 destructor TPDType.Destroy;
 begin
-  Properties.Free;
+  FreeAndNil(Properties);
   inherited;
 end;
@@ -254 +267 @@
 destructor TObjectProxy.Destroy;
 begin
-  Properties.Free;
+  FreeAndNil(Properties);
   inherited;
 end;
@@ -285 +298 @@
 destructor TListProxy.Destroy;
 begin
-  Objects.Free;
-  ColumnsFilter.Free;
+  FreeAndNil(Objects);
+  FreeAndNil(ColumnsFilter);
   inherited;
 end;
@@ -311 +324 @@
 procedure TPDClient.SetConnectionString(AValue: string);
 begin
-
 end;
 
@@ -413 +425 @@
 begin
   inherited;
-  Types := TPDTypeList.Create;
+  Types := TPDTypes.Create;
   Types.Client := Self;
   InitSystemTypes;
@@ -420 +432 @@
 destructor TPDClient.Destroy;
 begin
-  Types.Free;
+  FreeAndNil(Types);
   inherited;
 end;
@@ -434 +446 @@
 procedure TPDClient.Install;
 begin
-
 end;
 
@@ -444 +455 @@
 procedure TPDClient.Update;
 begin
-
 end;
 

trunk/Packages/PersistentData/UPersistentData.pas

@@ -12 +12 @@
   end;
 
+  TPDManagerItems = class(TObjectList<TPDManagerItem>)
+  end;
+
   { TPDManager }
 
   TPDManager = class(TComponent)
   public
-    Items: TObjectList<TPDManagerItem>;
+    Items: TPDManagerItems;
     procedure Register(ClientClass: TPDClientClass);
     procedure LoadToStrings(Strings: TStrings);
@@ -76 +79 @@
 begin
   inherited;
-  Items := TObjectList<TPDManagerItem>.Create;
+  Items := TPDManagerItems.Create;
 end;
 

trunk/ZdechovNET.lpi

@@ -73 +73 @@
       <SharedMatrixOptions Count="3">
         <Item1 ID="999041476570" Modes="Release,Debug" Type="IDEMacro" MacroName="LCLWidgetType" Value="nogui"/>
-        <Item2 ID="896442313085" Targets="Common,CoolWeb,ModularSystem" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
-        <Item3 ID="926538202016" Targets="Common,CoolWeb,ModularSystem" Modes="Release" Value="-CX -XX -O3"/>
+        <Item2 ID="896442313085" Targets="Common,CoolWeb,ModularSystem,PersistentData" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
+        <Item3 ID="926538202016" Targets="Common,CoolWeb,ModularSystem,PersistentData" Modes="Release" Value="-CX -XX -O3"/>
       </SharedMatrixOptions>
     </BuildModes>