Changeset 24 for branches/Xvcl/Xvcl.Generics.pas

Timestamp:

May 8, 2013, 2:53:22 PM (12 years ago)

Author:

chronos

Message:

• Fixed: Make only one form focused at once.
• Modified: Enhanced TList generic class to support more methods.

File:

• branches/Xvcl/Xvcl.Generics.pas (modified) (4 diffs)

branches/Xvcl/Xvcl.Generics.pas

@@ -2 +2 @@
 
 interface
+
+uses
+  SysUtils;
 
 type
@@ -24 +27 @@
     function GetEnumerator: TEnumerator;
     function Add(Item: T): Integer;
-    procedure Remove(Item: T);
+    function Remove(Item: T): Integer;
+    procedure Delete(Index: Integer);
+    procedure Move(FromIndex, ToIndex: Integer);
+    function IndexOf(Item: T): Integer;
+    function Compare(Item1, Item2: T): Integer;
+    procedure Exchange(Index1, Index2: Integer);
     property Count: Integer read FCount write SetCount;
     property Items[Index: Integer]: T read GetItem write SetItem; default;
@@ -55 +63 @@
 end;
 
+function TList<T>.Compare(Item1, Item2: T): Integer;
+begin
+  if CompareMem(Pointer(@Item1), Pointer(@Item2), SizeOf(T)) then Result := 0
+    else Result := -1;
+end;
+
+procedure TList<T>.Delete(Index: Integer);
+var
+  I: Integer;
+begin
+  if (Index >= 0) and (Index < Count) then
+  for I := Index to Count - 2 do
+    Items[I] := Items[I + 1];
+end;
+
+procedure TList<T>.Exchange(Index1, Index2: Integer);
+var
+  Temp: T;
+begin
+  Temp := Items[Index2];
+  Items[Index2] := Items[Index1];
+  Items[Index1] := Temp;
+end;
+
 function TList<T>.GetEnumerator: TEnumerator;
 begin
@@ -67 +99 @@
 end;
 
-procedure TList<T>.Remove(Item: T);
+function TList<T>.IndexOf(Item: T): Integer;
+var
+  I: Integer;
 begin
+  I := 0;
+  while (I < Count) and (Compare(Items[I], Item) <> 0) do
+    Inc(I);
+  if I < Count then Result := I
+    else Result := -1;
+end;
 
+procedure TList<T>.Move(FromIndex, ToIndex: Integer);
+var
+  I: Integer;
+  Temp: T;
+begin
+  if (FromIndex >= 0) and (FromIndex < Count) and
+  (ToIndex >= 0) and (ToIndex < Count) then begin
+    if FromIndex > ToIndex then begin
+      Temp := Items[ToIndex];
+      for I := ToIndex to FromIndex - 1 do
+        Items[I] := Items[I + 1];
+      Items[FromIndex] := Temp;
+    end else
+    if FromIndex < ToIndex then begin
+      Temp := Items[FromIndex];
+      for I := FromIndex to ToIndex - 1 do
+        Items[I] := Items[I + 1];
+      Items[ToIndex] := Temp;
+    end;
+  end;
+end;
+
+function TList<T>.Remove(Item: T): Integer;
+begin
+  Result := IndexOf(Item);
+  if Result >= 0 then Delete(Result);
 end;