Changeset 356

Timestamp:

Dec 30, 2024, 10:10:26 PM (3 days ago)

Author:

chronos

Message:

• Fixed: Missing ItemList new item name.

File:

• trunk/Packages/Common/ItemList.pas (modified) (12 diffs)

trunk/Packages/Common/ItemList.pas

@@ -86 +86 @@
     TGetCountEvent = function: SizeInt of object;
     TSetItemEvent = procedure(Index: SizeInt; AValue: TItem) of object;
-    TGetNameEvent = function: string of object;
+    TGetNameEvent = procedure (out Name: string) of object;
     TGetItemEvent = function(Index: SizeInt): TItem of object;
     TGetItemFieldsEvent = function: TItemFields of object;
     TRemoveEvent = function(constref AValue: TItem): SizeInt of object;
-    TGetNextAvailableNameEvent = function(Name: string): string of object;
+    TGetNextAvailableNameEvent = procedure (Name: string; out NewName: string) of object;
     TCreateItemEvent = function(Name: string = ''): TItem of object;
   private
@@ -138 +138 @@
     function BaseAdd(constref AValue: TItem): SizeInt;
     function BaseGetCount: SizeInt;
-    function BaseGetName(A: string): string;
+    procedure BaseGetName(out Name: string);
     function BaseRemove(constref AValue: TItem): SizeInt;
     function BaseGetItemFields: TItemFields;
     function BaseCreateItem(Name: string = ''): TItem;
+    procedure BaseGetNextAvailableName(Name: string; out NewName: string);
   public
     NewId: Integer;
     function CreateItem(Name: string = ''): T; virtual;
     function IncrementName(Name: string): string;
-    function GetNextAvailableName(Name: string): string;
     function FindById(Id: Integer): T;
     function FindByName(Name: string): T;
@@ -285 +285 @@
   FBaseItemList.OnGetItemFields := BaseGetItemFields;
   FBaseItemList.OnCreateItem := BaseCreateItem;
-  //FBaseItemList.OnGetNextAvailableName := GetNextAvailableName;
-  //FBaseItemList.OnGetName := BaseGetName;
+  FBaseItemList.OnGetNextAvailableName := BaseGetNextAvailableName;
+  FBaseItemList.OnGetName := BaseGetName;
   NewId := 1;
 end;
@@ -301 +301 @@
 end;
 
-function TItemList<T>.BaseGetName(A: string): string;
-begin
-  Result := T.GetClassName;
+procedure TItemList<T>.BaseGetName(out Name: string);
+begin
+  Name := T.GetClassName;
 end;
 
@@ -364 +364 @@
 end;
 
-function TItemList<T>.GetNextAvailableName(Name: string): string;
-begin
-  Result := Name;
-  while Assigned(FindByName(Result)) do
-    Result := IncrementName(Result);
+procedure TItemList<T>.BaseGetNextAvailableName(Name: string; out
+  NewName: string);
+begin
+  NewName := Name;
+  while Assigned(FindByName(NewName)) do
+    NewName := IncrementName(NewName);
 end;
 
@@ -757 +758 @@
 begin
   if Assigned(FOnSetItem) then FOnSetItem(Index, AValue)
-    else Exception.Create('Undefined SetItem handler');
+    else raise Exception.Create('Undefined SetItem handler');
 end;
 
 function TBaseItemList.GetName: string;
-begin
-  if Assigned(FOnGetName) then Result := FOnGetName
-    else Exception.Create('Undefined GetName handler');
+var
+  Name: string;
+begin
+  if Assigned(FOnGetName) then begin
+    FOnGetName(Name);
+    Result := Name;
+  end else raise Exception.Create('Undefined GetName handler');
 end;
 
@@ -769 +774 @@
 begin
   if Assigned(FOnGetCount) then Result := FOnGetCount
-    else Exception.Create('Undefined GetCount handler');
+    else raise Exception.Create('Undefined GetCount handler');
 end;
 
@@ -775 +780 @@
 begin
   if Assigned(FOnGetItem) then Result := FOnGetItem(Index)
-    else Exception.Create('Undefined GetItem handler');
+    else raise Exception.Create('Undefined GetItem handler');
 end;
 
@@ -781 +786 @@
 begin
   if Assigned(FOnRemove) then Result := FOnRemove(AValue)
-    else Exception.Create('Undefined Remove handler');
+    else raise Exception.Create('Undefined Remove handler');
 end;
 
@@ -787 +792 @@
 begin
   if Assigned(FOnAdd) then Result := FOnAdd(AValue)
-    else Exception.Create('Undefined Add handler');
+    else raise Exception.Create('Undefined Add handler');
 end;
 
@@ -793 +798 @@
 begin
   if Assigned(FOnCreateItem) then Result := FOnCreateItem(Name)
-    else Exception.Create('Undefined CreateItem handler');
+    else raise Exception.Create('Undefined CreateItem handler');
 end;
 
 function TBaseItemList.GetNextAvailableName(Name: string): string;
-begin
-  if Assigned(FOnGetNextAvailableName) then Result := FOnGetNextAvailableName(Name)
-    else Exception.Create('Undefined GetNextAvailableName handler');
+var
+  NewName: string;
+begin
+  if Assigned(FOnGetNextAvailableName) then begin
+    FOnGetNextAvailableName(Name, NewName);
+    Result := NewName;
+  end else raise Exception.Create('Undefined GetNextAvailableName handler');
 end;
 
@@ -805 +814 @@
 begin
   if Assigned(FOnGetItemFields) then Result := FOnGetItemFields
-    else Exception.Create('Undefined GetItemFields handler');
+    else raise Exception.Create('Undefined GetItemFields handler');
 end;