Changeset 326 for Generics/NativeGenerics/Units

Timestamp:

Feb 8, 2012, 2:13:08 PM (14 years ago)

Author:

chronos

Message:

• Modified: TGTree structure.

Location:

Generics/NativeGenerics/Units

Files:

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

Generics/NativeGenerics/Units/GenericList.pas

@@ -93 +93 @@
   end;
 
-  TListObject<TItem> = class(TGList<TItem>)
+  TGObjectList<TItem> = class(TGList<TItem>)
   private
     procedure Put(Index: Integer; const AValue: TItem); override;
@@ -105 +105 @@
   end;
 
-  TListString<TItem> = class(TGList<TItem>)
+  TGStringList<TItem> = class(TGList<TItem>)
   private
   public
@@ -603 +603 @@
 end;
 
-{ TListObject }
-
-procedure TListObject<TItem>.Assign(Source: TGList<TItem>);
+{ TGObjectList }
+
+procedure TGObjectList<TItem>.Assign(Source: TGList<TItem>);
 begin
   Clear;
@@ -612 +612 @@
 end;
 
-procedure TListObject<TItem>.Put(Index: Integer; const AValue: TItem);
+procedure TGObjectList<TItem>.Put(Index: Integer; const AValue: TItem);
 begin
   if OwnsObjects then FItems[Index].Free;
@@ -618 +618 @@
 end;
 
-procedure TListObject<TItem>.Delete(Index: Integer);
+procedure TGObjectList<TItem>.Delete(Index: Integer);
 begin
   if OwnsObjects then FItems[Index].Free;
@@ -624 +624 @@
 end;
 
-procedure TListObject<TItem>.Clear;
+procedure TGObjectList<TItem>.Clear;
 var
   I: Integer;
@@ -638 +638 @@
 end;
 
-constructor TListObject<TItem>.Create;
+constructor TGObjectList<TItem>.Create;
 begin
   inherited;
@@ -644 +644 @@
 end;
 
-destructor TListObject<TItem>.Destroy;
+destructor TGObjectList<TItem>.Destroy;
 begin
   Clear;
@@ -650 +650 @@
 end;
 
-{ TListString }
-
-procedure TListString<TItem>.Assign(Source: TGList<TItem>);
+{ TGStringList }
+
+procedure TGStringList<TItem>.Assign(Source: TGList<TItem>);
 begin
   Clear;
@@ -658 +658 @@
 end;
 
-procedure TListString<TItem>.Delete(Index: Integer);
+procedure TGStringList<TItem>.Delete(Index: Integer);
 begin
   FItems[Index] := '';
@@ -664 +664 @@
 end;
 
-procedure TListString<TItem>.Clear;
+procedure TGStringList<TItem>.Clear;
 var
   I: Integer;
@@ -676 +676 @@
 end;
 
-constructor TListString<TItem>.Create;
+constructor TGStringList<TItem>.Create;
 begin
   inherited;
 end;
 
-destructor TListString<TItem>.Destroy;
+destructor TGStringList<TItem>.Destroy;
 begin
   Clear;

Generics/NativeGenerics/Units/GenericTree.pas

@@ -9 +9 @@
 
 type
-//  TGTreeNode<TItem> = class;
 
-//  TGTreeNodeList = TGList<TGTreeNode>;
+  { TGAbstractTreeNode }
 
-  TGTreeNode<TItem> = class
-//    Childs: ;
-    Value: TItem;
-    procedure Clear;
+  TGAbstractTreeNode<TItem> = class
+  private
+    function GetValue: TItem; virtual; abstract;
+    procedure SetValue(AValue: TItem); virtual; abstract;
+  public
+    type
+      TNode = TGAbstractTreeNode<TItem>;
+  var
+    Childs: TGAbstractList<TNode>;
+    procedure Clear; virtual; abstract;
+    constructor Create; virtual;
+    destructor Destroy; override;
+    property Value: TItem read GetValue write SetValue;
+  end;
+
+  { TGAbstractTree }
+
+  TGAbstractTree<TItem> = class
+  public
+    type
+      TNode = TGAbstractTreeNode<TItem>;
+      TIndex = NativeInt;
+  private
+    function GetItem(Index: TIndex): TItem;
+    procedure SetItem(Index: TIndex; AValue: TItem);
+  var
+    TopItem: TGAbstractTreeNode<TItem>;
+    procedure Clear; virtual; abstract;
+    constructor Create; virtual;
+    property Items[Index: TIndex]: TItem read GetItem write SetItem;
+  end;
+
+
+  TGTreeNode<TItem> = class(TGAbstractTreeNode<TItem>)
+  public
+    type
+      TNode = TGTreeNode<TItem>;
+  private
+    FValue: TItem;
+    function GetValue: TItem; override;
+    procedure SetValue(AValue: TItem); override;
+  public
+    procedure Clear; override;
+    constructor Create; override;
+    destructor Destroy; override;
   end;
 
   TGTree<TItem> = class
-  //  TopItem: TGTreeNode;
-    procedure Clear;
+  public
+    type
+      TNode = TGTreeNode<TItem>;
+  private
+    FItems: TGList<TNode>;
+  public
+    procedure Clear; override;
+    constructor Create; override;
+    destructor Destroy; override;
   end;
+
 
 implementation
 
 { TGTreeNode }
+
+function TGTreeNode<TItem>.GetValue: TItem;
+begin
+  Result := FValue;
+end;
+
+procedure TGTreeNode<TItem>.SetValue(AValue: TItem);
+begin
+  FValue := AValue;
+end;
 
 procedure TGTreeNode<TItem>.Clear;
@@ -40 +98 @@
 end;
 
+constructor TGTree<TItem>.Create;
+begin
+  inherited;
+  FItems := TGList<TNode>.Create;
+end;
+
+destructor TGTree<TItem>.Destroy;
+begin
+  inherited Destroy;
+  FItems.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;
+
+{ TGAbstractTreeNode<TItem> }
+
+constructor TGAbstractTreeNode<TItem>.Create;
+begin
+end;
+
+destructor TGAbstractTreeNode<TItem>.Destroy;
+begin
+  inherited Destroy;
+end;
+
+
 end.