Changeset 75 for trunk/IDE/Project.pas

Timestamp:

Jun 4, 2024, 12:22:49 AM (5 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/IDE/Project.pas (moved) (moved from trunk/IDE/UProject.pas ) (19 diffs)

trunk/IDE/Project.pas

@@ -1 @@
-unit UProject;
-
-{$mode Delphi}{$H+}
+unit Project;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, Dialogs, DOM, XMLWrite, XMLRead, FileUtil,
-  SpecializedList;
+  Generics.Collections;
 
 const
@@ -19 +17 @@
   end;
 
-  { TProjectPackageList }
-
-  TProjectPackageList = class(TListObject)
+  { TProjectPackages }
+
+  TProjectPackages = class(TObjectList<TProjectPackage>)
     Parent: TProject;
     procedure Load;
@@ -33 +31 @@
   end;
 
-  TProjectBuildConfigList = class(TListObject)
+  TProjectBuildConfigs = class(TObjectList<TProjectBuildConfig>)
   end;
 
@@ -57 +55 @@
   end;
 
-  { TProjectFileList }
-
-  TProjectFileList = class(TListObject)
+  { TProjectFiles }
+
+  TProjectFiles = class(TObjectList<TProjectFile>)
     Parent: TProject;
-    procedure DumpFileList(Files: TListString);
-    procedure LoadFromList(Files: TListString);
+    procedure DumpFileList(Files: TStringList);
+    procedure LoadFromList(Files: TStringList);
     procedure Load;
     procedure Save;
@@ -78 +76 @@
   public
     FileName: string;
-    Files: TProjectFileList;
-    Packages: TProjectPackageList;
-    BuildConfigs: TProjectBuildConfigList;
+    Files: TProjectFiles;
+    Packages: TProjectPackages;
+    BuildConfigs: TProjectBuildConfigs;
     MainSource: TProjectFile;
     procedure LoadFromFile(FileName: string);
@@ -104 +102 @@
   end;
 
-  { TProjectTemplateList }
-
-  TProjectTemplateList = class(TListObject)
+  { TProjectTemplates }
+
+  TProjectTemplates = class(TObjectList<TProjectTemplate>)
     procedure AddTemplate(Template: TProjectTemplate);
   end;
@@ -113 +111 @@
   SNewProject = 'New project';
 
+
 implementation
 
-{ TProjectTemplateList }
-
-procedure TProjectTemplateList.AddTemplate(Template: TProjectTemplate);
+{ TProjectTemplates }
+
+procedure TProjectTemplates.AddTemplate(Template: TProjectTemplate);
 begin
   Add(Template);
@@ -136 +135 @@
 destructor TProjectTemplate.Destroy;
 begin
-  Description.Free;
-  inherited Destroy;
-end;
-
-{ TProjectPackageList }
-
-procedure TProjectPackageList.Load;
-begin
-
-end;
-
-procedure TProjectPackageList.Save;
-begin
-
-end;
-
-procedure TProjectPackageList.SaveToXMLNode(Node: TDOMNode);
-begin
-
-end;
-
-procedure TProjectPackageList.LoadFromXMLNode(Node: TDOMNode);
-begin
-
+  FreeAndNil(Description);
+  inherited;
+end;
+
+{ TProjectPackages }
+
+procedure TProjectPackages.Load;
+begin
+end;
+
+procedure TProjectPackages.Save;
+begin
+end;
+
+procedure TProjectPackages.SaveToXMLNode(Node: TDOMNode);
+begin
+end;
+
+procedure TProjectPackages.LoadFromXMLNode(Node: TDOMNode);
+begin
 end;
 
 { TProjectGroup }
 
-procedure TProjectFileList.DumpFileList(Files: TListString);
+procedure TProjectFiles.DumpFileList(Files: TStringList);
 var
   I: Integer;
@@ -173 +168 @@
 end;
 
-procedure TProjectFileList.LoadFromList(Files: TListString);
+procedure TProjectFiles.LoadFromList(Files: TStringList);
 var
   I: Integer;
@@ -190 +185 @@
 end;
 
-procedure TProjectFileList.Load;
+procedure TProjectFiles.Load;
 var
   I: Integer;
@@ -198 +193 @@
 end;
 
-procedure TProjectFileList.Save;
+procedure TProjectFiles.Save;
 var
   I: Integer;
@@ -206 +201 @@
 end;
 
-procedure TProjectFileList.SaveToXMLNode(Node: TDOMNode);
+procedure TProjectFiles.SaveToXMLNode(Node: TDOMNode);
 var
   I: Integer;
@@ -219 +214 @@
 end;
 
-procedure TProjectFileList.LoadFromXMLNode(Node: TDOMNode);
+procedure TProjectFiles.LoadFromXMLNode(Node: TDOMNode);
 var
   NewNode: TDomNode;
@@ -236 +231 @@
 end;
 
-function TProjectFileList.SearchFile(FileName: string): TProjectFile;
+function TProjectFiles.SearchFile(FileName: string): TProjectFile;
 var
   I: Integer;
@@ -250 +245 @@
 end;
 
-function TProjectFileList.AddFile(FileName: string): TProjectFile;
-begin
-  Result := TProjectFile(AddNew(TProjectFile.Create));
+function TProjectFiles.AddFile(FileName: string): TProjectFile;
+begin
+  Result := TProjectFile.Create;
   Result.Parent := Parent;
   Result.FileName := FileName;
+  Add(Result);
 end;
 
@@ -278 +274 @@
 destructor TProjectFile.Destroy;
 begin
-  Source.Free;
-  inherited Destroy;
+  FreeAndNil(Source);
+  inherited;
 end;
 
@@ -419 +415 @@
 constructor TProject.Create;
 begin
-  Files := TProjectFileList.Create;
+  Files := TProjectFiles.Create;
   Files.Parent := Self;
-  Packages := TProjectPackageList.Create;
+  Packages := TProjectPackages.Create;
   Packages.Parent := Self;
 end;
@@ -427 +423 @@
 destructor TProject.Destroy;
 begin
-  Files.Free;
-  Packages.Free;
-  BuildConfigs.Free;
-  inherited Destroy;
+  FreeAndNil(Files);
+  FreeAndNil(Packages);
+  FreeAndNil(BuildConfigs);
+  inherited;
 end;