Changeset 424 for trunk/Packages/Common/UJobProgressView.pas

Timestamp:

Apr 25, 2022, 6:22:53 PM (2 years ago)

Author:

chronos

Message:

• Modified: Update Common package to version 0.10.
• Modified: fgl unit replaced by Generics.Collections.

File:

• trunk/Packages/Common/UJobProgressView.pas (modified) (11 diffs)

trunk/Packages/Common/UJobProgressView.pas

@@ -5 +5 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms, Syncobjs,
-  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Contnrs, UThreading, Math,
+  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Generics.Collections, UThreading, Math,
   DateUtils;
 
@@ -69 +69 @@
   end;
 
-  TJobs = class(TObjectList)
+  TJobs = class(TObjectList<TJob>)
   end;
 
@@ -103 +103 @@
     procedure ReloadJobList;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
-    procedure FormDestroy(Sender: TObject);
     procedure ListViewJobsData(Sender: TObject; Item: TListItem);
     procedure TimerUpdateTimer(Sender: TObject);
@@ -163 +162 @@
   SExecuted = 'Executed';
 
+
 implementation
 
@@ -284 +284 @@
 end;
 
-procedure TFormJobProgressView.FormDestroy(Sender:TObject);
-begin
-end;
-
 procedure TFormJobProgressView.ListViewJobsData(Sender: TObject; Item: TListItem);
 begin
   if (Item.Index >= 0) and (Item.Index < JobProgressView.Jobs.Count) then
-  with TJob(JobProgressView.Jobs[Item.Index]) do begin
+  with JobProgressView.Jobs[Item.Index] do begin
     Item.Caption := Title;
     if Item.Index = JobProgressView.CurrentJobIndex then Item.ImageIndex := 1
@@ -403 +399 @@
     I := 0;
     while I < Jobs.Count do
-    with TJob(Jobs[I]) do begin
+    with Jobs[I] do begin
       CurrentJobIndex := I;
-      CurrentJob := TJob(Jobs[I]);
+      CurrentJob := Jobs[I];
       JobProgressChange(Self);
       StartTime := Now;
@@ -418 +414 @@
         Method(CurrentJob);
       end else begin
+        Thread := TJobThread.Create(True);
         try
-          Thread := TJobThread.Create(True);
           with Thread do begin
             FreeOnTerminate := False;
@@ -492 +488 @@
   if AValue = FTerminate then Exit;
   for I := 0 to Jobs.Count - 1 do
-    TJob(Jobs[I]).Terminate := AValue;
+    Jobs[I].Terminate := AValue;
   FTerminate := AValue;
 end;
@@ -618 +614 @@
 procedure TProgress.Increment;
 begin
-  try
-    FLock.Acquire;
+  FLock.Acquire;
+  try
     Value := Value + 1;
   finally
@@ -628 +624 @@
 procedure TProgress.Reset;
 begin
-  try
-    FLock.Acquire;
+  FLock.Acquire;
+  try
     FValue := 0;
   finally
@@ -676 +672 @@
 destructor TJob.Destroy;
 begin
-  Progress.Free;
+  FreeAndNil(Progress);
   inherited;
 end;