Changeset 138 for trunk/Application

Timestamp:

Sep 9, 2022, 8:20:25 PM (2 years ago)

Author:

chronos

Message:

• Modified: Removed TemplateGenerics package. Generics usage replaced by standard Generics.Collections.

Location:

trunk/Application

Files:

• UWebObjects.pas (modified) (10 diffs)
• UWebSession.pas (modified) (3 diffs)

trunk/Application/UWebObjects.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, UHtmlClasses, UXmlClasses, SpecializedDictionary,
-  Generics.Collections;
+  Classes, SysUtils, UHtmlClasses, UXmlClasses, Generics.Collections;
 
 type
@@ -42 +41 @@
     Title: string;
     Rows: TQueryFormItemList;
-    procedure Load(Items: TDictionaryStringString);
+    procedure Load(Items: TDictionary<string, string>);
     function AddNewItem: TQueryFormItem;
     constructor Create;
@@ -69 +68 @@
     function AddNewGroup: TQueryFormGroup;
     function AddNewAction(Caption, Action: string): TQueryAction;
-    procedure Load(Items: TDictionaryStringString);
+    procedure Load(Items: TDictionary<string, string>);
     constructor Create;
     destructor Destroy; override;
@@ -84 +83 @@
 begin
   I := 0;
-  while (I < Count) and (TQueryFormItem(Items[I]).Value.ItemName <> AValue) do Inc(I);
-  if I < Count then Result := TQueryFormItem(Items[I])
+  while (I < Count) and (Items[I].Value.ItemName <> AValue) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -141 +140 @@
     Table := THtmlTable.Create;
     Table.ClassId := ClassId;
-    Row := THtmlRow(Table.Rows.AddNew(THtmlRow.Create));
-    with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+    Row := Table.Rows.AddRow;
+    with Row.Cells.AddCell do begin
       ColSpan := 2;
       Value := THtmlString.Create;
@@ -149 +148 @@
     with Table do
     for G := 0 to Groups.Count - 1 do
-    with TQueryFormGroup(Groups[G]) do begin
+    with Groups[G] do begin
       if Title <> '' then begin
-        Row := THtmlRow(Table.Rows.AddNew(THtmlRow.Create));
-        with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+        Row := Table.Rows.AddRow;
+        with Row.Cells.AddCell do begin
           ColSpan := 2;
           Value := THtmlString.Create;
@@ -159 +158 @@
       end;
       for I := 0 to Rows.Count - 1 do
-      with TQueryFormItem(Rows[I]) do begin
-        Row := THtmlRow(Table.Rows.AddNew(THtmlRow.Create));
-        with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+      with Rows[I] do begin
+        Row := Table.Rows.AddRow;
+        with Row.Cells.AddCell do begin
           Value := THtmlString.Create;
           THtmlString(Value).Text := Caption;
@@ -167 +166 @@
           THtmlString(Value).Text := THtmlString(Value).Text + ': ';
         end;
-        with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+        with Row.Cells.AddCell do begin
           Value := THtmlInput.Create;
-          THtmlInput(Value).Assign(TQueryFormItem(Rows[I]).Value);
+          THtmlInput(Value).Assign(Rows[I].Value);
         end;
       end;
     end;
-    Row := THtmlRow(Table.Rows.AddNew(THtmlRow.Create));
-    with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+    Row := Table.Rows.AddRow;
+    with Row.Cells.AddCell do begin
       ColSpan := 2;
       Value := THtmlBlock.Create;
       for I := 0 to Actions.Count - 1 do
-      with THtmlInput(THtmlBlock(Value).SubItems.AddNew(THtmlInput.Create)) do begin
-        Value := TQueryAction(Actions[I]).Caption;
+      with THtmlBlock(Value).SubItems.AddInput do begin
+        Value := Actions[I].Caption;
         InputType := itSubmit;
-        ItemName := TQueryAction(Actions[I]).Action;
+        ItemName := Actions[I].Action;
       end;
     end;
@@ -203 +202 @@
 end;
 
-procedure TQueryForm.Load(Items: TDictionaryStringString);
+procedure TQueryForm.Load(Items: TDictionary<string, string>);
 var
   I: Integer;
 begin
   for I := 0 to Groups.Count - 1 do
-    TQueryFormGroup(Groups[I]).Load(Items);
+    Groups[I].Load(Items);
 end;
 
@@ -229 +228 @@
 { TQueryFormGroup }
 
-procedure TQueryFormGroup.Load(Items: TDictionaryStringString);
-var
-  I: Integer;
+procedure TQueryFormGroup.Load(Items: TDictionary<string, string>);
+var
+  I: Integer;
+  Item: string;
 begin
   for I := 0 to Rows.Count - 1 do
-  with TQueryFormItem(Rows[I]) do begin
-    if Items.SearchKey(Value.ItemName) <> -1 then
-      Value.Value := Items.Values[Value.ItemName];
+  with Rows[I] do begin
+    if Items.TryGetValue(Value.ItemName, Item) then
+      Value.Value := Item;
   end;
 end;

trunk/Application/UWebSession.pas

@@ -6 +6 @@
   Classes, SysUtils, UHTTPServer, USqlDatabase, UHTTPSessionMySQL, UUser,
   UHtmlClasses, UWebPage, UUtils, UXmlClasses, DateUtils, UModularSystem,
-  UPageList, UWebApp, SpecializedList;
+  UPageList, UWebApp, UGenerics;
 
 type
@@ -86 +86 @@
   try
     BaseUrlParts := TListString.Create;
-    BaseUrlParts.Explode(BaseURL, '/', StrToStr);
+    BaseUrlParts.Explode('/', BaseURL);
     while (BaseUrlParts.Count > 0) and (Request.Path.Count > 0) and
       (BaseUrlParts[0] = Request.Path[0]) do begin
@@ -104 +104 @@
     except
       on E: Exception do begin
-        THTMLString(Self.HtmlDocument.Body.SubItems.AddNew(THtmlString.Create)).
-          Text := Format(SError, [E.Message]);
+        Self.HtmlDocument.Body.SubItems.AddString.Text := Format(SError, [E.Message]);
         GeneratePage(Page.Page);
       end;