Changeset 251

Timestamp:

Jun 13, 2011, 8:21:12 AM (13 years ago)

Author:

george

Message:

• Modified: DebugLog transformed to component.
• Fixed: String compare for template generics.

Files:

• Common/Common.lpk (modified) (2 diffs)
• Common/Common.pas (modified) (2 diffs)
• Common/UDebugLog.pas (modified) (1 diff)
• Generics/TemplateGenerics/Generic/GenericList.inc (modified) (1 diff)
• Generics/TemplateGenerics/Generic/GenericListString.inc (modified) (2 diffs)

Common/Common.lpk

@@ -6 +6 @@
     <Author Value="Chronos (robie@centrum.cz)"/>
     <CompilerOptions>
-      <Version Value="9"/>
+      <Version Value="10"/>
       <PathDelim Value="\"/>
       <SearchPaths>
@@ -29 +29 @@
       <Item3>
         <Filename Value="UDebugLog.pas"/>
+        <HasRegisterProc Value="True"/>
         <UnitName Value="UDebugLog"/>
       </Item3>

Common/Common.pas

@@ -8 +8 @@
 
 uses
-    StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, 
-  UThreading, LazarusPackageIntf;
+  StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading, 
+  LazarusPackageIntf;
 
 implementation
@@ -15 +15 @@
 procedure Register; 
 begin
+  RegisterUnit('UDebugLog', @UDebugLog.Register); 
 end; 
 

Common/UDebugLog.pas

@@ -24 +24 @@
   private
     FFileName: string;
+    FMaxCount: Integer;
     FOnNewItem: TNewItemEvent;
+    FWriteToFileEnable: Boolean;
+    procedure SetMaxCount(const AValue: Integer);
   public
-    WriteToFileEnable: Boolean;
     Items: TThreadList;
-    MaxCount: Integer;
     procedure Add(Group: string; Text: string);
     procedure WriteToFile(Text: string);
-    property OnNewItem: TNewItemEvent read FOnNewItem write FOnNewItem;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   published
+    property WriteToFileEnable: Boolean read FWriteToFileEnable
+      write FWriteToFileEnable;
     property FileName: string read FFileName write FFileName;
+    property MaxCount: Integer read FMaxCount write SetMaxCount;
+    property OnNewItem: TNewItemEvent read FOnNewItem write FOnNewItem;
   end;
 
-var
-  DebugLog: TDebugLog;
+procedure Register;
 
 implementation
 
+procedure Register;
+begin
+  RegisterComponents('Common', [TDebugLog]);
+end;
+
 { TDebugLog }
+
+procedure TDebugLog.SetMaxCount(const AValue: Integer);
+var
+  List: TList;
+  I: Integer;
+begin
+  if FMaxCount = AValue then Exit;
+  FMaxCount := AValue;
+  List := Items.LockList;
+  if List.Count > 0 then begin
+    for I := AValue to List.Count - 1 do
+      TDebugLogItem(List[I]).Free;
+    List.Count := AValue;
+  end;
+  Items.UnlockList;
+end;
 
 procedure TDebugLog.Add(Group: string; Text: string);

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -42 +42 @@
     function GetArray: TGListItemArray;
     function Implode(Separator: string; Converter: TGListToStringConverter): string;
-    function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex;
+    function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex; virtual;
     function IndexOfList(List: TGList; Start: TGListIndex = 0): TGListIndex;
     procedure Insert(Index: TGListIndex; Item: TGListItem);

Generics/TemplateGenerics/Generic/GenericListString.inc

@@ -18 +18 @@
     procedure Clear; override;
     procedure Assign(Source: TGList); override;
+    function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex; override;
     constructor Create;
     destructor Destroy; override;
@@ -71 +72 @@
 end;
 
+function TGListString.IndexOf(Item: TGListItem; Start: TGListIndex): TGListIndex;
+begin
+  Result := Start;
+  while (Result < Count) and
+  (CompareStr(FItems[Result], Item) = -1) do
+    Result := Result + 1;
+  if Result = FCount then Result := -1;
+end;
+
 constructor TGListString.Create;
 begin