Changeset 78 for Generics/TemplateGenerics/Specialized/ListObject.pas

Timestamp:

Oct 30, 2010, 6:39:12 PM (14 years ago)

Author:

george

Message:

• Added: Ability of TListObject to own items and be able to free them on deletion and list destruction.

File:

• Generics/TemplateGenerics/Specialized/ListObject.pas (modified) (2 diffs)

Generics/TemplateGenerics/Specialized/ListObject.pas

@@ -15 +15 @@
 type
 
-  { TObjectList }
+  { TListObject }
 
-  TObjectList = class(TGList)
-    //OwnObjects: Boolean;
+  TListObject = class(TGList)
+  private
+    procedure Put(Index: TListIndex; const AValue: TListItem); override;
+  public
+    OwnObjects: Boolean;
+    procedure Delete(Index: TListIndex); override;
+    procedure Clear; override;
+    constructor Create;
     destructor Destroy; override;
   end;
@@ -29 +35 @@
 { TObjectList }
 
-destructor TObjectList.Destroy;
+procedure TListObject.Put(Index: TListIndex; const AValue: TListItem);
 begin
+  if OwnObjects then FItems[Index].Free;
+  inherited Put(Index, AValue);
+end;
+
+procedure TListObject.Delete(Index: TListIndex);
+begin
+  if OwnObjects then FItems[Index].Free;
+  inherited Delete(Index);
+end;
+
+procedure TListObject.Clear;
+var
+  I: TListIndex;
+begin
+  if OwnObjects then begin
+    I := 0;
+    while I < Count do begin
+      FItems[I].Free;
+      I := I + 1;
+    end;
+  end;
+  inherited Clear;
+end;
+
+constructor TListObject.Create;
+begin
+  inherited;
+  OwnObjects := True;
+end;
+
+destructor TListObject.Destroy;
+begin
+  Clear;
   inherited Destroy;
 end;