Changeset 30 for trunk/Components/TemplateGenerics/Generic/GenericListObject.inc

Timestamp:

Sep 8, 2012, 9:28:39 PM (12 years ago)

Author:

chronos

Message:

• Updated: Component versions.
• Added: Missing forms.

Location:

trunk

Files:

• . (modified) (1 prop)
• Components/TemplateGenerics (modified) (1 prop)
• Components/TemplateGenerics/Generic/GenericListObject.inc (modified) (4 diffs)

trunk

@@ -3 +3 @@
 backup
 tunneler.exe
+heaptrclog.trc

@@ -3 +3 @@
 backup
 tunneler.exe
+heaptrclog.trc

trunk/Components/TemplateGenerics/Generic/GenericListObject.inc

@@ -13 +13 @@
   // TGListObject<TListObjectIndex, TListObjectItem> = class(TGList)
   TGListObject = class(TGList)
-  private
+  protected
     procedure Put(Index: TGListIndex; const AValue: TGListItem); override;
+    procedure SetCount(const AValue: TGListIndex); override;
   public
     OwnsObjects: Boolean;
+    function AddNew(NewObject: TGListItem = nil): TGListItem;
+    function InsertNew(Index: TGListIndex; NewObject: TGListItem = nil): TGListItem;
     procedure Delete(Index: TGListObjectIndex); override;
-    procedure Clear; override;
     procedure Assign(Source: TGList); override;
-    constructor Create;
+    constructor Create; override;
     destructor Destroy; override;
   end;
@@ -49 +51 @@
 { TGListObject }
 
+function TGListObject.AddNew(NewObject: TGListItem = nil): TGListItem;
+begin
+  if Assigned(NewObject) then Result := NewObject
+    else Result := TGListItem.Create;
+  Add(Result);
+end;
+
+function TGListObject.InsertNew(Index: TGListIndex;
+  NewObject: TGListItem = nil): TGListItem;
+begin
+  if Assigned(NewObject) then Result := NewObject
+    else Result := TGListItem.Create;
+  Insert(Index, Result);
+end;
+
 procedure TGListObject.Assign(Source: TGList);
 begin
@@ -58 +75 @@
 procedure TGListObject.Put(Index: TGListIndex; const AValue: TGListItem);
 begin
-  if OwnsObjects then FItems[Index].Free;
+  if OwnsObjects and (FItems[Index] <> AValue) then FItems[Index].Free;
   inherited Put(Index, AValue);
 end;
@@ -68 +85 @@
 end;
 
-procedure TGListObject.Clear;
+procedure TGListObject.SetCount(const AValue: TGListIndex);
 var
   I: TGListObjectIndex;
 begin
   if OwnsObjects then begin
-    I := 0;
-    while I < Count do begin
+    I := FCount - 1;
+    while I >= AValue do begin
       FItems[I].Free;
-      I := I + 1;
+      I := I - 1;
     end;
   end;
-  inherited Clear;
+  inherited;
 end;
 

@@ -3 +3 @@
 backup
 tunneler.exe
+heaptrclog.trc