Changeset 23 for trunk/Units

Timestamp:

Apr 4, 2025, 9:22:05 AM (2 weeks ago)

Author:

chronos

Message:

• Modified: All unit renamed to names without U prefix.
• Modified: Removed global form variables.
• Modified: Code cleanup.

Location:

trunk/Units

Files:

• Backend.pas (moved) (moved from trunk/Units/UBackend.pas ) (1 diff)
• Project.pas (moved) (moved from trunk/Units/UProject.pas ) (5 diffs)
• VCS.pas (moved) (moved from trunk/Units/UVCS.pas ) (9 diffs)

trunk/Units/Backend.pas

@@ -1 @@
-unit UBackend;
+unit Backend;
 
 interface
 
 uses
-  Classes, SysUtils, UVCS;
+  Classes, SysUtils, VCS;
 
 type

trunk/Units/Project.pas

@@ -1 @@
-unit UProject;
+unit Project;
 
 interface
 
 uses
-  Classes, SysUtils, UVCS, UBackend, Contnrs, DOM, XMLRead, XMLWrite, XML,
-  LazFileUtils;
+  Classes, SysUtils, VCS, Backend, Generics.Collections, DOM, XMLRead, XMLWrite,
+  XML, LazFileUtils;
 
 type
@@ -34 +34 @@
   { TProjects }
 
-  TProjects = class(TObjectList)
+  TProjects = class(TObjectList<TProject>)
     procedure LoadXMLNode(Node: TDOMNode);
     procedure SaveXMLNode(Node: TDOMNode);
@@ -84 +84 @@
 end;
 
-
 { TProjectGroup }
 
@@ -94 +93 @@
 destructor TProjectGroup.Destroy;
 begin
-  Projects.Free;
-  inherited Destroy;
+  FreeAndNil(Projects);
+  inherited;
 end;
 
@@ -190 +189 @@
 destructor TProject.Destroy;
 begin
-  WorkingCopy.Free;
-  Repository.Free;
-  inherited Destroy;
+  FreeAndNil(WorkingCopy);
+  FreeAndNil(Repository);
+  inherited;
 end;
 

trunk/Units/VCS.pas

@@ -1 @@
-unit UVCS;
+unit VCS;
 
 interface
 
 uses
-  Classes, SysUtils, LazFileUtils, Contnrs;
+  Classes, SysUtils, LazFileUtils, Generics.Collections;
 
 type
@@ -21 +21 @@
   end;
 
-  TLogList = class(TObjectList)
-
+  TLogList = class(TObjectList<TLogItem>)
   end;
 
@@ -40 +39 @@
   { TFileStatusList }
 
-  TFileStatusList = class(TObjectList)
+  TFileStatusList = class(TObjectList<TFileStatus>)
     function SearchByName(Name: string): TFileStatus;
   end;
@@ -102 +101 @@
 
 uses
-  UFormConsole;
+  FormConsole;
 
 function URLFromDirectory(DirName: string; Relative: Boolean): string;
@@ -138 +137 @@
 procedure TRepository.ExecuteProcess(Command: string;
   Parameters: array of string);
-begin
-  FormConsole.Executable := Command;
-  FormConsole.Parameters.Clear;
-  FormConsole.Parameters.AddStrings(Parameters);
-  if DirectoryExistsUTF8(Path) then FormConsole.WorkingDir := Path
-    else FormConsole.WorkingDir := '';
-  FormConsole.ShowModal;
-  ExecutionOutput.Assign(FormConsole.Log);
+var
+  FormConsole: TFormConsole;
+begin
+  FormConsole := TFormConsole.Create(nil);
+  try
+    FormConsole.Executable := Command;
+    FormConsole.Parameters.Clear;
+    FormConsole.Parameters.AddStrings(Parameters);
+    if DirectoryExistsUTF8(Path) then FormConsole.WorkingDir := Path
+      else FormConsole.WorkingDir := '';
+    FormConsole.ShowModal;
+    ExecutionOutput.Assign(FormConsole.Log);
+  finally
+    FormConsole.Free;
+  end;
 end;
 
@@ -162 +168 @@
 begin
   FreeAndNil(ExecutionOutput);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -175 +181 @@
 destructor TLogItem.Destroy;
 begin
-  Messages.Free;
-  ChangedFiles.Free;
-  inherited Destroy;
+  FreeAndNil(Messages);
+  FreeAndNil(ChangedFiles);
+  inherited;
 end;
 
@@ -191 +197 @@
 procedure TWorkingCopy.SetRepositoryURL(AValue: string);
 begin
-  if FRepositoryURL=AValue then Exit;
-  FRepositoryURL:=AValue;
+  if FRepositoryURL = AValue then Exit;
+  FRepositoryURL := AValue;
 end;
 
 procedure TWorkingCopy.ExecuteProcess(Command: string; Parameters: array of string);
-begin
-  FormConsole.Executable := Command;
-  FormConsole.EnvironmentVariables.Assign(EnvVars);
-  FormConsole.Parameters.Clear;
-  FormConsole.Parameters.AddStrings(Parameters);
-  if DirectoryExistsUTF8(Path) then FormConsole.WorkingDir := Path
-    else FormConsole.WorkingDir := '';
-  if SilentExecution then FormConsole.Perform
-    else FormConsole.ShowModal;
-  ExecutionOutput.Assign(FormConsole.Log);
+var
+  FormConsole: TFormConsole;
+begin
+  FormConsole := TFormConsole.Create(nil);
+  try
+    FormConsole.Executable := Command;
+    FormConsole.EnvironmentVariables.Assign(EnvVars);
+    FormConsole.Parameters.Clear;
+    FormConsole.Parameters.AddStrings(Parameters);
+    if DirectoryExistsUTF8(Path) then FormConsole.WorkingDir := Path
+      else FormConsole.WorkingDir := '';
+    if SilentExecution then FormConsole.Perform
+      else FormConsole.ShowModal;
+    ExecutionOutput.Assign(FormConsole.Log);
+  finally
+    FormConsole.Free;
+  end;
 end;
 
@@ -286 +299 @@
   FreeAndNil(EnvVars);
   FreeAndNil(ExecutionOutput);
-  inherited Destroy;
+  inherited;
 end;