Changeset 327 for Generics/NativeGenerics/Units

Timestamp:

Feb 9, 2012, 8:46:05 AM (14 years ago)

Author:

chronos

Message:

• Modified: TGTree structure.

Location:

Generics/NativeGenerics/Units

Files:

• GenericList.pas (modified) (2 diffs)
• GenericTree.pas (modified) (7 diffs)

Generics/NativeGenerics/Units/GenericList.pas

@@ -33 +33 @@
   public
     constructor Create; virtual;
+    function Add(Item: TItem): TIndex; virtual; abstract;
     property Count: TIndex read GetCount write SetCount;
     property Capacity: TIndex read GetCapacity write SetCapacity;
@@ -59 +60 @@
     procedure QuickSort(L, R : TIndex; Compare: TSortCompare);
   public
-    function Add(Item: TItem): TIndex;
+    function Add(Item: TItem): TIndex; override;
     procedure AddArray(Values: array of TItem);
     procedure AddList(List: TGList<TItem>);

Generics/NativeGenerics/Units/GenericTree.pas

@@ -9 +9 @@
 
 type
+  //TGAbstractTree<TItem> = class;
 
   { TGAbstractTreeNode }
 
   TGAbstractTreeNode<TItem> = class
-  private
+  public
+    type
+      TIndex = NativeInt;
+      TNode = TGAbstractTreeNode<TItem>;
+  protected
+    function GetCount: TIndex; virtual; abstract;
+    function GetItem(Index: TIndex): TItem; virtual; abstract;
     function GetValue: TItem; virtual; abstract;
+    procedure SetCount(AValue: TIndex); virtual; abstract;
+    procedure SetItem(Index: TIndex; AValue: TItem); virtual; abstract;
     procedure SetValue(AValue: TItem); virtual; abstract;
   public
-    type
-      TNode = TGAbstractTreeNode<TItem>;
-  var
-    Childs: TGAbstractList<TNode>;
+    Parent: TGAbstractTreeNode<TItem>;
+    //Tree: TGAbstractTree<TItem>;
     procedure Clear; virtual; abstract;
     constructor Create; virtual;
     destructor Destroy; override;
+    function Add(Item: TItem): TIndex; virtual; abstract;
+    property Count: TIndex read GetCount write SetCount;
+    property Items[Index: TIndex]: TItem read GetItem write SetItem;
     property Value: TItem read GetValue write SetValue;
   end;
@@ -32 +42 @@
   public
     type
+      TIndex = NativeInt;
       TNode = TGAbstractTreeNode<TItem>;
-      TIndex = NativeInt;
   private
-    function GetItem(Index: TIndex): TItem;
-    procedure SetItem(Index: TIndex; AValue: TItem);
-  var
+  public
     TopItem: TGAbstractTreeNode<TItem>;
-    procedure Clear; virtual; abstract;
     constructor Create; virtual;
-    property Items[Index: TIndex]: TItem read GetItem write SetItem;
   end;
 
+
+  { TGTreeNode }
 
   TGTreeNode<TItem> = class(TGAbstractTreeNode<TItem>)
   public
     type
-      TNode = TGTreeNode<TItem>;
+      TNode = TGAbstractTreeNode<TItem>;
   private
     FValue: TItem;
+    FItems: TGAbstractList<TNode>;
+  protected
+    function GetItem(Index: TIndex): TItem; override;
+    procedure SetItem(Index: TIndex; AValue: TItem); override;
+    function GetCount: TIndex; override;
+    procedure SetCount(AValue: TIndex); override;
     function GetValue: TItem; override;
     procedure SetValue(AValue: TItem); override;
   public
+    function Add(Item: TItem): TIndex; override;
     procedure Clear; override;
     constructor Create; override;
@@ -59 +74 @@
   end;
 
-  TGTree<TItem> = class
+  TGTree<TItem> = class(TGAbstractTree<TItem>)
   public
-    type
-      TNode = TGTreeNode<TItem>;
-  private
-    FItems: TGList<TNode>;
-  public
-    procedure Clear; override;
     constructor Create; override;
     destructor Destroy; override;
@@ -75 +84 @@
 
 { TGTreeNode }
+
+function TGTreeNode<TItem>.GetItem(Index: TIndex): TItem;
+begin
+  Result := FItems[Index];
+end;
+
+procedure TGTreeNode<TItem>.SetItem(Index: TIndex; AValue: TItem);
+begin
+  FItems[Index] := AValue;
+end;
+
+function TGTreeNode<TItem>.GetCount: TIndex;
+begin
+  Result := FItems.Count;
+end;
+
+procedure TGTreeNode<TItem>.SetCount(AValue: TIndex);
+begin
+  FItems.Count := AValue;
+end;
 
 function TGTreeNode<TItem>.GetValue: TItem;
@@ -86 +115 @@
 end;
 
+function TGTreeNode<TItem>.Add(Item: TItem): TIndex;
+begin
+  Result := FItems.Add(Item);
+end;
+
 procedure TGTreeNode<TItem>.Clear;
 begin
@@ -91 +125 @@
 end;
 
-{ TGTree }
-
-procedure TGTree<TItem>.Clear;
-begin
-  //if Assigned(TopItem) then TopItem.Clear;
-end;
-
-constructor TGTree<TItem>.Create;
+constructor TGTreeNode<TItem>.Create;
 begin
   inherited;
@@ -104 +131 @@
 end;
 
+destructor TGTreeNode<TItem>.Destroy;
+begin
+  FItems.Free;
+  inherited;
+end;
+
+{ TGTree }
+
+constructor TGTree<TItem>.Create;
+begin
+  inherited;
+  TopItem := TGTreeNode<TItem>.Create;
+end;
+
 destructor TGTree<TItem>.Destroy;
 begin
   inherited Destroy;
-  FItems.Free;
+  TopItem.Free;
 end;
 
 { TGAbstractTree<TItem> }
 
-function TGAbstractTree<TItem>.GetItem(Index: TIndex): TItem;
-begin
-
-end;
-
-procedure TGAbstractTree<TItem>.SetItem(Index: TIndex; AValue: TItem);
-begin
-
-end;
-
 constructor TGAbstractTree<TItem>.Create;
 begin
-end;
-
-constructor TGTreeNode<TItem>.Create;
-begin
-  inherited;
-  Childs := TGList<TNode>.Create;
-end;
-
-destructor TGTreeNode<TItem>.Destroy;
-begin
-  Childs.Free;
-  inherited;
 end;