Changeset 132 for trunk/Packages/CoolWeb/WebServer/UWebApp.pas

Timestamp:

Mar 18, 2022, 3:47:27 PM (3 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/Packages/CoolWeb/WebServer/UWebApp.pas (modified) (11 diffs)

trunk/Packages/CoolWeb/WebServer/UWebApp.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, CustApp, SpecializedList, UWebPage, UHTTPSessionFile,
-  UHTTPServer, Forms, FileUtil;
+  Classes, SysUtils, UWebPage, UHTTPSessionFile,
+  UHTTPServer, Forms, FileUtil, fgl;
 
 type
@@ -22 +22 @@
   { TPageList }
 
-  TPageList = class(TListObject)
+  TPageList = class(TFPGObjectList<TRegistredPage>)
     RootDir: string;
     function FindByPage(Page: TWebPage): TRegistredPage;
@@ -29 +29 @@
     procedure UnregisterPage(Page: TWebPage);
     function ProducePage(HandlerData: THTTPHandlerData): Boolean;
-    constructor Create; override;
+    constructor Create(FreeObjects: Boolean = True);
   end;
 
@@ -64 +64 @@
   UHTTPServerCGI, UHTTPServerTCP, UHTTPServerTurboPower;
 
-
 procedure Register;
 begin
@@ -77 +76 @@
 end;
 
-
 { TPageList }
 
@@ -85 +83 @@
 begin
   I := 0;
-  while (I < Count) and (TRegistredPage(Items[I]).Page <> Page) do Inc(I);
-  if I < Count then Result := TRegistredPage(Items[I])
+  while (I < Count) and (Items[I].Page <> Page) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -95 +93 @@
 begin
   I := 0;
-  while (I < Count) and (TRegistredPage(Items[I]).Name <> Name) do Inc(I);
-  if I < Count then Result := TRegistredPage(Items[I])
+  while (I < Count) and (Items[I].Name <> Name) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -132 +130 @@
 var
   NewPage: TRegistredPage;
-  Instance: TWebPage;
-begin
-  NewPage := TRegistredPage(AddNew(TRegistredPage.Create));
+begin
+  NewPage := TRegistredPage.Create;
 //  NewPage.Page := PageClass.Create(Self);
   NewPage.Page := Page;
   NewPage.Name := Path;
+  Add(NewPage);
 end;
 
@@ -166 +164 @@
 constructor TPageList.Create;
 begin
-  inherited Create;
-  OwnsObjects := False;
+  inherited;
+  FreeObjects := False;
 end;
 
@@ -212 +210 @@
 constructor TWebApp.Create(AOwner: TComponent);
 begin
-  inherited Create(AOwner);
+  inherited;
   HTTPServer := THTTPServerCGI.Create(nil);
   HTTPServer.OnRequest := HTTPServerRequest;
@@ -219 +217 @@
 destructor TWebApp.Destroy;
 begin
-  HTTPServer.Free;
-  inherited Destroy;
+  FreeAndNil(HTTPServer);
+  inherited;
 end;