Menu
▾
▴
jcl-checkins-diff — SVN file check-in notifications with file differences included
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(20) |
May
(48) |
Jun
(8) |
Jul
(23) |
Aug
(41) |
Sep
(42) |
Oct
(22) |
Nov
(17) |
Dec
(36) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(42) |
Mar
(17) |
Apr
(39) |
May
(16) |
Jun
(35) |
Jul
(37) |
Aug
(47) |
Sep
(49) |
Oct
(9) |
Nov
(52) |
Dec
(37) |
| 2008 |
Jan
(48) |
Feb
(21) |
Mar
(7) |
Apr
(2) |
May
(5) |
Jun
(17) |
Jul
(17) |
Aug
(40) |
Sep
(58) |
Oct
(38) |
Nov
(19) |
Dec
(32) |
| 2009 |
Jan
(67) |
Feb
(46) |
Mar
(54) |
Apr
(34) |
May
(37) |
Jun
(52) |
Jul
(67) |
Aug
(72) |
Sep
(48) |
Oct
(35) |
Nov
(27) |
Dec
(12) |
| 2010 |
Jan
(56) |
Feb
(46) |
Mar
(19) |
Apr
(14) |
May
(21) |
Jun
(3) |
Jul
(13) |
Aug
(48) |
Sep
(34) |
Oct
(51) |
Nov
(16) |
Dec
(32) |
| 2011 |
Jan
(36) |
Feb
(14) |
Mar
(12) |
Apr
(3) |
May
(5) |
Jun
(24) |
Jul
(15) |
Aug
(30) |
Sep
(21) |
Oct
(4) |
Nov
(25) |
Dec
(23) |
| 2012 |
Jan
(45) |
Feb
(42) |
Mar
(19) |
Apr
(14) |
May
(13) |
Jun
(7) |
Jul
(3) |
Aug
(46) |
Sep
(21) |
Oct
(10) |
Nov
(2) |
Dec
|
| 2013 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ou...@us...> - 2010-08-10 11:01:56
|
Revision: 3292
http://jcl.svn.sourceforge.net/jcl/?rev=3292&view=rev
Author: outchy
Date: 2010-08-10 11:01:50 +0000 (Tue, 10 Aug 2010)
Log Message:
-----------
Remove the reference to JclBase.MoveArray.
Modified Paths:
--------------
trunk/jcl/source/common/JclStrings.pas
Modified: trunk/jcl/source/common/JclStrings.pas
===================================================================
--- trunk/jcl/source/common/JclStrings.pas 2010-08-09 15:10:10 UTC (rev 3291)
+++ trunk/jcl/source/common/JclStrings.pas 2010-08-10 11:01:50 UTC (rev 3292)
@@ -4309,6 +4309,8 @@
end;
function TTabSetData.Add(Column: SizeInt): SizeInt;
+var
+ I: SizeInt;
begin
if Column < Ord(FZeroBased) then
raise ArgumentOutOfRangeException.Create('Column');
@@ -4319,8 +4321,9 @@
Result := not Result;
// increase the tab stop array
SetLength(FStops, Length(FStops) + 1);
- // make room at the insert position
- MoveArray(FStops, Result, Result + 1, High(FStops) - Result);
+ // shift rooms after the insert position
+ for I := High(FStops) - 1 downto Result do
+ FStops[I + 1] := FStops[I];
// add the tab stop at the correct location
FStops[Result] := Column;
CalcRealWidth;
@@ -4369,8 +4372,11 @@
end;
procedure TTabSetData.RemoveAt(Index: SizeInt);
+var
+ I: SizeInt;
begin
- MoveArray(FStops, Succ(Index), Index, High(FStops) - Index);
+ for I := Index to High(FStops) - 1 do
+ FStops[I] := FStops[I + 1];
SetLength(FStops, High(FStops));
CalcRealWidth;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-09 15:10:19
|
Revision: 3291
http://jcl.svn.sourceforge.net/jcl/?rev=3291&view=rev
Author: outchy
Date: 2010-08-09 15:10:10 +0000 (Mon, 09 Aug 2010)
Log Message:
-----------
JclHashMaps and JclSortedMaps are now generated from templates.
Modified Paths:
--------------
trunk/jcl/devtools/jpp/Templates/JclContainer2DTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas
trunk/jcl/devtools/jpp/Templates/JclContainerTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas
trunk/jcl/devtools/jpp/jppContainers.dpr
trunk/jcl/packages/c6/JclDeveloperTools.bpk
trunk/jcl/packages/c6/JclDeveloperTools.dpk
trunk/jcl/packages/cs1/JclDeveloperTools.dpk
trunk/jcl/packages/d10/JclDeveloperTools.dpk
trunk/jcl/packages/d11/JclDeveloperTools.dpk
trunk/jcl/packages/d11/JclDeveloperTools.dproj
trunk/jcl/packages/d12/JclDeveloperTools.dpk
trunk/jcl/packages/d12/JclDeveloperTools.dproj
trunk/jcl/packages/d14/JclDeveloperTools.dpk
trunk/jcl/packages/d14/JclDeveloperTools.dproj
trunk/jcl/packages/d6/JclDeveloperTools.dpk
trunk/jcl/packages/d7/JclDeveloperTools.dpk
trunk/jcl/packages/d8/JclDeveloperTools.dpk
trunk/jcl/packages/d9/JclDeveloperTools.dpk
trunk/jcl/packages/fpc/JclDeveloperTools.lpk
trunk/jcl/packages/fpc/JclDeveloperTools.pas
trunk/jcl/packages/xml/JclDeveloperTools-R.xml
trunk/jcl/source/common/JclHashMaps.pas
trunk/jcl/source/common/JclSortedMaps.pas
trunk/jcl/source/prototypes/JclHashMaps.pas
trunk/jcl/source/prototypes/JclSortedMaps.pas
trunk/jcl/source/prototypes/containers/JclHashMaps.int
trunk/jcl/source/prototypes/containers/JclSortedMaps.imp
trunk/jcl/source/prototypes/containers/JclSortedMaps.int
Added Paths:
-----------
trunk/jcl/devtools/jpp/Templates/JclHashMapsTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclSortedMapsTemplates.pas
Modified: trunk/jcl/devtools/jpp/Templates/JclContainer2DTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainer2DTemplates.pas 2010-08-09 11:49:38 UTC (rev 3290)
+++ trunk/jcl/devtools/jpp/Templates/JclContainer2DTemplates.pas 2010-08-09 15:10:10 UTC (rev 3291)
@@ -55,6 +55,8 @@
procedure SetKeyAttribute(Index: TKeyAttributeID; const Value: string);
procedure SetValueAttribute(Index: TValueAttributeID;
const Value: string);
+ function GetKeyOwnershipDeclaration: string;
+ function GetValueOwnershipDeclaration: string;
protected
function GetKnownMap: Boolean;
function GetMapAttribute(Index: TMapAttributeID): string;
@@ -71,13 +73,17 @@
property MapAttributes[Index: TMapAttributeID]: string read GetMapAttribute write SetMapAttribute;
property KeyAttributes[Index: TKeyAttributeID]: string read GetKeyAttribute write SetKeyAttribute;
property KeyTypeInfo: TJclContainerTypeInfo read FKeyTypeInfo;
+ property KeyOwnershipDeclaration: string read GetKeyOwnershipDeclaration;
property ValueAttributes[Index: TValueAttributeID]: string read GetValueAttribute write SetValueAttribute;
property ValueTypeInfo: TJclContainerTypeInfo read FValueTypeInfo;
+ property ValueOwnershipDeclaration: string read GetValueOwnershipDeclaration;
end;
TJclMapInterfaceParams = class(TJclInterfaceParams)
private
FMapInfo: TJclContainerMapInfo;
+ function GetKeyOwnershipDeclaration: string;
+ function GetValueOwnershipDeclaration: string;
protected
function GetKeyAttribute(Index: TKeyAttributeID): string;
function GetMapAttribute(Index: TMapAttributeID): string;
@@ -87,28 +93,67 @@
procedure SetMapAttribute(Index: TMapAttributeID; const Value: string);
procedure SetValueAttribute(Index: TValueAttributeID; const Value: string);
public
+ property KeyOwnershipDeclaration: string read GetKeyOwnershipDeclaration;
property MapInfo: TJclContainerMapInfo read FMapInfo write FMapInfo;
+ property ValueOwnershipDeclaration: string read GetValueOwnershipDeclaration;
end;
TJclMapClassInterfaceParams = class(TJclMapInterfaceParams)
protected
+ FInterfaceAdditional: string;
+ FSectionAdditional: string;
+ function GetInterfaceAdditional: string; virtual;
+ function GetSectionAdditional: string; virtual;
+ function GetComparisonSectionAdditional: string; virtual; abstract;
public
+ property InterfaceAdditional: string read GetInterfaceAdditional write FInterfaceAdditional;
+ property SectionAdditional: string read GetSectionAdditional write FSectionAdditional;
+ property KeyTypeName: string index kaKeyTypeName read GetKeyAttribute write SetKeyAttribute stored False;
+ property ValueTypeName: string index vaValueTypeName read GetValueAttribute write SetValueAttribute stored False;
end;
TJclMapImplementationParams = class(TJclImplementationParams)
private
+ function GetKeyOwnershipDeclaration: string;
+ function GetValueOwnershipDeclaration: string;
+ function GetMapInfo: TJclContainerMapInfo;
protected
+ function GetKeyAttribute(Index: TKeyAttributeID): string;
+ function GetMapAttribute(Index: TMapAttributeID): string;
+ function GetValueAttribute(Index: TValueAttributeID): string;
+ procedure SetKeyAttribute(Index: TKeyAttributeID; const Value: string);
+ procedure SetMapAttribute(Index: TMapAttributeID; const Value: string);
+ procedure SetValueAttribute(Index: TValueAttributeID; const Value: string);
public
+ property KeyOwnershipDeclaration: string read GetKeyOwnershipDeclaration;
+ property ValueOwnershipDeclaration: string read GetValueOwnershipDeclaration;
+ property MapInfo: TJclContainerMapInfo read GetMapInfo;
end;
TJclMapClassImplementationParams = class(TJclMapImplementationParams)
protected
+ FCreateKeySet: string;
+ FCreateValueCollection: string;
FMacroFooter: string;
+ FOwnershipAssignments: string;
+ function GetCreateKeySet: string;
+ function GetCreateValueCollection: string;
+ function GetOwnershipAssignment: string;
function GetSelfClassName: string; virtual; abstract;
public
+ function GetConstructorParameters: string; virtual; abstract;
function GetMacroFooter: string; override;
procedure ResetDefault(Value: Boolean); override;
property MacroFooter: string read GetMacroFooter write FMacroFooter;
+ property KeyTypeName: string index kaKeyTypeName read GetKeyAttribute write SetKeyAttribute stored False;
+ property KeyDefault: string index kaKeyDefaultValue read GetKeyAttribute write SetKeyAttribute stored False;
+ property KeyArraySetClassName: string index kaKeyArraySetClassName read GetKeyAttribute write SetKeyAttribute stored False;
+ property ValueTypeName: string index vaValueTypeName read GetValueAttribute write SetValueAttribute stored False;
+ property ValueDefault: string index vaValueDefaultValue read GetValueAttribute write SetValueAttribute stored False;
+ property ValueArrayListClassName: string index vaValueArrayListClassName read GetValueAttribute write SetValueAttribute stored False;
+ property OwnershipAssignments: string read GetOwnershipAssignment write FOwnershipAssignments;
+ property CreateKeySet: string read GetCreateKeySet write FCreateKeySet;
+ property CreateValueCollection: string read GetCreateValueCollection write FCreateValueCollection;
end;
{$IFNDEF TYPEINFO_ON}
@@ -182,6 +227,13 @@
end;
end;
+function TJclContainerMapInfo.GetKeyOwnershipDeclaration: string;
+begin
+ Result := GetKeyAttribute(kaKeyOwnershipParameter);
+ if Result <> '' then
+ Result := 'AOwnsKeys: Boolean';
+end;
+
function TJclContainerMapInfo.GetKnownMap: Boolean;
var
Index: TMapAttributeID;
@@ -231,6 +283,13 @@
end;
end;
+function TJclContainerMapInfo.GetValueOwnershipDeclaration: string;
+begin
+ Result := GetValueAttribute(vaValueOwnershipParameter);
+ if Result <> '' then
+ Result := 'AOwnsValues: Boolean';
+end;
+
function TJclContainerMapInfo.IsMapAttributeStored(Index: TMapAttributeID): Boolean;
begin
if (Index >= Low(TMapAttributeID)) and (Index <= High(TMapAttributeID)) then
@@ -335,6 +394,13 @@
Result := MapInfo.KeyAttributes[Index];
end;
+function TJclMapInterfaceParams.GetKeyOwnershipDeclaration: string;
+begin
+ Result := MapInfo.KeyOwnershipDeclaration;
+ if Result <> '' then
+ Result := '; ' + Result;
+end;
+
function TJclMapInterfaceParams.GetMapAttribute(
Index: TMapAttributeID): string;
begin
@@ -347,6 +413,13 @@
Result := MapInfo.ValueAttributes[Index];
end;
+function TJclMapInterfaceParams.GetValueOwnershipDeclaration: string;
+begin
+ Result := MapInfo.ValueOwnershipDeclaration;
+ if Result <> '' then
+ Result := '; ' + Result;
+end;
+
function TJclMapInterfaceParams.IsMapAttributeStored(
Index: TMapAttributeID): Boolean;
begin
@@ -371,24 +444,180 @@
MapInfo.ValueAttributes[Index] := Value;
end;
+//=== { TJclMapClassInterfaceParams } ========================================
+
+function TJclMapClassInterfaceParams.GetInterfaceAdditional: string;
+begin
+ Result := FInterfaceAdditional;
+ if Result = '' then
+ begin
+ if MapInfo.KeyTypeInfo.StringType or MapInfo.ValueTypeInfo.StringType then
+ Result := ' IJclStrContainer,';
+ if MapInfo.KeyTypeInfo.TypeAttributes[taContainerInterfaceName] <> '' then
+ Result := Format('%s %s,', [Result, MapInfo.KeyTypeInfo.TypeAttributes[taContainerInterfaceName]])
+ else
+ if MapInfo.ValueTypeInfo.TypeAttributes[taContainerInterfaceName] <> '' then
+ Result := Format('%s %s,', [Result, MapInfo.ValueTypeInfo.TypeAttributes[taContainerInterfaceName]]);
+ if MapInfo.KeyTypeInfo.TObjectType then
+ Result := Result + ' IJclKeyOwner,';
+ if MapInfo.ValueTypeInfo.TObjectType then
+ Result := Result + ' IJclValueOwner,';
+ end;
+end;
+
+function TJclMapClassInterfaceParams.GetSectionAdditional: string;
+begin
+ Result := FSectionAdditional;
+ if (Result = '') and MapInfo.KnownMap then
+ begin
+ Result := NativeLineBreak +
+ 'protected' + NativeLineBreak +
+ ' function CreateEmptyContainer: TJclAbstractContainerBase; override;' + NativeLineBreak;
+
+ if not MapInfo.KeyTypeInfo.TObjectType then
+ Result := Format('%s function FreeKey(var Key: %s): %s;' + NativeLineBreak,
+ [Result, KeyTypeName, KeyTypeName]);
+ if not MapInfo.ValueTypeInfo.TObjectType then
+ Result := Format('%s function FreeValue(var Value: %s): %s;' + NativeLineBreak,
+ [Result, ValueTypeName, ValueTypeName]);
+
+ Result := Result + GetComparisonSectionAdditional;
+
+ if MapInfo.KeyTypeInfo.TObjectType or MapInfo.ValueTypeInfo.TObjectType then
+ begin
+ if MapInfo.ValueTypeInfo.TObjectType then
+ Result := ' FOwnsValues: Boolean;' + Result;
+ if MapInfo.KeyTypeInfo.TObjectType then
+ Result := ' FOwnsKeys: Boolean;' + NativeLineBreak + Result;
+ Result := NativeLineBreak + 'private' + NativeLineBreak + Result + NativeLineBreak + 'public' + NativeLineBreak;
+ if MapInfo.KeyTypeInfo.TObjectType then
+ Result := Result + ' { IJclKeyOwner }' + NativeLineBreak +
+ ' function FreeKey(var Key: TObject): TObject;' + NativeLineBreak +
+ ' function GetOwnsKeys: Boolean;' + NativeLineBreak +
+ ' property OwnsKeys: Boolean read FOwnsKeys;';
+ if MapInfo.KeyTypeInfo.TObjectType and MapInfo.ValueTypeInfo.TObjectType then
+ Result := Result + NativeLineBreak;
+ if MapInfo.ValueTypeInfo.TObjectType then
+ Result := Result + ' { IJclValueOwner }' + NativeLineBreak +
+ ' function FreeValue(var Value: TObject): TObject;' + NativeLineBreak +
+ ' function GetOwnsValues: Boolean;' + NativeLineBreak +
+ ' property OwnsValues: Boolean read FOwnsValues;';
+ end;
+ end
+end;
+
+//=== { TJclMapImplementationParams } ========================================
+
+function TJclMapImplementationParams.GetKeyAttribute(
+ Index: TKeyAttributeID): string;
+begin
+ Result := (InterfaceParams as TJclMapInterfaceParams).GetKeyAttribute(Index);
+end;
+
+function TJclMapImplementationParams.GetKeyOwnershipDeclaration: string;
+begin
+ Result := (InterfaceParams as TJclMapInterfaceParams).GetKeyOwnershipDeclaration;
+end;
+
+function TJclMapImplementationParams.GetMapAttribute(
+ Index: TMapAttributeID): string;
+begin
+ Result := (InterfaceParams as TJclMapInterfaceParams).GetMapAttribute(Index);
+end;
+
+function TJclMapImplementationParams.GetMapInfo: TJclContainerMapInfo;
+begin
+ Result := (InterfaceParams as TJclMapInterfaceParams).MapInfo;
+end;
+
+function TJclMapImplementationParams.GetValueAttribute(
+ Index: TValueAttributeID): string;
+begin
+ Result := (InterfaceParams as TJclMapInterfaceParams).GetValueAttribute(Index);
+end;
+
+function TJclMapImplementationParams.GetValueOwnershipDeclaration: string;
+begin
+ Result := (InterfaceParams as TJclMapInterfaceParams).GetValueOwnershipDeclaration;
+end;
+
+procedure TJclMapImplementationParams.SetKeyAttribute(Index: TKeyAttributeID;
+ const Value: string);
+begin
+ (InterfaceParams as TJclMapInterfaceParams).SetKeyAttribute(Index, Value);
+end;
+
+procedure TJclMapImplementationParams.SetMapAttribute(Index: TMapAttributeID;
+ const Value: string);
+begin
+ (InterfaceParams as TJclMapInterfaceParams).SetMapAttribute(Index, Value);
+end;
+
+procedure TJclMapImplementationParams.SetValueAttribute(
+ Index: TValueAttributeID; const Value: string);
+begin
+ (InterfaceParams as TJclMapInterfaceParams).SetValueAttribute(Index, Value);
+end;
+
//=== { TJclMapClassImplementationParams } ===================================
-function TJclMapClassImplementationParams.GetMacroFooter: string;
-//var
-// Ownership, SelfClassName, ConstructorParameters: string;
+function TJclMapClassImplementationParams.GetCreateKeySet: string;
+var
+ Ownership: string;
begin
- {if GetTypeAttribute(taOwnershipParameter) <> '' then
- Ownership := 'False'
- else
- Ownership := '';
+ Result := FCreateKeySet;
+ if Result = '' then
+ begin
+ if MapInfo.KeyTypeInfo.TypeAttributes[taOwnershipParameter] <> '' then
+ Ownership := ', False'
+ else
+ Ownership := '';
+ Result := Format('%s.Create(FSize%s)', [KeyArraySetClassName, Ownership]);
+ end;
+end;
- SelfClassName := GetSelfClassName;
- ConstructorParameters := GetConstructorParameters;
+function TJclMapClassImplementationParams.GetCreateValueCollection: string;
+var
+ Ownership: string;
+begin
+ Result := FCreateValueCollection;
+ if Result = '' then
+ begin
+ if MapInfo.ValueTypeInfo.TypeAttributes[taOwnershipParameter] <> '' then
+ Ownership := ', False'
+ else
+ Ownership := '';
+ Result := Format('%s.Create(FSize%s)', [ValueArrayListClassName, Ownership]);
+ end;
+end;
+function TJclMapClassImplementationParams.GetMacroFooter: string;
+var
+ Ownership, SelfClassName, ConstructorParameters,
+ FuncBody: string;
+begin
Result := FMacroFooter;
- if (Result = '') and TypeInfo.KnownType then
+ if (Result = '') and MapInfo.KnownMap then
begin
+ if GetKeyAttribute(kaKeyOwnershipParameter) <> '' then
+ begin
+ if GetValueAttribute(vaValueOwnershipParameter) <> '' then
+ Ownership := 'False, False'
+ else
+ Ownership := 'False';
+ end
+ else
+ begin
+ if GetValueAttribute(vaValueOwnershipParameter) <> '' then
+ Ownership := 'False'
+ else
+ Ownership := '';
+ end;
+
+ SelfClassName := GetSelfClassName;
+ ConstructorParameters := GetConstructorParameters;
+
if (ConstructorParameters <> '') and (Ownership <> '') then
ConstructorParameters := ConstructorParameters + ', ' + Ownership
else
@@ -403,16 +632,101 @@
' AssignPropertiesTo(Result);' + NativeLineBreak +
'end;' + NativeLineBreak,
[SelfClassName, SelfClassName, ConstructorParameters]);
- end;}
- Result := '';
+
+ if MapInfo.KeyTypeInfo.TObjectType then
+ FuncBody := Format(' if FOwnsKeys then' + NativeLineBreak +
+ ' begin' + NativeLineBreak +
+ ' Result := %s;' + NativeLineBreak +
+ ' FreeAndNil(Key);' + NativeLineBreak +
+ ' end' + NativeLineBreak +
+ ' else' + NativeLineBreak +
+ ' begin' + NativeLineBreak +
+ ' Result := Key;' + NativeLineBreak +
+ ' Key := %s;' + NativeLineBreak +
+ ' end;' + NativeLineBreak,
+ [KeyDefault, KeyDefault])
+ else
+ FuncBody := Format(' Result := Key;' + NativeLineBreak +
+ ' Key := %s;' + NativeLineBreak, [KeyDefault]);
+
+ Result := Format('%s' + NativeLineBreak +
+ 'function %s.FreeKey(var Key: %s): %s;' + NativeLineBreak +
+ 'begin' + NativeLineBreak +
+ '%s' +
+ 'end;' + NativeLineBreak,
+ [Result, SelfClassName, KeyTypeName, KeyTypeName, FuncBody]);
+
+ if MapInfo.ValueTypeInfo.TObjectType then
+ FuncBody := Format(' if FOwnsValues then' + NativeLineBreak +
+ ' begin' + NativeLineBreak +
+ ' Result := %s;' + NativeLineBreak +
+ ' FreeAndNil(Value);' + NativeLineBreak +
+ ' end' + NativeLineBreak +
+ ' else' + NativeLineBreak +
+ ' begin' + NativeLineBreak +
+ ' Result := Value;' + NativeLineBreak +
+ ' Value := %s;' + NativeLineBreak +
+ ' end;' + NativeLineBreak,
+ [ValueDefault, ValueDefault])
+ else
+ FuncBody := Format(' Result := Value;' + NativeLineBreak +
+ ' Value := %s;' + NativeLineBreak, [ValueDefault]);
+
+ Result := Format('%s' + NativeLineBreak +
+ 'function %s.FreeValue(var Value: %s): %s;' + NativeLineBreak +
+ 'begin' + NativeLineBreak +
+ '%s' +
+ 'end;' + NativeLineBreak,
+ [Result, SelfClassName, ValueTypeName, ValueTypeName, FuncBody]);
+
+ if MapInfo.KeyTypeInfo.TObjectType then
+ begin
+ Result := Format('%s' + NativeLineBreak +
+ 'function %s.GetOwnsKeys: Boolean;' + NativeLineBreak +
+ 'begin' + NativeLineBreak +
+ ' Result := FOwnsKeys;' + NativeLineBreak +
+ 'end;' + NativeLineBreak,
+ [Result, SelfClassName]);
+ end;
+
+ if MapInfo.ValueTypeInfo.TObjectType then
+ begin
+ Result := Format('%s' + NativeLineBreak +
+ 'function %s.GetOwnsValues: Boolean;' + NativeLineBreak +
+ 'begin' + NativeLineBreak +
+ ' Result := FOwnsValues;' + NativeLineBreak +
+ 'end;' + NativeLineBreak,
+ [Result, SelfClassName]);
+ end;
+ end;
end;
+function TJclMapClassImplementationParams.GetOwnershipAssignment: string;
+begin
+ Result := FOwnershipAssignments;
+ if Result = '' then
+ begin
+ if MapInfo.KeyTypeInfo.TObjectType then
+ Result := NativeLineBreak + ' FOwnsKeys := AOwnsKeys;';
+ if MapInfo.ValueTypeInfo.TObjectType then
+ Result := Result + NativeLineBreak + ' FOwnsValues := AOwnsValues;';
+ end;
+end;
+
procedure TJclMapClassImplementationParams.ResetDefault(Value: Boolean);
begin
inherited ResetDefault(Value);
+ FCreateKeySet := '';
+ FCreateValueCollection := '';
FMacroFooter := '';
+ FOwnershipAssignments := '';
if not Value then
+ begin
+ FCreateKeySet := GetCreateKeySet;
+ FCreateValueCollection := GetCreateValueCollection;
FMacroFooter := GetMacroFooter;
+ FOwnershipAssignments := GetOwnershipAssignment;
+ end;
end;
initialization
Modified: trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas 2010-08-09 11:49:38 UTC (rev 3290)
+++ trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas 2010-08-09 15:10:10 UTC (rev 3291)
@@ -46,14 +46,13 @@
{maMapInterfaceGUID} '{01D05399-4A05-4F3E-92F4-0C236BE77019}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfIntfSortedMap',
- {maSortedMapInterfaceGUID} '{265A6EB2-4BB3-459F-8813-360FD32A4971}');
- //{maHashMapEntryTypeName} 'TJclIntfIntfHashEntry',
- //{maHashMapBucketTypeName} 'TJclIntfIntfBucket',
- //{maHashMapClassName} 'TJclIntfIntfHashMap',
- //{maHashMapAncestorClassName} 'TJclIntfAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclIntfIntfSortedEntry',
- //{maSortedMapClassName} 'TJclIntfIntfSortedMap',
- //{maSortedMapAncestorClassName} 'TJclIntfAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{265A6EB2-4BB3-459F-8813-360FD32A4971}',
+ {maMapAncestorClassName} 'TJclIntfAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfIntfBucket',
+ {maHashMapClassName} 'TJclIntfIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfIntfSortedEntry',
+ {maSortedMapClassName} 'TJclIntfIntfSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -63,14 +62,13 @@
{maMapInterfaceGUID} '{A4788A96-281A-4924-AA24-03776DDAAD8A}',
{maMapInterfaceAncestorName} 'IJclAnsiStrContainer',
{maSortedMapInterfaceName} 'IJclAnsiStrIntfSortedMap',
- {maSortedMapInterfaceGUID} '{706D1C91-5416-4FDC-B6B1-F4C1E8CFCD38}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{706D1C91-5416-4FDC-B6B1-F4C1E8CFCD38}',
+ {maMapAncestorClassName} 'TJclAnsiStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclAnsiStrIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclAnsiStrIntfBucket',
+ {maHashMapClassName} 'TJclAnsiStrIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclAnsiStrIntfSortedEntry',
+ {maSortedMapClassName} 'TJclAnsiStrIntfSortedMap' );
KeyAttributes: @AnsiStringKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -80,14 +78,13 @@
{maMapInterfaceGUID} '{C959AB76-9CF0-4C2C-A2C6-8A1846563FAF}',
{maMapInterfaceAncestorName} 'IJclWideStrContainer',
{maSortedMapInterfaceName} 'IJclWideStrIntfSortedMap',
- {maSortedMapInterfaceGUID} '{299FDCFD-2DB7-4D64-BF18-EE3668316430}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{299FDCFD-2DB7-4D64-BF18-EE3668316430}',
+ {maMapAncestorClassName} 'TJclWideStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclWideStrIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclWideStrIntfBucket',
+ {maHashMapClassName} 'TJclWideStrIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclWideStrIntfSortedEntry',
+ {maSortedMapClassName} 'TJclWideStrIntfSortedMap' );
KeyAttributes: @WideStringKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -97,14 +94,13 @@
{maMapInterfaceGUID} '{C83D4F5E-8E66-41E9-83F6-338B44F24BE6}',
{maMapInterfaceAncestorName} 'IJclUnicodeStrContainer',
{maSortedMapInterfaceName} 'IJclUnicodeStrIntfSortedMap',
- {maSortedMapInterfaceGUID} '{25FDE916-730D-449A-BA29-852D8A0470B6}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{25FDE916-730D-449A-BA29-852D8A0470B6}',
+ {maMapAncestorClassName} 'TJclUnicodeStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclUnicodeStrIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclUnicodeStrIntfBucket',
+ {maHashMapClassName} 'TJclUnicodeStrIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclUnicodeStrIntfSortedEntry',
+ {maSortedMapClassName} 'TJclUnicodeStrIntfSortedMap' );
KeyAttributes: @UnicodeStringKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -114,14 +110,13 @@
{maMapInterfaceGUID} '',
{maMapInterfaceAncestorName} 'IJclStrContainer',
{maSortedMapInterfaceName} 'IJclStrIntfSortedMap',
- {maSortedMapInterfaceGUID} '' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '',
+ {maMapAncestorClassName} 'TJclStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclStrIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclStrIntfBucket',
+ {maHashMapClassName} 'TJclStrIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclStrIntfSortedEntry',
+ {maSortedMapClassName} 'TJclStrIntfSortedMap' );
KeyAttributes: @StringKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -131,14 +126,13 @@
{maMapInterfaceGUID} '{B10E324A-1D98-42FF-B9B4-7F99044591B2}',
{maMapInterfaceAncestorName} 'IJclAnsiStrContainer',
{maSortedMapInterfaceName} 'IJclIntfAnsiStrSortedMap',
- {maSortedMapInterfaceGUID} '{96E6AC5E-8C40-4795-9C8A-CFD098B58680}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{96E6AC5E-8C40-4795-9C8A-CFD098B58680}',
+ {maMapAncestorClassName} 'TJclAnsiStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfAnsiStrHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfAnsiStrBucket',
+ {maHashMapClassName} 'TJclIntfAnsiStrHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfAnsiStrSortedEntry',
+ {maSortedMapClassName} 'TJclIntfAnsiStrSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @AnsiStringKnownType);
@@ -148,14 +142,13 @@
{maMapInterfaceGUID} '{D9FD7887-B840-4636-8A8F-E586663E332C}',
{maMapInterfaceAncestorName} 'IJclWideStrContainer',
{maSortedMapInterfaceName} 'IJclIntfWideStrSortedMap',
- {maSortedMapInterfaceGUID} '{FBE3AD2E-2781-4DC0-9E80-027027380E21}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{FBE3AD2E-2781-4DC0-9E80-027027380E21}',
+ {maMapAncestorClassName} 'TJclWideStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfWideStrHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfWideStrBucket',
+ {maHashMapClassName} 'TJclIntfWideStrHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfWideStrSortedEntry',
+ {maSortedMapClassName} 'TJclIntfWideStrSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @WideStringKnownType);
@@ -165,14 +158,13 @@
{maMapInterfaceGUID} '{40F8B873-B763-4A3C-8EC4-31DB3404BF73}',
{maMapInterfaceAncestorName} 'IJclUnicodeStrContainer',
{maSortedMapInterfaceName} 'IJclIntfUnicodeStrSortedMap',
- {maSortedMapInterfaceGUID} '{B0B0CB9B-268B-40D2-94A8-0B8B5BE2E1AC}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{B0B0CB9B-268B-40D2-94A8-0B8B5BE2E1AC}',
+ {maMapAncestorClassName} 'TJclUnicodeStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfUnicodeStrHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfUnicodeStrBucket',
+ {maHashMapClassName} 'TJclIntfUnicodeStrHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfUnicodeStrSortedEntry',
+ {maSortedMapClassName} 'TJclIntfUnicodeStrSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @UnicodeStringKnownType);
@@ -182,14 +174,13 @@
{maMapInterfaceGUID} '',
{maMapInterfaceAncestorName} 'IJclStrContainer',
{maSortedMapInterfaceName} 'IJclIntfStrSortedMap',
- {maSortedMapInterfaceGUID} '' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '',
+ {maMapAncestorClassName} 'TJclStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfStrHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfStrBucket',
+ {maHashMapClassName} 'TJclIntfStrHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfStrSortedEntry',
+ {maSortedMapClassName} 'TJclIntfStrSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @StringKnownType);
@@ -199,14 +190,13 @@
{maMapInterfaceGUID} '{A4788A96-281A-4924-AA24-03776DDAAD8A}',
{maMapInterfaceAncestorName} 'IJclAnsiStrContainer',
{maSortedMapInterfaceName} 'IJclAnsiStrAnsiStrSortedMap',
- {maSortedMapInterfaceGUID} '{4F457799-5D03-413D-A46C-067DC4200CC3}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{4F457799-5D03-413D-A46C-067DC4200CC3}',
+ {maMapAncestorClassName} 'TJclAnsiStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclAnsiStrAnsiStrHashEntry',
+ {maHashMapBucketTypeName} 'TJclAnsiStrAnsiStrBucket',
+ {maHashMapClassName} 'TJclAnsiStrAnsiStrHashMap',
+ {maSortedMapEntryTypeName} 'TJclAnsiStrAnsiStrSortedEntry',
+ {maSortedMapClassName} 'TJclAnsiStrAnsiStrSortedMap' );
KeyAttributes: @AnsiStringKnownType;
ValueAttributes: @AnsiStringKnownType);
@@ -216,14 +206,13 @@
{maMapInterfaceGUID} '{8E8D2735-C4FB-4F00-8802-B2102BCE3644}',
{maMapInterfaceAncestorName} 'IJclWideStrContainer',
{maSortedMapInterfaceName} 'IJclWideStrWideStrSortedMap',
- {maSortedMapInterfaceGUID} '{3B0757B2-2290-4AFA-880D-F9BA600E501E}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{3B0757B2-2290-4AFA-880D-F9BA600E501E}',
+ {maMapAncestorClassName} 'TJclWideStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclWideStrWideStrHashEntry',
+ {maHashMapBucketTypeName} 'TJclWideStrWideStrBucket',
+ {maHashMapClassName} 'TJclWideStrWideStrHashMap',
+ {maSortedMapEntryTypeName} 'TJclWideStrWideStrSortedEntry',
+ {maSortedMapClassName} 'TJclWideStrWideStrSortedMap' );
KeyAttributes: @WideStringKnownType;
ValueAttributes: @WideStringKnownType);
@@ -233,14 +222,13 @@
{maMapInterfaceGUID} '{557E1CBD-06AC-41C2-BAED-253709CBD0AE}',
{maMapInterfaceAncestorName} 'IJclUnicodeStrContainer',
{maSortedMapInterfaceName} 'IJclUnicodeStrUnicodeStrSortedMap',
- {maSortedMapInterfaceGUID} '{D8EACC5D-B31E-47A8-9CC9-32B15A79CACA}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{D8EACC5D-B31E-47A8-9CC9-32B15A79CACA}',
+ {maMapAncestorClassName} 'TJclUnicodeStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclUnicodeStrUnicodeStrHashEntry',
+ {maHashMapBucketTypeName} 'TJclUnicodeStrUnicodeStrBucket',
+ {maHashMapClassName} 'TJclUnicodeStrUnicodeStrHashMap',
+ {maSortedMapEntryTypeName} 'TJclUnicodeStrUnicodeStrSortedEntry',
+ {maSortedMapClassName} 'TJclUnicodeStrUnicodeStrSortedMap' );
KeyAttributes: @UnicodeStringKnownType;
ValueAttributes: @UnicodeStringKnownType);
@@ -250,14 +238,13 @@
{maMapInterfaceGUID} '',
{maMapInterfaceAncestorName} 'IJclStrContainer',
{maSortedMapInterfaceName} 'IJclStrStrSortedMap',
- {maSortedMapInterfaceGUID} '' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '',
+ {maMapAncestorClassName} 'TJclStrAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclStrStrHashEntry',
+ {maHashMapBucketTypeName} 'TJclStrStrBucket',
+ {maHashMapClassName} 'TJclStrStrHashMap',
+ {maSortedMapEntryTypeName} 'TJclStrStrSortedEntry',
+ {maSortedMapClassName} 'TJclStrStrSortedMap' );
KeyAttributes: @StringKnownType;
ValueAttributes: @StringKnownType);
@@ -267,14 +254,13 @@
{maMapInterfaceGUID} '{5F5E9E8B-E648-450B-B6C0-0EC65CC2D0BA}',
{maMapInterfaceAncestorName} 'IJclSingleContainer',
{maSortedMapInterfaceName} 'IJclSingleIntfSortedMap',
- {maSortedMapInterfaceGUID} '{83D57068-7B8E-453E-B35B-2AB4B594A7A9}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{83D57068-7B8E-453E-B35B-2AB4B594A7A9}',
+ {maMapAncestorClassName} 'TJclSingleAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclSingleIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclSingleIntfBucket',
+ {maHashMapClassName} 'TJclSingleIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclSingleIntfSortedEntry',
+ {maSortedMapClassName} 'TJclSingleIntfSortedMap' );
KeyAttributes: @SingleKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -284,14 +270,13 @@
{maMapInterfaceGUID} '{234D1618-FB0E-46F5-A70D-5106163A90F7}',
{maMapInterfaceAncestorName} 'IJclSingleContainer',
{maSortedMapInterfaceName} 'IJclIntfSingleSortedMap',
- {maSortedMapInterfaceGUID} '{B07FA192-3466-4F2A-BBF0-2DC0100B08A8}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{B07FA192-3466-4F2A-BBF0-2DC0100B08A8}',
+ {maMapAncestorClassName} 'TJclSingleAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfSingleHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfSingleBucket',
+ {maHashMapClassName} 'TJclIntfSingleHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfSingleSortedEntry',
+ {maSortedMapClassName} 'TJclIntfSingleSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @SingleKnownType);
@@ -301,14 +286,13 @@
{maMapInterfaceGUID} '{AEB0008F-F3CF-4055-A7F3-A330D312F03F}',
{maMapInterfaceAncestorName} 'IJclSingleContainer',
{maSortedMapInterfaceName} 'IJclSingleSingleSortedMap',
- {maSortedMapInterfaceGUID} '{7C6EA0B4-959D-44D5-915F-99DFC1753B00}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{7C6EA0B4-959D-44D5-915F-99DFC1753B00}',
+ {maMapAncestorClassName} 'TJclSingleAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclSingleSingleHashEntry',
+ {maHashMapBucketTypeName} 'TJclSingleSingleBucket',
+ {maHashMapClassName} 'TJclSingleSingleHashMap',
+ {maSortedMapEntryTypeName} 'TJclSingleSingleSortedEntry',
+ {maSortedMapClassName} 'TJclSingleSingleSortedMap' );
KeyAttributes: @SingleKnownType;
ValueAttributes: @SingleKnownType);
@@ -318,14 +302,13 @@
{maMapInterfaceGUID} '{08968FFB-36C6-4FBA-BC09-3DCA2B5D7A50}',
{maMapInterfaceAncestorName} 'IJclDoubleContainer',
{maSortedMapInterfaceName} 'IJclDoubleIntfSortedMap',
- {maSortedMapInterfaceGUID} '{F36C5F4F-4F8C-4943-AA35-41623D3C21E9}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{F36C5F4F-4F8C-4943-AA35-41623D3C21E9}',
+ {maMapAncestorClassName} 'TJclDoubleAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclDoubleIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclDoubleIntfBucket',
+ {maHashMapClassName} 'TJclDoubleIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclDoubleIntfSortedEntry',
+ {maSortedMapClassName} 'TJclDoubleIntfSortedMap' );
KeyAttributes: @DoubleKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -335,14 +318,13 @@
{maMapInterfaceGUID} '{B23DAF6A-6DC5-4DDD-835C-CD4633DDA010}',
{maMapInterfaceAncestorName} 'IJclDoubleContainer',
{maSortedMapInterfaceName} 'IJclIntfDoubleSortedMap',
- {maSortedMapInterfaceGUID} '{0F16ADAE-F499-4857-B5EA-6F3CC9009DBA}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{0F16ADAE-F499-4857-B5EA-6F3CC9009DBA}',
+ {maMapAncestorClassName} 'TJclDoubleAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfDoubleHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfDoubleBucket',
+ {maHashMapClassName} 'TJclIntfDoubleHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfDoubleSortedEntry',
+ {maSortedMapClassName} 'TJclIntfDoubleSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @DoubleKnownType);
@@ -352,14 +334,13 @@
{maMapInterfaceGUID} '{329A03B8-0B6B-4FE3-87C5-4B63447A5FFD}',
{maMapInterfaceAncestorName} 'IJclDoubleContainer',
{maSortedMapInterfaceName} 'IJclDoubleDoubleSortedMap',
- {maSortedMapInterfaceGUID} '{855C858B-74CF-4338-872B-AF88A02DB537}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{855C858B-74CF-4338-872B-AF88A02DB537}',
+ {maMapAncestorClassName} 'TJclDoubleAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclDoubleDoubleHashEntry',
+ {maHashMapBucketTypeName} 'TJclDoubleDoubleBucket',
+ {maHashMapClassName} 'TJclDoubleDoubleHashMap',
+ {maSortedMapEntryTypeName} 'TJclDoubleDoubleSortedEntry',
+ {maSortedMapClassName} 'TJclDoubleDoubleSortedMap' );
KeyAttributes: @DoubleKnownType;
ValueAttributes: @DoubleKnownType);
@@ -369,14 +350,13 @@
{maMapInterfaceGUID} '{7C0731E0-C9AB-4378-B1B0-8CE3DD60AD41}',
{maMapInterfaceAncestorName} 'IJclExtendedContainer',
{maSortedMapInterfaceName} 'IJclExtendedIntfSortedMap',
- {maSortedMapInterfaceGUID} '{A30B8835-A319-4776-9A11-D1EEF60B9C26}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{A30B8835-A319-4776-9A11-D1EEF60B9C26}',
+ {maMapAncestorClassName} 'TJclExtendedAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclExtendedIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclExtendedIntfBucket',
+ {maHashMapClassName} 'TJclExtendedIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclExtendedIntfSortedEntry',
+ {maSortedMapClassName} 'TJclExtendedIntfSortedMap' );
KeyAttributes: @ExtendedKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -386,14 +366,13 @@
{maMapInterfaceGUID} '{479FCE5A-2D8A-44EE-96BC-E8DA3187DBD8}',
{maMapInterfaceAncestorName} 'IJclExtendedContainer',
{maSortedMapInterfaceName} 'IJclIntfExtendedSortedMap',
- {maSortedMapInterfaceGUID} '{3493D6C4-3075-48B6-8E99-CB0000D3978C}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{3493D6C4-3075-48B6-8E99-CB0000D3978C}',
+ {maMapAncestorClassName} 'TJclExtendedAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfExtendedHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfExtendedBucket',
+ {maHashMapClassName} 'TJclIntfExtendedHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfExtendedSortedEntry',
+ {maSortedMapClassName} 'TJclIntfExtendedSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @ExtendedKnownType);
@@ -403,14 +382,13 @@
{maMapInterfaceGUID} '{962C2B09-8CF5-44E8-A21A-4A7DAFB72A11}',
{maMapInterfaceAncestorName} 'IJclExtendedContainer',
{maSortedMapInterfaceName} 'IJclExtendedExtendedSortedMap',
- {maSortedMapInterfaceGUID} '{8CAA505C-D9BB-47E7-92EC-6043DC4AF42C}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{8CAA505C-D9BB-47E7-92EC-6043DC4AF42C}',
+ {maMapAncestorClassName} 'TJclExtendedAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclExtendedExtendedHashEntry',
+ {maHashMapBucketTypeName} 'TJclExtendedExtendedBucket',
+ {maHashMapClassName} 'TJclExtendedExtendedHashMap',
+ {maSortedMapEntryTypeName} 'TJclExtendedExtendedSortedEntry',
+ {maSortedMapClassName} 'TJclExtendedExtendedSortedMap' );
KeyAttributes: @ExtendedKnownType;
ValueAttributes: @ExtendedKnownType);
@@ -420,14 +398,13 @@
{maMapInterfaceGUID} '',
{maMapInterfaceAncestorName} 'IJclFloatContainer',
{maSortedMapInterfaceName} 'IJclFloatIntfSortedMap',
- {maSortedMapInterfaceGUID} '' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '',
+ {maMapAncestorClassName} 'TJclFloatAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclFloatIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclFloatIntfBucket',
+ {maHashMapClassName} 'TJclFloatIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclFloatIntfSortedEntry',
+ {maSortedMapClassName} 'TJclFloatIntfSortedMap' );
KeyAttributes: @FloatKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -437,14 +414,13 @@
{maMapInterfaceGUID} '',
{maMapInterfaceAncestorName} 'IJclFloatContainer',
{maSortedMapInterfaceName} 'IJclIntfFloatSortedMap',
- {maSortedMapInterfaceGUID} '' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '',
+ {maMapAncestorClassName} 'TJclFloatAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfFloatHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfFloatBucket',
+ {maHashMapClassName} 'TJclIntfFloatHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfFloatSortedEntry',
+ {maSortedMapClassName} 'TJclIntfFloatSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @FloatKnownType);
@@ -454,14 +430,13 @@
{maMapInterfaceGUID} '',
{maMapInterfaceAncestorName} 'IJclFloatContainer',
{maSortedMapInterfaceName} 'IJclFloatFloatSortedMap',
- {maSortedMapInterfaceGUID} '{8CAA505C-D9BB-47E7-92EC-6043DC4AF42C}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{8CAA505C-D9BB-47E7-92EC-6043DC4AF42C}',
+ {maMapAncestorClassName} 'TJclFloatAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclFloatFloatHashEntry',
+ {maHashMapBucketTypeName} 'TJclFloatFloatBucket',
+ {maHashMapClassName} 'TJclFloatFloatHashMap',
+ {maSortedMapEntryTypeName} 'TJclFloatFloatSortedEntry',
+ {maSortedMapClassName} 'TJclFloatFloatSortedMap' );
KeyAttributes: @FloatKnownType;
ValueAttributes: @FloatKnownType);
@@ -471,14 +446,13 @@
{maMapInterfaceGUID} '{E535FE65-AC88-49D3-BEF2-FB30D92C2FA6}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntegerIntfSortedMap',
- {maSortedMapInterfaceGUID} '{8B22802C-61F2-4DA5-B1E9-DBB7840E7996}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{8B22802C-61F2-4DA5-B1E9-DBB7840E7996}',
+ {maMapAncestorClassName} 'TJclIntegerAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntegerIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntegerIntfBucket',
+ {maHashMapClassName} 'TJclIntegerIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntegerIntfSortedEntry',
+ {maSortedMapClassName} 'TJclIntegerIntfSortedMap' );
KeyAttributes: @IntegerKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -488,14 +462,13 @@
{maMapInterfaceGUID} '{E01DA012-BEE0-4259-8E30-0A7A1A87BED0}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfIntegerSortedMap',
- {maSortedMapInterfaceGUID} '{8D3C9B7E-772D-409B-A58C-0CABFAFDEFF0}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{8D3C9B7E-772D-409B-A58C-0CABFAFDEFF0}',
+ {maMapAncestorClassName} 'TJclIntegerAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfIntegerHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfIntegerBucket',
+ {maHashMapClassName} 'TJclIntfIntegerHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfIntegerSortedEntry',
+ {maSortedMapClassName} 'TJclIntfIntegerSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @IntegerKnownType);
@@ -505,14 +478,13 @@
{maMapInterfaceGUID} '{23A46BC0-DF8D-4BD2-89D2-4DACF1EC73A1}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntegerIntegerSortedMap',
- {maSortedMapInterfaceGUID} '{8A8BA17A-F468-469C-AF99-77D64C802F7A}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{8A8BA17A-F468-469C-AF99-77D64C802F7A}',
+ {maMapAncestorClassName} 'TJclIntegerAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntegerIntegerHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntegerIntegerBucket',
+ {maHashMapClassName} 'TJclIntegerIntegerHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntegerIntegerSortedEntry',
+ {maSortedMapClassName} 'TJclIntegerIntegerSortedMap' );
KeyAttributes: @IntegerKnownType;
ValueAttributes: @IntegerKnownType);
@@ -522,14 +494,13 @@
{maMapInterfaceGUID} '{80D39FB1-0D10-49CE-8AF3-1CD98A1D4F6C}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclCardinalIntfSortedMap',
- {maSortedMapInterfaceGUID} '{BAE97425-4F2E-461B-88DD-F83D27657AFA}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{BAE97425-4F2E-461B-88DD-F83D27657AFA}',
+ {maMapAncestorClassName} 'TJclCardinalAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclCardinalIntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclCardinalIntfBucket',
+ {maHashMapClassName} 'TJclCardinalIntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclCardinalIntfSortedEntry',
+ {maSortedMapClassName} 'TJclCardinalIntfSortedMap' );
KeyAttributes: @CardinalKnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -539,14 +510,13 @@
{maMapInterfaceGUID} '{E1A724AB-6BDA-45F0-AE21-5E7E789A751B}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfCardinalSortedMap',
- {maSortedMapInterfaceGUID} '{BC66BACF-23AE-48C4-9573-EDC3B5110BE7}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{BC66BACF-23AE-48C4-9573-EDC3B5110BE7}',
+ {maMapAncestorClassName} 'TJclCardinalAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfCardinalHashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfCardinalBucket',
+ {maHashMapClassName} 'TJclIntfCardinalHashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfCardinalSortedEntry',
+ {maSortedMapClassName} 'TJclIntfCardinalSortedMap' );
KeyAttributes: @IInterfaceKnownType;
ValueAttributes: @CardinalKnownType);
@@ -556,14 +526,13 @@
{maMapInterfaceGUID} '{1CD3F54C-F92F-4AF4-82B2-0829C08AA83B}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclCardinalCardinalSortedMap',
- {maSortedMapInterfaceGUID} '{182ACDA4-7D74-4D29-BB5C-4C8189DA774E}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{182ACDA4-7D74-4D29-BB5C-4C8189DA774E}',
+ {maMapAncestorClassName} 'TJclCardinalAbstractContainer',
+ {maHashMapEntryTypeName} 'TJclCardinalCardinalHashEntry',
+ {maHashMapBucketTypeName} 'TJclCardinalCardinalBucket',
+ {maHashMapClassName} 'TJclCardinalCardinalHashMap',
+ {maSortedMapEntryTypeName} 'TJclCardinalCardinalSortedEntry',
+ {maSortedMapClassName} 'TJclCardinalCardinalSortedMap' );
KeyAttributes: @CardinalKnownType;
ValueAttributes: @CardinalKnownType);
@@ -573,14 +542,13 @@
{maMapInterfaceGUID} '{B64FB2D1-8D45-4367-B950-98D3D05AC6A0}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclInt64IntfSortedMap',
- {maSortedMapInterfaceGUID} '{24391756-FB02-4901-81E3-A37738B73DAD}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{24391756-FB02-4901-81E3-A37738B73DAD}',
+ {maMapAncestorClassName} 'TJclInt64AbstractContainer',
+ {maHashMapEntryTypeName} 'TJclInt64IntfHashEntry',
+ {maHashMapBucketTypeName} 'TJclInt64IntfBucket',
+ {maHashMapClassName} 'TJclInt64IntfHashMap',
+ {maSortedMapEntryTypeName} 'TJclInt64IntfSortedEntry',
+ {maSortedMapClassName} 'TJclInt64IntfSortedMap' );
KeyAttributes: @Int64KnownType;
ValueAttributes: @IInterfaceKnownType);
@@ -590,14 +558,13 @@
{maMapInterfaceGUID} '{9886BEE3-D15B-45D2-A3FB-4D3A0ADEC8AC}',
{maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfInt64SortedMap',
- {maSortedMapInterfaceGUID} '{6E2AB647-59CC-4609-82E8-6AE75AED80CA}' );
- //{maHashMapEntryTypeName} 'TJclHashEntry',
- //{maHashMapBucketTypeName} 'TJclBucket',
- //{maHashMapClassName} 'TJclHashMap',
- //{maHashMapAncestorClassName} 'TJclAbstractContainer',
- //{maSortedMapEntryTypeName} 'TJclSortedEntry',
- //{maSortedMapClassName} 'TJclSortedMap',
- //{maSortedMapAncestorClassName} 'TJclAbstractContainer' );
+ {maSortedMapInterfaceGUID} '{6E2AB647-59CC-4609-82E8-6AE75AED80CA}',
+ {maMapAncestorClassName} 'TJclInt64AbstractContainer',
+ {maHashMapEntryTypeName} 'TJclIntfInt64HashEntry',
+ {maHashMapBucketTypeName} 'TJclIntfInt64Bucket',
+ {maHashMapClassName} 'TJclIntfInt64HashMap',
+ {maSortedMapEntryTypeName} 'TJclIntfInt64SortedEntry',
+ {maSortedMapClassName} 'TJclIntfInt64SortedMap' );
KeyAttributes...
[truncated message content] |
|
From: <ou...@us...> - 2010-08-09 11:49:45
|
Revision: 3290
http://jcl.svn.sourceforge.net/jcl/?rev=3290&view=rev
Author: outchy
Date: 2010-08-09 11:49:38 +0000 (Mon, 09 Aug 2010)
Log Message:
-----------
Renamed maMapAncestorName to maMapInterfaceAncestorName.
The name of the key array set class and of the value array list class are also required.
Modified Paths:
--------------
trunk/jcl/devtools/jpp/Templates/JclContainerIntfTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas
trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas
Modified: trunk/jcl/devtools/jpp/Templates/JclContainerIntfTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainerIntfTemplates.pas 2010-08-09 11:41:31 UTC (rev 3289)
+++ trunk/jcl/devtools/jpp/Templates/JclContainerIntfTemplates.pas 2010-08-09 11:49:38 UTC (rev 3290)
@@ -270,7 +270,7 @@
function AliasAttributeIDs: TAllTypeAttributeIDs; override;
published
property InterfaceName: string index maMapInterfaceName read GetMapAttribute write SetMapAttribute stored IsMapAttributeStored;
- property AncestorName: string index maMapAncestorName read GetMapAttribute write SetMapAttribute stored IsMapAttributeStored;
+ property AncestorName: string index maMapInterfaceAncestorName read GetMapAttribute write SetMapAttribute stored IsMapAttributeStored;
property GUID: string index maMapInterfaceGUID read GetMapAttribute write SetMapAttribute stored IsMapAttributeStored;
property ConstKeyword: string index kaKeyConstKeyword read GetKeyAttribute write SetKeyAttribute stored False;
property TypeName: string index kaKeyTypeName read GetKeyAttribute write SetKeyAttribute stored False;
Modified: trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas 2010-08-09 11:41:31 UTC (rev 3289)
+++ trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas 2010-08-09 11:49:38 UTC (rev 3290)
@@ -44,7 +44,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfIntfMap',
{maMapInterfaceGUID} '{01D05399-4A05-4F3E-92F4-0C236BE77019}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfIntfSortedMap',
{maSortedMapInterfaceGUID} '{265A6EB2-4BB3-459F-8813-360FD32A4971}');
//{maHashMapEntryTypeName} 'TJclIntfIntfHashEntry',
@@ -61,7 +61,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclAnsiStrIntfMap',
{maMapInterfaceGUID} '{A4788A96-281A-4924-AA24-03776DDAAD8A}',
- {maMapAncestorName} 'IJclAnsiStrContainer',
+ {maMapInterfaceAncestorName} 'IJclAnsiStrContainer',
{maSortedMapInterfaceName} 'IJclAnsiStrIntfSortedMap',
{maSortedMapInterfaceGUID} '{706D1C91-5416-4FDC-B6B1-F4C1E8CFCD38}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -78,7 +78,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclWideStrIntfMap',
{maMapInterfaceGUID} '{C959AB76-9CF0-4C2C-A2C6-8A1846563FAF}',
- {maMapAncestorName} 'IJclWideStrContainer',
+ {maMapInterfaceAncestorName} 'IJclWideStrContainer',
{maSortedMapInterfaceName} 'IJclWideStrIntfSortedMap',
{maSortedMapInterfaceGUID} '{299FDCFD-2DB7-4D64-BF18-EE3668316430}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -95,7 +95,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclUnicodeStrIntfMap',
{maMapInterfaceGUID} '{C83D4F5E-8E66-41E9-83F6-338B44F24BE6}',
- {maMapAncestorName} 'IJclUnicodeStrContainer',
+ {maMapInterfaceAncestorName} 'IJclUnicodeStrContainer',
{maSortedMapInterfaceName} 'IJclUnicodeStrIntfSortedMap',
{maSortedMapInterfaceGUID} '{25FDE916-730D-449A-BA29-852D8A0470B6}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -112,7 +112,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclStrIntfMap',
{maMapInterfaceGUID} '',
- {maMapAncestorName} 'IJclStrContainer',
+ {maMapInterfaceAncestorName} 'IJclStrContainer',
{maSortedMapInterfaceName} 'IJclStrIntfSortedMap',
{maSortedMapInterfaceGUID} '' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -129,7 +129,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfAnsiStrMap',
{maMapInterfaceGUID} '{B10E324A-1D98-42FF-B9B4-7F99044591B2}',
- {maMapAncestorName} 'IJclAnsiStrContainer',
+ {maMapInterfaceAncestorName} 'IJclAnsiStrContainer',
{maSortedMapInterfaceName} 'IJclIntfAnsiStrSortedMap',
{maSortedMapInterfaceGUID} '{96E6AC5E-8C40-4795-9C8A-CFD098B58680}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -146,7 +146,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfWideStrMap',
{maMapInterfaceGUID} '{D9FD7887-B840-4636-8A8F-E586663E332C}',
- {maMapAncestorName} 'IJclWideStrContainer',
+ {maMapInterfaceAncestorName} 'IJclWideStrContainer',
{maSortedMapInterfaceName} 'IJclIntfWideStrSortedMap',
{maSortedMapInterfaceGUID} '{FBE3AD2E-2781-4DC0-9E80-027027380E21}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -163,7 +163,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfUnicodeStrMap',
{maMapInterfaceGUID} '{40F8B873-B763-4A3C-8EC4-31DB3404BF73}',
- {maMapAncestorName} 'IJclUnicodeStrContainer',
+ {maMapInterfaceAncestorName} 'IJclUnicodeStrContainer',
{maSortedMapInterfaceName} 'IJclIntfUnicodeStrSortedMap',
{maSortedMapInterfaceGUID} '{B0B0CB9B-268B-40D2-94A8-0B8B5BE2E1AC}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -180,7 +180,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfStrMap',
{maMapInterfaceGUID} '',
- {maMapAncestorName} 'IJclStrContainer',
+ {maMapInterfaceAncestorName} 'IJclStrContainer',
{maSortedMapInterfaceName} 'IJclIntfStrSortedMap',
{maSortedMapInterfaceGUID} '' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -197,7 +197,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclAnsiStrAnsiStrMap',
{maMapInterfaceGUID} '{A4788A96-281A-4924-AA24-03776DDAAD8A}',
- {maMapAncestorName} 'IJclAnsiStrContainer',
+ {maMapInterfaceAncestorName} 'IJclAnsiStrContainer',
{maSortedMapInterfaceName} 'IJclAnsiStrAnsiStrSortedMap',
{maSortedMapInterfaceGUID} '{4F457799-5D03-413D-A46C-067DC4200CC3}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -214,7 +214,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclWideStrWideStrMap',
{maMapInterfaceGUID} '{8E8D2735-C4FB-4F00-8802-B2102BCE3644}',
- {maMapAncestorName} 'IJclWideStrContainer',
+ {maMapInterfaceAncestorName} 'IJclWideStrContainer',
{maSortedMapInterfaceName} 'IJclWideStrWideStrSortedMap',
{maSortedMapInterfaceGUID} '{3B0757B2-2290-4AFA-880D-F9BA600E501E}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -231,7 +231,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclUnicodeStrUnicodeStrMap',
{maMapInterfaceGUID} '{557E1CBD-06AC-41C2-BAED-253709CBD0AE}',
- {maMapAncestorName} 'IJclUnicodeStrContainer',
+ {maMapInterfaceAncestorName} 'IJclUnicodeStrContainer',
{maSortedMapInterfaceName} 'IJclUnicodeStrUnicodeStrSortedMap',
{maSortedMapInterfaceGUID} '{D8EACC5D-B31E-47A8-9CC9-32B15A79CACA}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -248,7 +248,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclStrStrMap',
{maMapInterfaceGUID} '',
- {maMapAncestorName} 'IJclStrContainer',
+ {maMapInterfaceAncestorName} 'IJclStrContainer',
{maSortedMapInterfaceName} 'IJclStrStrSortedMap',
{maSortedMapInterfaceGUID} '' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -265,7 +265,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclSingleIntfMap',
{maMapInterfaceGUID} '{5F5E9E8B-E648-450B-B6C0-0EC65CC2D0BA}',
- {maMapAncestorName} 'IJclSingleContainer',
+ {maMapInterfaceAncestorName} 'IJclSingleContainer',
{maSortedMapInterfaceName} 'IJclSingleIntfSortedMap',
{maSortedMapInterfaceGUID} '{83D57068-7B8E-453E-B35B-2AB4B594A7A9}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -282,7 +282,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfSingleMap',
{maMapInterfaceGUID} '{234D1618-FB0E-46F5-A70D-5106163A90F7}',
- {maMapAncestorName} 'IJclSingleContainer',
+ {maMapInterfaceAncestorName} 'IJclSingleContainer',
{maSortedMapInterfaceName} 'IJclIntfSingleSortedMap',
{maSortedMapInterfaceGUID} '{B07FA192-3466-4F2A-BBF0-2DC0100B08A8}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -299,7 +299,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclSingleSingleMap',
{maMapInterfaceGUID} '{AEB0008F-F3CF-4055-A7F3-A330D312F03F}',
- {maMapAncestorName} 'IJclSingleContainer',
+ {maMapInterfaceAncestorName} 'IJclSingleContainer',
{maSortedMapInterfaceName} 'IJclSingleSingleSortedMap',
{maSortedMapInterfaceGUID} '{7C6EA0B4-959D-44D5-915F-99DFC1753B00}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -316,7 +316,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclDoubleIntfMap',
{maMapInterfaceGUID} '{08968FFB-36C6-4FBA-BC09-3DCA2B5D7A50}',
- {maMapAncestorName} 'IJclDoubleContainer',
+ {maMapInterfaceAncestorName} 'IJclDoubleContainer',
{maSortedMapInterfaceName} 'IJclDoubleIntfSortedMap',
{maSortedMapInterfaceGUID} '{F36C5F4F-4F8C-4943-AA35-41623D3C21E9}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -333,7 +333,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfDoubleMap',
{maMapInterfaceGUID} '{B23DAF6A-6DC5-4DDD-835C-CD4633DDA010}',
- {maMapAncestorName} 'IJclDoubleContainer',
+ {maMapInterfaceAncestorName} 'IJclDoubleContainer',
{maSortedMapInterfaceName} 'IJclIntfDoubleSortedMap',
{maSortedMapInterfaceGUID} '{0F16ADAE-F499-4857-B5EA-6F3CC9009DBA}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -350,7 +350,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclDoubleDoubleMap',
{maMapInterfaceGUID} '{329A03B8-0B6B-4FE3-87C5-4B63447A5FFD}',
- {maMapAncestorName} 'IJclDoubleContainer',
+ {maMapInterfaceAncestorName} 'IJclDoubleContainer',
{maSortedMapInterfaceName} 'IJclDoubleDoubleSortedMap',
{maSortedMapInterfaceGUID} '{855C858B-74CF-4338-872B-AF88A02DB537}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -367,7 +367,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclExtendedIntfMap',
{maMapInterfaceGUID} '{7C0731E0-C9AB-4378-B1B0-8CE3DD60AD41}',
- {maMapAncestorName} 'IJclExtendedContainer',
+ {maMapInterfaceAncestorName} 'IJclExtendedContainer',
{maSortedMapInterfaceName} 'IJclExtendedIntfSortedMap',
{maSortedMapInterfaceGUID} '{A30B8835-A319-4776-9A11-D1EEF60B9C26}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -384,7 +384,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfExtendedMap',
{maMapInterfaceGUID} '{479FCE5A-2D8A-44EE-96BC-E8DA3187DBD8}',
- {maMapAncestorName} 'IJclExtendedContainer',
+ {maMapInterfaceAncestorName} 'IJclExtendedContainer',
{maSortedMapInterfaceName} 'IJclIntfExtendedSortedMap',
{maSortedMapInterfaceGUID} '{3493D6C4-3075-48B6-8E99-CB0000D3978C}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -401,7 +401,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclExtendedExtendedMap',
{maMapInterfaceGUID} '{962C2B09-8CF5-44E8-A21A-4A7DAFB72A11}',
- {maMapAncestorName} 'IJclExtendedContainer',
+ {maMapInterfaceAncestorName} 'IJclExtendedContainer',
{maSortedMapInterfaceName} 'IJclExtendedExtendedSortedMap',
{maSortedMapInterfaceGUID} '{8CAA505C-D9BB-47E7-92EC-6043DC4AF42C}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -418,7 +418,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclFloatIntfMap',
{maMapInterfaceGUID} '',
- {maMapAncestorName} 'IJclFloatContainer',
+ {maMapInterfaceAncestorName} 'IJclFloatContainer',
{maSortedMapInterfaceName} 'IJclFloatIntfSortedMap',
{maSortedMapInterfaceGUID} '' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -435,7 +435,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfFloatMap',
{maMapInterfaceGUID} '',
- {maMapAncestorName} 'IJclFloatContainer',
+ {maMapInterfaceAncestorName} 'IJclFloatContainer',
{maSortedMapInterfaceName} 'IJclIntfFloatSortedMap',
{maSortedMapInterfaceGUID} '' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -452,7 +452,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclFloatFloatMap',
{maMapInterfaceGUID} '',
- {maMapAncestorName} 'IJclFloatContainer',
+ {maMapInterfaceAncestorName} 'IJclFloatContainer',
{maSortedMapInterfaceName} 'IJclFloatFloatSortedMap',
{maSortedMapInterfaceGUID} '{8CAA505C-D9BB-47E7-92EC-6043DC4AF42C}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -469,7 +469,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntegerIntfMap',
{maMapInterfaceGUID} '{E535FE65-AC88-49D3-BEF2-FB30D92C2FA6}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntegerIntfSortedMap',
{maSortedMapInterfaceGUID} '{8B22802C-61F2-4DA5-B1E9-DBB7840E7996}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -486,7 +486,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfIntegerMap',
{maMapInterfaceGUID} '{E01DA012-BEE0-4259-8E30-0A7A1A87BED0}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfIntegerSortedMap',
{maSortedMapInterfaceGUID} '{8D3C9B7E-772D-409B-A58C-0CABFAFDEFF0}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -503,7 +503,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntegerIntegerMap',
{maMapInterfaceGUID} '{23A46BC0-DF8D-4BD2-89D2-4DACF1EC73A1}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntegerIntegerSortedMap',
{maSortedMapInterfaceGUID} '{8A8BA17A-F468-469C-AF99-77D64C802F7A}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -520,7 +520,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclCardinalIntfMap',
{maMapInterfaceGUID} '{80D39FB1-0D10-49CE-8AF3-1CD98A1D4F6C}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclCardinalIntfSortedMap',
{maSortedMapInterfaceGUID} '{BAE97425-4F2E-461B-88DD-F83D27657AFA}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -537,7 +537,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfCardinalMap',
{maMapInterfaceGUID} '{E1A724AB-6BDA-45F0-AE21-5E7E789A751B}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfCardinalSortedMap',
{maSortedMapInterfaceGUID} '{BC66BACF-23AE-48C4-9573-EDC3B5110BE7}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -554,7 +554,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclCardinalCardinalMap',
{maMapInterfaceGUID} '{1CD3F54C-F92F-4AF4-82B2-0829C08AA83B}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclCardinalCardinalSortedMap',
{maSortedMapInterfaceGUID} '{182ACDA4-7D74-4D29-BB5C-4C8189DA774E}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -571,7 +571,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclInt64IntfMap',
{maMapInterfaceGUID} '{B64FB2D1-8D45-4367-B950-98D3D05AC6A0}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclInt64IntfSortedMap',
{maSortedMapInterfaceGUID} '{24391756-FB02-4901-81E3-A37738B73DAD}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -588,7 +588,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfInt64Map',
{maMapInterfaceGUID} '{9886BEE3-D15B-45D2-A3FB-4D3A0ADEC8AC}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfInt64SortedMap',
{maSortedMapInterfaceGUID} '{6E2AB647-59CC-4609-82E8-6AE75AED80CA}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -605,7 +605,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclInt64Int64Map',
{maMapInterfaceGUID} '{EF2A2726-408A-4984-9971-DDC1B6EFC9F5}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclInt64Int64SortedMap',
{maSortedMapInterfaceGUID} '{168581D2-9DD3-46D0-934E-EA0CCE5E3C0C}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -622,7 +622,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclPtrIntfMap',
{maMapInterfaceGUID} '{B7C48542-39A0-453F-8F03-8C8CFAB0DCCF}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclPtrIntfSortedMap',
{maSortedMapInterfaceGUID} '{6D7B8042-3CBC-4C8F-98B5-69AFAA104532}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -639,7 +639,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfPtrMap',
{maMapInterfaceGUID} '{DA51D823-58DB-4D7C-9B8E-07E0FD560B57}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfPtrSortedMap',
{maSortedMapInterfaceGUID} '{B054BDA2-536F-4C16-B6BB-BB64FA0818B3}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -656,7 +656,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclPtrPtrMap',
{maMapInterfaceGUID} '{1200CB0F-A766-443F-9030-5A804C11B798}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclPtrPtrSortedMap',
{maSortedMapInterfaceGUID} '{F1FAE922-0212-41D0-BB4E-76A8AB2CAB86}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -673,7 +673,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntfMap',
{maMapInterfaceGUID} '{C70570C6-EDDB-47B4-9003-C637B486731D}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntfSortedMap',
{maSortedMapInterfaceGUID} '{3CED1477-B958-4109-9BDA-7C84B9E063B2}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -690,7 +690,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclAnsiStrMap',
{maMapInterfaceGUID} '{A7D0A882-6952-496D-A258-23D47DDCCBC4}',
- {maMapAncestorName} 'IJclAnsiStrContainer',
+ {maMapInterfaceAncestorName} 'IJclAnsiStrContainer',
{maSortedMapInterfaceName} 'IJclAnsiStrSortedMap',
{maSortedMapInterfaceGUID} '{573F98E3-EBCD-4F28-8F35-96A7366CBF47}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -707,7 +707,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclWideStrMap',
{maMapInterfaceGUID} '{ACE8E6B4-5A56-4753-A2C6-BAE195A56B63}',
- {maMapAncestorName} 'IJclWideStrContainer',
+ {maMapInterfaceAncestorName} 'IJclWideStrContainer',
{maSortedMapInterfaceName} 'IJclWideStrSortedMap',
{maSortedMapInterfaceGUID} '{B3021EFC-DE25-4B4B-A896-ACE823CD5C01}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -724,7 +724,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclUnicodeStrMap',
{maMapInterfaceGUID} '{4328E033-9B92-40C6-873D-A6982CFC2B95}',
- {maMapAncestorName} 'IJclUnicodeStrContainer',
+ {maMapInterfaceAncestorName} 'IJclUnicodeStrContainer',
{maSortedMapInterfaceName} 'IJclUnicodeStrSortedMap',
{maSortedMapInterfaceGUID} '{5510B8FC-3439-4211-8D1F-5EDD9A56D3E3}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -741,7 +741,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclStrMap',
{maMapInterfaceGUID} '',
- {maMapAncestorName} 'IJclStrContainer',
+ {maMapInterfaceAncestorName} 'IJclStrContainer',
{maSortedMapInterfaceName} 'IJclStrSortedMap',
{maSortedMapInterfaceGUID} '' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -758,7 +758,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclSingleMap',
{maMapInterfaceGUID} '{C501920A-F252-4F94-B142-1F05AE06C3D2}',
- {maMapAncestorName} 'IJclSingleContainer',
+ {maMapInterfaceAncestorName} 'IJclSingleContainer',
{maSortedMapInterfaceName} 'IJclSingleSortedMap',
{maSortedMapInterfaceGUID} '{8C1A12BE-A7F2-4351-90B7-25DB0AAF5F94}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -775,7 +775,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclDoubleMap',
{maMapInterfaceGUID} '{B1B994AC-49C9-418B-814B-43BAD706F355}',
- {maMapAncestorName} 'IJclDoubleContainer',
+ {maMapInterfaceAncestorName} 'IJclDoubleContainer',
{maSortedMapInterfaceName} 'IJclDoubleSortedMap',
{maSortedMapInterfaceGUID} '{8018D66B-AA54-4016-84FC-3E780FFCC38B}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -792,7 +792,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclExtendedMap',
{maMapInterfaceGUID} '{3BCC8C87-A186-45E8-9B37-0B8E85120434}',
- {maMapAncestorName} 'IJclExtendedContainer',
+ {maMapInterfaceAncestorName} 'IJclExtendedContainer',
{maSortedMapInterfaceName} 'IJclExtendedSortedMap',
{maSortedMapInterfaceGUID} '{2B82C65A-B3EF-477D-BEC0-3D8620A226B1}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -809,7 +809,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclFloatMap',
{maMapInterfaceGUID} '',
- {maMapAncestorName} 'IJclFloatContainer',
+ {maMapInterfaceAncestorName} 'IJclFloatContainer',
{maSortedMapInterfaceName} 'IJclFloatSortedMap',
{maSortedMapInterfaceGUID} '' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -826,7 +826,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclIntegerMap',
{maMapInterfaceGUID} '{D6FA5D64-A4AF-4419-9981-56BA79BF8770}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclIntegerSortedMap',
{maSortedMapInterfaceGUID} '{DD7B4C5E-6D51-44CC-9328-B38396A7E1C9}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -843,7 +843,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclCardinalMap',
{maMapInterfaceGUID} '{A2F92F4F-11CB-4DB2-932F-F10A14237126}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclCardinalSortedMap',
{maSortedMapInterfaceGUID} '{4AEAF81F-D72E-4499-B10E-3D017F39915E}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -860,7 +860,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclInt64Map',
{maMapInterfaceGUID} '{4C720CE0-7A7C-41D5-BFC1-8D58A47E648F}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclInt64SortedMap',
{maSortedMapInterfaceGUID} '{06C03F90-7DE9-4043-AA56-AAE071D8BD50}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -877,7 +877,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclPtrMap',
{maMapInterfaceGUID} '{2FE029A9-026C-487D-8204-AD3A28BD2FA2}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclPtrSortedMap',
{maSortedMapInterfaceGUID} '{578918DB-6A4A-4A9D-B44E-AE3E8FF70818}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
@@ -894,7 +894,7 @@
(MapAttributes:
( {maMapInterfaceName} 'IJclMap',
{maMapInterfaceGUID} '{A7D0A882-6952-496D-A258-23D47DDCCBC4}',
- {maMapAncestorName} 'IJclContainer',
+ {maMapInterfaceAncestorName} 'IJclContainer',
{maSortedMapInterfaceName} 'IJclSortedMap',
{maSortedMapInterfaceGUID} '{F317A70F-7851-49C2-9DCF-092D8F4D4F98}' );
//{maHashMapEntryTypeName} 'TJclHashEntry',
Modified: trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas 2010-08-09 11:41:31 UTC (rev 3289)
+++ trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas 2010-08-09 11:49:38 UTC (rev 3290)
@@ -127,14 +127,16 @@
kaKeyDefaultValue,
kaKeyIteratorInterfaceName,
kaKeySetInterfaceName,
+ kaKeyArraySetClassName,
vaValueTypeName,
vaValueOwnershipParameter,
vaValueConstKeyword,
vaValueDefaultValue,
vaValueCollectionInterfaceName,
+ vaValueArrayListClassName,
maMapInterfaceName,
maMapInterfaceGUID,
- maMapAncestorName,
+ maMapInterfaceAncestorName,
maSortedMapInterfaceName,
maSortedMapInterfaceGUID);
//maHashMapEntryTypeName,
@@ -153,9 +155,9 @@
TKnownTypeAttributes = TTypeAttributes;
PKnownTypeAttributes = ^TKnownTypeAttributes;
- TKeyAttributeID = kaKeyTypeName..kaKeySetInterfaceName;
+ TKeyAttributeID = kaKeyTypeName..kaKeyArraySetClassName;
- TValueAttributeID = vaValueTypeName..vaValueCollectionInterfaceName;
+ TValueAttributeID = vaValueTypeName..vaValueArrayListClassName;
TMapAttributeID = maMapInterfaceName..maSortedMapInterfaceGUID; // maSortedMapAncestorClassName;
@@ -258,19 +260,21 @@
{KeyConstKeyword} taConstKeyword,
{KeyDefaultValue} taDefaultValue,
{KeyIteratorInterfaceName} taIteratorInterfaceName,
- {KeySetInterfaceName} taSetInterfaceName);
+ {KeySetInterfaceName} taSetInterfaceName,
+ {KeyArraySetClassName} taArraySetClassName);
ValueAttributeInfos: array [TValueAttributeID] of TTypeAttributeID =
( {ValueTypeName} taTypeName,
{ValueOwnershipParameter} taOwnershipParameter,
{ValueConstKeyword} taConstKeyword,
{ValueDefaultValue} taDefaultValue,
- {ValueCollectionInterfaceName} taCollectionInterfaceName);
+ {ValueCollectionInterfaceName} taCollectionInterfaceName,
+ {ValueArrayListClassName} taArrayListClassName);
MapAttributeInfos: array [TMapAttributeID] of TTypeAttributeInfo =
( {MapInterfaceName} (IsGUID: False; DefaultValue: 'TJcl%s%sMap'),
{MapInterfaceGUID} (IsGUID: True; DefaultValue: ''),
- {MapInterfaceAncestor} (IsGUID: False; DefaultValue: 'IJclContainer'),
+ {MapInterfaceAncestorName} (IsGUID: False; DefaultValue: 'IJclContainer'),
{SortedMapInterfaceName} (IsGUID: False; DefaultValue: 'TJcl%s%sSortedMap'),
{SortedMapInterfaceGUID} (IsGUID: True; DefaultValue: '') );
//{HashMapEntryTypeName} (IsGUID: False; DefaultValue: 'TJcl%s%sHashEntry'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-09 11:41:39
|
Revision: 3289
http://jcl.svn.sourceforge.net/jcl/?rev=3289&view=rev
Author: outchy
Date: 2010-08-09 11:41:31 +0000 (Mon, 09 Aug 2010)
Log Message:
-----------
Move the hash functions from JclAbstractContainers to JclAlgorithms.
Make JclAbstractContainers' comparison functions use JclAlgorithms' ones.
Modified Paths:
--------------
trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainerKnownTypes.pas
trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas
trunk/jcl/source/common/JclAbstractContainers.pas
trunk/jcl/source/common/JclAlgorithms.pas
trunk/jcl/source/prototypes/JclAlgorithms.pas
trunk/jcl/source/prototypes/containers/JclAlgorithms.int
Modified: trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas 2010-08-08 19:11:20 UTC (rev 3288)
+++ trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas 2010-08-09 11:41:31 UTC (rev 3289)
@@ -102,6 +102,15 @@
property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
end;
+ (* SIMPLEHASHCONVERTINT(PROCNAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME) *)
+ TJclSimpleHashConvertIntParams = class(TJclAlgorithmsIntParams)
+ published
+ property ProcName: string index taSimpleHashConvertFunctionName read GetTypeAttribute write SetTypeAttribute stored IsTypeAttributeStored;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
(* FINDINT(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE, OVERLOAD) *)
TJclFindIntParams = class(TJclAlgorithmsIntProcParams)
protected
@@ -335,6 +344,7 @@
RegisterContainerParams('APPLYINT', TJclApplyIntParams);
RegisterContainerParams('SIMPLECOMPAREINT', TJclSimpleCompareIntParams);
RegisterContainerParams('SIMPLEEQUALITYCOMPAREINT', TJclSimpleEqualityCompareIntParams);
+ RegisterContainerParams('SIMPLEHASHCONVERTINT', TJclSimpleHashConvertIntParams);
RegisterContainerParams('FINDINT', TJclFindIntParams);
RegisterContainerParams('FINDEQINT', TJclFindEqIntParams);
RegisterContainerParams('COUNTOBJECTINT', TJclCountObjectIntParams);
Modified: trunk/jcl/devtools/jpp/Templates/JclContainerKnownTypes.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainerKnownTypes.pas 2010-08-08 19:11:20 UTC (rev 3288)
+++ trunk/jcl/devtools/jpp/Templates/JclContainerKnownTypes.pas 2010-08-09 11:41:31 UTC (rev 3289)
@@ -61,6 +61,7 @@
{taEqualityCompareFunctionName} 'TIntfEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'IntfSimpleEqualityCompare',
{taHashConvertFunctionName} 'TIntfHashConvert',
+ {taSimpleHashConvertFunctionName} 'IntfSimpleHashConvert',
{taContainerInterfaceName} '',
{taContainerInterfaceGUID} '',
{taFlatContainerInterfaceName} '',
@@ -139,6 +140,7 @@
{taEqualityCompareFunctionName} 'TAnsiStrEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'AnsiStrSimpleEqualityCompare',
{taHashConvertFunctionName} 'TAnsiStrHashConvert',
+ {taSimpleHashConvertFunctionName} 'AnsiStrSimpleHashConvert',
{taContainerInterfaceName} 'IJclAnsiStrContainer',
{taContainerInterfaceGUID} '{F8239357-B96F-46F1-A48E-B5DF25B5F1FA}',
{taFlatContainerInterfaceName} 'IJclAnsiStrFlatContainer',
@@ -217,6 +219,7 @@
{taEqualityCompareFunctionName} 'TWideStrEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'WideStrSimpleEqualityCompare',
{taHashConvertFunctionName} 'TWideStrHashConvert',
+ {taSimpleHashConvertFunctionName} 'WideStrSimpleHashConvert',
{taContainerInterfaceName} 'IJclWideStrContainer',
{taContainerInterfaceGUID} '{875E1AC4-CA22-46BC-8999-048E5B9BF11D}',
{taFlatContainerInterfaceName} 'IJclWideStrFlatContainer',
@@ -295,6 +298,7 @@
{taEqualityCompareFunctionName} 'TUnicodeStrEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'UnicodeStrSimpleEqualityCompare',
{taHashConvertFunctionName} 'TUnicodeStrHashConvert',
+ {taSimpleHashConvertFunctionName} 'UnicodeStrSimpleHashConvert',
{taContainerInterfaceName} 'IJclUnicodeStrContainer',
{taContainerInterfaceGUID} '{619BA29F-5E05-464D-B472-1C8453DBC707}',
{taFlatContainerInterfaceName} 'IJclUnicodeStrFlatContainer',
@@ -373,6 +377,7 @@
{taEqualityCompareFunctionName} 'TStrEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'StrSimpleEqualityCompare',
{taHashConvertFunctionName} 'TStrHashConvert',
+ {taSimpleHashConvertFunctionName} 'StrSimpleHashConvert',
{taContainerInterfaceName} '',
{taContainerInterfaceGUID} '',
{taFlatContainerInterfaceName} '',
@@ -451,6 +456,7 @@
{taEqualityCompareFunctionName} 'TSingleEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'SingleSimpleEqualityCompare',
{taHashConvertFunctionName} 'TSingleHashConvert',
+ {taSimpleHashConvertFunctionName} 'SingleSimpleHashConvert',
{taContainerInterfaceName} 'IJclSingleContainer',
{taContainerInterfaceGUID} '{22BE88BD-87D1-4B4D-9FAB-F1B6D555C6A9}',
{taFlatContainerInterfaceName} '',
@@ -529,6 +535,7 @@
{taEqualityCompareFunctionName} 'TDoubleEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'DoubleSimpleEqualityCompare',
{taHashConvertFunctionName} 'TDoubleHashConvert',
+ {taSimpleHashConvertFunctionName} 'DoubleSimpleHashConvert',
{taContainerInterfaceName} 'IJclDoubleContainer',
{taContainerInterfaceGUID} '{372B9354-DF6D-4CAA-A5A9-C50E1FEE5525}',
{taFlatContainerInterfaceName} '',
@@ -607,6 +614,7 @@
{taEqualityCompareFunctionName} 'TExtendedEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'ExtendedSimpleEqualityCompare',
{taHashConvertFunctionName} 'TExtendedHashConvert',
+ {taSimpleHashConvertFunctionName} 'ExtendedSimpleHashConvert',
{taContainerInterfaceName} 'IJclExtendedContainer',
{taContainerInterfaceGUID} '{431A6482-FD5C-45A7-BE53-339A3CF75AC9}',
{taFlatContainerInterfaceName} '',
@@ -685,6 +693,7 @@
{taEqualityCompareFunctionName} 'TFloatEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'FloatSimpleEqualityCompare',
{taHashConvertFunctionName} 'TFloatHashConvert',
+ {taSimpleHashConvertFunctionName} 'FloatSimpleHashConvert',
{taContainerInterfaceName} 'IJclFloatContainer',
{taContainerInterfaceGUID} '',
{taFlatContainerInterfaceName} '',
@@ -763,6 +772,7 @@
{taEqualityCompareFunctionName} 'TIntegerEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'IntegerSimpleEqualityCompare',
{taHashConvertFunctionName} 'TIntegerHashConvert',
+ {taSimpleHashConvertFunctionName} 'IntegerSimpleHashConvert',
{taContainerInterfaceName} '',
{taContainerInterfaceGUID} '',
{taFlatContainerInterfaceName} '',
@@ -841,6 +851,7 @@
{taEqualityCompareFunctionName} 'TCardinalEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'CardinalSimpleEqualityCompare',
{taHashConvertFunctionName} 'TCardinalHashConvert',
+ {taSimpleHashConvertFunctionName} 'CardinalSimpleHashConvert',
{taContainerInterfaceName} '',
{taContainerInterfaceGUID} '',
{taFlatContainerInterfaceName} '',
@@ -919,6 +930,7 @@
{taEqualityCompareFunctionName} 'TInt64EqualityCompare',
{taSimpleEqualityCompareFunctionName} 'Int64SimpleEqualityCompare',
{taHashConvertFunctionName} 'TInt64HashConvert',
+ {taSimpleHashConvertFunctionName} 'Int64SimpleHashConvert',
{taContainerInterfaceName} '',
{taContainerInterfaceGUID} '',
{taFlatContainerInterfaceName} '',
@@ -997,6 +1009,7 @@
{taEqualityCompareFunctionName} 'TPtrEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'PtrSimpleEqualityCompare',
{taHashConvertFunctionName} 'TPtrHashConvert',
+ {taSimpleHashConvertFunctionName} 'PtrSimpleHashConvert',
{taContainerInterfaceName} '',
{taContainerInterfaceGUID} '',
{taFlatContainerInterfaceName} '',
@@ -1075,6 +1088,7 @@
{taEqualityCompareFunctionName} 'TEqualityCompare',
{taSimpleEqualityCompareFunctionName} 'SimpleEqualityCompare',
{taHashConvertFunctionName} 'THashConvert',
+ {taSimpleHashConvertFunctionName} 'SimpleHashConvert',
{taContainerInterfaceName} '',
{taContainerInterfaceGUID} '',
{taFlatContainerInterfaceName} '',
Modified: trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas 2010-08-08 19:11:20 UTC (rev 3288)
+++ trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas 2010-08-09 11:41:31 UTC (rev 3289)
@@ -65,6 +65,7 @@
taEqualityCompareFunctionName,
taSimpleEqualityCompareFunctionName,
taHashConvertFunctionName,
+ taSimpleHashConvertFunctionName,
taContainerInterfaceName,
taContainerInterfaceGUID,
taFlatContainerInterfaceName,
@@ -195,6 +196,7 @@
{EqualityCompareFunctionName} (IsGUID: False; DefaultValue: 'T%sEqualityCompare'),
{SimpleEqualityCompareFunctionName} (IsGUID: False; DefaultValue: '%sSimpleCompare'),
{HashConvertFunctionName} (IsGUID: False; DefaultValue: 'T%sHashConvert'),
+ {SimpleHashConvertFunctionName} (IsGUID: False; DefaultValue: '%sSimpleHashConvert'),
{ContainerInterfaceName} (IsGUID: False; DefaultValue: ''),
{ContainerInterfaceGUID} (IsGUID: True; DefaultValue: ''),
{FlatContainerInterfaceName} (IsGUID: False; DefaultValue: ''),
Modified: trunk/jcl/source/common/JclAbstractContainers.pas
===================================================================
--- trunk/jcl/source/common/JclAbstractContainers.pas 2010-08-08 19:11:20 UTC (rev 3288)
+++ trunk/jcl/source/common/JclAbstractContainers.pas 2010-08-09 11:41:31 UTC (rev 3289)
@@ -711,6 +711,7 @@
AnsiStrings,
{$ENDIF HAS_UNIT_ANSISTRINGS}
JclStringConversions, JclUnicode,
+ JclAlgorithms,
SysUtils;
//=== { TJclAbstractLockable } ===============================================
@@ -1163,7 +1164,7 @@
if Assigned(FHashConvert) then
Result := FHashConvert(AInterface)
else
- Result := Integer(AInterface);
+ Result := IntfSimpleHashConvert(AInterface);
end;
function TJclIntfAbstractContainer.ItemsCompare(const A, B: IInterface): Integer;
@@ -1171,13 +1172,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B)
else
- if Integer(A) > Integer(B) then
- Result := 1
- else
- if Integer(A) < Integer(B) then
- Result := -1
- else
- Result := 0;
+ Result := IntfSimpleCompare(A, B);
end;
function TJclIntfAbstractContainer.ItemsEqual(const A, B: IInterface): Boolean;
@@ -1188,7 +1183,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B) = 0
else
- Result := Integer(A) = Integer(B);
+ Result := IntfSimpleEqualityCompare(A, B);
end;
procedure TJclIntfAbstractContainer.SetCompare(Value: TIntfCompare);
@@ -1269,98 +1264,25 @@
end;
function TJclAnsiStrAbstractContainer.Hash(const AString: AnsiString): Integer;
-// from "Fast Hashing of Variable-Length Text Strings", Peter K. Pearson, 1990
-// http://portal.acm.org/citation.cfm?id=78978
-type
- TIntegerHash = packed record
- case Byte of
- 0: (H1, H2, H3, H4: Byte);
- 1: (H: Integer);
- 2: (C: UCS4);
- end;
-var
- I, J: Integer;
- C1: Byte;
- C2, IntegerHash: TIntegerHash;
- CA: TUCS4Array;
begin
if Assigned(FHashConvert) then
Result := FHashConvert(AString)
else
begin
- IntegerHash.H1 := 0;
- IntegerHash.H2 := 1;
- IntegerHash.H3 := 2;
- IntegerHash.H4 := 3;
case FEncoding of
seISO:
- begin
- if FCaseSensitive then
- begin
- for I := 1 to Length(AString) do
- begin
- C1 := Ord(AString[I]);
- IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C1];
- IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C1];
- IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C1];
- IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C1];
- end;
- end
- else
- begin
- // case insensitive
- for I := 1 to Length(AString) - 1 do
- begin
- C1 := Ord(JclAnsiStrings.CharUpper(AString[I]));
- IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C1];
- IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C1];
- IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C1];
- IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C1];
- end;
- end;
- end;
+ if FCaseSensitive then
+ Result := AnsiStrSimpleHashConvert(AString)
+ else
+ Result := AnsiStrSimpleHashConvertI(AString);
seUTF8:
- begin
- if FCaseSensitive then
- begin
- I := 1;
- while I < Length(AString) do
- begin
- C2.C := UTF8GetNextChar(AString, I);
- if I = -1 then
- raise EJclUnexpectedEOSequenceError.Create;
- IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C2.H1];
- IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C2.H2];
- IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C2.H3];
- IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C2.H4];
- end;
- end
- else
- begin
- // case insensitive
- I := 1;
- SetLength(CA, 0);
- while I < Length(AString) do
- begin
- C2.C := UTF8GetNextChar(AString, I);
- CA := UnicodeCaseFold(C2.C);
- for J := Low(CA) to High(CA) do
- begin
- C2.C := CA[J];
- if I = -1 then
- raise EJclUnexpectedEOSequenceError.Create;
- IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C2.H1];
- IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C2.H2];
- IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C2.H3];
- IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C2.H4];
- end;
- end;
- end;
- end;
+ if FCaseSensitive then
+ Result := AnsiStrSimpleHashConvertU(AString)
+ else
+ Result := AnsiStrSimpleHashConvertUI(AString);
else
raise EJclOperationNotSupportedError.Create;
end;
- Result := IntegerHash.H;
end;
end;
@@ -1371,12 +1293,11 @@
else
begin
case FEncoding of
- seISO:
+ seISO, seUTF8:
if FCaseSensitive then
- Result := CompareStr(A, B)
+ Result := AnsiStrSimpleCompare(A, B)
else
- Result := CompareText(A, B);
- //seUTF8:
+ Result := AnsiStrSimpleCompareI(A, B);
else
raise EJclOperationNotSupportedError.Create;
end;
@@ -1393,12 +1314,11 @@
else
begin
case FEncoding of
- seISO:
+ seISO, seUTF8:
if FCaseSensitive then
- Result := CompareStr(A, B) = 0
+ Result := AnsiStrSimpleEqualityCompare(A, B)
else
- Result := CompareText(A, B) = 0;
- //seUTF8:
+ Result := AnsiStrSimpleEqualityCompareI(A, B);
else
raise EJclOperationNotSupportedError.Create;
end;
@@ -1469,71 +1389,20 @@
end;
function TJclWideStrAbstractContainer.Hash(const AString: WideString): Integer;
-// from "Fast Hashing of Variable-Length Text Strings", Peter K. Pearson, 1990
-// http://portal.acm.org/citation.cfm?id=78978
-type
- TIntegerHash = packed record
- case Byte of
- 0: (H1, H2, H3, H4: Byte);
- 1: (H: Integer);
- 2: (C: UCS4);
- end;
-var
- I, J: Integer;
- C2, IntegerHash: TIntegerHash;
- CA: TUCS4Array;
begin
if Assigned(FHashConvert) then
Result := FHashConvert(AString)
else
begin
- IntegerHash.H1 := 0;
- IntegerHash.H2 := 1;
- IntegerHash.H3 := 2;
- IntegerHash.H4 := 3;
case FEncoding of
seUTF16:
- begin
- SetLength(CA, 0);
- if FCaseSensitive then
- begin
- I := 1;
- while I < Length(AString) do
- begin
- C2.C := UTF16GetNextChar(AString, I);
- if I = -1 then
- raise EJclUnexpectedEOSequenceError.Create;
- IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C2.H1];
- IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C2.H2];
- IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C2.H3];
- IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C2.H4];
- end;
- end
- else
- begin
- // case insensitive
- I := 1;
- while I < Length(AString) do
- begin
- C2.C := UTF16GetNextChar(AString, I);
- CA := UnicodeCaseFold(C2.C);
- for J := Low(CA) to High(CA) do
- begin
- C2.C := CA[J];
- if I = -1 then
- raise EJclUnexpectedEOSequenceError.Create;
- IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C2.H1];
- IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C2.H2];
- IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C2.H3];
- IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C2.H4];
- end;
- end;
- end;
- end;
+ if FCaseSensitive then
+ Result := WideStrSimpleHashConvert(AString)
+ else
+ Result := WideStrSimpleHashConvertI(AString);
else
raise EJclOperationNotSupportedError.Create;
end;
- Result := IntegerHash.H;
end;
end;
@@ -1546,9 +1415,9 @@
case FEncoding of
seUTF16:
if FCaseSensitive then
- Result := JclWideStrings.WideCompareStr(A, B)
+ Result := WideStrSimpleCompare(A, B)
else
- Result := JclWideStrings.WideCompareText(A, B);
+ Result := WideStrSimpleCompareI(A, B);
else
raise EJclOperationNotSupportedError.Create;
end;
@@ -1567,9 +1436,9 @@
case FEncoding of
seUTF16:
if FCaseSensitive then
- Result := JclWideStrings.WideCompareStr(A, B) = 0
+ Result := WideStrSimpleEqualityCompare(A, B)
else
- Result := JclWideStrings.WideCompareText(A, B) = 0;
+ Result := WideStrSimpleEqualityCompareI(A, B);
else
raise EJclOperationNotSupportedError.Create;
end;
@@ -1635,65 +1504,14 @@
end;
function TJclUnicodeStrAbstractContainer.Hash(const AString: UnicodeString): Integer;
-// from "Fast Hashing of Variable-Length Text Strings", Peter K. Pearson, 1990
-// http://portal.acm.org/citation.cfm?id=78978
-type
- TIntegerHash = packed record
- case Byte of
- 0: (H1, H2, H3, H4: Byte);
- 1: (H: Integer);
- 2: (C: UCS4);
- end;
-var
- I, J: Integer;
- C2, IntegerHash: TIntegerHash;
- CA: TUCS4Array;
begin
if Assigned(FHashConvert) then
Result := FHashConvert(AString)
else
- begin
- IntegerHash.H1 := 0;
- IntegerHash.H2 := 1;
- IntegerHash.H3 := 2;
- IntegerHash.H4 := 3;
- SetLength(CA, 0);
- if FCaseSensitive then
- begin
- I := 1;
- while I < Length(AString) do
- begin
- C2.C := UTF16GetNextChar(AString, I);
- if I = -1 then
- raise EJclUnexpectedEOSequenceError.Create;
- IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C2.H1];
- IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C2.H2];
- IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C2.H3];
- IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C2.H4];
- end;
- end
- else
- begin
- // case insensitive
- I := 1;
- while I < Length(AString) do
- begin
- C2.C := UTF16GetNextChar(AString, I);
- CA := UnicodeCaseFold(C2.C);
- for J := Low(CA) to High(CA) do
- begin
- C2.C := CA[J];
- if I = -1 then
- raise EJclUnexpectedEOSequenceError.Create;
- IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C2.H1];
- IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C2.H2];
- IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C2.H3];
- IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C2.H4];
- end;
- end;
- end;
- Result := IntegerHash.H;
- end;
+ if FCaseSensitive then
+ Result := UnicodeStrSimpleHashConvert(AString)
+ else
+ Result := UnicodeStrSimpleHashConvertI(AString);
end;
@@ -1703,9 +1521,9 @@
Result := FCompare(A, B)
else
if FCaseSensitive then
- Result := CompareStr(A, B)
+ Result := UnicodeStrSimpleCompare(A, B)
else
- Result := CompareText(A, B);
+ Result := UnicodeStrSimpleCompareI(A, B);
end;
function TJclUnicodeStrAbstractContainer.ItemsEqual(const A, B: UnicodeString): Boolean;
@@ -1717,9 +1535,9 @@
Result := FCompare(A, B) = 0
else
if FCaseSensitive then
- Result := CompareStr(A, B) = 0
+ Result := UnicodeStrSimpleEqualityCompare(A, B)
else
- Result := CompareText(A, B) = 0;
+ Result := UnicodeStrSimpleEqualityCompareI(A, B);
end;
procedure TJclUnicodeStrAbstractContainer.SetCompare(Value: TUnicodeStrCompare);
@@ -1782,13 +1600,11 @@
end;
function TJclSingleAbstractContainer.Hash(const AValue: Single): Integer;
-const
- A = 0.6180339887; // (sqrt(5) - 1) / 2
begin
if Assigned(FHashConvert) then
Result := FHashConvert(AValue)
else
- Result := Round(MaxInt * Frac(AValue * A));
+ Result := SingleSimpleHashConvert(AValue);
end;
function TJclSingleAbstractContainer.ItemsCompare(const A, B: Single): Integer;
@@ -1880,13 +1696,11 @@
end;
function TJclDoubleAbstractContainer.Hash(const AValue: Double): Integer;
-const
- A = 0.6180339887; // (sqrt(5) - 1) / 2
begin
if Assigned(FHashConvert) then
Result := FHashConvert(AValue)
else
- Result := Round(MaxInt * Frac(AValue * A));
+ Result := DoubleSimpleHashConvert(AValue);
end;
function TJclDoubleAbstractContainer.ItemsCompare(const A, B: Double): Integer;
@@ -1978,13 +1792,11 @@
end;
function TJclExtendedAbstractContainer.Hash(const AValue: Extended): Integer;
-const
- A = 0.6180339887; // (sqrt(5) - 1) / 2
begin
if Assigned(FHashConvert) then
Result := FHashConvert(AValue)
else
- Result := Round(MaxInt * Frac(AValue * A));
+ Result := ExtendedSimpleHashConvert(AValue);
end;
function TJclExtendedAbstractContainer.ItemsCompare(const A, B: Extended): Integer;
@@ -2074,7 +1886,7 @@
if Assigned(FHashConvert) then
Result := FHashConvert(AValue)
else
- Result := AValue;
+ Result := IntegerSimpleHashConvert(AValue);
end;
function TJclIntegerAbstractContainer.ItemsCompare(A, B: Integer): Integer;
@@ -2082,13 +1894,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B)
else
- if A > B then
- Result := 1
- else
- if A < B then
- Result := -1
- else
- Result := 0;
+ Result := IntegerSimpleCompare(A, B);
end;
function TJclIntegerAbstractContainer.ItemsEqual(A, B: Integer): Boolean;
@@ -2099,7 +1905,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B) = 0
else
- Result := A = B;
+ Result := IntegerSimpleEqualityCompare(A, B);
end;
procedure TJclIntegerAbstractContainer.SetCompare(Value: TIntegerCompare);
@@ -2159,7 +1965,7 @@
if Assigned(FHashConvert) then
Result := FHashConvert(AValue)
else
- Result := AValue and MaxInt;
+ Result := CardinalSimpleHashConvert(AValue);
end;
function TJclCardinalAbstractContainer.ItemsCompare(A, B: Cardinal): Integer;
@@ -2167,13 +1973,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B)
else
- if A > B then
- Result := 1
- else
- if A < B then
- Result := -1
- else
- Result := 0;
+ Result := CardinalSimpleCompare(A, B);
end;
function TJclCardinalAbstractContainer.ItemsEqual(A, B: Cardinal): Boolean;
@@ -2184,7 +1984,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B) = 0
else
- Result := A = B;
+ Result := CardinalSimpleEqualityCompare(A, B);
end;
procedure TJclCardinalAbstractContainer.SetCompare(Value: TCardinalCompare);
@@ -2244,7 +2044,7 @@
if Assigned(FHashConvert) then
Result := FHashConvert(AValue)
else
- Result := AValue and MaxInt;
+ Result := Int64SimpleHashConvert(AValue);
end;
function TJclInt64AbstractContainer.ItemsCompare(const A, B: Int64): Integer;
@@ -2252,13 +2052,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B)
else
- if A > B then
- Result := 1
- else
- if A < B then
- Result := -1
- else
- Result := 0;
+ Result := Int64SimpleCompare(A, B);
end;
function TJclInt64AbstractContainer.ItemsEqual(const A, B: Int64): Boolean;
@@ -2269,7 +2063,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B) = 0
else
- Result := A = B;
+ Result := Int64SimpleEqualityCompare(A, B);
end;
procedure TJclInt64AbstractContainer.SetCompare(Value: TInt64Compare);
@@ -2329,7 +2123,7 @@
if Assigned(FHashConvert) then
Result := FHashConvert(APtr)
else
- Result := Integer(APtr) and MaxInt;
+ Result := PtrSimpleHashConvert(APtr);
end;
function TJclPtrAbstractContainer.ItemsCompare(A, B: Pointer): Integer;
@@ -2337,13 +2131,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B)
else
- if Integer(A) > Integer(B) then
- Result := 1
- else
- if Integer(A) < Integer(B) then
- Result := -1
- else
- Result := 0;
+ Result := PtrSimpleCompare(A, B);
end;
function TJclPtrAbstractContainer.ItemsEqual(A, B: Pointer): Boolean;
@@ -2354,7 +2142,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B) = 0
else
- Result := Integer(A) = Integer(B);
+ Result := PtrSimpleEqualityCompare(A, B);
end;
procedure TJclPtrAbstractContainer.SetCompare(Value: TPtrCompare);
begin
@@ -2432,7 +2220,7 @@
if Assigned(FHashConvert) then
Result := FHashConvert(AObject)
else
- Result := Integer(AObject);
+ Result := SimpleHashConvert(AObject);
end;
function TJclAbstractContainer.ItemsCompare(A, B: TObject): Integer;
@@ -2440,13 +2228,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B)
else
- if Integer(A) > Integer(B) then
- Result := 1
- else
- if Integer(A) < Integer(B) then
- Result := -1
- else
- Result := 0;
+ Result := SimpleCompare(A, B);
end;
function TJclAbstractContainer.ItemsEqual(A, B: TObject): Boolean;
@@ -2457,7 +2239,7 @@
if Assigned(FCompare) then
Result := FCompare(A, B) = 0
else
- Result := Integer(A) = Integer(B);
+ Result := SimpleEqualityCompare(A, B);
end;
procedure TJclAbstractContainer.SetCompare(Value: TCompare);
Modified: trunk/jcl/source/common/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/common/JclAlgorithms.pas 2010-08-08 19:11:20 UTC (rev 3288)
+++ trunk/jcl/source/common/JclAlgorithms.pas 2010-08-09 11:41:31 UTC (rev 3289)
@@ -29,7 +29,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -68,6 +68,12 @@
function IntegerCompare(Obj1, Obj2: TObject): Integer;
+function AnsiStrSimpleCompareI(const Obj1, Obj2: AnsiString): Integer;
+function WideStrSimpleCompareI(const Obj1, Obj2: WideString): Integer;
+{$IFDEF SUPPORTS_UNICODE_STRING}
+function UnicodeStrSimpleCompareI(const Obj1, Obj2: UnicodeString): Integer;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+
// Compare functions for equality
function IntfSimpleEqualityCompare(const Obj1, Obj2: IInterface): Boolean;
@@ -87,6 +93,39 @@
function PtrSimpleEqualityCompare(Obj1, Obj2: Pointer): Boolean;
function SimpleEqualityCompare(Obj1, Obj2: TObject): Boolean;
+function AnsiStrSimpleEqualityCompareI(const Obj1, Obj2: AnsiString): Boolean;
+function WideStrSimpleEqualityCompareI(const Obj1, Obj2: WideString): Boolean;
+{$IFDEF SUPPORTS_UNICODE_STRING}
+function UnicodeStrSimpleEqualityCompareI(const Obj1, Obj2: UnicodeString): Boolean;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+
+// Hash conversion functions
+
+function IntfSimpleHashConvert(const AInterface: IInterface): Integer;
+function AnsiStrSimpleHashConvert(const AString: AnsiString): Integer;
+function WideStrSimpleHashConvert(const AString: WideString): Integer;
+{$IFDEF SUPPORTS_UNICODE_STRING}
+function UnicodeStrSimpleHashConvert(const AString: UnicodeString): Integer;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+function StrSimpleHashConvert(const AString: string): Integer;
+function SingleSimpleHashConvert(const AValue: Single): Integer;
+function DoubleSimpleHashConvert(const AValue: Double): Integer;
+function ExtendedSimpleHashConvert(const AValue: Extended): Integer;
+function FloatSimpleHashConvert(const AValue: Float): Integer;
+function IntegerSimpleHashConvert(AValue: Integer): Integer;
+function CardinalSimpleHashConvert(AValue: Cardinal): Integer;
+function Int64SimpleHashConvert(const AValue: Int64): Integer;
+function PtrSimpleHashConvert(APtr: Pointer): Integer;
+function SimpleHashConvert(AObject: TObject): Integer;
+
+function AnsiStrSimpleHashConvertI(const AString: AnsiString): Integer;
+function AnsiStrSimpleHashConvertU(const AString: AnsiString): Integer;
+function AnsiStrSimpleHashConvertUI(const AString: AnsiString): Integer;
+function WideStrSimpleHashConvertI(const AString: WideString): Integer;
+{$IFDEF SUPPORTS_UNICODE_STRING}
+function UnicodeStrSimpleHashConvertI(const AString: UnicodeString): Integer;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+
// Apply algorithms
procedure Apply(const First: IJclIntfIterator; Count: Integer; F: TIntfApplyFunction); overload;
@@ -370,6 +409,26 @@
end;
{$ENDIF SUPPORTS_GENERICS}
+const
+ // table of byte permutations without inner loop
+ BytePermTable: array [Byte] of Byte =
+ ( 22, 133, 0, 244, 194, 193, 4, 164, 69, 211, 166, 235, 75, 110, 9, 140,
+ 125, 84, 64, 209, 57, 47, 197, 76, 237, 48, 189, 87, 221, 254, 20, 132,
+ 25, 162, 203, 225, 186, 165, 72, 228, 61, 208, 158, 185, 114, 173, 1, 66,
+ 202, 46, 198, 214, 27, 161, 178, 238, 8, 68, 97, 17, 199, 210, 96, 196,
+ 85, 240, 233, 71, 232, 142, 148, 70, 184, 152, 90, 206, 139, 182, 34, 101,
+ 104, 12, 143, 227, 24, 247, 175, 150, 39, 31, 36, 123, 62, 119, 236, 28,
+ 117, 100, 230, 223, 30, 154, 18, 153, 127, 192, 176, 19, 174, 134, 2, 216,
+ 218, 91, 45, 7, 128, 138, 126, 40, 16, 54, 207, 181, 11, 137, 60, 191,
+ 51, 231, 121, 213, 86, 111, 141, 172, 98, 226, 179, 249, 136, 58, 88, 93,
+ 201, 195, 118, 144, 146, 113, 212, 32, 21, 131, 177, 33, 151, 130, 205, 171,
+ 92, 251, 168, 29, 156, 124, 224, 200, 3, 187, 105, 52, 239, 147, 82, 94,
+ 26, 102, 243, 242, 145, 163, 49, 135, 43, 78, 112, 83, 63, 35, 170, 167,
+ 250, 159, 73, 37, 6, 79, 106, 215, 129, 74, 109, 42, 41, 120, 23, 160,
+ 107, 180, 103, 77, 53, 169, 89, 149, 44, 38, 81, 246, 188, 67, 15, 80,
+ 155, 99, 95, 5, 229, 108, 13, 255, 59, 241, 252, 245, 222, 248, 115, 55,
+ 217, 56, 65, 219, 204, 190, 10, 50, 253, 183, 234, 116, 122, 220, 14, 157);
+
{$IFDEF UNITVERSIONING}
const
UnitVersioning: TUnitVersionInfo = (
@@ -388,6 +447,7 @@
{$IFDEF HAS_UNIT_ANSISTRINGS}
AnsiStrings,
{$ENDIF HAS_UNIT_ANSISTRINGS}
+ JclAnsiStrings, JclStringConversions, JclUnicode,
SysUtils;
function IntfSimpleCompare(const Obj1, Obj2: IInterface): Integer;
@@ -401,23 +461,42 @@
Result := 0;
end;
+// default is case-sensitive
function AnsiStrSimpleCompare(const Obj1, Obj2: AnsiString): Integer;
begin
- // (rom) changed to case sensitive compare
Result := CompareStr(Obj1, Obj2);
end;
+// case-insensitive
+function AnsiStrSimpleCompareI(const Obj1, Obj2: AnsiString): Integer;
+begin
+ Result := CompareText(Obj1, Obj2);
+end;
+
+// default is case-sensitive
function WideStrSimpleCompare(const Obj1, Obj2: WideString): Integer;
begin
- // (rom) changed to case sensitive compare
Result := WideCompareStr(Obj1, Obj2);
end;
+// case-insensitive
+function WideStrSimpleCompareI(const Obj1, Obj2: WideString): Integer;
+begin
+ Result := WideCompareText(Obj1, Obj2);
+end;
+
{$IFDEF SUPPORTS_UNICODE_STRING}
+// default is case-sensitive
function UnicodeStrSimpleCompare(const Obj1, Obj2: UnicodeString): Integer;
begin
Result := CompareStr(Obj1, Obj2);
end;
+
+// case-insensitive
+function UnicodeStrSimpleCompareI(const Obj1, Obj2: UnicodeString): Integer;
+begin
+ Result := CompareText(Obj1, Obj2);
+end;
{$ENDIF SUPPORTS_UNICODE_STRING}
function StrSimpleCompare(const Obj1, Obj2: string): Integer;
@@ -551,23 +630,42 @@
Result := Integer(Obj1) = Integer(Obj2);
end;
+// default is case-sensitive
function AnsiStrSimpleEqualityCompare(const Obj1, Obj2: AnsiString): Boolean;
begin
- // (rom) changed to case sensitive compare
Result := CompareStr(Obj1, Obj2) = 0;
end;
+// case-insensitive
+function AnsiStrSimpleEqualityCompareI(const Obj1, Obj2: AnsiString): Boolean;
+begin
+ Result := CompareText(Obj1, Obj2) = 0;
+end;
+
+// default is case-sensitive
function WideStrSimpleEqualityCompare(const Obj1, Obj2: WideString): Boolean;
begin
- // (rom) changed to case sensitive compare
Result := WideCompareStr(Obj1, Obj2) = 0;
end;
+// case-insensitive
+function WideStrSimpleEqualityCompareI(const Obj1, Obj2: WideString): Boolean;
+begin
+ Result := WideCompareText(Obj1, Obj2) = 0;
+end;
+
{$IFDEF SUPPORTS_UNICODE_STRING}
+// default is case-sensitive
function UnicodeStrSimpleEqualityCompare(const Obj1, Obj2: UnicodeString): Boolean;
begin
Result := CompareStr(Obj1, Obj2) = 0;
end;
+
+// case-insensitive
+function UnicodeStrSimpleEqualityCompareI(const Obj1, Obj2: UnicodeString): Boolean;
+begin
+ Result := CompareText(Obj1, Obj2) = 0;
+end;
{$ENDIF SUPPORTS_UNICODE_STRING}
function StrSimpleEqualityCompare(const Obj1, Obj2: string): Boolean;
@@ -627,7 +725,299 @@
Result := Integer(Obj1) = Integer(Obj2);
end;
+function IntfSimpleHashConvert(const AInterface: IInterface): Integer;
+begin
+ Result := Integer(AInterface) and MaxInt;
+end;
+// from "Fast Hashing of Variable-Length Text Strings", Peter K. Pearson, 1990
+// http://portal.acm.org/citation.cfm?id=78978
+type
+ TIntegerHash = packed record
+ case Byte of
+ 0: (H1, H2, H3, H4: Byte);
+ 1: (H: Integer);
+ 2: (C: UCS4);
+ end;
+
+// default is case-sensitive and ISO-encoded
+function AnsiStrSimpleHashConvert(const AString: AnsiString): Integer;
+var
+ I: Integer;
+ C: Byte;
+ IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ for I := 1 to Length(AString) do
+ begin
+ C := Ord(AString[I]);
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-insensitive and ISO-encoded
+function AnsiStrSimpleHashConvertI(const AString: AnsiString): Integer;
+var
+ I: Integer;
+ C: Byte;
+ IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ for I := 1 to Length(AString) - 1 do
+ begin
+ C := Ord(JclAnsiStrings.CharUpper(AString[I]));
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-sensitive and UTF8-encoded
+function AnsiStrSimpleHashConvertU(const AString: AnsiString): Integer;
+var
+ I: Integer;
+ C, IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF8GetNextChar(AString, I);
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-insensitive and UTF8-encoded
+function AnsiStrSimpleHashConvertUI(const AString: AnsiString): Integer;
+var
+ I, J: Integer;
+ C, IntegerHash: TIntegerHash;
+ CA: TUCS4Array;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ I := 1;
+ SetLength(CA, 0);
+ while I < Length(AString) do
+ begin
+ C.C := UTF8GetNextChar(AString, I);
+ CA := UnicodeCaseFold(C.C);
+ for J := Low(CA) to High(CA) do
+ begin
+ C.C := CA[J];
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// default is case-sensitive
+function WideStrSimpleHashConvert(const AString: WideString): Integer;
+var
+ I: Integer;
+ C, IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF16GetNextChar(AString, I);
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-insensitive
+function WideStrSimpleHashConvertI(const AString: WideString): Integer;
+var
+ I, J: Integer;
+ C, IntegerHash: TIntegerHash;
+ CA: TUCS4Array;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ SetLength(CA, 0);
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF16GetNextChar(AString, I);
+ CA := UnicodeCaseFold(C.C);
+ for J := Low(CA) to High(CA) do
+ begin
+ C.C := CA[J];
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+{$IFDEF SUPPORTS_UNICODE_STRING}
+// default is case-sensitive
+function UnicodeStrSimpleHashConvert(const AString: UnicodeString): Integer;
+var
+ I: Integer;
+ C, IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF16GetNextChar(AString, I);
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-insensitive
+function UnicodeStrSimpleHashConvertI(const AString: UnicodeString): Integer;
+var
+ I, J: Integer;
+ C, IntegerHash: TIntegerHash;
+ CA: TUCS4Array;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ SetLength(CA, 0);
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF16GetNextChar(AString, I);
+ CA := UnicodeCaseFold(C.C);
+ for J := Low(CA) to High(CA) do
+ begin
+ C.C := CA[J];
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+
+function StrSimpleHashConvert(const AString: string): Integer;
+begin
+ {$IFDEF SUPPORTS_UNICODE}
+ {$IFDEF SUPPORTS_UNICODE_STRING}
+ Result := UnicodeStrSimpleHashConvert(AString);
+ {$ELSE ~SUPPORTS_UNICODE_STRING}
+ Result := WideStrSimpleHashConvert(AString);
+ {$ENDIF ~SUPPORTS_UNICODE_STRING}
+ {$ELSE ~SUPPORTS_UNICODE}
+ Result := AnsiStrSimpleHashConvert(AString);
+ {$ENDIF ~SUPPORTS_UNICODE}
+end;
+
+function SingleSimpleHashConvert(const AValue: Single): Integer;
+const
+ A = 0.6180339887; // (sqrt(5) - 1) / 2
+begin
+ Result := Round(MaxInt * Frac(AValue * A));
+end;
+
+function DoubleSimpleHashConvert(const AValue: Double): Integer;
+const
+ A = 0.6180339887; // (sqrt(5) - 1) / 2
+begin
+ Result := Round(MaxInt * Frac(AValue * A));
+end;
+
+function ExtendedSimpleHashConvert(const AValue: Extended): Integer;
+const
+ A = 0.6180339887; // (sqrt(5) - 1) / 2
+begin
+ Result := Round(MaxInt * Frac(AValue * A));
+end;
+
+function FloatSimpleHashConvert(const AValue: Float): Integer;
+const
+ A = 0.6180339887; // (sqrt(5) - 1) / 2
+begin
+ Result := Round(MaxInt * Frac(AValue * A));
+end;
+
+function IntegerSimpleHashConvert(AValue: Integer): Integer;
+begin
+ Result := AValue and MaxInt;
+end;
+
+function CardinalSimpleHashConvert(AValue: Cardinal): Integer;
+begin
+ Result := AValue and MaxInt;
+end;
+
+function Int64SimpleHashConvert(const AValue: Int64): Integer;
+begin
+ Result := AValue and MaxInt;
+end;
+
+function PtrSimpleHashConvert(APtr: Pointer): Integer;
+begin
+ Result := Integer(APtr) and MaxInt;
+end;
+
+function SimpleHashConvert(AObject: TObject): Integer;
+begin
+ Result := Integer(AObject) and MaxInt;
+end;
+
+
procedure Apply(const First: IJclIntfIterator; Count: Integer; F: TIntfApplyFunction);
var
I: Integer;
Modified: trunk/jcl/source/prototypes/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/prototypes/JclAlgorithms.pas 2010-08-08 19:11:20 UTC (rev 3288)
+++ trunk/jcl/source/prototypes/JclAlgorithms.pas 2010-08-09 11:41:31 UTC (rev 3289)
@@ -50,10 +50,34 @@
{$JPPEXPANDMACRO SIMPLECOMPAREINT(IntegerCompare,,TObject)}
+function AnsiStrSimpleCompareI(const Obj1, Obj2: AnsiString): Integer;
+function WideStrSimpleCompareI(const Obj1, Obj2: WideString): Integer;
+{$IFDEF SUPPORTS_UNICODE_STRING}
+function UnicodeStrSimpleCompareI(const Obj1, Obj2: UnicodeString): Integer;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+
// Compare functions for equality
(*$JPPLOOP ALLTYPEINDEX ALLTYPECOUNT
{$JPPEXPANDMACRO SIMPLEEQUALITYCOMPAREINT(,,)}*)
+function AnsiStrSimpleEqualityCompareI(const Obj1, Obj2: AnsiString): Boolean;
+function WideStrSimpleEqualityCompareI(const Obj1, Obj2: WideString): Boolean;
+{$IFDEF SUPPORTS_UNICODE_STRING}
+function UnicodeStrSimpleEqualityCompareI(const Obj1, Obj2: UnicodeString): Boolean;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+
+// Hash conversion functions
+(*$JPPLOOP ALLTYPEINDEX ALLTYPECOUNT
+{$JPPEXPANDMACRO SIMPLEHASHCONVERTINT(,,,)}*)
+
+function AnsiStrSimpleHashConvertI(const AString: AnsiString): Integer;
+function AnsiStrSimpleHashConvertU(const AString: AnsiString): Integer;
+function AnsiStrSimpleHashConvertUI(const AString: AnsiString): Integer;
+function WideStrSimpleHashConvertI(const AString: WideString): Integer;
+{$IFDEF SUPPORTS_UNICODE_STRING}
+function UnicodeStrSimpleHashConvertI(const AString: UnicodeString): Integer;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+
// Apply algorithms
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO APPLYINT(Apply,,, overload;)}*)
@@ -129,6 +153,26 @@
end;
{$ENDIF SUPPORTS_GENERICS}
+const
+ // table of byte permutations without inner loop
+ BytePermTable: array [Byte] of Byte =
+ ( 22, 133, 0, 244, 194, 193, 4, 164, 69, 211, 166, 235, 75, 110, 9, 140,
+ 125, 84, 64, 209, 57, 47, 197, 76, 237, 48, 189, 87, 221, 254, 20, 132,
+ 25, 162, 203, 225, 186, 165, 72, 228, 61, 208, 158, 185, 114, 173, 1, 66,
+ 202, 46, 198, 214, 27, 161, 178, 238, 8, 68, 97, 17, 199, 210, 96, 196,
+ 85, 240, 233, 71, 232, 142, 148, 70, 184, 152, 90, 206, 139, 182, 34, 101,
+ 104, 12, 143, 227, 24, 247, 175, 150, 39, 31, 36, 123, 62, 119, 236, 28,
+ 117, 100, 230, 223, 30, 154, 18, 153, 127, 192, 176, 19, 174, 134, 2, 216,
+ 218, 91, 45, 7, 128, 138, 126, 40, 16, 54, 207, 181, 11, 137, 60, 191,
+ 51, 231, 121, 213, 86, 111, 141, 172, 98, 226, 179, 249, 136, 58, 88, 93,
+ 201, 195, 118, 144, 146, 113, 212, 32, 21, 131, 177, 33, 151, 130, 205, 171,
+ 92, 251, 168, 29, 156, 124, 224, 200, 3, 187, 105, 52, 239, 147, 82, 94,
+ 26, 102, 243, 242, 145, 163, 49, 135, 43, 78, 112, 83, 63, 35, 170, 167,
+ 250, 159, 73, 37, 6, 79, 106, 215, 129, 74, 109, 42, 41, 120, 23, 160,
+ 107, 180, 103, 77, 53, 169, 89, 149, 44, 38, 81, 246, 188, 67, 15, 80,
+ 155, 99, 95, 5, 229, 108, 13, 255, 59, 241, 252, 245, 222, 248, 115, 55,
+ 217, 56, 65, 219, 204, 190, 10, 50, 253, 183, 234, 116, 122, 220, 14, 157);
+
{$IFDEF UNITVERSIONING}
const
UnitVersioning: TUnitVersionInfo = (
@@ -147,6 +191,7 @@
{$IFDEF HAS_UNIT_ANSISTRINGS}
AnsiStrings,
{$ENDIF HAS_UNIT_ANSISTRINGS}
+ JclAnsiStrings, JclStringConversions, JclUnicode,
SysUtils;
function IntfSimpleCompare(const Obj1, Obj2: IInterface): Integer;
@@ -160,23 +205,42 @@
Result := 0;
end;
+// default is case-sensitive
function AnsiStrSimpleCompare(const Obj1, Obj2: AnsiString): Integer;
begin
- // (rom) changed to case sensitive compare
Result := CompareStr(Obj1, Obj2);
end;
+// case-insensitive
+function AnsiStrSimpleCompareI(const Obj1, Obj2: AnsiString): Integer;
+begin
+ Result := CompareText(Obj1, Obj2);
+end;
+
+// default is case-sensitive
function WideStrSimpleCompare(const Obj1, Obj2: WideString): Integer;
begin
- // (rom) changed to case sensitive compare
Result := WideCompareStr(Obj1, Obj2);
end;
+// case-insensitive
+function WideStrSimpleCompareI(const Obj1, Obj2: WideString): Integer;
+begin
+ Result := WideCompareText(Obj1, Obj2);
+end;
+
{$IFDEF SUPPORTS_UNICODE_STRING}
+// default is case-sensitive
function UnicodeStrSimpleCompare(const Obj1, Obj2: UnicodeString): Integer;
begin
Result := CompareStr(Obj1, Obj2);
end;
+
+// case-insensitive
+function UnicodeStrSimpleCompareI(const Obj1, Obj2: UnicodeString): Integer;
+begin
+ Result := CompareText(Obj1, Obj2);
+end;
{$ENDIF SUPPORTS_UNICODE_STRING}
function StrSimpleCompare(const Obj1, Obj2: string): Integer;
@@ -310,23 +374,42 @@
Result := Integer(Obj1) = Integer(Obj2);
end;
+// default is case-sensitive
function AnsiStrSimpleEqualityCompare(const Obj1, Obj2: AnsiString): Boolean;
begin
- // (rom) changed to case sensitive compare
Result := CompareStr(Obj1, Obj2) = 0;
end;
+// case-insensitive
+function AnsiStrSimpleEqualityCompareI(const Obj1, Obj2: AnsiString): Boolean;
+begin
+ Result := CompareText(Obj1, Obj2) = 0;
+end;
+
+// default is case-sensitive
function WideStrSimpleEqualityCompare(const Obj1, Obj2: WideString): Boolean;
begin
- // (rom) changed to case sensitive compare
Result := WideCompareStr(Obj1, Obj2) = 0;
end;
+// case-insensitive
+function WideStrSimpleEqualityCompareI(const Obj1, Obj2: WideString): Boolean;
+begin
+ Result := WideCompareText(Obj1, Obj2) = 0;
+end;
+
{$IFDEF SUPPORTS_UNICODE_STRING}
+// default is case-sensitive
function UnicodeStrSimpleEqualityCompare(const Obj1, Obj2: UnicodeString): Boolean;
begin
Result := CompareStr(Obj1, Obj2) = 0;
end;
+
+// case-insensitive
+function UnicodeStrSimpleEqualityCompareI(const Obj1, Obj2: UnicodeString): Boolean;
+begin
+ Result := CompareText(Obj1, Obj2) = 0;
+end;
{$ENDIF SUPPORTS_UNICODE_STRING}
function StrSimpleEqualityCompare(const Obj1, Obj2: string): Boolean;
@@ -386,6 +469,298 @@
Result := Integer(Obj1) = Integer(Obj2);
end;
+function IntfSimpleHashConvert(const AInterface: IInterface): Integer;
+begin
+ Result := Integer(AInterface) and MaxInt;
+end;
+
+// from "Fast Hashing of Variable-Length Text Strings", Peter K. Pearson, 1990
+// http://portal.acm.org/citation.cfm?id=78978
+type
+ TIntegerHash = packed record
+ case Byte of
+ 0: (H1, H2, H3, H4: Byte);
+ 1: (H: Integer);
+ 2: (C: UCS4);
+ end;
+
+// default is case-sensitive and ISO-encoded
+function AnsiStrSimpleHashConvert(const AString: AnsiString): Integer;
+var
+ I: Integer;
+ C: Byte;
+ IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ for I := 1 to Length(AString) do
+ begin
+ C := Ord(AString[I]);
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-insensitive and ISO-encoded
+function AnsiStrSimpleHashConvertI(const AString: AnsiString): Integer;
+var
+ I: Integer;
+ C: Byte;
+ IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ for I := 1 to Length(AString) - 1 do
+ begin
+ C := Ord(JclAnsiStrings.CharUpper(AString[I]));
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-sensitive and UTF8-encoded
+function AnsiStrSimpleHashConvertU(const AString: AnsiString): Integer;
+var
+ I: Integer;
+ C, IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF8GetNextChar(AString, I);
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-insensitive and UTF8-encoded
+function AnsiStrSimpleHashConvertUI(const AString: AnsiString): Integer;
+var
+ I, J: Integer;
+ C, IntegerHash: TIntegerHash;
+ CA: TUCS4Array;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ I := 1;
+ SetLength(CA, 0);
+ while I < Length(AString) do
+ begin
+ C.C := UTF8GetNextChar(AString, I);
+ CA := UnicodeCaseFold(C.C);
+ for J := Low(CA) to High(CA) do
+ begin
+ C.C := CA[J];
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// default is case-sensitive
+function WideStrSimpleHashConvert(const AString: WideString): Integer;
+var
+ I: Integer;
+ C, IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF16GetNextChar(AString, I);
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-insensitive
+function WideStrSimpleHashConvertI(const AString: WideString): Integer;
+var
+ I, J: Integer;
+ C, IntegerHash: TIntegerHash;
+ CA: TUCS4Array;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ SetLength(CA, 0);
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF16GetNextChar(AString, I);
+ CA := UnicodeCaseFold(C.C);
+ for J := Low(CA) to High(CA) do
+ begin
+ C.C := CA[J];
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+{$IFDEF SUPPORTS_UNICODE_STRING}
+// default is case-sensitive
+function UnicodeStrSimpleHashConvert(const AString: UnicodeString): Integer;
+var
+ I: Integer;
+ C, IntegerHash: TIntegerHash;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF16GetNextChar(AString, I);
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+
+// case-insensitive
+function UnicodeStrSimpleHashConvertI(const AString: UnicodeString): Integer;
+var
+ I, J: Integer;
+ C, IntegerHash: TIntegerHash;
+ CA: TUCS4Array;
+begin
+ IntegerHash.H1 := 0;
+ IntegerHash.H2 := 1;
+ IntegerHash.H3 := 2;
+ IntegerHash.H4 := 3;
+ SetLength(CA, 0);
+ I := 1;
+ while I < Length(AString) do
+ begin
+ C.C := UTF16GetNextChar(AString, I);
+ CA := UnicodeCaseFold(C.C);
+ for J := Low(CA) to High(CA) do
+ begin
+ C.C := CA[J];
+ if I = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+ IntegerHash.H1 := BytePermTable[IntegerHash.H1 xor C.H1];
+ IntegerHash.H2 := BytePermTable[IntegerHash.H2 xor C.H2];
+ IntegerHash.H3 := BytePermTable[IntegerHash.H3 xor C.H3];
+ IntegerHash.H4 := BytePermTable[IntegerHash.H4 xor C.H4];
+ end;
+ end;
+ Result := IntegerHash.H and MaxInt;
+end;
+{$ENDIF SUPPORTS_UNICODE_STRING}
+
+function StrSimpleHashConvert(const AString: string): Integer;
+begin
+ {$IFDEF SUPPORTS_UNICODE}
+ {$IFDEF SUPPORTS_UNICODE_STRING}
+ Result := UnicodeStrSimpleHashConvert(AString);
+ {$ELSE ~SUPPORTS_UNICODE_STRING}
+ Result := WideStrSimpleHashConvert(AString);
+ {$ENDIF ~SUPPORTS_UNICODE_STRING}
+ {$ELSE ~SUPPORTS_UNICODE}
+ Result := AnsiStrSimpleHashConvert(AString);
+ {$ENDIF ~SUPPORTS_UNICODE}
+end;
+
+function SingleSimpleHashConvert(const AValue: Single): Integer;
+const
+ A = 0.6180339887; // (sqrt(5) - 1) / 2
+begin
+ Result := Round(MaxInt * Frac(AValue * A));
+end;
+
+function DoubleSimpleHashConvert(const AValue: Double): Integer;
+const
+ A = 0.6180339887; // (sqrt(5) - 1) / 2
+begin
+ Result := Round(MaxInt * Frac(AValue * A));
+end;
+
+function ExtendedSimpleHashConvert(const AValue: Extended): Integer;
+const
+ A = 0.6180339887; // (sqrt(5) - 1) / 2
+begin
+ Result := Round(MaxInt * Frac(AValue * A));
+end;
+
+function FloatSimpleHashConvert(const AValue: Float): Integer;
+const
+ A = 0.6180339887; // (sqrt(5) - 1) / 2
+begin
+ Result := Round(MaxInt * Frac(AValue * A));
+end;
+
+function IntegerSimpleHashConvert(AValue: Integer): Integer;
+begin
+ Result := AValue and MaxInt;
+end;
+
+function CardinalSimpleHashConvert(AValue: Cardinal): Integer;
+begin
+ Result := AValue and MaxInt;
+end;
+
+function Int64SimpleHashConvert(const AValue: Int64): Integer;
+begin
+ Result := AValue and MaxInt;
+end;
+
+function PtrSimpleHashConvert(APtr: Pointer): Integer;
+begin
+ Result := Integer(APtr) and MaxInt;
+end;
+
+function SimpleHashConvert(AObject: TObject): Integer;
+begin
+ Result := Integer(AObject) and MaxInt;
+end;
+
(*$JPPLOOP TRUETYPEINDEX TRUETYPECOUNT
{$JPPEXPANDMACRO APPLYIMP(Apply,,,)}
*)
Modified: trunk/jcl/source/prototypes/containers/JclAlgorithms.int
===================================================================
--- trunk/jcl/source/prototypes/containers/JclAlgorithms.int 2010-08-08 19:11:20 UTC (rev 3288)
+++ trunk/jcl/source/prototypes/containers/JclAlgorithms.int 2010-08-09 11:41:31 UTC (rev 3289)
@@ -4,6 +4,8 @@
function PROCNAME(CONSTKEYWORDObj1, Obj2: TYPENAME): Integer;*)
(*$JPPDEFINEMACRO SIMPLEEQUALITYCOMPAREINT(PROCNAME, CONSTKEYWORD, TYPENAME)
function PROCNAME(CONSTKEYWORDObj1, Obj2: TYPENAME): Boolean;*)
+(*$JPPDEFINEMACRO SIMPLEHASHCONVERTINT(PROCNAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME)
+function PROCNAME(CONSTKEYWORDPARAMETERNAME: TYPENAME): Integer;*)
(*$JPPDEFINEMACRO FINDINT(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE, OVERLOAD)
function PROCNAME(const First: ITRINTERFACENAME; Count: Integer; CONSTKEYWORDPARAMETERNAME: TYPENAME;
AComparator: CALLBACKTYPE): ITRINTERFACENAME;OVERLOAD*)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-08 19:11:28
|
Revision: 3288
http://jcl.svn.sourceforge.net/jcl/?rev=3288&view=rev
Author: outchy
Date: 2010-08-08 19:11:20 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
Avoid callback macros in JclSortedMaps and JclHashMaps.
Modified Paths:
--------------
trunk/jcl/source/prototypes/JclHashMaps.pas
trunk/jcl/source/prototypes/JclSortedMaps.pas
trunk/jcl/source/prototypes/containers/JclHashMaps.imp
trunk/jcl/source/prototypes/containers/JclSortedMaps.imp
Modified: trunk/jcl/source/prototypes/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/prototypes/JclHashMaps.pas 2010-08-08 12:56:48 UTC (rev 3287)
+++ trunk/jcl/source/prototypes/JclHashMaps.pas 2010-08-08 19:11:20 UTC (rev 3288)
@@ -768,11 +768,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfIntfBucket,nil,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfIntfHashMap,TJclIntfIntfBucket,IJclIntfIntfMap,IJclIntfSet,IJclIntfIterator,IJclIntfCollection,,,,const ,IInterface,nil,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfIntfHashMap,TJclIntfIntfBucket,IJclIntfIntfMap,IJclIntfSet,IJclIntfIterator,IJclIntfCollection,,,,const ,IInterface,nil,const ,IInterface,nil,TJclIntfArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclIntfIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -804,11 +800,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclAnsiStrIntfBucket,'',nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclAnsiStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclAnsiStrIntfHashMap,TJclAnsiStrIntfBucket,IJclAnsiStrIntfMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclIntfCollection,,,,const ,AnsiString,'',const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclAnsiStrIntfHashMap,TJclAnsiStrIntfBucket,IJclAnsiStrIntfMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclIntfCollection,,,,const ,AnsiString,'',const ,IInterface,nil,TJclAnsiStrArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclAnsiStrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -840,11 +832,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfAnsiStrBucket,nil,'')}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclAnsiStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfAnsiStrHashMap,TJclIntfAnsiStrBucket,IJclIntfAnsiStrMap,IJclIntfSet,IJclIntfIterator,IJclAnsiStrCollection,,,,const ,IInterface,nil,const ,AnsiString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfAnsiStrHashMap,TJclIntfAnsiStrBucket,IJclIntfAnsiStrMap,IJclIntfSet,IJclIntfIterator,IJclAnsiStrCollection,,,,const ,IInterface,nil,const ,AnsiString,'',TJclIntfArraySet.Create(FSize),TJclAnsiStrArrayList.Create(FSize))}
function TJclIntfAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -881,11 +869,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclAnsiStrAnsiStrBucket,'','')}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclAnsiStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclAnsiStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclAnsiStrAnsiStrHashMap,TJclAnsiStrAnsiStrBucket,IJclAnsiStrAnsiStrMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclAnsiStrCollection,,,,const ,AnsiString,'',const ,AnsiString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclAnsiStrAnsiStrHashMap,TJclAnsiStrAnsiStrBucket,IJclAnsiStrAnsiStrMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclAnsiStrCollection,,,,const ,AnsiString,'',const ,AnsiString,'',TJclAnsiStrArraySet.Create(FSize),TJclAnsiStrArrayList.Create(FSize))}
function TJclAnsiStrAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -917,11 +901,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclWideStrIntfBucket,'',nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclWideStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclWideStrIntfHashMap,TJclWideStrIntfBucket,IJclWideStrIntfMap,IJclWideStrSet,IJclWideStrIterator,IJclIntfCollection,,,,const ,WideString,'',const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclWideStrIntfHashMap,TJclWideStrIntfBucket,IJclWideStrIntfMap,IJclWideStrSet,IJclWideStrIterator,IJclIntfCollection,,,,const ,WideString,'',const ,IInterface,nil,TJclWideStrArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclWideStrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -953,11 +933,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfWideStrBucket,nil,'')}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclWideStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfWideStrHashMap,TJclIntfWideStrBucket,IJclIntfWideStrMap,IJclIntfSet,IJclIntfIterator,IJclWideStrCollection,,,,const ,IInterface,nil,const ,WideString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfWideStrHashMap,TJclIntfWideStrBucket,IJclIntfWideStrMap,IJclIntfSet,IJclIntfIterator,IJclWideStrCollection,,,,const ,IInterface,nil,const ,WideString,'',TJclIntfArraySet.Create(FSize),TJclWideStrArrayList.Create(FSize))}
function TJclIntfWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -994,11 +970,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclWideStrWideStrBucket,'','')}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclWideStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclWideStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclWideStrWideStrHashMap,TJclWideStrWideStrBucket,IJclWideStrWideStrMap,IJclWideStrSet,IJclWideStrIterator,IJclWideStrCollection,,,,const ,WideString,'',const ,WideString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclWideStrWideStrHashMap,TJclWideStrWideStrBucket,IJclWideStrWideStrMap,IJclWideStrSet,IJclWideStrIterator,IJclWideStrCollection,,,,const ,WideString,'',const ,WideString,'',TJclWideStrArraySet.Create(FSize),TJclWideStrArrayList.Create(FSize))}
function TJclWideStrWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1031,11 +1003,7 @@
{$IFDEF SUPPORTS_UNICODE_STRING}
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclUnicodeStrIntfBucket,'',nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclUnicodeStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclUnicodeStrIntfHashMap,TJclUnicodeStrIntfBucket,IJclUnicodeStrIntfMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclIntfCollection,,,,const ,UnicodeString,'',const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclUnicodeStrIntfHashMap,TJclUnicodeStrIntfBucket,IJclUnicodeStrIntfMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclIntfCollection,,,,const ,UnicodeString,'',const ,IInterface,nil,TJclUnicodeStrArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclUnicodeStrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1067,11 +1035,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfUnicodeStrBucket,nil,'')}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclUnicodeStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfUnicodeStrHashMap,TJclIntfUnicodeStrBucket,IJclIntfUnicodeStrMap,IJclIntfSet,IJclIntfIterator,IJclUnicodeStrCollection,,,,const ,IInterface,nil,const ,UnicodeString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfUnicodeStrHashMap,TJclIntfUnicodeStrBucket,IJclIntfUnicodeStrMap,IJclIntfSet,IJclIntfIterator,IJclUnicodeStrCollection,,,,const ,IInterface,nil,const ,UnicodeString,'',TJclIntfArraySet.Create(FSize),TJclUnicodeStrArrayList.Create(FSize))}
function TJclIntfUnicodeStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1108,11 +1072,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclUnicodeStrUnicodeStrBucket,'','')}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclUnicodeStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclUnicodeStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclUnicodeStrUnicodeStrHashMap,TJclUnicodeStrUnicodeStrBucket,IJclUnicodeStrUnicodeStrMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclUnicodeStrCollection,,,,const ,UnicodeString,'',const ,UnicodeString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclUnicodeStrUnicodeStrHashMap,TJclUnicodeStrUnicodeStrBucket,IJclUnicodeStrUnicodeStrMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclUnicodeStrCollection,,,,const ,UnicodeString,'',const ,UnicodeString,'',TJclUnicodeStrArraySet.Create(FSize),TJclUnicodeStrArrayList.Create(FSize))}
function TJclUnicodeStrUnicodeStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1146,11 +1106,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclSingleIntfBucket,0.0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclSingleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclSingleIntfHashMap,TJclSingleIntfBucket,IJclSingleIntfMap,IJclSingleSet,IJclSingleIterator,IJclIntfCollection,,,,const ,Single,0.0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclSingleIntfHashMap,TJclSingleIntfBucket,IJclSingleIntfMap,IJclSingleSet,IJclSingleIterator,IJclIntfCollection,,,,const ,Single,0.0,const ,IInterface,nil,TJclSingleArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclSingleIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1182,11 +1138,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfSingleBucket,nil,0.0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclSingleArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfSingleHashMap,TJclIntfSingleBucket,IJclIntfSingleMap,IJclIntfSet,IJclIntfIterator,IJclSingleCollection,,,,const ,IInterface,nil,const ,Single,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfSingleHashMap,TJclIntfSingleBucket,IJclIntfSingleMap,IJclIntfSet,IJclIntfIterator,IJclSingleCollection,,,,const ,IInterface,nil,const ,Single,0.0,TJclIntfArraySet.Create(FSize),TJclSingleArrayList.Create(FSize))}
function TJclIntfSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1223,11 +1175,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclSingleSingleBucket,0.0,0.0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclSingleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclSingleArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclSingleSingleHashMap,TJclSingleSingleBucket,IJclSingleSingleMap,IJclSingleSet,IJclSingleIterator,IJclSingleCollection,,,,const ,Single,0.0,const ,Single,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclSingleSingleHashMap,TJclSingleSingleBucket,IJclSingleSingleMap,IJclSingleSet,IJclSingleIterator,IJclSingleCollection,,,,const ,Single,0.0,const ,Single,0.0,TJclSingleArraySet.Create(FSize),TJclSingleArrayList.Create(FSize))}
function TJclSingleSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1259,11 +1207,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclDoubleIntfBucket,0.0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclDoubleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclDoubleIntfHashMap,TJclDoubleIntfBucket,IJclDoubleIntfMap,IJclDoubleSet,IJclDoubleIterator,IJclIntfCollection,,,,const ,Double,0.0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclDoubleIntfHashMap,TJclDoubleIntfBucket,IJclDoubleIntfMap,IJclDoubleSet,IJclDoubleIterator,IJclIntfCollection,,,,const ,Double,0.0,const ,IInterface,nil,TJclDoubleArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclDoubleIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1295,11 +1239,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfDoubleBucket,nil,0.0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclDoubleArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfDoubleHashMap,TJclIntfDoubleBucket,IJclIntfDoubleMap,IJclIntfSet,IJclIntfIterator,IJclDoubleCollection,,,,const ,IInterface,nil,const ,Double,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfDoubleHashMap,TJclIntfDoubleBucket,IJclIntfDoubleMap,IJclIntfSet,IJclIntfIterator,IJclDoubleCollection,,,,const ,IInterface,nil,const ,Double,0.0,TJclIntfArraySet.Create(FSize),TJclDoubleArrayList.Create(FSize))}
function TJclIntfDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1336,11 +1276,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclDoubleDoubleBucket,0.0,0.0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclDoubleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclDoubleArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclDoubleDoubleHashMap,TJclDoubleDoubleBucket,IJclDoubleDoubleMap,IJclDoubleSet,IJclDoubleIterator,IJclDoubleCollection,,,,const ,Double,0.0,const ,Double,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclDoubleDoubleHashMap,TJclDoubleDoubleBucket,IJclDoubleDoubleMap,IJclDoubleSet,IJclDoubleIterator,IJclDoubleCollection,,,,const ,Double,0.0,const ,Double,0.0,TJclDoubleArraySet.Create(FSize),TJclDoubleArrayList.Create(FSize))}
function TJclDoubleDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1372,11 +1308,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclExtendedIntfBucket,0.0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclExtendedArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclExtendedIntfHashMap,TJclExtendedIntfBucket,IJclExtendedIntfMap,IJclExtendedSet,IJclExtendedIterator,IJclIntfCollection,,,,const ,Extended,0.0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclExtendedIntfHashMap,TJclExtendedIntfBucket,IJclExtendedIntfMap,IJclExtendedSet,IJclExtendedIterator,IJclIntfCollection,,,,const ,Extended,0.0,const ,IInterface,nil,TJclExtendedArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclExtendedIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1408,11 +1340,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfExtendedBucket,nil,0.0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclExtendedArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfExtendedHashMap,TJclIntfExtendedBucket,IJclIntfExtendedMap,IJclIntfSet,IJclIntfIterator,IJclExtendedCollection,,,,const ,IInterface,nil,const ,Extended,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfExtendedHashMap,TJclIntfExtendedBucket,IJclIntfExtendedMap,IJclIntfSet,IJclIntfIterator,IJclExtendedCollection,,,,const ,IInterface,nil,const ,Extended,0.0,TJclIntfArraySet.Create(FSize),TJclExtendedArrayList.Create(FSize))}
function TJclIntfExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1449,11 +1377,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclExtendedExtendedBucket,0.0,0.0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclExtendedArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclExtendedArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclExtendedExtendedHashMap,TJclExtendedExtendedBucket,IJclExtendedExtendedMap,IJclExtendedSet,IJclExtendedIterator,IJclExtendedCollection,,,,const ,Extended,0.0,const ,Extended,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclExtendedExtendedHashMap,TJclExtendedExtendedBucket,IJclExtendedExtendedMap,IJclExtendedSet,IJclExtendedIterator,IJclExtendedCollection,,,,const ,Extended,0.0,const ,Extended,0.0,TJclExtendedArraySet.Create(FSize),TJclExtendedArrayList.Create(FSize))}
function TJclExtendedExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1485,11 +1409,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntegerIntfBucket,0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntegerArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntegerIntfHashMap,TJclIntegerIntfBucket,IJclIntegerIntfMap,IJclIntegerSet,IJclIntegerIterator,IJclIntfCollection,,,,,Integer,0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntegerIntfHashMap,TJclIntegerIntfBucket,IJclIntegerIntfMap,IJclIntegerSet,IJclIntegerIterator,IJclIntfCollection,,,,,Integer,0,const ,IInterface,nil,TJclIntegerArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclIntegerIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1521,11 +1441,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfIntegerBucket,nil,0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntegerArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfIntegerHashMap,TJclIntfIntegerBucket,IJclIntfIntegerMap,IJclIntfSet,IJclIntfIterator,IJclIntegerCollection,,,,const ,IInterface,nil,,Integer,0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfIntegerHashMap,TJclIntfIntegerBucket,IJclIntfIntegerMap,IJclIntfSet,IJclIntfIterator,IJclIntegerCollection,,,,const ,IInterface,nil,,Integer,0,TJclIntfArraySet.Create(FSize),TJclIntegerArrayList.Create(FSize))}
function TJclIntfIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1562,11 +1478,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntegerIntegerBucket,0,0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntegerArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntegerArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntegerIntegerHashMap,TJclIntegerIntegerBucket,IJclIntegerIntegerMap,IJclIntegerSet,IJclIntegerIterator,IJclIntegerCollection,,,,,Integer,0,,Integer,0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntegerIntegerHashMap,TJclIntegerIntegerBucket,IJclIntegerIntegerMap,IJclIntegerSet,IJclIntegerIterator,IJclIntegerCollection,,,,,Integer,0,,Integer,0,TJclIntegerArraySet.Create(FSize),TJclIntegerArrayList.Create(FSize))}
function TJclIntegerIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1598,11 +1510,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclCardinalIntfBucket,0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclCardinalArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclCardinalIntfHashMap,TJclCardinalIntfBucket,IJclCardinalIntfMap,IJclCardinalSet,IJclCardinalIterator,IJclIntfCollection,,,,,Cardinal,0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclCardinalIntfHashMap,TJclCardinalIntfBucket,IJclCardinalIntfMap,IJclCardinalSet,IJclCardinalIterator,IJclIntfCollection,,,,,Cardinal,0,const ,IInterface,nil,TJclCardinalArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclCardinalIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1634,11 +1542,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfCardinalBucket,nil,0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclCardinalArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfCardinalHashMap,TJclIntfCardinalBucket,IJclIntfCardinalMap,IJclIntfSet,IJclIntfIterator,IJclCardinalCollection,,,,const ,IInterface,nil,,Cardinal,0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfCardinalHashMap,TJclIntfCardinalBucket,IJclIntfCardinalMap,IJclIntfSet,IJclIntfIterator,IJclCardinalCollection,,,,const ,IInterface,nil,,Cardinal,0,TJclIntfArraySet.Create(FSize),TJclCardinalArrayList.Create(FSize))}
function TJclIntfCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1675,11 +1579,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclCardinalCardinalBucket,0,0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclCardinalArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclCardinalArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclCardinalCardinalHashMap,TJclCardinalCardinalBucket,IJclCardinalCardinalMap,IJclCardinalSet,IJclCardinalIterator,IJclCardinalCollection,,,,,Cardinal,0,,Cardinal,0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclCardinalCardinalHashMap,TJclCardinalCardinalBucket,IJclCardinalCardinalMap,IJclCardinalSet,IJclCardinalIterator,IJclCardinalCollection,,,,,Cardinal,0,,Cardinal,0,TJclCardinalArraySet.Create(FSize),TJclCardinalArrayList.Create(FSize))}
function TJclCardinalCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1711,11 +1611,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclInt64IntfBucket,0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclInt64ArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclInt64IntfHashMap,TJclInt64IntfBucket,IJclInt64IntfMap,IJclInt64Set,IJclInt64Iterator,IJclIntfCollection,,,,const ,Int64,0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclInt64IntfHashMap,TJclInt64IntfBucket,IJclInt64IntfMap,IJclInt64Set,IJclInt64Iterator,IJclIntfCollection,,,,const ,Int64,0,const ,IInterface,nil,TJclInt64ArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclInt64IntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1747,11 +1643,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfInt64Bucket,nil,0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclInt64ArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfInt64HashMap,TJclIntfInt64Bucket,IJclIntfInt64Map,IJclIntfSet,IJclIntfIterator,IJclInt64Collection,,,,const ,IInterface,nil,const ,Int64,0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfInt64HashMap,TJclIntfInt64Bucket,IJclIntfInt64Map,IJclIntfSet,IJclIntfIterator,IJclInt64Collection,,,,const ,IInterface,nil,const ,Int64,0,TJclIntfArraySet.Create(FSize),TJclInt64ArrayList.Create(FSize))}
function TJclIntfInt64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1788,11 +1680,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclInt64Int64Bucket,0,0)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclInt64ArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclInt64ArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclInt64Int64HashMap,TJclInt64Int64Bucket,IJclInt64Int64Map,IJclInt64Set,IJclInt64Iterator,IJclInt64Collection,,,,const ,Int64,0,const ,Int64,0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclInt64Int64HashMap,TJclInt64Int64Bucket,IJclInt64Int64Map,IJclInt64Set,IJclInt64Iterator,IJclInt64Collection,,,,const ,Int64,0,const ,Int64,0,TJclInt64ArraySet.Create(FSize),TJclInt64ArrayList.Create(FSize))}
function TJclInt64Int64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1824,11 +1712,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclPtrIntfBucket,nil,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclPtrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclPtrIntfHashMap,TJclPtrIntfBucket,IJclPtrIntfMap,IJclPtrSet,IJclPtrIterator,IJclIntfCollection,,,,,Pointer,nil,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclPtrIntfHashMap,TJclPtrIntfBucket,IJclPtrIntfMap,IJclPtrSet,IJclPtrIterator,IJclIntfCollection,,,,,Pointer,nil,const ,IInterface,nil,TJclPtrArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclPtrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1860,11 +1744,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfPtrBucket,nil,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclPtrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfPtrHashMap,TJclIntfPtrBucket,IJclIntfPtrMap,IJclIntfSet,IJclIntfIterator,IJclPtrCollection,,,,const ,IInterface,nil,,Pointer,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfPtrHashMap,TJclIntfPtrBucket,IJclIntfPtrMap,IJclIntfSet,IJclIntfIterator,IJclPtrCollection,,,,const ,IInterface,nil,,Pointer,nil,TJclIntfArraySet.Create(FSize),TJclPtrArrayList.Create(FSize))}
function TJclIntfPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1901,11 +1781,7 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclPtrPtrBucket,nil,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclPtrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclPtrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclPtrPtrHashMap,TJclPtrPtrBucket,IJclPtrPtrMap,IJclPtrSet,IJclPtrIterator,IJclPtrCollection,,,,,Pointer,nil,,Pointer,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclPtrPtrHashMap,TJclPtrPtrBucket,IJclPtrPtrMap,IJclPtrSet,IJclPtrIterator,IJclPtrCollection,,,,,Pointer,nil,,Pointer,nil,TJclPtrArraySet.Create(FSize),TJclPtrArrayList.Create(FSize))}
function TJclPtrPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1937,12 +1813,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfBucket,nil,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntfHashMap,TJclIntfBucket,IJclIntfMap,IJclIntfSet,IJclIntfIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,const ,IInterface,nil,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,IInterface,nil,,TObject,nil,TJclIntfArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1992,12 +1864,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclAnsiStrBucket,'',nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclAnsiStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclAnsiStrHashMap,TJclAnsiStrBucket,IJclAnsiStrMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,const ,AnsiString,'',,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,AnsiString,'',,TObject,nil,TJclAnsiStrArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2042,12 +1910,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclWideStrBucket,'',nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclWideStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclWideStrHashMap,TJclWideStrBucket,IJclWideStrMap,IJclWideStrSet,IJclWideStrIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,const ,WideString,'',,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,WideString,'',,TObject,nil,TJclWideStrArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2093,12 +1957,8 @@
{$IFDEF SUPPORTS_UNICODE_STRING}
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclUnicodeStrBucket,'',nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclUnicodeStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclUnicodeStrHashMap,TJclUnicodeStrBucket,IJclUnicodeStrMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,const ,UnicodeString,'',,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,UnicodeString,'',,TObject,nil,TJclUnicodeStrArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclUnicodeStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2144,12 +2004,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclSingleBucket,0.0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclSingleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclSingleHashMap,TJclSingleBucket,IJclSingleMap,IJclSingleSet,IJclSingleIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,const ,Single,0.0,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,Single,0.0,,TObject,nil,TJclSingleArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2194,12 +2050,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclDoubleBucket,0.0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclDoubleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclDoubleHashMap,TJclDoubleBucket,IJclDoubleMap,IJclDoubleSet,IJclDoubleIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,const ,Double,0.0,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,Double,0.0,,TObject,nil,TJclDoubleArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2244,12 +2096,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclExtendedBucket,0.0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclExtendedArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclExtendedHashMap,TJclExtendedBucket,IJclExtendedMap,IJclExtendedSet,IJclExtendedIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,const ,Extended,0.0,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,Extended,0.0,,TObject,nil,TJclExtendedArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2294,12 +2142,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntegerBucket,0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntegerArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclIntegerHashMap,TJclIntegerBucket,IJclIntegerMap,IJclIntegerSet,IJclIntegerIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,,Integer,0,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,,Integer,0,,TObject,nil,TJclIntegerArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2344,12 +2188,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclCardinalBucket,0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclCardinalArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclCardinalHashMap,TJclCardinalBucket,IJclCardinalMap,IJclCardinalSet,IJclCardinalIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,,Cardinal,0,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,,Cardinal,0,,TObject,nil,TJclCardinalArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2394,12 +2234,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclInt64Bucket,0,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclInt64ArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclInt64HashMap,TJclInt64Bucket,IJclInt64Map,IJclInt64Set,IJclInt64Iterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,const ,Int64,0,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,Int64,0,,TObject,nil,TJclInt64ArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclInt64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2444,12 +2280,8 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclPtrBucket,nil,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclPtrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclPtrHashMap,TJclPtrBucket,IJclPtrMap,IJclPtrSet,IJclPtrIterator,IJclCollection,; AOwnsValues: Boolean,,
- FOwnsValues := AOwnsValues;,,Pointer,nil,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,,Pointer,nil,,TObject,nil,TJclPtrArraySet.Create(FSize),TJclArrayList.Create(FSize, False))}
function TJclPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2494,13 +2326,9 @@
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclBucket,nil,nil)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclArraySet.Create(Param, False)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclArrayList.Create(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclHashMap,TJclBucket,IJclMap,IJclSet,IJclIterator,IJclCollection,; AOwnsKeys: Boolean,; AOwnsValues: Boolean,
FOwnsKeys := AOwnsKeys;
- FOwnsValues := AOwnsValues;,,TObject,nil,,TObject,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,,TObject,nil,,TObject,nil,TJclArraySet.Create(FSize, False),TJclArrayList.Create(FSize, False))}
function TJclHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -2564,13 +2392,9 @@
{$IFDEF SUPPORTS_GENERICS}
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclBucket<TKey\, TValue>,Default(TKey),Default(TValue))}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)CreateEmptyArraySet(Param, False)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)CreateEmptyArrayList(Param, False)}
{$JPPEXPANDMACRO JCLHASHMAPIMP(TJclHashMap<TKey\, TValue>,TBucket,IJclMap<TKey\, TValue>,IJclSet<TKey>,IJclIterator<TKey>,IJclCollection<TValue>,; AOwnsKeys: Boolean,; AOwnsValues: Boolean,
FOwnsKeys := AOwnsKeys;
- FOwnsValues := AOwnsValues;,const ,TKey,Default(TKey),const ,TValue,Default(TValue))}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+ FOwnsValues := AOwnsValues;,const ,TKey,Default(TKey),const ,TValue,Default(TValue),CreateEmptyArraySet(FSize, False),CreateEmptyArrayList(FSize, False))}
function TJclHashMap<TKey, TValue>.FreeKey(var Key: TKey): TKey;
begin
Modified: trunk/jcl/source/prototypes/JclSortedMaps.pas
===================================================================
--- trunk/jcl/source/prototypes/JclSortedMaps.pas 2010-08-08 12:56:48 UTC (rev 3287)
+++ trunk/jcl/source/prototypes/JclSortedMaps.pas 2010-08-08 19:11:20 UTC (rev 3288)
@@ -725,11 +725,7 @@
uses
SysUtils;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfIntfSortedMap,TJclIntfIntfSortedEntry,IJclIntfIntfMap,IJclIntfIntfSortedMap,IJclIntfSet,IJclIntfIterator,IJclIntfCollection,,,,const ,IInterface,nil,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfIntfSortedMap,TJclIntfIntfSortedEntry,IJclIntfIntfMap,IJclIntfIntfSortedMap,IJclIntfSet,IJclIntfIterator,IJclIntfCollection,,,,const ,IInterface,nil,const ,IInterface,nil,TJclIntfArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclIntfIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -759,11 +755,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclAnsiStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclAnsiStrIntfSortedMap,TJclAnsiStrIntfSortedEntry,IJclAnsiStrIntfMap,IJclAnsiStrIntfSortedMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclIntfCollection,,,,const ,AnsiString,'',const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclAnsiStrIntfSortedMap,TJclAnsiStrIntfSortedEntry,IJclAnsiStrIntfMap,IJclAnsiStrIntfSortedMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclIntfCollection,,,,const ,AnsiString,'',const ,IInterface,nil,TJclAnsiStrArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclAnsiStrIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -799,11 +791,7 @@
Result := 0;
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclAnsiStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfAnsiStrSortedMap,TJclIntfAnsiStrSortedEntry,IJclIntfAnsiStrMap,IJclIntfAnsiStrSortedMap,IJclIntfSet,IJclIntfIterator,IJclAnsiStrCollection,,,,const ,IInterface,nil,const ,AnsiString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfAnsiStrSortedMap,TJclIntfAnsiStrSortedEntry,IJclIntfAnsiStrMap,IJclIntfAnsiStrSortedMap,IJclIntfSet,IJclIntfIterator,IJclAnsiStrCollection,,,,const ,IInterface,nil,const ,AnsiString,'',TJclIntfArraySet.Create(FSize),TJclAnsiStrArrayList.Create(FSize))}
function TJclIntfAnsiStrSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -839,11 +827,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclAnsiStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclAnsiStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclAnsiStrAnsiStrSortedMap,TJclAnsiStrAnsiStrSortedEntry,IJclAnsiStrAnsiStrMap,IJclAnsiStrAnsiStrSortedMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclAnsiStrCollection,,,,const ,AnsiString,'',const ,AnsiString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclAnsiStrAnsiStrSortedMap,TJclAnsiStrAnsiStrSortedEntry,IJclAnsiStrAnsiStrMap,IJclAnsiStrAnsiStrSortedMap,IJclAnsiStrSet,IJclAnsiStrIterator,IJclAnsiStrCollection,,,,const ,AnsiString,'',const ,AnsiString,'',TJclAnsiStrArraySet.Create(FSize),TJclAnsiStrArrayList.Create(FSize))}
function TJclAnsiStrAnsiStrSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -873,11 +857,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclWideStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclWideStrIntfSortedMap,TJclWideStrIntfSortedEntry,IJclWideStrIntfMap,IJclWideStrIntfSortedMap,IJclWideStrSet,IJclWideStrIterator,IJclIntfCollection,,,,const ,WideString,'',const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclWideStrIntfSortedMap,TJclWideStrIntfSortedEntry,IJclWideStrIntfMap,IJclWideStrIntfSortedMap,IJclWideStrSet,IJclWideStrIterator,IJclIntfCollection,,,,const ,WideString,'',const ,IInterface,nil,TJclWideStrArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclWideStrIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -913,11 +893,7 @@
Result := 0;
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclWideStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfWideStrSortedMap,TJclIntfWideStrSortedEntry,IJclIntfWideStrMap,IJclIntfWideStrSortedMap,IJclIntfSet,IJclIntfIterator,IJclWideStrCollection,,,,const ,IInterface,nil,const ,WideString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfWideStrSortedMap,TJclIntfWideStrSortedEntry,IJclIntfWideStrMap,IJclIntfWideStrSortedMap,IJclIntfSet,IJclIntfIterator,IJclWideStrCollection,,,,const ,IInterface,nil,const ,WideString,'',TJclIntfArraySet.Create(FSize),TJclWideStrArrayList.Create(FSize))}
function TJclIntfWideStrSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -953,11 +929,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclWideStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclWideStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclWideStrWideStrSortedMap,TJclWideStrWideStrSortedEntry,IJclWideStrWideStrMap,IJclWideStrWideStrSortedMap,IJclWideStrSet,IJclWideStrIterator,IJclWideStrCollection,,,,const ,WideString,'',const ,WideString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclWideStrWideStrSortedMap,TJclWideStrWideStrSortedEntry,IJclWideStrWideStrMap,IJclWideStrWideStrSortedMap,IJclWideStrSet,IJclWideStrIterator,IJclWideStrCollection,,,,const ,WideString,'',const ,WideString,'',TJclWideStrArraySet.Create(FSize),TJclWideStrArrayList.Create(FSize))}
function TJclWideStrWideStrSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -988,11 +960,7 @@
end;
{$IFDEF SUPPORTS_UNICODE_STRING}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclUnicodeStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclUnicodeStrIntfSortedMap,TJclUnicodeStrIntfSortedEntry,IJclUnicodeStrIntfMap,IJclUnicodeStrIntfSortedMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclIntfCollection,,,,const ,UnicodeString,'',const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclUnicodeStrIntfSortedMap,TJclUnicodeStrIntfSortedEntry,IJclUnicodeStrIntfMap,IJclUnicodeStrIntfSortedMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclIntfCollection,,,,const ,UnicodeString,'',const ,IInterface,nil,TJclUnicodeStrArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclUnicodeStrIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1028,11 +996,7 @@
Result := 0;
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclUnicodeStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfUnicodeStrSortedMap,TJclIntfUnicodeStrSortedEntry,IJclIntfUnicodeStrMap,IJclIntfUnicodeStrSortedMap,IJclIntfSet,IJclIntfIterator,IJclUnicodeStrCollection,,,,const ,IInterface,nil,const ,UnicodeString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfUnicodeStrSortedMap,TJclIntfUnicodeStrSortedEntry,IJclIntfUnicodeStrMap,IJclIntfUnicodeStrSortedMap,IJclIntfSet,IJclIntfIterator,IJclUnicodeStrCollection,,,,const ,IInterface,nil,const ,UnicodeString,'',TJclIntfArraySet.Create(FSize),TJclUnicodeStrArrayList.Create(FSize))}
function TJclIntfUnicodeStrSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1068,11 +1032,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclUnicodeStrArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclUnicodeStrArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclUnicodeStrUnicodeStrSortedMap,TJclUnicodeStrUnicodeStrSortedEntry,IJclUnicodeStrUnicodeStrMap,IJclUnicodeStrUnicodeStrSortedMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclUnicodeStrCollection,,,,const ,UnicodeString,'',const ,UnicodeString,'')}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclUnicodeStrUnicodeStrSortedMap,TJclUnicodeStrUnicodeStrSortedEntry,IJclUnicodeStrUnicodeStrMap,IJclUnicodeStrUnicodeStrSortedMap,IJclUnicodeStrSet,IJclUnicodeStrIterator,IJclUnicodeStrCollection,,,,const ,UnicodeString,'',const ,UnicodeString,'',TJclUnicodeStrArraySet.Create(FSize),TJclUnicodeStrArrayList.Create(FSize))}
function TJclUnicodeStrUnicodeStrSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1103,11 +1063,7 @@
end;
{$ENDIF SUPPORTS_UNICODE_STRING}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclSingleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclSingleIntfSortedMap,TJclSingleIntfSortedEntry,IJclSingleIntfMap,IJclSingleIntfSortedMap,IJclSingleSet,IJclSingleIterator,IJclIntfCollection,,,,const ,Single,0.0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclSingleIntfSortedMap,TJclSingleIntfSortedEntry,IJclSingleIntfMap,IJclSingleIntfSortedMap,IJclSingleSet,IJclSingleIterator,IJclIntfCollection,,,,const ,Single,0.0,const ,IInterface,nil,TJclSingleArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclSingleIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1143,11 +1099,7 @@
Result := 0;
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclSingleArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfSingleSortedMap,TJclIntfSingleSortedEntry,IJclIntfSingleMap,IJclIntfSingleSortedMap,IJclIntfSet,IJclIntfIterator,IJclSingleCollection,,,,const ,IInterface,nil,const ,Single,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfSingleSortedMap,TJclIntfSingleSortedEntry,IJclIntfSingleMap,IJclIntfSingleSortedMap,IJclIntfSet,IJclIntfIterator,IJclSingleCollection,,,,const ,IInterface,nil,const ,Single,0.0,TJclIntfArraySet.Create(FSize),TJclSingleArrayList.Create(FSize))}
function TJclIntfSingleSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1183,11 +1135,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclSingleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclSingleArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclSingleSingleSortedMap,TJclSingleSingleSortedEntry,IJclSingleSingleMap,IJclSingleSingleSortedMap,IJclSingleSet,IJclSingleIterator,IJclSingleCollection,,,,const ,Single,0.0,const ,Single,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclSingleSingleSortedMap,TJclSingleSingleSortedEntry,IJclSingleSingleMap,IJclSingleSingleSortedMap,IJclSingleSet,IJclSingleIterator,IJclSingleCollection,,,,const ,Single,0.0,const ,Single,0.0,TJclSingleArraySet.Create(FSize),TJclSingleArrayList.Create(FSize))}
function TJclSingleSingleSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1217,11 +1165,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclDoubleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclDoubleIntfSortedMap,TJclDoubleIntfSortedEntry,IJclDoubleIntfMap,IJclDoubleIntfSortedMap,IJclDoubleSet,IJclDoubleIterator,IJclIntfCollection,,,,const ,Double,0.0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclDoubleIntfSortedMap,TJclDoubleIntfSortedEntry,IJclDoubleIntfMap,IJclDoubleIntfSortedMap,IJclDoubleSet,IJclDoubleIterator,IJclIntfCollection,,,,const ,Double,0.0,const ,IInterface,nil,TJclDoubleArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclDoubleIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1257,11 +1201,7 @@
Result := 0;
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclDoubleArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfDoubleSortedMap,TJclIntfDoubleSortedEntry,IJclIntfDoubleMap,IJclIntfDoubleSortedMap,IJclIntfSet,IJclIntfIterator,IJclDoubleCollection,,,,const ,IInterface,nil,const ,Double,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfDoubleSortedMap,TJclIntfDoubleSortedEntry,IJclIntfDoubleMap,IJclIntfDoubleSortedMap,IJclIntfSet,IJclIntfIterator,IJclDoubleCollection,,,,const ,IInterface,nil,const ,Double,0.0,TJclIntfArraySet.Create(FSize),TJclDoubleArrayList.Create(FSize))}
function TJclIntfDoubleSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1297,11 +1237,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclDoubleArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclDoubleArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclDoubleDoubleSortedMap,TJclDoubleDoubleSortedEntry,IJclDoubleDoubleMap,IJclDoubleDoubleSortedMap,IJclDoubleSet,IJclDoubleIterator,IJclDoubleCollection,,,,const ,Double,0.0,const ,Double,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclDoubleDoubleSortedMap,TJclDoubleDoubleSortedEntry,IJclDoubleDoubleMap,IJclDoubleDoubleSortedMap,IJclDoubleSet,IJclDoubleIterator,IJclDoubleCollection,,,,const ,Double,0.0,const ,Double,0.0,TJclDoubleArraySet.Create(FSize),TJclDoubleArrayList.Create(FSize))}
function TJclDoubleDoubleSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1331,11 +1267,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclExtendedArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclExtendedIntfSortedMap,TJclExtendedIntfSortedEntry,IJclExtendedIntfMap,IJclExtendedIntfSortedMap,IJclExtendedSet,IJclExtendedIterator,IJclIntfCollection,,,,const ,Extended,0.0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclExtendedIntfSortedMap,TJclExtendedIntfSortedEntry,IJclExtendedIntfMap,IJclExtendedIntfSortedMap,IJclExtendedSet,IJclExtendedIterator,IJclIntfCollection,,,,const ,Extended,0.0,const ,IInterface,nil,TJclExtendedArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclExtendedIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1371,11 +1303,7 @@
Result := 0;
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclExtendedArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfExtendedSortedMap,TJclIntfExtendedSortedEntry,IJclIntfExtendedMap,IJclIntfExtendedSortedMap,IJclIntfSet,IJclIntfIterator,IJclExtendedCollection,,,,const ,IInterface,nil,const ,Extended,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfExtendedSortedMap,TJclIntfExtendedSortedEntry,IJclIntfExtendedMap,IJclIntfExtendedSortedMap,IJclIntfSet,IJclIntfIterator,IJclExtendedCollection,,,,const ,IInterface,nil,const ,Extended,0.0,TJclIntfArraySet.Create(FSize),TJclExtendedArrayList.Create(FSize))}
function TJclIntfExtendedSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1411,11 +1339,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclExtendedArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclExtendedArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclExtendedExtendedSortedMap,TJclExtendedExtendedSortedEntry,IJclExtendedExtendedMap,IJclExtendedExtendedSortedMap,IJclExtendedSet,IJclExtendedIterator,IJclExtendedCollection,,,,const ,Extended,0.0,const ,Extended,0.0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclExtendedExtendedSortedMap,TJclExtendedExtendedSortedEntry,IJclExtendedExtendedMap,IJclExtendedExtendedSortedMap,IJclExtendedSet,IJclExtendedIterator,IJclExtendedCollection,,,,const ,Extended,0.0,const ,Extended,0.0,TJclExtendedArraySet.Create(FSize),TJclExtendedArrayList.Create(FSize))}
function TJclExtendedExtendedSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1445,11 +1369,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntegerArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntegerIntfSortedMap,TJclIntegerIntfSortedEntry,IJclIntegerIntfMap,IJclIntegerIntfSortedMap,IJclIntegerSet,IJclIntegerIterator,IJclIntfCollection,,,,,Integer,0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntegerIntfSortedMap,TJclIntegerIntfSortedEntry,IJclIntegerIntfMap,IJclIntegerIntfSortedMap,IJclIntegerSet,IJclIntegerIterator,IJclIntfCollection,,,,,Integer,0,const ,IInterface,nil,TJclIntegerArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclIntegerIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1485,11 +1405,7 @@
Result := 0;
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntegerArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfIntegerSortedMap,TJclIntfIntegerSortedEntry,IJclIntfIntegerMap,IJclIntfIntegerSortedMap,IJclIntfSet,IJclIntfIterator,IJclIntegerCollection,,,,const ,IInterface,nil,,Integer,0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntfIntegerSortedMap,TJclIntfIntegerSortedEntry,IJclIntfIntegerMap,IJclIntfIntegerSortedMap,IJclIntfSet,IJclIntfIterator,IJclIntegerCollection,,,,const ,IInterface,nil,,Integer,0,TJclIntfArraySet.Create(FSize),TJclIntegerArrayList.Create(FSize))}
function TJclIntfIntegerSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1525,11 +1441,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntegerArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntegerArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntegerIntegerSortedMap,TJclIntegerIntegerSortedEntry,IJclIntegerIntegerMap,IJclIntegerIntegerSortedMap,IJclIntegerSet,IJclIntegerIterator,IJclIntegerCollection,,,,,Integer,0,,Integer,0)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclIntegerIntegerSortedMap,TJclIntegerIntegerSortedEntry,IJclIntegerIntegerMap,IJclIntegerIntegerSortedMap,IJclIntegerSet,IJclIntegerIterator,IJclIntegerCollection,,,,,Integer,0,,Integer,0,TJclIntegerArraySet.Create(FSize),TJclIntegerArrayList.Create(FSize))}
function TJclIntegerIntegerSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1559,11 +1471,7 @@
Result := ItemsCompare(A, B);
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclCardinalArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclIntfArrayList.Create(Param)}
-{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclCardinalIntfSortedMap,TJclCardinalIntfSortedEntry,IJclCardinalIntfMap,IJclCardinalIntfSortedMap,IJclCardinalSet,IJclCardinalIterator,IJclIntfCollection,,,,,Cardinal,0,const ,IInterface,nil)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYSET(Param)}
-{$JPPUNDEFMACRO CREATEEMPTYARRAYLIST(Param)}
+{$JPPEXPANDMACRO JCLSORTEDMAPIMP(TJclCardinalIntfSortedMap,TJclCardinalIntfSortedEntry,IJclCardinalIntfMap,IJclCardinalIntfSortedMap,IJclCardinalSet,IJclCardinalIterator,IJclIntfCollection,,,,,Cardinal,0,const ,IInterface,nil,TJclCardinalArraySet.Create(FSize),TJclIntfArrayList.Create(FSize))}
function TJclCardinalIntfSortedMap.CreateEmptyContainer: TJclAbstractContainerBase;
begin
@@ -1599,11 +1507,7 @@
Result := 0;
end;
-{$JPPDEFINEMACRO CREATEEMPTYARRAYSET(Param)TJclIntfArraySet.Create(Param)}
-{$JPPDEFINEMACRO CREATEEMPTYARRAYLIST(Param)TJclCardinalArrayList.Create(Param)}
-{$JPPEXPAN...
[truncated message content] |
|
From: <ou...@us...> - 2010-08-08 12:56:55
|
Revision: 3287
http://jcl.svn.sourceforge.net/jcl/?rev=3287&view=rev
Author: outchy
Date: 2010-08-08 12:56:48 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
The C++ test files are now automatically generated.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
Removed Paths:
-------------
trunk/jcl/install/HeaderTest/jcl_a2z.cpp
trunk/jcl/install/HeaderTest/jcl_z2a.cpp
Property Changed:
----------------
trunk/jcl/install/HeaderTest/
Property changes on: trunk/jcl/install/HeaderTest
___________________________________________________________________
Modified: svn:ignore
- *.obj
*.~*
__history
*.bak
+ *.bak
*.cpp
*.obj
*.~*
__history
Deleted: trunk/jcl/install/HeaderTest/jcl_a2z.cpp
===================================================================
--- trunk/jcl/install/HeaderTest/jcl_a2z.cpp 2010-08-08 12:54:19 UTC (rev 3286)
+++ trunk/jcl/install/HeaderTest/jcl_a2z.cpp 2010-08-08 12:56:48 UTC (rev 3287)
@@ -1,326 +0,0 @@
-//---------------------------------------------------------------------------
-
-//#pragma hdrstop
-
-#ifdef TEST_COMMON
-#include <bzip2.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <Hardlinks.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <Jcl8087.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclAbstractContainers.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclAlgorithms.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclAnsiStrings.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclAppInst.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclArrayLists.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclArraySets.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclBase.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclBinaryTrees.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclCharsets.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclCIL.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclCLR.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclCOM.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclCompilerUtils.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclComplex.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclCompression.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclConsole.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclContainerIntf.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclCounter.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclDateTime.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclDebug.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclDebugSerialization.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclDebugXMLDeserializer.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclDebugXMLSerializer.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclDevToolsResources.hpp>
-#endif TEST_COMMON
-//#ifdef TEST_WINDOWS
-//#include <JclDotNet.hpp> mscorlib_TLB is known to fail
-//#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclExprEval.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclFileUtils.hpp>
-#endif TEST_COMMON
-#ifdef TEST_VCL
-#include <JclFont.hpp>
-#endif TEST_VCL
-#ifdef TEST_VCL
-#include <JclGraphics.hpp>
-#endif TEST_VCL
-#ifdef TEST_VCL
-#include <JclGraphUtils.hpp>
-#endif TEST_VCL
-#ifdef TEST_COMMON
-#include <JclHashMaps.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclHashSets.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclHelpUtils.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclHookExcept.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclIDEUtils.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclIniFiles.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclLANMan.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclLinkedLists.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclLocales.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclLogic.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclMapi.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclMath.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclMetadata.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclMIDI.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclMime.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclMiscel.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclMsdosSys.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclMultimedia.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclNotify.hpp>
-#endif TEST_COMMON
-//#ifdef TEST_WINDOWS
-//#include <JclNTFS.hpp> no declaration for IPropertyStorage
-//#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclPCRE.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclPeImage.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_VCL
-#include <JclPrint.hpp>
-#endif TEST_VCL
-#ifdef TEST_COMMON
-#include <JclQueues.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclRegistry.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclResources.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclRTTI.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclSchedule.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclSecurity.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclShell.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclSimpleXml.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclSortedMaps.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStacks.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStatistics.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStreams.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStrHashMap.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStringConversions.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStringLists.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStrings.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclStructStorage.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclSvcCtrl.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclSynch.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclSysInfo.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclSysUtils.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclTask.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclTD32.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclTimeZones.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclTrees.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclUnicode.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclUnitConv.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclUnitVersioning.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclUnitVersioningProviders.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclValidation.hpp>
-#endif TEST_COMMON
-#ifdef TEST_VCL
-#include <JclVclResources.hpp>
-#endif TEST_VCL
-#ifdef TEST_COMMON
-#include <JclVectors.hpp>
-#endif TEST_COMMON
-#ifdef TEST_VCL
-#include <JclVersionControl.hpp>
-#endif TEST_VCL
-#ifdef TEST_VCL
-#include <JclVersionCtrlCVSImpl.hpp>
-#endif TEST_VCL
-#ifdef TEST_VCL
-#include <JclVersionCtrlSVNImpl.hpp>
-#endif TEST_VCL
-#ifdef TEST_COMMON
-#include <JclWideStrings.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclWin32.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclWin32Ex.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclWinMIDI.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <mscoree_TLB.hpp>
-#endif TEST_WINDOWS
-//#ifdef TEST_WINDOWS
-//#include <mscorlib_TLB.hpp> known to fail
-//#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <MSHelpServices_TLB.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <MSTask.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <pcre.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <sevenzip.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <Snmp.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <zlibh.hpp>
-#endif TEST_COMMON
-#ifdef TEST_UNIX
-#include <zlibh.hpp>
-#endif TEST_UNIX
-
-//---------------------------------------------------------------------------
-
-#pragma argsused
-int main(int argc, char* argv[])
-{
- return 0;
-}
-//---------------------------------------------------------------------------
-
Deleted: trunk/jcl/install/HeaderTest/jcl_z2a.cpp
===================================================================
--- trunk/jcl/install/HeaderTest/jcl_z2a.cpp 2010-08-08 12:54:19 UTC (rev 3286)
+++ trunk/jcl/install/HeaderTest/jcl_z2a.cpp 2010-08-08 12:56:48 UTC (rev 3287)
@@ -1,326 +0,0 @@
-//---------------------------------------------------------------------------
-
-//#pragma hdrstop
-
-#ifdef TEST_COMMON
-#include <zlibh.hpp>
-#endif TEST_COMMON
-#ifdef TEST_UNIX
-#include <zlibh.hpp>
-#endif TEST_UNIX
-#ifdef TEST_WINDOWS
-#include <Snmp.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <sevenzip.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <pcre.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <MSTask.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <MSHelpServices_TLB.hpp>
-#endif TEST_WINDOWS
-//#ifdef TEST_WINDOWS
-//#include <mscorlib_TLB.hpp> known to fail
-//#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <mscoree_TLB.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclWinMIDI.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclWin32Ex.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclWin32.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclWideStrings.hpp>
-#endif TEST_COMMON
-#ifdef TEST_VCL
-#include <JclVersionCtrlSVNImpl.hpp>
-#endif TEST_VCL
-#ifdef TEST_VCL
-#include <JclVersionCtrlCVSImpl.hpp>
-#endif TEST_VCL
-#ifdef TEST_VCL
-#include <JclVersionControl.hpp>
-#endif TEST_VCL
-#ifdef TEST_COMMON
-#include <JclVectors.hpp>
-#endif TEST_COMMON
-#ifdef TEST_VCL
-#include <JclVclResources.hpp>
-#endif TEST_VCL
-#ifdef TEST_COMMON
-#include <JclValidation.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclUnitVersioningProviders.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclUnitVersioning.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclUnitConv.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclUnicode.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclTrees.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclTimeZones.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclTD32.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclTask.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclSysUtils.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclSysInfo.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclSynch.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclSvcCtrl.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclStructStorage.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclStrings.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStringLists.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStringConversions.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStrHashMap.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStreams.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStatistics.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclStacks.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclSortedMaps.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclSimpleXml.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclShell.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclSecurity.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclSchedule.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclRTTI.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclResources.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclRegistry.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclQueues.hpp>
-#endif TEST_COMMON
-#ifdef TEST_VCL
-#include <JclPrint.hpp>
-#endif TEST_VCL
-#ifdef TEST_WINDOWS
-#include <JclPeImage.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclPCRE.hpp>
-#endif TEST_COMMON
-//#ifdef TEST_WINDOWS
-//#include <JclNTFS.hpp> no declaration for IPropertyStorage
-//#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclNotify.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclMultimedia.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclMsdosSys.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclMiscel.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclMime.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclMIDI.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclMetadata.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclMath.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclMapi.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclLogic.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclLocales.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclLinkedLists.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclLANMan.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclIniFiles.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclIDEUtils.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclHookExcept.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclHelpUtils.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclHashSets.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclHashMaps.hpp>
-#endif TEST_COMMON
-#ifdef TEST_VCL
-#include <JclGraphUtils.hpp>
-#endif TEST_VCL
-#ifdef TEST_VCL
-#include <JclGraphics.hpp>
-#endif TEST_VCL
-#ifdef TEST_VCL
-#include <JclFont.hpp>
-#endif TEST_VCL
-#ifdef TEST_COMMON
-#include <JclFileUtils.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclExprEval.hpp>
-#endif TEST_COMMON
-//#ifdef TEST_WINDOWS
-//#include <JclDotNet.hpp> mscorlib_TLB.hpp is known to fail
-//#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclDevToolsResources.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclDebugXMLSerializer.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclDebugXMLDeserializer.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclDebugSerialization.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclDebug.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclDateTime.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclCounter.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclContainerIntf.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclConsole.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclCompression.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclComplex.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclCompilerUtils.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclCOM.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclCLR.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_WINDOWS
-#include <JclCIL.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclCharsets.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclBinaryTrees.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclBase.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclArraySets.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclArrayLists.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <JclAppInst.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <JclAnsiStrings.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclAlgorithms.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <JclAbstractContainers.hpp>
-#endif TEST_COMMON
-#ifdef TEST_COMMON
-#include <Jcl8087.hpp>
-#endif TEST_COMMON
-#ifdef TEST_WINDOWS
-#include <Hardlinks.hpp>
-#endif TEST_WINDOWS
-#ifdef TEST_COMMON
-#include <bzip2.hpp>
-#endif TEST_COMMON
-
-//---------------------------------------------------------------------------
-
-#pragma argsused
-int main(int argc, char* argv[])
-{
- return 0;
-}
-//---------------------------------------------------------------------------
-
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2010-08-08 12:54:19 UTC (rev 3286)
+++ trunk/jcl/install/JclInstall.pas 2010-08-08 12:56:48 UTC (rev 3287)
@@ -524,6 +524,16 @@
Result := Format(S + 'DLL%s0%3:s', [VersionNumberStr, BaseName, VersionNumberStr, ProjectSourceFileExtension]);
end;
+function SortFileNameA2Z(List: TStringList; Index1, Index2: Integer): Integer;
+begin
+ Result := CompareText(List.Strings[Index1], List.Strings[Index2]);
+end;
+
+function SortFileNameZ2A(List: TStringList; Index1, Index2: Integer): Integer;
+begin
+ Result := -CompareText(List.Strings[Index1], List.Strings[Index2]);
+end;
+
//=== { TJclInstallation } ===================================================
constructor TJclInstallation.Create(JclDistribution: TJclDistribution;
@@ -1378,10 +1388,43 @@
function CheckHppFiles: Boolean;
var
SaveDir, Options: string;
+ UnitList, CppFile: TStrings;
+ I: Integer;
begin
SaveDir := GetCurrentDir;
- SetCurrentDir(Format('%sinstall%sHeaderTest', [Distribution.JclPath, DirDelimiter]));
try
+ SetCurrentDir(Distribution.JclPath);
+
+ UnitList := TStringList.Create;
+ CppFile := TStringList.Create;
+ try
+ for I := Low(JclSrcPaths) to High(JclSrcPaths) do
+ BuildFileList(PathAddSeparator(JclSrcPaths[I]) + '*.pas', faAnyFile, UnitList, False);
+ // these headers are known to fail
+ UnitList.Delete(UnitList.IndexOf('JclDotNet.pas'));
+ UnitList.Delete(UnitList.IndexOf('JclNTFS.pas'));
+ UnitList.Delete(UnitList.IndexOf('mscorlib_TLB.pas'));
+
+ SetCurrentDir(Format('%sinstall%sHeaderTest', [Distribution.JclPath, DirDelimiter]));
+
+ TStringList(UnitList).CustomSort(SortFileNameA2Z);
+ CppFile.Clear;
+ CppFile.Add('#pragma hdrstop');
+ for I := 0 to UnitList.Count - 1 do
+ CppFile.Add(Format('#include <%s>', [ChangeFileExt(UnitList.Strings[I], '.hpp')]));
+ CppFile.SaveToFile('jcl_a2z.cpp');
+
+ TStringList(UnitList).CustomSort(SortFileNameZ2A);
+ CppFile.Clear;
+ CppFile.Add('#pragma hdrstop');
+ for I := 0 to UnitList.Count - 1 do
+ CppFile.Add(Format('#include <%s>', [ChangeFileExt(UnitList.Strings[I], '.hpp')]));
+ CppFile.SaveToFile('jcl_z2a.cpp');
+ finally
+ UnitList.Free;
+ CppFile.Free;
+ end;
+
Target.BCC32.Options.Clear;
Target.BCC32.Options.Add('-c'); // compile only
Target.BCC32.Options.Add('-Ve'); // compatibility
@@ -1397,14 +1440,6 @@
Target.BCC32.Options.Add('-w-par'); // warning
Target.BCC32.Options.Add('-w-aus'); // warning
Target.BCC32.AddPathOption('I', Format('%sinclude%s%s%s%s%sinclude%s%s', [Distribution.JclPath, DirSeparator, Distribution.JclSourcePath, DirSeparator, Target.RootDir, DirDelimiter, DirSeparator, Target.VclIncludeDir]));
- Target.BCC32.Options.Add('-DTEST_COMMON');
- {$IFDEF MSWINDOWS}
- Target.BCC32.Options.Add('-DTEST_WINDOWS');
- {$ENDIF MSWINDOWS}
- {$IFDEF UNIX}
- Target.BCC32.Options.Add('-DTEST_UNIX');
- {$ENDIF UNIX}
- Target.BCC32.Options.Add('-DTEST_VCL');
Options := StringsToStr(Target.BCC32.Options, NativeSpace);
Result := Target.BCC32.Execute(Options + ' "jcl_a2z.cpp"')
and Target.BCC32.Execute(Options + ' "jcl_z2a.cpp"');
@@ -2240,16 +2275,7 @@
end;
function TJclInstallation.CompileLibraryUnits(const SubDir: string; Debug: Boolean): Boolean;
-var
- UnitList: TStrings;
- Compiler: TJclDCC32;
-
- function CompileUnits: Boolean;
- begin
- Result := Compiler.Execute(StringsToStr(UnitList, ' '));
- end;
-
function CopyFiles(Files: TStrings; const TargetDir: string; Overwrite: Boolean = True): Boolean;
var
I: Integer;
@@ -2276,7 +2302,7 @@
end;
end;
- function CopyHppFiles(const TargetDir: string): Boolean;
+ function CopyHppFiles(UnitList: TStrings; const TargetDir: string): Boolean;
var
I: Integer;
FileName: string;
@@ -2301,7 +2327,8 @@
var
UnitType, LibDescriptor, SaveDir, UnitOutputDir, Path, ExclusionFileName: string;
Index, ExcIndex: Integer;
- Exclusions: TStrings;
+ UnitList, Exclusions: TStrings;
+ Compiler: TJclDCC32;
begin
Result := True;
if Debug then
@@ -2309,6 +2336,7 @@
LibDescriptor := Format(LoadResString(@RsLogLibDescriptor), [SubDir, UnitType, TargetName]);
WriteLog(Format(LoadResString(@RsLogBuilding), [LibDescriptor]));
Path := Distribution.JclPath + SubDir;
+
UnitList := TStringList.Create;
try
BuildFileList(PathAddSeparator(Path) + '*.pas', faAnyFile, UnitList);
@@ -2413,7 +2441,7 @@
Compiler.AddPathOption('I', Distribution.JclIncludeDir);
Compiler.AddPathOption('U', Distribution.JclSourcePath);
Compiler.AddPathOption('R', Distribution.JclSourcePath);
-
+
SaveDir := GetCurrentDir;
Result := SetCurrentDir(Path);
{$IFDEF WIN32}
@@ -2423,12 +2451,12 @@
{$ENDIF}
try
WriteLog('');
- Result := Result and CompileUnits;
+ Result := Result and Compiler.Execute(StringsToStr(UnitList, ' '));
CopyResFiles(UnitOutputDir);
if OptionChecked[joJCLCopyHppFiles] then
begin
MarkOptionBegin(joJCLCopyHppFiles);
- Result := Result and CopyHppFiles(Target.VclIncludeDir);
+ Result := Result and CopyHppFiles(UnitList, Target.VclIncludeDir);
MarkOptionEnd(joJCLCopyHppFiles, Result);
end;
finally
@@ -2437,6 +2465,7 @@
finally
UnitList.Free;
end;
+
if not Result then
WriteLog(LoadResString(@RsLogFailed));
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-08 12:54:25
|
Revision: 3286
http://jcl.svn.sourceforge.net/jcl/?rev=3286&view=rev
Author: outchy
Date: 2010-08-08 12:54:19 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
Make C++Builder happy (wrong HPP generation).
Modified Paths:
--------------
trunk/jcl/devtools/jpp/Templates/JclContainer1DTemplates.pas
Modified: trunk/jcl/devtools/jpp/Templates/JclContainer1DTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainer1DTemplates.pas 2010-08-08 11:47:54 UTC (rev 3285)
+++ trunk/jcl/devtools/jpp/Templates/JclContainer1DTemplates.pas 2010-08-08 12:54:19 UTC (rev 3286)
@@ -49,6 +49,7 @@
FKnownTypeAttributes: PKnownTypeAttributes;
FOnKnownTypeChange: TNotifyEvent;
function GetCustomTypeAttribute(Index: TTypeAttributeID): string;
+ function GetTypeName: string;
protected
function GetFloatType: Boolean;
function GetKnownType: Boolean;
@@ -67,7 +68,7 @@
property KnownTypeAttributes: PKnownTypeAttributes read FKnownTypeAttributes;
property CustomTypeAttributes[Index: TTypeAttributeID]: string read GetCustomTypeAttribute;
property TypeAttributes[Index: TTypeAttributeID]: string read GetTypeAttribute write SetTypeAttribute;
- property TypeName: string read FCustomTypeAttributes[taTypeName] write SetTypeName stored True;
+ property TypeName: string read GetTypeName write SetTypeName stored True;
property OwnershipDeclaration: string read GetOwnershipDeclaration;
property OnKnownTypeChange: TNotifyEvent read FOnKnownTypeChange write FOnKnownTypeChange;
end;
@@ -223,6 +224,11 @@
end;
end;
+function TJclContainerTypeInfo.GetTypeName: string;
+begin
+ Result := FCustomTypeAttributes[taTypeName];
+end;
+
function TJclContainerTypeInfo.GetCustomTypeAttribute(Index: TTypeAttributeID): string;
begin
if (Index >= Low(TTypeAttributeID)) and (Index <= High(TTypeAttributeID)) then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-08 11:48:01
|
Revision: 3285
http://jcl.svn.sourceforge.net/jcl/?rev=3285&view=rev
Author: outchy
Date: 2010-08-08 11:47:54 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
Build units in all the JCL source paths.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
trunk/jcl/install/JclInstallResources.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2010-08-08 11:18:28 UTC (rev 3284)
+++ trunk/jcl/install/JclInstall.pas 2010-08-08 11:47:54 UTC (rev 3285)
@@ -207,7 +207,6 @@
FJclBinDir: string;
FLibReleaseDirMask: string;
FLibDebugDirMask: string;
- FJclSourceDir: string;
FJclIncludeDir: string;
FJclSourcePath: string;
FJclExamplesDir: string;
@@ -265,7 +264,6 @@
property JclBinDir: string read FJclBinDir;
property LibReleaseDirMask: string read FLibReleaseDirMask;
property LibDebugDirMask: string read FLibDebugDirMask;
- property JclSourceDir: string read FJclSourceDir;
property JclIncludeDir: string read FJclIncludeDir;
property JclSourcePath: string read FJclSourcePath;
property JclExamplesDir: string read FJclExamplesDir;
@@ -438,19 +436,22 @@
OldExperts: array [0..6] of string =
( 'JclDebugIde', 'ProjectAnalyzer', 'IdeOpenDlgFavorite', 'ThreadNameExpert', 'JediUses', 'JclSIMDView', 'JclVersionControl' );
- JclSrcDirWindows = 'windows';
- JclSrcDirUnix = 'unix';
- JclSrcDirVcl = 'vcl';
- JclSrcDirCommon = 'common';
+ JclSrcDirWindows = 'source' + DirDelimiter + 'windows';
+ JclSrcDirUnix = 'source' + DirDelimiter + 'unix';
+ JclSrcDirVcl = 'source' + DirDelimiter + 'vcl';
+ JclSrcDirCommon = 'source' + DirDelimiter + 'common';
+ JclJppDir = 'devtools' + DirDelimiter + 'jpp';
+ JClJppDirTemplates = 'devtools' + DirDelimiter + 'jpp' + DirDelimiter + 'Templates';
BCBIncludePath = '%s' + DirSeparator + '%s' + DirSeparator + '$(BCB)' + DirDelimiter + 'include;$(BCB)' + DirDelimiter + 'include' + DirDelimiter + 'vcl';
{$IFDEF MSWINDOWS}
BCBObjectPath = '%s;%s;$(BCB)\Lib\Obj';
- JclSourceDirs: array[0..2] of string = (JclSrcDirCommon, JclSrcDirWindows, JclSrcDirVcl);
+ // to be compiled and added to IDE browsing path
+ JclSrcPaths: array[0..4] of string = (JclSrcDirCommon, JclSrcDirWindows, JclSrcDirVcl, JclJppDir, JclJppDirTemplates);
{$ENDIF MSWINDOWS}
{$IFDEF UNIX}
BCBObjectPath = BCBIncludePath;
- JclSourceDirs: array[0..1] of string = (JclSrcDirCommon, JclSrcDirUnix);
+ JclSrcPaths: array[0..3] of string = (JclSrcDirCommon, JclSrcDirUnix, JclJppDir, JclJppDirTemplates);
{$ENDIF UNIX}
ExceptDlgPath = 'experts' + DirDelimiter + 'repository' + DirDelimiter + 'ExceptionDialog' + DirDelimiter + 'StandardDialogs' + DirDelimiter;
@@ -1422,21 +1423,16 @@
if OptionChecked[joJCLMakeRelease] then
begin
MarkOptionBegin(joJCLMakeRelease);
-
- for I := Low(JclSourceDirs) to High(JclSourceDirs) do
- begin
- Result := Result and CompileLibraryUnits(JclSourceDirs[I], False);
- end;
+ for I := Low(JclSrcPaths) to High(JclSrcPaths) do
+ Result := Result and CompileLibraryUnits(JclSrcPaths[I], False);
MarkOptionEnd(joJCLMakeRelease, Result);
end;
if Result and OptionChecked[joJCLMakeDebug] then
begin
MarkOptionBegin(joJCLMakeDebug);
- for I := Low(JclSourceDirs) to High(JclSourceDirs) do
- begin
- Result := Result and CompileLibraryUnits(JclSourceDirs[I], True);
- end;
+ for I := Low(JclSrcPaths) to High(JclSrcPaths) do
+ Result := Result and CompileLibraryUnits(JclSrcPaths[I], True);
MarkOptionEnd(joJCLMakeDebug, Result);
end;
@@ -1479,7 +1475,7 @@
{$IFDEF MSWINDOWS}
InstallJediRegInformation(ATarget.ConfigDataLocation, 'JCL',
Format('%d.%d.%d.%d', [JclVersionMajor, JclVersionMinor, JclVersionRelease, JclVersionBuild]),
- GetDcpPath, GetBplPath, Distribution.FJclPath, ATarget.RootKey);
+ GetDcpPath, GetBplPath, Distribution.JclPath, ATarget.RootKey);
PathEnvVar := RegReadStringDef(ATarget.RootKey, RegHKCUEnvironmentVar, PathEnvironmentVar, '');
PathListIncludeItems(PathEnvVar, RegReadStringDef(HKLM, RegHKLMEnvironmentVar, PathEnvironmentVar, ''));
@@ -1845,9 +1841,8 @@
begin
//ioJclEnvLibPath
if ATarget.RemoveFromLibrarySearchPath(FLibReleaseDir) and
- ATarget.RemoveFromLibrarySearchPath(Distribution.JclSourceDir) and
ATarget.RemoveFromLibrarySearchPath(Distribution.JclIncludeDir) then
- WriteLog(Format(LoadResString(@RsLogDelLibrarySearchPath3), [FLibReleaseDir, Distribution.JclSourceDir, Distribution.JclIncludeDir]))
+ WriteLog(Format(LoadResString(@RsLogDelLibrarySearchPath2), [FLibReleaseDir, Distribution.JclIncludeDir]))
else
WriteLog(LoadResString(@RsLogFailedDelLibrarySearchPath));
{$IFDEF MSWINDOWS}
@@ -1855,10 +1850,9 @@
with TJclBDSInstallation(ATarget) do
begin
if RemoveFromCppSearchPath(FLibReleaseDir) and
- RemoveFromCppSearchPath(Distribution.JclSourceDir) and
RemoveFromCppSearchPath(Distribution.JclIncludeDir) and
((IDEVersionNumber < 5) or RemoveFromCppLibraryPath(FLibReleaseDir)) then
- WriteLog(Format(LoadResString(@RsLogDelCppSearchPath3), [FLibReleaseDir, Distribution.JclSourceDir, Distribution.JclIncludeDir]))
+ WriteLog(Format(LoadResString(@RsLogDelCppSearchPath2), [FLibReleaseDir, Distribution.JclIncludeDir]))
else
WriteLog(LoadResString(@RsLogFailedDelCppSearchPath));
end;
@@ -2314,7 +2308,7 @@
UnitType := 'debug ';
LibDescriptor := Format(LoadResString(@RsLogLibDescriptor), [SubDir, UnitType, TargetName]);
WriteLog(Format(LoadResString(@RsLogBuilding), [LibDescriptor]));
- Path := Format('%s' + DirDelimiter + '%s', [Distribution.JclSourceDir, SubDir]);
+ Path := Distribution.JclPath + SubDir;
UnitList := TStringList.Create;
try
BuildFileList(PathAddSeparator(Path) + '*.pas', faAnyFile, UnitList);
@@ -2916,7 +2910,7 @@
begin
Result := 0;
- DailyFileName := FJclPath + DailyRevisionFileName;
+ DailyFileName := JclPath + DailyRevisionFileName;
if FileExists(DailyFileName) then
begin
// directory from a daily zip
@@ -2931,9 +2925,9 @@
if Result = 0 then
begin
- SvnEntriesFileName := FJclPath + EntriesFileName1;
+ SvnEntriesFileName := JclPath + EntriesFileName1;
if not FileExists(SvnEntriesFileName) then
- SvnEntriesFileName := FJclPath + EntriesFileName2;
+ SvnEntriesFileName := JclPath + EntriesFileName2;
if FileExists(SvnEntriesFileName) then
begin
// directory from subversion
@@ -2987,25 +2981,24 @@
InstallerFileName := ParamStr(0);
FJclPath := PathAddSeparator(ExpandFileName(PathExtractFileDirFixed(InstallerFileName) + '..'));
- FLibReleaseDirMask := Format('%slib' + VersionDirExp, [FJclPath]);
+ FLibReleaseDirMask := Format('%slib' + VersionDirExp, [JclPath]);
FLibDebugDirMask := FLibReleaseDirMask + DirDelimiter + 'debug';
- FJclBinDir := FJclPath + 'bin';
- FJclSourceDir := FJclPath + 'source';
- FJclIncludeDir := PathAddSeparator(FJclSourceDir) + 'include';
- FJclExamplesDir := FJclPath + 'examples';
+ FJclBinDir := JclPath + 'bin';
+ FJclIncludeDir := PathAddSeparator(JclPath + 'source') + 'include';
+ FJclExamplesDir := JclPath + 'examples';
FJclSourcePath := '';
- for Index := Low(JclSourceDirs) to High(JclSourceDirs) do
- ListAddItems(FJclSourcePath, DirSeparator, PathAddSeparator(FJclSourceDir) + JclSourceDirs[Index]);
+ for Index := Low(JclSrcPaths) to High(JclSrcPaths) do
+ ListAddItems(FJclSourcePath, DirSeparator, JclPath + JclSrcPaths[Index]);
- ExceptDialogsPath := FJclPath + ExceptDlgPath;
+ ExceptDialogsPath := JclPath + ExceptDlgPath;
FVclDialogFileName := ExceptDialogsPath + ExceptDlgVclFileName;
FVclDialogSendFileName := ExceptDialogsPath + ExceptDlgVclSndFileName;
- ExceptDialogsPath := FJclPath + ExceptIcoPath;
+ ExceptDialogsPath := JclPath + ExceptIcoPath;
FVclDialogIconFileName := ExceptDialogsPath + ExceptIcoVclFileName;
FVclDialogSendIconFileName := ExceptDialogsPath + ExceptIcoVclSndFileName;
- FJclChmHelpFileName := FJclPath + JclChmHelpFile;
- FJclHlpHelpFileName := FJclPath + JclHlpHelpFile;
- FJclHxSHelpFileName := FJclPath + JclHxSHelpFile;
+ FJclChmHelpFileName := JclPath + JclChmHelpFile;
+ FJclHlpHelpFileName := JclPath + JclHlpHelpFile;
+ FJclHxSHelpFileName := JclPath + JclHxSHelpFile;
if not FileExists(FJclChmHelpFileName) then
FJclChmHelpFileName := '';
if not FileExists(FJclHlpHelpFileName) then
@@ -3019,7 +3012,7 @@
FileSetAttr(FVclDialogSendFileName, faArchive);
FileSetAttr(ChangeFileExt(FVclDialogSendFileName, '.dfm'), faArchive);
{$ENDIF MSWINDOWS}
- FJclReadmeFileName := FJclPath + 'docs' + DirDelimiter + ReadmeFileName;
+ FJclReadmeFileName := JclPath + 'docs' + DirDelimiter + ReadmeFileName;
if Assigned(GUI) then
begin
ReadMePage := GUI.CreateReadmePage;
Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas 2010-08-08 11:18:28 UTC (rev 3284)
+++ trunk/jcl/install/JclInstallResources.pas 2010-08-08 11:47:54 UTC (rev 3285)
@@ -300,11 +300,11 @@
RsLogAddLibrarySearchPath2 = 'Added "%s;%s" to library search path.';
RsLogAddLibrarySearchPath1 = 'Added "%s" to library search path.';
RsLogFailedAddLibrarySearchPath = 'Failed to add library search paths.';
- RsLogDelLibrarySearchPath3 = 'Removed "%s;%s;%s" from library search path.';
+ RsLogDelLibrarySearchPath2 = 'Removed "%s;%s" from library search path.';
RsLogFailedDelLibrarySearchPath = 'Failed to remove library search path.';
RsLogAddCppSearchPath2 = 'Added "%s;%s" to cpp search path.';
RsLogFailedAddCppSearchPath = 'Failed to add cpp search paths.';
- RsLogDelCppSearchPath3 = 'Removed "%s;%s;%s" from cpp search path.';
+ RsLogDelCppSearchPath2 = 'Removed "%s;%s" from cpp search path.';
RsLogFailedDelCppSearchPath = 'Failed to remove cpp search path.';
RsLogAddLibraryBrowsingPath = 'Added "%s" to library browsing path.';
RsLogFailedAddLibraryBrowsingPath = 'Failed to add library browsing path';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-08 11:18:35
|
Revision: 3284
http://jcl.svn.sourceforge.net/jcl/?rev=3284&view=rev
Author: outchy
Date: 2010-08-08 11:18:28 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
always build JclVcl package.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
trunk/jcl/install/JclInstallResources.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2010-08-08 10:54:21 UTC (rev 3283)
+++ trunk/jcl/install/JclInstall.pas 2010-08-08 11:18:28 UTC (rev 3284)
@@ -92,13 +92,10 @@
joJCLEnvDebugDCUPath,
joJCLMake,
joJCLMakeRelease,
- joJCLMakeReleaseVCL,
joJCLMakeDebug,
- joJCLMakeDebugVCL,
joJCLCopyHppFiles,
joJCLCheckHppFiles,
joJCLPackages,
- joJCLVclPackage,
joJCLDualPackages,
joJCLCopyPackagesHppFiles,
joJCLMapCreate,
@@ -372,13 +369,10 @@
(Id: -1; Caption: @RsCaptionEnvDebugDCUPath; Hint: @RsHintEnvDebugDCUPath), // joEnvDebugDCUPath
(Id: -1; Caption: @RsCaptionMake; Hint: @RsHintMake), // joMake
(Id: -1; Caption: @RsCaptionMakeRelease; Hint: @RsHintMakeRelease), // joMakeRelease
- (Id: -1; Caption: @RsCaptionMakeVCL; Hint: @RsHintMakeReleaseVCL), // joMakeReleaseVCL
(Id: -1; Caption: @RsCaptionMakeDebug; Hint: @RsHintMakeDebug), // joMakeDebug
- (Id: -1; Caption: @RsCaptionMakeVCL; Hint: @RsHintMakeDebugVCL), // joMakeDebugVCL
(Id: -1; Caption: @RsCaptionCopyHppFiles; Hint: @RsHintCopyHppFiles), // joCopyHppFiles
(Id: -1; Caption: @RsCaptionCheckHppFiles; Hint: @RsHintCheckHppFiles), // joCheckHppFiles
(Id: -1; Caption: @RsCaptionPackages; Hint: @RsHintPackages), // joPackages
- (Id: -1; Caption: @RsCaptionVclPackage; Hint: @RsHintVclPackage), // joVclPackage
(Id: -1; Caption: @RsCaptionDualPackages; Hint: @RsHintDualPackages), // joDualPackages
(Id: -1; Caption: @RsCaptionCopyPackagesHppFiles; Hint: @RsHintCopyPackagesHppFiles), // joCopyPackagesHppFiles
(Id: -1; Caption: @RsCaptionMapCreate; Hint: @RsHintMapCreate), // joMapCreate
@@ -809,12 +803,6 @@
AddOption(joJCLMakeRelease, [goStandAloneParent, goExpandable, goChecked], Parent);
AddOption(joJCLMakeDebug, [goStandAloneParent, goExpandable, goChecked], Parent);
- if Target.SupportsVCL then
- begin
- AddOption(joJCLMakeReleaseVCL, [goChecked], joJCLMakeRelease);
- AddOption(joJCLMakeDebugVCL, [goChecked], joJCLMakeDebug);
- end;
-
if bpBCBuilder32 in Target.Personalities then
begin
AddOption(joJCLCopyHppFiles, [goChecked], OptionData[joJCLMake].Id,
@@ -869,8 +857,6 @@
procedure AddPackageOptions(Parent: TInstallerOption);
begin
- if RuntimeInstallation and Target.SupportsVCL then
- AddOption(joJCLVclPackage, [goChecked], Parent);
if (bpBCBuilder32 in Target.Personalities) and RunTimeInstallation then
begin
if (Target.RadToolKind = brBorlandDevStudio) and (Target.VersionNumber >= 4) then
@@ -1122,8 +1108,7 @@
Result := True;
{$IFDEF MSWINDOWS}
- if (not OptionChecked[joJCLPackages] or (Target.SupportsVCL and not OptionChecked[joJCLVCLPackage])) and
- Assigned(GUI) and not Target.IsTurboExplorer then
+ if not OptionChecked[joJCLPackages] and Assigned(GUI) and not Target.IsTurboExplorer then
Result := GUI.Dialog(LoadResString(@RsWarningPackageNodeNotSelected), dtConfirmation, [drYes, drNo]) = drYes;
{$ENDIF MSWINDOWS}
@@ -1418,8 +1403,7 @@
{$IFDEF UNIX}
Target.BCC32.Options.Add('-DTEST_UNIX');
{$ENDIF UNIX}
- if OptionChecked[joJCLMakeReleaseVCL] or OptionChecked[joJCLMakeDebugVCL] then
- Target.BCC32.Options.Add('-DTEST_VCL');
+ Target.BCC32.Options.Add('-DTEST_VCL');
Options := StringsToStr(Target.BCC32.Options, NativeSpace);
Result := Target.BCC32.Execute(Options + ' "jcl_a2z.cpp"')
and Target.BCC32.Execute(Options + ' "jcl_z2a.cpp"');
@@ -1441,11 +1425,7 @@
for I := Low(JclSourceDirs) to High(JclSourceDirs) do
begin
- if (JclSourceDirs[I] = JclSrcDirVcl) and OptionChecked[joJCLMakeReleaseVCL] then
- MarkOptionBegin(joJCLMakeReleaseVCL);
Result := Result and CompileLibraryUnits(JclSourceDirs[I], False);
- if (JclSourceDirs[I] = JclSrcDirVcl) and OptionChecked[joJCLMakeReleaseVCL] then
- MarkOptionEnd(joJCLMakeReleaseVCL, Result);
end;
MarkOptionEnd(joJCLMakeRelease, Result);
end;
@@ -1455,11 +1435,7 @@
MarkOptionBegin(joJCLMakeDebug);
for I := Low(JclSourceDirs) to High(JclSourceDirs) do
begin
- if (JclSourceDirs[I] = JclSrcDirVcl) and OptionChecked[joJCLMakeDebugVCL] then
- MarkOptionBegin(joJCLMakeDebugVCL);
Result := Result and CompileLibraryUnits(JclSourceDirs[I], True);
- if (JclSourceDirs[I] = JclSrcDirVcl) and OptionChecked[joJCLMakeDebugVCL] then
- MarkOptionEnd(joJCLMakeDebugVCL, Result);
end;
MarkOptionEnd(joJCLMakeDebug, Result);
end;
@@ -1487,12 +1463,8 @@
and CompilePackage(FullPackageFileName(Target, JclContainersDpk))
and CompilePackage(FullPackageFileName(Target, JclDeveloperToolsDpk));
- if Result and OptionChecked[joJCLVclPackage] then
- begin
- MarkOptionBegin(joJCLVclPackage);
+ if Result and Target.SupportsVCL then
Result := Result and CompilePackage(FullPackageFileName(Target, JclVclDpk));
- MarkOptionEnd(joJCLVclPackage, Result);
- end;
MarkOptionEnd(joJCLPackages, Result);
end;
Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas 2010-08-08 10:54:21 UTC (rev 3283)
+++ trunk/jcl/install/JclInstallResources.pas 2010-08-08 11:18:28 UTC (rev 3284)
@@ -117,13 +117,11 @@
RsCaptionMake = 'Make library units';
RsCaptionMakeRelease = 'Release';
RsCaptionMakeDebug = 'Debug';
- RsCaptionMakeVCL = 'Visual Component Library';
RsCaptionCopyHppFiles = 'Copy HPP files to %s';
RsCaptionCheckHppFiles = 'Check HPP files';
// packages
RsCaptionPackages = 'Packages';
- RsCaptionVclPackage = 'VCL Package';
RsCaptionDualPackages = 'Dual packages';
RsCaptionCopyPackagesHppFiles = 'Output HPP files to %s';
@@ -231,16 +229,13 @@
// make units
RsHintMake = 'Generate .dcu files.' + NativeLineBreak + 'Recommended.';
RsHintMakeRelease = 'Make precompiled units for release, i.e. optimized, w/o debug information.';
- RsHintMakeReleaseVcl = 'Make precompiled VCL units for release';
RsHintMakeDebug = 'Make precompiled units for debugging, i.e.optimization off, debug information included.' + NativeLineBreak +
'When installed, available through Project Options|Compiler|Use Debug DCUs.';
- RsHintMakeDebugVcl = 'Make precompiled VCL units for debugging';
RsHintCopyHppFiles = 'Copy .hpp files into C++Builder''s include path.';
RsHintCheckHppFiles = 'Compile some C++ source files to verify JCL headers';
// packages
RsHintPackages = 'Build and eventually install JCL runtime packages and optional IDE experts.';
- RsHintVclPackage = 'Build JCL runtime package containing VCL extensions';
RsHintDualPackages = 'The same package introduce code for Delphi Win32 and C++Builder Win32';
RsHintCopyPackagesHppFiles = 'Output .hpp files into C++Builder''s include path instead of ' +
'the source paths.';
@@ -275,7 +270,7 @@
RsHintMakeDemos = 'Make JCL demo applications';
// warning messages
- RsWarningPackageNodeNotSelected = 'The "Packages" or "VCL package" nodes are not selected.' + sLineBreak +
+ RsWarningPackageNodeNotSelected = 'The "Packages" node is not selected.' + sLineBreak +
'Various libraries (including the JVCL) require JCL packages to be compiled' + sLineBreak +
'Do you want to continue without compiling JCL packages?';
RsWarningCreatePath = 'The path where %s files will be created doesn''t exists.' + sLineBreak +
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-08 10:54:27
|
Revision: 3283
http://jcl.svn.sourceforge.net/jcl/?rev=3283&view=rev
Author: outchy
Date: 2010-08-08 10:54:21 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
use relative path only for compilers with long path bug.
Modified Paths:
--------------
trunk/jcl/source/common/JclCompilerUtils.pas
Modified: trunk/jcl/source/common/JclCompilerUtils.pas
===================================================================
--- trunk/jcl/source/common/JclCompilerUtils.pas 2010-08-08 10:01:19 UTC (rev 3282)
+++ trunk/jcl/source/common/JclCompilerUtils.pas 2010-08-08 10:54:21 UTC (rev 3283)
@@ -1096,11 +1096,11 @@
Option := Options.Strings[OptionIndex];
if IsPathOption(Option, SwitchLen) then
begin
-
StrToStrings(StrTrimQuotes(Copy(Option, SwitchLen + 1, Length(Option) - SwitchLen)), PathSep, PathList);
- // change to relative paths to avoid DCC32 126 character path limit
- for PathIndex := 0 to PathList.Count - 1 do
- PathList.Strings[PathIndex] := PathGetRelativePath(CurrentFolder, ExpandFileName(PathList[PathIndex]));
+ if LongPathBug then
+ // change to relative paths to avoid DCC32 126 character path limit
+ for PathIndex := 0 to PathList.Count - 1 do
+ PathList.Strings[PathIndex] := PathGetRelativePath(CurrentFolder, ExpandFileName(PathList[PathIndex]));
if PathList.Count > 0 then
Arguments := Format('%s %s"%s"', [Arguments, Copy(Option, 1, SwitchLen),
StringsToStr(PathList, PathSep)]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-08 10:01:27
|
Revision: 3282
http://jcl.svn.sourceforge.net/jcl/?rev=3282&view=rev
Author: outchy
Date: 2010-08-08 10:01:19 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
make C6 happy with the repository expert.
Modified Paths:
--------------
trunk/jcl/experts/repository/JclOtaRepositoryReg.pas
trunk/jcl/packages/c6/JclRepositoryExpert.bpk
trunk/jcl/packages/c6/JclRepositoryExpert.dpk
trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf
trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr
trunk/jcl/packages/d10/JclRepositoryExpert.dpk
trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d11/JclRepositoryExpert.dpk
trunk/jcl/packages/d11/JclRepositoryExpert.dproj
trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d12/JclRepositoryExpert.dpk
trunk/jcl/packages/d12/JclRepositoryExpert.dproj
trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d14/JclRepositoryExpert.dpk
trunk/jcl/packages/d14/JclRepositoryExpert.dproj
trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d6/JclRepositoryExpert.dpk
trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d7/JclRepositoryExpert.dpk
trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d9/JclRepositoryExpert.dpk
trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/xml/JclRepositoryExpert-D.xml
trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml
Modified: trunk/jcl/experts/repository/JclOtaRepositoryReg.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaRepositoryReg.pas 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/experts/repository/JclOtaRepositoryReg.pas 2010-08-08 10:01:19 UTC (rev 3282)
@@ -71,7 +71,7 @@
uses
Windows,
JclStrings, JclFileUtils, JclRegistry,
- JclOtaResources, JclOtaConsts, JclTemplates, JclOtaExcDlgWizard;
+ JclOtaResources, JclOtaConsts, JclTemplates;
type
TExpertRecord = record
Modified: trunk/jcl/packages/c6/JclRepositoryExpert.bpk
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpert.bpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/c6/JclRepositoryExpert.bpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:46 UTC
*****************************************************************************
-->
<PROJECT>
@@ -15,6 +15,7 @@
<OBJFILES value="
..\..\lib\c6\JclRepositoryExpert.obj
..\..\lib\c6\JclOtaRepositoryUtils.obj
+ ..\..\lib\c6\JclOtaRepositoryReg.obj
..\..\lib\c6\JclOtaExcDlgRepository.obj
..\..\lib\c6\JclOtaExcDlgWizard.obj
..\..\lib\c6\JclOtaExcDlgFileFrame.obj
@@ -24,7 +25,6 @@
..\..\lib\c6\JclOtaExcDlgTraceFrame.obj
..\..\lib\c6\JclOtaExcDlgThreadFrame.obj
..\..\lib\c6\JclOtaExcDlgIgnoreFrame.obj
- ..\..\lib\c6\JclOtaRepositoryReg.obj
"/>
<RESFILES value="JclRepositoryExpert.res"/>
<IDLFILES value=""/>
@@ -64,7 +64,7 @@
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="JclRepositoryExpert.cpp"/>
<INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\experts\repository;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <LIBPATH value="..\..\experts\repository;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
@@ -96,6 +96,7 @@
<FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\JclOtaRepositoryUtils.pas" FORMNAME="" UNITNAME="JclOtaRepositoryUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\experts\repository\JclOtaRepositoryReg.pas" FORMNAME="" UNITNAME="JclOtaRepositoryReg" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" FORMNAME="" UNITNAME="JclOtaExcDlgRepository" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas" FORMNAME="JclOtaExcDlgForm" UNITNAME="JclOtaExcDlgWizard" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas" FORMNAME="JclOtaExcDlgFilePage" UNITNAME="JclOtaExcDlgFileFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
@@ -105,7 +106,6 @@
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas" FORMNAME="JclOtaExcDlgTracePage" UNITNAME="JclOtaExcDlgTraceFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas" FORMNAME="JclOtaExcDlgThreadPage" UNITNAME="JclOtaExcDlgThreadFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas" FORMNAME="JclOtaExcDlgIgnoredPage" UNITNAME="JclOtaExcDlgIgnoreFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\experts\repository\JclOtaRepositoryReg.pas" FORMNAME="" UNITNAME="JclOtaRepositoryReg" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: trunk/jcl/packages/c6/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpert.dpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/c6/JclRepositoryExpert.dpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:46 UTC
-----------------------------------------------------------------------------
}
@@ -52,6 +52,7 @@
;
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -60,7 +61,6 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame}
;
end.
Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf 2010-08-08 10:01:19 UTC (rev 3282)
@@ -1,4 +1,5 @@
USEUNIT("..\..\experts\repository\JclOtaRepositoryUtils.pas");
+USEUNIT("..\..\experts\repository\JclOtaRepositoryReg.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas");
@@ -8,7 +9,6 @@
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas");
-USEUNIT("..\..\experts\repository\JclOtaRepositoryReg.pas");
USEDEF("JclRepositoryExpertDLL.def");
Project file
DllEntryPoint
Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr 2010-08-08 10:01:19 UTC (rev 3282)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:46 UTC
*****************************************************************************
-->
<PROJECT>
@@ -15,6 +15,7 @@
<OBJFILES value="
..\..\lib\c6\JclRepositoryExpertDLL.obj
..\..\lib\c6\JclOtaRepositoryUtils.obj
+ ..\..\lib\c6\JclOtaRepositoryReg.obj
..\..\lib\c6\JclOtaExcDlgRepository.obj
..\..\lib\c6\JclOtaExcDlgWizard.obj
..\..\lib\c6\JclOtaExcDlgFileFrame.obj
@@ -24,7 +25,6 @@
..\..\lib\c6\JclOtaExcDlgTraceFrame.obj
..\..\lib\c6\JclOtaExcDlgThreadFrame.obj
..\..\lib\c6\JclOtaExcDlgIgnoreFrame.obj
- ..\..\lib\c6\JclOtaRepositoryReg.obj
"/>
<RESFILES value=""/>
<IDLFILES value=""/>
@@ -64,7 +64,7 @@
<SYSDEFINES value="NO_STRICT;_RTLDLL;USEPACKAGES"/>
<MAINSOURCE value="JclRepositoryExpertDLL.cpp"/>
<INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\experts\repository;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <LIBPATH value="..\..\experts\repository;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
@@ -95,6 +95,7 @@
<FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\JclOtaRepositoryUtils.pas" FORMNAME="" UNITNAME="JclOtaRepositoryUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\experts\repository\JclOtaRepositoryReg.pas" FORMNAME="" UNITNAME="JclOtaRepositoryReg" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" FORMNAME="" UNITNAME="JclOtaExcDlgRepository" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas" FORMNAME="JclOtaExcDlgForm" UNITNAME="JclOtaExcDlgWizard" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas" FORMNAME="JclOtaExcDlgFilePage" UNITNAME="JclOtaExcDlgFileFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
@@ -104,7 +105,6 @@
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas" FORMNAME="JclOtaExcDlgTracePage" UNITNAME="JclOtaExcDlgTraceFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas" FORMNAME="JclOtaExcDlgThreadPage" UNITNAME="JclOtaExcDlgThreadFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas" FORMNAME="JclOtaExcDlgIgnorePage" UNITNAME="JclOtaExcDlgIgnoreFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\experts\repository\JclOtaRepositoryReg.pas" FORMNAME="" UNITNAME="JclOtaRepositoryReg" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: trunk/jcl/packages/d10/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d10/JclRepositoryExpert.dpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d10/JclRepositoryExpert.dpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:49 UTC
-----------------------------------------------------------------------------
}
@@ -53,6 +53,7 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -61,8 +62,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame}
;
end.
Modified: trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:49 UTC
-----------------------------------------------------------------------------
}
@@ -43,6 +43,7 @@
uses
ToolsAPI,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -51,8 +52,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame}
;
exports
Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpert.dpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d11/JclRepositoryExpert.dpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:49 UTC
-----------------------------------------------------------------------------
}
@@ -54,6 +54,7 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -62,8 +63,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame}
;
end.
Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpert.dproj 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d11/JclRepositoryExpert.dproj 2010-08-08 10:01:19 UTC (rev 3282)
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{2B548932-6654-4E44-8B06-3288D7A884C4}</ProjectGuid>
<MainSource>JclRepositoryExpert.dpk</MainSource>
@@ -93,6 +93,7 @@
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas"/>
@@ -102,6 +103,5 @@
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas"/>
- <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
</ItemGroup>
</Project>
Modified: trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:49 UTC
-----------------------------------------------------------------------------
}
@@ -44,6 +44,7 @@
uses
ToolsAPI,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -52,8 +53,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame}
;
exports
Modified: trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj 2010-08-08 10:01:19 UTC (rev 3282)
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{D93FF823-44C6-49D4-B9B3-30F1F60082F5}</ProjectGuid>
<MainSource>JclRepositoryExpertDLL.dpr</MainSource>
@@ -93,6 +93,7 @@
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas"/>
@@ -102,6 +103,5 @@
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas"/>
- <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
</ItemGroup>
</Project>
Modified: trunk/jcl/packages/d12/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d12/JclRepositoryExpert.dpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d12/JclRepositoryExpert.dpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:49 UTC
-----------------------------------------------------------------------------
}
@@ -53,6 +53,7 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -61,8 +62,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame}
;
end.
Modified: trunk/jcl/packages/d12/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d12/JclRepositoryExpert.dproj 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d12/JclRepositoryExpert.dproj 2010-08-08 10:01:19 UTC (rev 3282)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{2B548932-6654-4E44-8B06-3288D7A884C4}</ProjectGuid>
<MainSource>JclRepositoryExpert.dpk</MainSource>
@@ -68,6 +68,7 @@
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas"/>
@@ -77,7 +78,6 @@
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas"/>
- <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:50 UTC
-----------------------------------------------------------------------------
}
@@ -43,6 +43,7 @@
uses
ToolsAPI,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -51,8 +52,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame}
;
exports
Modified: trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj 2010-08-08 10:01:19 UTC (rev 3282)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{D93FF823-44C6-49D4-B9B3-30F1F60082F5}</ProjectGuid>
<MainSource>JclRepositoryExpertDLL.dpr</MainSource>
@@ -68,6 +68,7 @@
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas"/>
@@ -77,7 +78,6 @@
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas"/>
- <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d14/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d14/JclRepositoryExpert.dpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d14/JclRepositoryExpert.dpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:50 UTC
-----------------------------------------------------------------------------
}
@@ -53,6 +53,7 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -61,8 +62,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame}
;
end.
Modified: trunk/jcl/packages/d14/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d14/JclRepositoryExpert.dproj 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d14/JclRepositoryExpert.dproj 2010-08-08 10:01:19 UTC (rev 3282)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{2B548932-6654-4E44-8B06-3288D7A884C4}</ProjectGuid>
<MainSource>JclRepositoryExpert.dpk</MainSource>
@@ -70,6 +70,7 @@
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas"/>
@@ -79,7 +80,6 @@
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas"/>
- <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:50 UTC
-----------------------------------------------------------------------------
}
@@ -43,6 +43,7 @@
uses
ToolsAPI,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -51,8 +52,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame}
;
exports
Modified: trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj 2010-08-08 10:01:19 UTC (rev 3282)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{D93FF823-44C6-49D4-B9B3-30F1F60082F5}</ProjectGuid>
<MainSource>JclRepositoryExpertDLL.dpr</MainSource>
@@ -70,6 +70,7 @@
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas"/>
@@ -79,7 +80,6 @@
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas"/>
- <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d6/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d6/JclRepositoryExpert.dpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d6/JclRepositoryExpert.dpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:47 UTC
-----------------------------------------------------------------------------
}
@@ -52,6 +52,7 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -60,8 +61,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame}
;
end.
Modified: trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:47 UTC
-----------------------------------------------------------------------------
}
@@ -42,6 +42,7 @@
uses
ToolsAPI,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -50,8 +51,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame}
;
exports
Modified: trunk/jcl/packages/d7/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d7/JclRepositoryExpert.dpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d7/JclRepositoryExpert.dpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:47 UTC
-----------------------------------------------------------------------------
}
@@ -52,6 +52,7 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -60,8 +61,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame}
;
end.
Modified: trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:47 UTC
-----------------------------------------------------------------------------
}
@@ -42,6 +42,7 @@
uses
ToolsAPI,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -50,8 +51,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame}
;
exports
Modified: trunk/jcl/packages/d9/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d9/JclRepositoryExpert.dpk 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d9/JclRepositoryExpert.dpk 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:48 UTC
-----------------------------------------------------------------------------
}
@@ -52,6 +52,7 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -60,8 +61,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnoredPage: TFrame}
;
end.
Modified: trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr 2010-08-08 10:01:19 UTC (rev 3282)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:44:37 UTC
+ Last generated: 08-08-2010 09:58:48 UTC
-----------------------------------------------------------------------------
}
@@ -42,6 +42,7 @@
uses
ToolsAPI,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
+ JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
@@ -50,8 +51,7 @@
JclOtaExcDlgLogFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgLogFrame.pas' {JclOtaExcDlgLogPage: TFrame},
JclOtaExcDlgTraceFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas' {JclOtaExcDlgTracePage: TFrame},
JclOtaExcDlgThreadFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas' {JclOtaExcDlgThreadPage: TFrame},
- JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame},
- JclOtaRepositoryReg in '..\..\experts\repository\JclOtaRepositoryReg.pas'
+ JclOtaExcDlgIgnoreFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas' {JclOtaExcDlgIgnorePage: TFrame}
;
exports
Modified: trunk/jcl/packages/xml/JclRepositoryExpert-D.xml
===================================================================
--- trunk/jcl/packages/xml/JclRepositoryExpert-D.xml 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/xml/JclRepositoryExpert-D.xml 2010-08-08 10:01:19 UTC (rev 3282)
@@ -17,6 +17,7 @@
</Requires>
<Contains>
<File Name="..\..\experts\repository\JclOtaRepositoryUtils.pas" Targets="runtimeIDE" Formname="" Condition=""/>
+ <File Name="..\..\experts\repository\JclOtaRepositoryReg.pas" Targets="runtimeIDE" Formname="" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" Targets="runtimeIDE" Formname="" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgForm" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgFilePage: TFrame" Condition=""/>
@@ -26,6 +27,5 @@
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgTracePage: TFrame" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgThreadPage: TFrame" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgIgnoredPage: TFrame" Condition=""/>
- <File Name="..\..\experts\repository\JclOtaRepositoryReg.pas" Targets="runtimeIDE" Formname="" Condition=""/>
</Contains>
</Package>
Modified: trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml
===================================================================
--- trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml 2010-08-08 09:15:39 UTC (rev 3281)
+++ trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml 2010-08-08 10:01:19 UTC (rev 3282)
@@ -17,6 +17,7 @@
</Requires>
<Contains>
<File Name="..\..\experts\repository\JclOtaRepositoryUtils.pas" Targets="runtimeIDE" Formname="" Condition=""/>
+ <File Name="..\..\experts\repository\JclOtaRepositoryReg.pas" Targets="runtimeIDE" Formname="" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" Targets="runtimeIDE" Formname="" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgForm" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgFilePage: TFrame" Condition=""/>
@@ -26,6 +27,5 @@
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgTraceFrame.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgTracePage: TFrame" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgThreadFrame.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgThreadPage: TFrame" Condition=""/>
<File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgIgnoreFrame.pas" Targets="runtimeIDE" Formname="JclOtaExcDlgIgnorePage: TFrame" Condition=""/>
- <File Name="..\..\experts\repository\JclOtaRepositoryReg.pas" Targets="runtimeIDE" Formname="" Condition=""/>
</Contains>
</Package>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-08 09:15:46
|
Revision: 3281
http://jcl.svn.sourceforge.net/jcl/?rev=3281&view=rev
Author: outchy
Date: 2010-08-08 09:15:39 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
fix PCRE example compilation.
Modified Paths:
--------------
trunk/jcl/examples/common/pcre/PCREDemoMain.pas
Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.pas
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.pas 2010-08-08 08:59:23 UTC (rev 3280)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.pas 2010-08-08 09:15:39 UTC (rev 3281)
@@ -44,7 +44,7 @@
{ Private declarations }
RE: TJclAnsiRegEx;
FMatchIndex: integer;
- procedure SelectText(const Range: TJclAnsiCaptureOffset);
+ procedure SelectText(const Range: TJclAnsiCaptureRange);
procedure Match;
function GetUIOptions: TJclAnsiRegExOptions;
procedure UpdateUIOptions;
@@ -88,7 +88,7 @@
Match;
end;
-procedure TfrmMain.SelectText(const Range: TJclAnsiCaptureOffset);
+procedure TfrmMain.SelectText(const Range: TJclAnsiCaptureRange);
begin
reFile.SelStart := Range.FirstPos - 1;
reFile.SelLength := Range.LastPos - Range.FirstPos + 1;
@@ -104,8 +104,8 @@
end
else
begin
- SelectText(RE.CaptureOffset[0]);
- FMatchIndex := RE.CaptureOffset[0].LastPos + 1;
+ SelectText(RE.CaptureRanges[0]);
+ FMatchIndex := RE.CaptureRanges[0].LastPos + 1;
end;
UpdateUIOptions;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-08 08:59:32
|
Revision: 3280
http://jcl.svn.sourceforge.net/jcl/?rev=3280&view=rev
Author: outchy
Date: 2010-08-08 08:59:23 +0000 (Sun, 08 Aug 2010)
Log Message:
-----------
moved debug converters to example directory.
Added Paths:
-----------
trunk/jcl/examples/windows/debug/tools/
trunk/jcl/examples/windows/debug/tools/MakeJclDbg.dof
trunk/jcl/examples/windows/debug/tools/MakeJclDbg.dpr
trunk/jcl/examples/windows/debug/tools/MapToJdbg.dof
trunk/jcl/examples/windows/debug/tools/MapToJdbg.dpr
trunk/jcl/examples/windows/debug/tools/MapToJdbg.res
trunk/jcl/examples/windows/debug/tools/MapToJdbgMain.dfm
trunk/jcl/examples/windows/debug/tools/MapToJdbgMain.pas
trunk/jcl/examples/windows/debug/tools/TlbToMap.dof
trunk/jcl/examples/windows/debug/tools/TlbToMap.dpr
trunk/jcl/examples/windows/debug/tools/TlbToMap.res
trunk/jcl/examples/windows/debug/tools/TlbToMapMain.dfm
trunk/jcl/examples/windows/debug/tools/TlbToMapMain.pas
trunk/jcl/examples/windows/debug/tools/makejcldbg.res
Removed Paths:
-------------
trunk/jcl/experts/debug/tools/
Property changes on: trunk/jcl/examples/windows/debug/tools
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: svn:ignore
+ __history
*.identcache
*.local
*.cfg
*.drc
*.dcu
*.dproj
*.bdsproj
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/examples/windows/debug/tools/MakeJclDbg.dof (from rev 3279, trunk/jcl/experts/debug/tools/MakeJclDbg.dof)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/MakeJclDbg.dof (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/MakeJclDbg.dof 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,3 @@
+[Directories]
+OutputDir=..\..\..\..\bin
+
Copied: trunk/jcl/examples/windows/debug/tools/MakeJclDbg.dpr (from rev 3279, trunk/jcl/experts/debug/tools/MakeJclDbg.dpr)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/MakeJclDbg.dpr (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/MakeJclDbg.dpr 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,136 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is MakeJclDbg.dpr. }
+{ }
+{ The Initial Developer of the Original Code is documented in the accompanying }
+{ help file JCL.chm. Portions created by these individuals are Copyright (C) of these individuals. }
+{ }
+{**************************************************************************************************}
+{ }
+{ Command line tool for inserting JCL debug data created from MAP files into executable files }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+program MakeJclDbg;
+
+{$I jcl.inc}
+
+{$APPTYPE CONSOLE}
+
+uses
+ Windows, Classes, SysUtils,
+ JclDebug, JclFileUtils, JclPeImage, JclStrings;
+
+var
+ JdbgFlag, InsertToExeFlag: Boolean;
+
+function MakeDebugData(const FileNames: string): Boolean;
+var
+ FilesList: TStringList;
+ I: Integer;
+ MapFileSize, BinDataSize: Integer;
+ FileName, ExecutableFileName: TFileName;
+ LinkerBugUnit: string;
+
+ procedure FindExecutableFileName(const MapFileName: TFileName);
+ var
+ ExecFilesList: TStringList;
+ I, ValidCnt: Integer;
+ begin
+ ExecutableFileName := '';
+ ValidCnt := 0;
+ ExecFilesList := TStringList.Create;
+ try
+ if AdvBuildFileList(ChangeFileExt(MapFileName, '.*'), faArchive, ExecFilesList, amSubSetOf, [flFullNames]) then
+ with ExecFilesList do
+ begin
+ for I := 0 to Count - 1 do
+ if IsValidPeFile(Strings[I]) then
+ begin
+ Objects[I] := Pointer(True);
+ Inc(ValidCnt);
+ if ExecutableFileName = '' then
+ ExecutableFileName := Strings[I];
+ end;
+ case ValidCnt of
+ 0: WriteLn(#13#10'Can not find any executable file for the MAP file.');
+ 1: Write(' -> ' + ExtractFileName(ExecutableFileName));
+ else
+ ExecutableFileName := '';
+ WriteLn(#13#10'Ambiguous executable file names:');
+ for I := 0 to Count - 1 do
+ if Boolean(Objects[I]) then
+ WriteLn(Strings[I]);
+ end;
+ end;
+ finally
+ ExecFilesList.Free;
+ end;
+ end;
+
+begin
+ Result := True;
+ FilesList := TStringList.Create;
+ try
+ if AdvBuildFileList(FileNames, faArchive, FilesList, amSubSetOf, [flFullNames]) then
+ for I := 0 to FilesList.Count - 1 do
+ begin
+ FileName := FilesList[I];
+ if not AnsiSameText(ExtractFileExt(FileName), '.map') then
+ Continue;
+ Write(#13#10, FilesList[I]);
+ Result := False;
+ if JdbgFlag then
+ Result := ConvertMapFileToJdbgFile(FileName);
+ if InsertToExeFlag then
+ begin
+ FindExecutableFileName(FileName);
+ Result := (ExecutableFileName <> '');
+ if Result then
+ Result := InsertDebugDataIntoExecutableFile(ExecutableFileName,
+ FileName, LinkerBugUnit, MapFileSize, BinDataSize);
+ end;
+ if Result then
+ WriteLn(' ... OK')
+ else
+ begin
+ WriteLn(' ... ERROR!');
+ Break;
+ end;
+ end;
+ finally
+ FilesList.Free;
+ end;
+end;
+
+begin
+ WriteLn('Make JCL debug data command line utility. (c) 2002 Project JEDI');
+ JdbgFlag := AnsiSameText(ParamStr(1), '-J');
+ InsertToExeFlag := AnsiSameText(ParamStr(1), '-E');
+ if (ParamCount <> 2) or not (JdbgFlag xor InsertToExeFlag) then
+ begin
+ WriteLn('Usage: MAKEJCLDBG -<J|E> <map filenames>');
+ WriteLn(' J - Create .JDBG files');
+ WriteLn(' E - Insert debug data into executable files');
+ WriteLn('Executable files must be in the same directory as the MAP files');
+ end
+ else
+ if not MakeDebugData(ParamStr(2)) then
+ Halt(1);
+end.
Copied: trunk/jcl/examples/windows/debug/tools/MapToJdbg.dof (from rev 3279, trunk/jcl/experts/debug/tools/MapToJdbg.dof)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/MapToJdbg.dof (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/MapToJdbg.dof 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,3 @@
+[Directories]
+OutputDir=..\..\..\..\bin
+
Copied: trunk/jcl/examples/windows/debug/tools/MapToJdbg.dpr (from rev 3279, trunk/jcl/experts/debug/tools/MapToJdbg.dpr)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/MapToJdbg.dpr (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/MapToJdbg.dpr 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,43 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is MapToJdbg.dpr. }
+{ }
+{ The Initial Developer of the Original Code is documented in the accompanying }
+{ help file JCL.chm. Portions created by these individuals are Copyright (C) of these individuals. }
+{ }
+{**************************************************************************************************}
+{ }
+{ Command line tool for converting JCL debug data created from MAP files }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+program MapToJdbg;
+
+uses
+ Forms,
+ MapToJdbgMain in 'MapToJdbgMain.pas' {MainForm};
+
+{$R *.RES}
+
+begin
+ Application.Initialize;
+ Application.Title := 'MAP to JDBG';
+ Application.CreateForm(TMainForm, MainForm);
+ Application.Run;
+end.
Copied: trunk/jcl/examples/windows/debug/tools/MapToJdbg.res (from rev 3279, trunk/jcl/experts/debug/tools/MapToJdbg.res)
===================================================================
(Binary files differ)
Copied: trunk/jcl/examples/windows/debug/tools/MapToJdbgMain.dfm (from rev 3279, trunk/jcl/experts/debug/tools/MapToJdbgMain.dfm)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/MapToJdbgMain.dfm (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/MapToJdbgMain.dfm 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,577 @@
+object MainForm: TMainForm
+ Left = 275
+ Top = 222
+ Width = 692
+ Height = 444
+ Caption = 'MAP to JDBG format conversion utility'
+ Color = clBtnFace
+ Constraints.MinHeight = 200
+ Constraints.MinWidth = 300
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'MS Sans Serif'
+ Font.Style = []
+ Menu = MainMenu1
+ OldCreateOrder = False
+ Position = poDefaultPosOnly
+ ShowHint = True
+ OnCreate = FormCreate
+ PixelsPerInch = 96
+ TextHeight = 13
+ object ToolBar1: TToolBar
+ Left = 0
+ Top = 0
+ Width = 684
+ Height = 24
+ AutoSize = True
+ Caption = 'ToolBar1'
+ Flat = True
+ Images = ImageList1
+ Indent = 4
+ TabOrder = 0
+ object ToolButton1: TToolButton
+ Left = 4
+ Top = 0
+ Action = Open1
+ end
+ object ToolButton3: TToolButton
+ Left = 27
+ Top = 0
+ Width = 8
+ Caption = 'ToolButton3'
+ ImageIndex = 2
+ Style = tbsSeparator
+ end
+ object ToolButton2: TToolButton
+ Left = 35
+ Top = 0
+ Action = Convert1
+ end
+ end
+ object StatusBar1: TStatusBar
+ Left = 0
+ Top = 379
+ Width = 684
+ Height = 19
+ Panels = <
+ item
+ Width = 250
+ end
+ item
+ Width = 90
+ end
+ item
+ Width = 50
+ end>
+ SimplePanel = False
+ end
+ object FilesListView: TListView
+ Left = 0
+ Top = 24
+ Width = 684
+ Height = 355
+ Align = alClient
+ Columns = <
+ item
+ Caption = 'Name'
+ Width = 100
+ end
+ item
+ Alignment = taRightJustify
+ Caption = 'MAP file size'
+ Width = 75
+ end
+ item
+ Alignment = taRightJustify
+ Caption = 'JDBG file size'
+ Width = 80
+ end
+ item
+ Alignment = taRightJustify
+ Caption = 'Ratio'
+ end
+ item
+ Caption = 'Full path name'
+ Width = 240
+ end
+ item
+ Caption = 'Linker bug'
+ Width = 65
+ end
+ item
+ Caption = 'Line errors'
+ Width = 65
+ end>
+ ColumnClick = False
+ HotTrackStyles = []
+ ReadOnly = True
+ RowSelect = True
+ SmallImages = ImageList1
+ TabOrder = 2
+ ViewStyle = vsReport
+ end
+ object MainMenu1: TMainMenu
+ Images = ImageList1
+ Left = 8
+ Top = 344
+ object File1: TMenuItem
+ Caption = 'File'
+ object Open2: TMenuItem
+ Action = Open1
+ end
+ object N1: TMenuItem
+ Caption = '-'
+ end
+ object Exit2: TMenuItem
+ Action = Exit1
+ end
+ end
+ object Run1: TMenuItem
+ Caption = 'Run'
+ object Convert2: TMenuItem
+ Action = Convert1
+ end
+ end
+ end
+ object ActionList1: TActionList
+ Images = ImageList1
+ Left = 40
+ Top = 344
+ object Exit1: TAction
+ Caption = 'Exit'
+ Hint = 'Exit the application'
+ ImageIndex = 0
+ OnExecute = Exit1Execute
+ end
+ object Open1: TAction
+ Caption = 'Open ...'
+ Hint = 'Open MAP file(s)'
+ ImageIndex = 2
+ ShortCut = 16463
+ OnExecute = Open1Execute
+ end
+ object Convert1: TAction
+ Caption = 'Convert'
+ Hint = 'Start conversion'
+ ImageIndex = 1
+ ShortCut = 120
+ OnExecute = Convert1Execute
+ OnUpdate = Convert1Update
+ end
+ end
+ object ImageList1: TImageList
+ Left = 72
+ Top = 344
+ Bitmap = {
+ 494C010105000900040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+ 0000000000003600000028000000400000003000000001002000000000000030
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000000000000000FF000000
+ FF000000FF0000000000000000007F7F7F00000000007F7F7F00000000000000
+ 00000000FF000000FF000000FF00000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ FF000000FF000000FF0000000000000000000000000000000000000000000000
+ FF000000FF000000FF0000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000FF000000FF000000FF007F7F7F00000000007F7F7F000000FF000000
+ FF000000FF000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000FF000000FF000000FF00000000000000FF000000FF000000
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000FF000000FF00000000000000FF000000FF000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000080000000000000008000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000FF000000800000000000000080000000FF000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000FF000000FF000000000000000000000000000000FF000000
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000FF000000FF000000FF000000000000000000000000000000FF000000
+ FF000000FF000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ FF000000FF000000FF0000000000000000000000000000000000000000000000
+ FF000000FF000000FF0000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000000000000000FF000000
+ FF000000FF0000000000000000007F7F7F00000000007F7F7F00000000000000
+ 00000000FF000000FF000000FF00000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000
+ 0000000000000000000000000000FFFFFF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 80000000800000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000
+ FF000000FF000000FF0000000000FFFFFF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000FF0000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 8000000080000000800000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF0000000000000000000000000000000000000000000000000000000000FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000
+ FF000000FF000000FF0000000000FFFFFF000000000000000000008484000084
+ 8400008484000084840000848400008484000084840000848400008484000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000FF000000FF000000FF00000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000008000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 0000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000
+ FF000000FF000000FF0000000000FFFFFF000000000000FFFF00000000000084
+ 8400008484000084840000848400008484000084840000848400008484000084
+ 8400000000000000000000000000000000000000000000000000000000000000
+ 00000000FF000000FF000000FF00000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000008000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000
+ 0000000000000000000000000000FFFFFF0000000000FFFFFF0000FFFF000000
+ 0000008484000084840000848400008484000084840000848400008484000084
+ 8400008484000000000000000000000000000000000000000000000000000000
+ FF000000FF000000FF000000FF000000FF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000008000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000FFFF00FFFFFF0000FF
+ FF00000000000084840000848400008484000084840000848400008484000084
+ 84000084840000848400000000000000000000000000000000000000FF000000
+ FF000000FF000000FF000000FF000000FF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000008000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+ FF0000000000FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF0000FFFF00FFFF
+ FF0000FFFF000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000000000007F7F7F000000FF000000
+ FF0000000000000000000000FF000000FF000000FF0000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000008000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF000000
+ 00000000000000000000FFFFFF00FFFFFF000000000000FFFF00FFFFFF0000FF
+ FF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00000000000000
+ 0000000000000000000000000000000000007F7F7F000000FF00000000000000
+ 00000000000000000000000000000000FF000000FF0000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000008000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000FFFFFF00000000000000
+ 0000000000000000000000000000FFFFFF0000000000FFFFFF0000FFFF00FFFF
+ FF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF00000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000FF000000FF000000FF00000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 8000000080000000800000FFFF000000000000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000FFFF00FFFFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF000000FF00000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000008000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000FFFF0000FFFF
+ 0000FFFF00000000000000000000000000000000000000000000000000000000
+ 00000000000000000000FFFFFF00FFFFFF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000000000000000FF000000FF000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 800000008000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000FFFF0000FFFF
+ 0000FFFF00000000000000000000000000000000000000000000000000000000
+ 00000000000000000000FFFFFF00FFFFFF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000000000007F7F7F000000
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 8000FFFF0000000080000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000FFFF0000FFFF
+ 0000FFFF00000000000000000000000000000000000000000000000000000000
+ 00000000000000000000FFFFFF00FFFFFF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000007F7F
+ 7F000000FF000000000000000000000000000000000000000000000000000000
+ 8000FFFF0000FFFF00000000000000FFFF0000FFFF0000FFFF0000FFFF0000FF
+ FF00000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000FFFFFF00FFFFFF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000FF000000FF00000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000FFFFFF000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000424D3E000000000000003E000000
+ 2800000040000000300000000100010000000000800100000000000000000000
+ 000000000000000000000000FFFFFF0000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000FFFF000000000000FFFF000000000000
+ C631000000000000E223000000000000F007000000000000F88F000000000000
+ FC1F000000000000FE3F000000000000FC1F000000000000F80F000000000000
+ F007000000000000E223000000000000C631000000000000FFFF000000000000
+ FFFF000000000000FFFF000000000000C0078000FFFFFFFFC0078000FFFFFFFF
+ C007C000001FF9FFC007E000000FF0FFC007F0000007F0FFC007F8000003E07F
+ C007FC000001C07FC007FE000000843FC007FF00001F1E3FC007FF80001FFE1F
+ C0078380001FFF1FC00783E08FF1FF8FC00783E0FFF9FFC7C00783E0FF75FFE3
+ C0078384FF8FFFF8C007FFFEFFFFFFFF00000000000000000000000000000000
+ 000000000000}
+ end
+ object OpenDialog1: TOpenDialog
+ Filter = 'MAP files (*.map)|*.map'
+ Options = [ofHideReadOnly, ofAllowMultiSelect, ofPathMustExist, ofFileMustExist, ofEnableSizing]
+ Title = 'Select MAP file(s) to convert'
+ Left = 104
+ Top = 344
+ end
+end
Copied: trunk/jcl/examples/windows/debug/tools/MapToJdbgMain.pas (from rev 3279, trunk/jcl/experts/debug/tools/MapToJdbgMain.pas)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/MapToJdbgMain.pas (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/MapToJdbgMain.pas 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,228 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is MapToJdbgMain.pas. }
+{ }
+{ The Initial Developer of the Original Code is Petr Vones. }
+{ Portions created by Petr Vones are Copyright (C) of Petr Vones. }
+{ }
+{ Contributors: }
+{ Michael Chernyshev }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit MapToJdbgMain;
+
+interface
+
+uses
+ Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
+ ComCtrls, ImgList, ActnList, Menus, ToolWin;
+
+type
+ TMainForm = class(TForm)
+ ToolBar1: TToolBar;
+ MainMenu1: TMainMenu;
+ ActionList1: TActionList;
+ ImageList1: TImageList;
+ StatusBar1: TStatusBar;
+ Exit1: TAction;
+ Open1: TAction;
+ Convert1: TAction;
+ File1: TMenuItem;
+ Open2: TMenuItem;
+ N1: TMenuItem;
+ Exit2: TMenuItem;
+ OpenDialog1: TOpenDialog;
+ FilesListView: TListView;
+ ToolButton1: TToolButton;
+ ToolButton2: TToolButton;
+ ToolButton3: TToolButton;
+ Run1: TMenuItem;
+ Convert2: TMenuItem;
+ procedure Exit1Execute(Sender: TObject);
+ procedure FormCreate(Sender: TObject);
+ procedure Open1Execute(Sender: TObject);
+ procedure Convert1Execute(Sender: TObject);
+ procedure Convert1Update(Sender: TObject);
+ private
+ { Private declarations }
+ public
+ { Public declarations }
+ end;
+
+var
+ MainForm: TMainForm;
+
+implementation
+
+{$R *.DFM}
+
+uses
+ JclCounter, JclDebug, JclFileUtils, JclUnitConv;
+
+resourcestring
+ RsConverting = 'Converting ...';
+ RsConversionStatus = '%d file(s) converted, Conversion time: %5.3f sec.';
+ RsLinkerBugs = 'Linker bugs: %d';
+
+procedure TMainForm.FormCreate(Sender: TObject);
+var
+ MapFileName, ExeFileName: TFileName;
+ LinkerBugUnit: string;
+ MapFileSize, JclDebugDataSize, LineNumberErrors: Integer;
+begin
+ if ParamCount = 1 then
+ begin
+ MapFileName := ParamStr(1);
+ if MapFileName <> '' then
+ begin
+ if not ConvertMapFileToJdbgFile(MapFileName) then
+ ExitCode := 1;
+ Application.ShowMainForm := False;
+ Application.Terminate;
+ end;
+ end
+ else
+ if ParamCount = 2 then
+ begin
+ MapFileName := ParamStr(1);
+ ExeFileName := ParamStr(2);
+ if (MapFileName <> '') and (ExeFileName <> '') then
+ begin
+ if not InsertDebugDataIntoExecutableFile(ExeFileName, MapFileName, LinkerBugUnit, MapFileSize, JclDebugDataSize, LineNumberErrors) then
+ ExitCode := 1;
+ Application.ShowMainForm := False;
+ Application.Terminate;
+ end;
+ end;
+end;
+
+procedure TMainForm.Exit1Execute(Sender: TObject);
+begin
+ Close;
+end;
+
+procedure TMainForm.Open1Execute(Sender: TObject);
+var
+ I, FileSize: Integer;
+begin
+ with OpenDialog1 do
+ begin
+ FileName := '';
+ if Execute then
+ begin
+ with FilesListView.Items do
+ begin
+ BeginUpdate;
+ try
+ Clear;
+ for I := 0 to Files.Count - 1 do
+ with Add do
+ begin
+ Caption := PathExtractFileNameNoExt(Files[I]);
+ FileSize := FileGetSize(Files[I]);
+ SubItems.AddObject(IntToStr(FileSize), Pointer(FileSize));
+ SubItems.Add('');
+ SubItems.Add('');
+ SubItems.Add(Files[I]);
+ SubItems.Add('');
+ SubItems.Add('');
+ ImageIndex := 1;
+ end;
+ finally
+ EndUpdate;
+ end;
+ end;
+ StatusBar1.Panels[0].Text := '';
+ end;
+ end;
+end;
+
+procedure TMainForm.Convert1Execute(Sender: TObject);
+var
+ I, JdbgFileSize, FilesConverted, LineNumberErrors, LinkerBugCnt: Integer;
+ MapFileName, JdbgFileName: TFileName;
+ Ratio: Extended;
+ LinkerBugUnit: string;
+ Cnt: TJclCounter;
+begin
+ Screen.Cursor := crHourGlass;
+ try
+ with FilesListView do
+ begin
+ StatusBar1.Panels[0].Text := RsConverting;
+ StatusBar1.Panels[1].Text := '';
+ StatusBar1.Update;
+ Items.BeginUpdate;
+ for I := 0 to Items.Count - 1 do
+ with Items[I] do
+ begin
+ SubItems[1] := '';
+ SubItems[2] := '';
+ SubItems[4] := '';
+ SubItems[5] := '';
+ ImageIndex := 1;
+ end;
+ Items.EndUpdate;
+ Update;
+ FilesConverted := 0;
+ LinkerBugCnt := 0;
+ StartCount(Cnt);
+ for I := 0 to Items.Count - 1 do
+ begin
+ with Items[I] do
+ begin
+ MapFileName := SubItems[3];
+ JdbgFileName := ChangeFileExt(MapFileName, JclDbgFileExtension);
+ if ConvertMapFileToJdbgFile(MapFileName, LinkerBugUnit, LineNumberErrors) then
+ begin
+ ImageIndex := 3;
+ JdbgFileSize := FileGetSize(JdbgFileName);
+ Ratio := JdbgFileSize * 100 / Integer(SubItems.Objects[0]);
+ SubItems[1] := IntToStr(JdbgFileSize);
+ SubItems[2] := Format('%3.1f %%', [Ratio]);
+ SubItems[4] := LinkerBugUnit;
+ if LinkerBugUnit <> '' then
+ Inc(LinkerBugCnt);
+ if LineNumberErrors > 0 then
+ SubItems[5] := IntToStr(LineNumberErrors);
+ Inc(FilesConverted);
+ end
+ else
+ begin
+ SubItems[0] := '';
+ ImageIndex := 4;
+ end;
+ end;
+ Update;
+ end;
+ StatusBar1.Panels[0].Text := Format(RsConversionStatus, [FilesConverted, StopCount(Cnt)]);
+ StatusBar1.Panels[1].Text := Format(RsLinkerBugs, [LinkerBugCnt]);
+ end;
+ finally
+ Screen.Cursor := crDefault;
+ end;
+end;
+
+procedure TMainForm.Convert1Update(Sender: TObject);
+begin
+ Convert1.Enabled := FilesListView.Items.Count > 0;
+end;
+
+end.
Copied: trunk/jcl/examples/windows/debug/tools/TlbToMap.dof (from rev 3279, trunk/jcl/experts/debug/tools/TlbToMap.dof)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/TlbToMap.dof (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/TlbToMap.dof 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,3 @@
+[Directories]
+OutputDir=..\..\..\..\bin
+
Copied: trunk/jcl/examples/windows/debug/tools/TlbToMap.dpr (from rev 3279, trunk/jcl/experts/debug/tools/TlbToMap.dpr)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/TlbToMap.dpr (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/TlbToMap.dpr 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,43 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is MapToJdbg.dpr. }
+{ }
+{ The Initial Developer of the Original Code is documented in the accompanying }
+{ help file JCL.chm. Portions created by these individuals are Copyright (C) of these individuals. }
+{ }
+{**************************************************************************************************}
+{ }
+{ Command line tool for converting JCL debug data created from TLB files }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+program TlbToMap;
+
+uses
+ Forms,
+ TlbToMapMain in 'TlbToMapMain.pas' {MainForm};
+
+{$R *.RES}
+
+begin
+ Application.Initialize;
+ Application.Title := 'TLB to MAP';
+ Application.CreateForm(TMainForm, MainForm);
+ Application.Run;
+end.
Copied: trunk/jcl/examples/windows/debug/tools/TlbToMap.res (from rev 3279, trunk/jcl/experts/debug/tools/TlbToMap.res)
===================================================================
(Binary files differ)
Copied: trunk/jcl/examples/windows/debug/tools/TlbToMapMain.dfm (from rev 3279, trunk/jcl/experts/debug/tools/TlbToMapMain.dfm)
===================================================================
--- trunk/jcl/examples/windows/debug/tools/TlbToMapMain.dfm (rev 0)
+++ trunk/jcl/examples/windows/debug/tools/TlbToMapMain.dfm 2010-08-08 08:59:23 UTC (rev 3280)
@@ -0,0 +1,592 @@
+object MainForm: TMainForm
+ Left = 274
+ Top = 174
+ Width = 430
+ Height = 346
+ Caption = 'Type Library to MAP file'
+ Color = clBtnFace
+ Constraints.MinHeight = 200
+ Constraints.MinWidth = 300
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'MS Sans Serif'
+ Font.Style = []
+ Menu = MainMenu1
+ OldCreateOrder = False
+ Position = poDefaultPosOnly
+ ShowHint = True
+ OnCreate = FormCreate
+ OnDestroy = FormDestroy
+ PixelsPerInch = 96
+ TextHeight = 13
+ object Splitter1: TSplitter
+ Left = 0
+ Top = 239
+ Width = 422
+ Height = 3
+ Cursor = crVSplit
+ Align = alBottom
+ MinSize = 10
+ ResizeStyle = rsUpdate
+ Visible = False
+ end
+ object ToolBar1: TToolBar
+ Left = 0
+ Top = 0
+ Width = 422
+ Height = 24
+ AutoSize = True
+ Caption = 'ToolBar1'
+ Flat = True
+ Images = ImageList1
+ Indent = 4
+ TabOrder = 0
+ Wrapable = False
+ object ToolButton1: TToolButton
+ Left = 4
+ Top = 0
+ Action = Open1
+ end
+ object ToolButton3: TToolButton
+ Left = 27
+ Top = 0
+ Width = 8
+ Caption = 'ToolButton3'
+ ImageIndex = 2
+ Style = tbsSeparator
+ end
+ object ToolButton2: TToolButton
+ Left = 35
+ Top = 0
+ Action = CreateMAP1
+ end
+ object ToolButton4: TToolButton
+ Left = 58
+ Top = 0
+ Action = CreateJDBG1
+ end
+ end
+ object StatusBar1: TStatusBar
+ Left = 0
+ Top = 281
+ Width = 422
+ Height = 19
+ Panels = <
+ item
+ Width = 50
+ end>
+ SimplePanel = False
+ end
+ object MethodsListView: TListView
+ Left = 0
+ Top = 24
+ Width = 422
+ Height = 215
+ Align = alClient
+ Columns = <
+ item
+ Caption = 'Method'
+ Width = 200
+ end
+ item
+...
[truncated message content] |
|
From: <ou...@us...> - 2010-08-07 09:44:28
|
Revision: 3279
http://jcl.svn.sourceforge.net/jcl/?rev=3279&view=rev
Author: outchy
Date: 2010-08-07 09:44:18 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
Renamed ProjAnalyzerFrm to JclProjectAnalyzerFrm.
Renamed ProjAnalyzerImpl to JclProjectAnalyzerImpl.
Renamed ProjAnalyzerIcon to JclProjectAnalyzerIcon.
Modified Paths:
--------------
trunk/jcl/packages/c6/JclProjectAnalysisExpert.bpk
trunk/jcl/packages/c6/JclProjectAnalysisExpert.cpp
trunk/jcl/packages/c6/JclProjectAnalysisExpert.dpk
trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.bpf
trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.bpr
trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.cpp
trunk/jcl/packages/d10/JclProjectAnalysisExpert.dpk
trunk/jcl/packages/d10/JclProjectAnalysisExpertDLL.dpr
trunk/jcl/packages/d11/JclProjectAnalysisExpert.dpk
trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj
trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dpr
trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj
trunk/jcl/packages/d12/JclProjectAnalysisExpert.dpk
trunk/jcl/packages/d12/JclProjectAnalysisExpert.dproj
trunk/jcl/packages/d12/JclProjectAnalysisExpertDLL.dpr
trunk/jcl/packages/d12/JclProjectAnalysisExpertDLL.dproj
trunk/jcl/packages/d14/JclProjectAnalysisExpert.dpk
trunk/jcl/packages/d14/JclProjectAnalysisExpert.dproj
trunk/jcl/packages/d14/JclProjectAnalysisExpertDLL.dpr
trunk/jcl/packages/d14/JclProjectAnalysisExpertDLL.dproj
trunk/jcl/packages/d6/JclProjectAnalysisExpert.dpk
trunk/jcl/packages/d6/JclProjectAnalysisExpertDLL.dpr
trunk/jcl/packages/d7/JclProjectAnalysisExpert.dpk
trunk/jcl/packages/d7/JclProjectAnalysisExpertDLL.dpr
trunk/jcl/packages/d9/JclProjectAnalysisExpert.dpk
trunk/jcl/packages/d9/JclProjectAnalysisExpertDLL.dpr
trunk/jcl/packages/xml/JclProjectAnalysisExpert-D.xml
trunk/jcl/packages/xml/JclProjectAnalysisExpertDLL-L.xml
Added Paths:
-----------
trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerFrm.dfm
trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerFrm.pas
trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerIcon.res
trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerImpl.pas
Removed Paths:
-------------
trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.dfm
trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas
trunk/jcl/experts/projectanalyzer/ProjAnalyzerIcon.res
trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas
Copied: trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerFrm.dfm (from rev 3277, trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.dfm)
===================================================================
--- trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerFrm.dfm (rev 0)
+++ trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerFrm.dfm 2010-08-07 09:44:18 UTC (rev 3279)
@@ -0,0 +1,572 @@
+object ProjectAnalyzerForm: TProjectAnalyzerForm
+ Left = 362
+ Top = 263
+ BorderIcons = [biSystemMenu]
+ BorderStyle = bsSizeToolWin
+ Caption = 'Project Analyzer'
+ ClientHeight = 459
+ ClientWidth = 595
+ Color = clBtnFace
+ Constraints.MinHeight = 250
+ Constraints.MinWidth = 290
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'MS Sans Serif'
+ Font.Style = []
+ OldCreateOrder = False
+ ShowHint = True
+ OnCreate = FormCreate
+ OnDestroy = FormDestroy
+ PixelsPerInch = 96
+ TextHeight = 13
+ object UnitListView: TListView
+ Left = 0
+ Top = 40
+ Width = 595
+ Height = 400
+ Align = alClient
+ Columns = <
+ item
+ Caption = 'RsName'
+ ImageIndex = 0
+ Width = 150
+ end
+ item
+ Alignment = taRightJustify
+ Caption = 'RsSize'
+ Width = 70
+ end
+ item
+ Caption = 'RsGroup'
+ Width = 85
+ end
+ item
+ Caption = 'RsPackage'
+ Width = 90
+ end>
+ ReadOnly = True
+ RowSelect = True
+ PopupMenu = PopupMenuUnitView
+ SmallImages = ExplorerItemImages
+ TabOrder = 0
+ ViewStyle = vsReport
+ OnColumnClick = UnitListViewColumnClick
+ OnCompare = UnitListViewCompare
+ end
+ object ToolBarMain: TToolBar
+ Left = 0
+ Top = 0
+ Width = 595
+ Height = 40
+ AutoSize = True
+ ButtonHeight = 36
+ ButtonWidth = 95
+ Caption = 'ToolBarMain'
+ EdgeBorders = [ebTop, ebBottom]
+ Images = ExplorerItemImages
+ Indent = 4
+ PopupMenu = PopupMenuToolbar
+ ShowCaptions = True
+ TabOrder = 1
+ object ToolButtonCopy: TToolButton
+ Left = 4
+ Top = 0
+ Action = ActionCopy
+ end
+ object ToolButtonSave: TToolButton
+ Left = 99
+ Top = 0
+ Action = ActionSave
+ end
+ object ToolButtonSeparator1: TToolButton
+ Left = 194
+ Top = 0
+ Width = 8
+ ImageIndex = 3
+ Style = tbsSeparator
+ end
+ object ToolButtonDetails: TToolButton
+ Left = 202
+ Top = 0
+ Action = ActionShowDetails
+ Grouped = True
+ Style = tbsCheck
+ end
+ object ToolButtonSummary: TToolButton
+ Left = 297
+ Top = 0
+ Action = ActionShowSummary
+ Grouped = True
+ Style = tbsCheck
+ end
+ object ToolButtonDfms: TToolButton
+ Left = 392
+ Top = 0
+ Action = ActionShowDfms
+ Grouped = True
+ Style = tbsCheck
+ end
+ object ToolButtonSeparator2: TToolButton
+ Left = 487
+ Top = 0
+ Width = 8
+ ImageIndex = 18
+ Style = tbsSeparator
+ end
+ object ToolButtonShowPackages: TToolButton
+ Left = 495
+ Top = 0
+ Action = ActionShowPackages
+ end
+ end
+ object StatusBarMain: TStatusBar
+ Left = 0
+ Top = 440
+ Width = 595
+ Height = 19
+ Panels = <
+ item
+ Width = 50
+ end>
+ SimplePanel = False
+ end
+ object ExplorerItemImages: TImageList
+ Left = 8
+ Top = 392
+ Bitmap = {
+ 494C010113001500040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+ 0000000000003600000028000000400000005000000001001000000000000028
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000EF3D0000EF3DEF3D000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000FF0300000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000F75E0000F75EF75E000000000000000000000000000000000000
+ 000000000000000000000000000000000000000000000000000000000000FF03
+ FF7FFF03FF031F00000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000F75EF75EF75EF75E000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7FFF7FFF7FFF7FFF7FFF7FFF7F00000000000000000000FF7F007CFF7F
+ FF7FFF03FF03FF03007CFF030000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7F00000000FF7F00000000
+ FF7F000000000000FF7F00000000FF7F0000000000000000FF7FFF03007CFF03
+ FF7FFF03FF031F00007C1F00FF03000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7FFF7FFF7FFF7FFF7FFF7FFF7F0000000000000000FF7FFF7F007CFF7F
+ FF7FFF03FF03FF03007CFF03FF03000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7F0000FF7FFF7FFF7FFF7FFF7FFF7F00000000FF7F00000000FF7F00000000
+ FF7FFF7F00000000000000000000FF7F0000000000000000FF7FFF03007CFF03
+ FF7FFF03FF031F00007C1F00FF03000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7F0000FF7FFF7FFF7FFF7FFF7FFF7F00000000FF7FFF03FF03FF03FF03FF03
+ FF7FFF7F0000FF7F007CFF7F1F00FF7F0000000000000000FF7FFF7F007CFF7F
+ FF7F1042FF03FF03007CFF03FF03000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7F00000000FF7F00000000
+ F75E00001F001F001F00007C1F001F0000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7F0000FF7F007CFF7F1F00FF7F0000000000000000FF7FFF03007C1042
+ 10420000FF7F1000007C1F00FF03000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7F00000000007C007C007C000000000000FF7F0000000000000000FF7F
+ FF7FFF7F0000FF7FFF7FFF7F1F00FF7F0000000000000000FF7F10421042FF7F
+ 000010420000FF7F10001000FF03000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7F0000000000000000FF7F
+ 0000FF7F0000007C007C007C007C007C00000000FF7F0000000000000000FF7F
+ FF7FFF7F0000FF7FFF7FFF7FFF7FFF7F00000000000010421042FF7FFF7F0000
+ 1863104218630000FF7FFF7F1000100000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7F007C007C007C007C007C007C007C0000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7FFF7FFF7FFF7FFF7FFF7FFF7F00000000FF7FFF7FFF7F000000001863
+ 000000001863186300000000FF7FFF7FFF7F0000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7F00000000FF7F00000000
+ 0000000000000000007C007C007C0000000000001F001F001F001F001F001F00
+ 1F001F001F001F001F001F001F001F0000000000000000000000FF7F10420000
+ E07FE07F000010421042FF7F0000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7FFF7FFF7FFF7F0000FF7F
+ FF7F000000000000007C007C007C000000000000F75EF75E1F001F001F001F00
+ 1F001F001F001F001F001F00F75EF75E0000000000000000FF7FFF7F0000E07F
+ E07FE07FE07F0000FF7FFF7FFF7F000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7F0000F75EFF7F0000FF7F
+ 000000000000EF3D007C007C007C000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000FF7FFF7FFF7F0000E07F
+ E07FE07FE07F0000FF7FFF7FFF7FFF7F00000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7FFF7FFF7FFF7F00000000
+ 0000007C007C007C007C007C0000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000FF7FFF7F0000
+ E07FE07F0000FF7FFF7FFF7F0000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000000000000000000000000000FF7F
+ 00000000FF7FFF7F000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ E07FEF3DFF7FFF7FFF7FFF7FFF7FE07F00000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ E07FEF3DFF7FFF7FFF7FFF7FFF7FE07F00000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000007C00400040
+ 0000000000000000004000400000000000000000000000000000000000000000
+ E07FEF3DFF7FFF7FFF7FFF7FFF7FE07F00000000104210421042104210421042
+ 1042104210421042104210421042104200000000000010421042104210421042
+ 1042104210421042104210421042000000000000000000000000007C007C0040
+ 004000000000007C007C00401042000000000000000000000000000000000000
+ E07FEF3DFF7FFF7FFF7FFF7FFF7FE07F000000001042FF7FE07F1863E07F1863
+ E07F1863E07F1863E07F1863E07F10420000000000001042FF7FE07F1863E07F
+ 1863E07F1863E07F1863E07F10420000000000000000000000000000007C007C
+ 00400000007C007C007C00401042000000000000000000000000000000000000
+ 000000000000EF3DEF3D00000000EF3D000000001042FF7F1863E07F1863E07F
+ 1863E07F1863E07F1863E07F18631042000000001042FF7FE07F1863E07F1863
+ E07F1863E07F1863E07F1863000010420000000000000000007C00001042007C
+ 007C007C007C0040004000420000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7F000000000000EF3DEF3DE07F000000001042FF7FE07F1863E07F1863
+ E07F1863E07F1863E07F1863E07F1042000000001042FF7F1863E07F1863E07F
+ 1863E07F1863E07F18631042000010420000000000000000007C007C0000007C
+ 007C007C007CE07F004200420042000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7F000000000000EF3DE07FE07F000000001042FF7F1863E07F1863E07F
+ 1863E07F1863E07F1863E07F1863104200001042FF7F1863E07F1863E07F1863
+ E07F1863E07F1863E07F0000104210420000000000000000007C007C007C0000
+ 007C007C007CE07F004200420042000000000000FF7F00000000FF7F00000000
+ 0000FF7F000000000000007C00000000EF3D00001042FF7FE07F1863E07F1863
+ E07F1863E07F1863E07F1863E07F104200001042FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7FFF7FFF7F10420000186310420000000000000000007C007C0040007C
+ 007C007C007C0042004200000000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7F00000000007C007C007C0000000000001042FF7F1863E07F1863E07F
+ 1863E07F1863E07F1863E07F1863104200001042104210421042104210421042
+ 104210421042104210421042E07F10420000000000000000007C007C0040007C
+ 007C007C00400040104210420000000000000000FF7F0000000000000000FF7F
+ 0000FF7F0000007C007C007C007C007C000000001042FF7FE07F1863E07F1863
+ E07F1863E07F1863E07F1863E07F1042000000001042FF7F1863E07F1863E07F
+ 1863E07F1863E07F1863E07F186310420000000000000000007C0040007C007C
+ 007C007C007C0040004010420000000000000000FF7FFF7FFF7FFF7FFF7FFF7F
+ FF7FFF7F007C007C007C007C007C007C007C00001042FF7FFF7FFF7FFF7FFF7F
+ FF7FFF7FFF7FFF7FFF7FFF7FFF7F1042000000001042FF7FE07F1863E07F1863
+ E07F1863FF7FFF7FFF7FFF7FFF7F104200000000000000000000007C007C007C
+ 007C1002007C007C004000400040000000000000FF7F00000000FF7F00000000
+ 0000000000000000007C007C007C00000000000010421863E07F1863E07F1863
+ E07F1863104210421042104210421042000000001042FF7F1863E07F1863E07F
+ 1863FF7F10421042104210421042104200000000000000000000007C007C007C
+ 000000001F00007C007C007C0040000000000000FF7FFF7FFF7FFF7F0000FF7F
+ FF7F000000000000007C007C007C000000000000000010421863E07F1863E07F
+ 186310420000000000000000000000000000000000001042FF7FFF7FFF7FFF7F
+ FF7F104200000000000000000000000000000000000000000000000000000000
+ 0000100210021F001000007C0000000000000000FF7F0000F75EFF7F0000FF7F
+ 000000000000EF3D007C007C007C000000000000000000001042104210421042
+ 1042000000000000000000000000000000000000000000001042104210421042
+ 1042000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000FF7FFF7FFF7FFF7F00000000
+ 0000007C007C007C007C007C0000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000001042104210420000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000001863
+ 1863104210420000000010421042104200000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000104210420000000000000000000000000000186318631863
+ 1863104210421042104200000000104210420000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000010421042000000000000000018631863186318631863
+ 1863104210421042104210420000104200000000000000000000000010421042
+ 1042000000000000000000000000000000000000000000000000000010421042
+ 1042000000000000000000000000000000000000000000000000000010420000
+ 000000001042004200420000104200000000104218631863186318631863FF7F
+ FF7F104210421042104210420000000000000000000000000000000000000000
+ 1042104200001042104210421042000000000000000000000000000000000000
+ 104210420000104210421042104200000000000000000000007C000010421042
+ 1042004200420042004200420000000000001042186318631863FF7FFF7F1042
+ 1042FF7FFF7F1042104210420000000000000000000000000000E003E0030002
+ 00001042E003E003E003E0031042000000000000000000000000E07FE07F0042
+ 00001042E07FE07FE07FE07F104200000000000000000000007C007C00001042
+ 10420042E07F00420042004200420000000010421863FF7FFF7F104210420000
+ 104210420000FF7FFF7F1042000000000000000000000000E003E003E0030002
+ 000010420002E003E003E003104200000000000000000000E07FE07FE07F0042
+ 000010420042E07FE07FE07F104200000000000000000000007C007C007C0000
+ 00000042E07FE07F004200420042000000001042FF7F10421042007C007C0042
+ 00420042004200000000FF7F00000000000000001042E003E003E00310420002
+ 000000000000E003E003E00310420000000000001042E07FE07FE07F10420042
+ 000000000000E07FE07FE07F104200000000000000000000007C007C00400040
+ 004000000000004200420000000000000000000010421042007C007C007C0042
+ E07F00420042004200000000000000000000000000001042E003104210420002
+ 00020002E003E003E003E003104200000000000000001042E07F104210420042
+ 00420042E07FE07FE07FE07F104200000000000000000000007C007C00400000
+ 000010421042104210421042000000000000000000000000007C007C00400042
+ 1042104200000000000000000000000000000000000000001042000010420002
+ 0002E003E003E0030000E0030000000000000000000000001042000010420042
+ 0042E07FE07FE07F0000E07F000000000000000000000000007C004000000000
+ 10421F0010021F0000001042000000000000000000000000007C004000400000
+ 0000000010421042104210420000000000000000000000000000000010420002
+ E003E003E0030000000000000000000000000000000000000000000010420042
+ E07FE07FE07F0000000000000000000000000000000000000000000000000000
+ 0000100210021F00000010420000000000000000000000000040004000001042
+ 186318631042104210421042104200000000000000000000000000001042E003
+ E003E0030000000000000000000000000000000000000000000000001042E07F
+ E07FE07F00000000000000000000000000000000000000000000000000000000
+ 000000001F001F00000010420000000000000000000000001042186318631863
+ 1863186310421042104210421042000000000000000000000000000000001042
+ E003000000000000000000000000000000000000000000000000000000001042
+ E07F000000000000000000000000000000000000000000000000000000000000
+ 0000100210021F001000000000000000000000001042FF7F1863186318631863
+ 1042104218631863186318630000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000000000001042FF7F186310421042
+ 1863186318630000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000001042104218631863
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000104210421042000000000000000000000000000000000000
+ 0000000000000000104210421042000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000001042000000001042
+ 0000000010420000000010420000000000000000000000000000000000000000
+ 0000000000000000000000001042104200000000000000000000000000000000
+ 0000000000000000000000001042104200000000000000000000000000000000
+ 0000104200000000000000000000000000000000000000001042000000001042
+ 0000000010421042104210420000000000000000000000000000104200000000
+ 0000000010420042004200420000104210420000000000000000104200000000
+ 0000000010420042104200420000104200000000000000000000000010421042
+ 1042186310420000000000000000000000000000104210420000104210420000
+ 1042104200000000104210421042104200000000000000001042104210420000
+ 0000000000420042004200420042000010420000000000001042104210420000
+ 00000000004210420000000000420000104200000000000010421042FF7F1863
+ FF7F186310421042000000000000000000000000000000001042104200001042
+ 0000104200420042000010420000000000000000007C00000000104210421042
+ 1042004200420042004200420042000010420000007C00000000104210421042
+ 1042004210420000000000000000000010420000000010421863FF7F1863FF7F
+ 18631863104210421042000000000000000000000000007C0000104210421042
+ 0042004200420042004200000000000000000000007C007C007C000010421042
+ 10420042E07F0042004200420042004200000000007C1042007C000010421042
+ 104200421042104200000000000000421042000000001042FF7F1863FF7F1863
+ FF7F1863104210421042104200000000000000001042007C007C000010421042
+ 0042E07F00420042004200421042104200000000007C007C007C007C00000000
+ 10420042E07FE07F004200420042004200000000007C10420000007C00000000
+ 10420042E07F1042104200000000004200000000000010421863FF7FFF7F1863
+ 18631863104210421042104200000000000000000000007C007C007C00000000
+ 0042E07FE07F0042004200420000000000000000007C007C007C004000400040
+ 000000001042E07FE07F00420042000000000000007C10420000000010421042
+ 000000000000E07F10421042004200000000000000001042FF7F186318631863
+ 18631863186310421042104200000000000000000000007C007C004000400040
+ 0000000000420042000010420000000000000000007C007C0040004000400040
+ 0000000000000042004200420000000000000000007C10421042104200400040
+ 0000000000000042004200420000000000000000000010421863186318631863
+ 18631863186318631042104200000000000000001042007C007C004010420000
+ 1042104210421042104200001042104200000000007C007C0040004000000000
+ 1042104210421042104210421042000000000000007C10420040004000000000
+ 1042104210421042104210421042000000000000000010421863186318631863
+ 18631863186318631042104200000000000000000000007C0040000000001042
+ 1F0010021F000000104210420000000000000000007C00400000000000001042
+ 00001F0010021F001F0000001042000000000000007C00400000000000001042
+ 10421F0010021F001F0000001042000000000000000000001042186318631863
+ 1863186318631863186310421042000000000000000000001042000000001042
+ 100210021F000000104210420000000000000000000000000000000000000000
+ FF0300001F001F001F000000104200000000000000000000000000000000FF03
+ 1042000000000000000000001042000000000000000000000000104218631863
+ 1863186318631042104200000000000000000000104210420000104210420000
+ 10421F001F000000104200001042104200000000000000000000000000000000
+ 0000100210021F001F0000001042000000000000000000000000000000000000
+ 1042000000000000000000001042000000000000000000000000000010421863
+ 1863104210420000000000000000000000000000000000001042000000001042
+ 100210021F001000000010420000000000000000000000000000000000000000
+ FF0300001F001F001F000000104200000000000000000000000000000000FF03
+ 1042000000000000000000001042000000000000000000000000000000001042
+ 1042000000000000000000000000000000000000000000001042000000001042
+ 0000000010420000000010420000000000000000000000000000000000000000
+ 0000100210021F001F0010000000000000000000000000000000000000000000
+ 1042104210421042104210000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ FF03FF03FF03FF03FF03FF030000000000000000000000000000000000000000
+ FF03FF03FF03FF03FF03FF030000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000001042104210420000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000001863
+ 1863104210420000000010421042104200000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000186318631863
+ 1863104210421042104200000000104210420000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000018631863186318631863
+ 1863104210421042104210420000104200000000000000000000000010421042
+ 1042000000000000000000000000000000000000000000000000000000000000
+ 1042FF7F00000000000000000000000000000000000000000000FF7FFF7FFF7F
+ FF7FFF7FFF7FFF7FFF7F0000000000000000104218631863186318631863FF7F
+ FF7F104210421042104210420000000000000000000000000000000000000000
+ 1042104200001042104210421042000000000000000000000000000000001042
+ 1042FF7FFF7F0000000000000000000000000000000000000000104210420000
+ 000000000000FF7FFF7F00000000000000001042186318631863FF7FFF7F1042
+ 1042FF7FFF7F104210421042000000000000000000000000007C000010420002
+ 00001042E003E003E003E0031042000000000000000000000000000000001042
+ 00000000FF7F0000000000000000000000000000000000000000000010420000
+ 000000000000FF7F0000000000000000000010421863FF7FFF7F104210420000
+ 104210420000FF7FFF7F1042000000000000000000000000007C007C00001042
+ E07F10420002E003E003E0031042000000000000000000000000000010421042
+ 00000000FF7FFF7F000000000000000000000000000000000000000010421042
+ 00000000FF7FFF7F000000000000000000001042FF7F10421042007C007C0042
+ 00420042004200000000FF7F00000000000000001042007C007C007C00000000
+ E07F00000000E003E003E0031042000000000000000000000000000010420000
+ 000000000000FF7F000000000000000000000000000000000000000000001042
+ 00000000FF7F000000000000000000000000000010421042007C007C007C0042
+ E07F00420042004210421042000000000000000000001042007C007C007C0000
+ 00000002E003E003E003E0031042000000000000000000000000104210420000
+ 000000000000FF7FFF7F00000000000000000000000000000000000000001042
+ 1042FF7FFF7F000000000000000000000000000000000000007C007C00400042
+ E07FE07F0042004200420000000000000000000000000000007C007C00400040
+ 0040E003E003E0031002E0030000000000000000000000000000104210421042
+ 1042104210421042104200000000000000000000000000000000000000000000
+ 1042FF7F0000000000000000000000000000000000000000007C007C00401042
+ 104200420042000000000000000000000000000000000000007C004010420002
+ E003E003E0031F00000010420000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000000000000000007C00401F001002
+ 1F0000000000000000000000000000000000000000000000000000001042E003
+ E003E00310021F00000010420000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000010021002
+ 1F00000000000000000000000000000000000000000000000000000000001042
+ E00310021F001F00000010420000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000001F00
+ 1F00000000000000000000000000000000000000000000000000000000000000
+ 0000100210021F00100000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000010021002
+ 1F00100000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000424D3E000000000000003E000000
+ 2800000040000000500000000100010000000000800200000000000000000000
+ 000000000000000000000000FFFFFF00FF00FFFFFC1F0000FF000000F0070000
+ FF000000C0010000FF000000C001000000000000C001000000000000C0010000
+ 00000000C001000000000000C001000000230000C00100000001000080000000
+ 0000000000000000002300008000000000630000C001000000C3000080000000
+ 0107FFFFC001000003FFFFFFF0070000FFFFFFFFFFFFFC00FFFFFFFFFFFFFC00
+ C000E000F1E7FC008000C000F0C3FC008000C000F883000080008000E0030000
+ 80008000E003000080000000E003000080000000E00F002380000000E0070001
+ 80008000E007000080008000F003002380018001F1830063C07FC07FFF0700C3
+ E0FFE0FFFFFF0107FFFFFFFFFFFF03FFFFFFFC07FFFFFFFFFFFFF001FFFFFFFF
+ FFE7C000FFFFFFFFFFC30001F8FFF8FFFB830003F043F043E0030003E003E003
+ E0030003C003C003E003000380038003E0CF8007C003C003E307E003E817E817
+ E607E001F83FF83FFF07E001F87FF87FFF87C003FCFFFCFFFF0F8007FFFFFFFF
+ FFFFC03FFFFFFFFFFFFFE1FFFFFFFFFFFFFFFFFFFFE3FFE3FFFFEDB7FFC1FFC1
+ FF3FED87F780F781F81F8001E380E398E00FE5078000803CC007C0078001801C
+ C00380018001900DC003C007808398C3C003C19781C781C7C003800186038603
+ C003CC079D039C03E003EC07FE83FCF3F00F8001FF03FEF3F83FEC17FE83FCF3
+ FCFFEDB7FF07FE07FFFFFFFFFE07FE07FFFFFFFFFC07FFFFFFFFFFFFF001FFFF
+ FFFFFFFFC000FFFFFFFFFFFF0001F8FFFE7FF00F0003F043FC3FF3CF0003E003
+ FDBFFBDF0003C003F99FF99F00038003FBDFFDBF8007C003F3CFFC3FE00FE007
+ F00FFE7FE03FE007FFFFFFFFE07FF807FFFFFFFFF87FFC07FFFFFFFFFC7FFF0F
+ FFFFFFFFF87FFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000
+ 000000000000}
+ end
+ object ActionListProjectAnalyser: TActionList
+ Images = ExplorerItemImages
+ Left = 40
+ Top = 392
+ object ActionCopy: TAction
+ Caption = 'RsCopy'
+ Hint = 'Copy to clipboard'
+ ImageIndex = 15
+ OnExecute = ActionCopyExecute
+ end
+ object ActionSave: TAction
+ Caption = 'RsSave'
+ Hint = 'Save to text file'
+ ImageIndex = 16
+ OnExecute = ActionSaveExecute
+ end
+ object ActionShowDetails: TAction
+ Tag = 1
+ Caption = 'RsDetails'
+ Hint = 'Detailed view'
+ ImageIndex = 3
+ OnExecute = ActionShowDetailsExecute
+ OnUpdate = ActionShowDetailsUpdate
+ end
+ object ActionShowSummary: TAction
+ Tag = 1
+ Caption = 'RsSummary'
+ Checked = True
+ Hint = 'Summary view'
+ ImageIndex = 2
+ OnExecute = ActionShowSummaryExecute
+ OnUpdate = ActionShowSummaryUpdate
+ end
+ object ActionShowDfms: TAction
+ Tag = 1
+ Caption = 'RsForms'
+ Hint = 'Forms list'
+ ImageIndex = 17
+ OnExecute = ActionShowDfmsExecute
+ OnUpdate = ActionShowDfmsUpdate
+ end
+ object ActionShowPackages: TAction
+ Caption = 'RsShowPackages'
+ Checked = True
+ ImageIndex = 18
+ OnExecute = ActionShowPackagesExecute
+ OnUpdate = ActionShowPackagesUpdate
+ end
+ end
+ object PopupMenuUnitView: TPopupMenu
+ Left = 72
+ Top = 392
+ object MenuItemDetails: TMenuItem
+ Action = ActionShowDetails
+ end
+ object MenuItemSummary: TMenuItem
+ Action = ActionShowSummary
+ end
+ object MenuItemDfms: TMenuItem
+ Action = ActionShowDfms
+ end
+ object MenuItemSeparator: TMenuItem
+ Caption = '-'
+ end
+ object MenuItemCopy: TMenuItem
+ Action = ActionCopy
+ end
+ object MenuItemSave: TMenuItem
+ Action = ActionSave
+ end
+ end
+ object PopupMenuToolbar: TPopupMenu
+ Left = 104
+ Top = 392
+ object TextLabelsItem: TMenuItem
+ Caption = 'RsTextLabels'
+ Checked = True
+ OnClick = TextLabelsItemClick
+ end
+ end
+ object SaveDialogProjectAnalyser: TSaveDialog
+ DefaultExt = 'txt'
+ Filter = 'Text files (*.txt)|*.txt|All Files (*.*)|*.*'
+ Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing]
+ Left = 136
+ Top = 392
+ end
+end
Copied: trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerFrm.pas (from rev 3277, trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas)
===================================================================
--- trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerFrm.pas (rev 0)
+++ trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerFrm.pas 2010-08-07 09:44:18 UTC (rev 3279)
@@ -0,0 +1,735 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is ProjAnalyzerFrm.pas. }
+{ }
+{ The Initial Developer of the Original Code is documented in the accompanying }
+{ help file JCL.chm. Portions created by these individuals are Copyright (C) of these individuals. }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclProjectAnalyzerFrm;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ Windows, SysUtils, Classes, Controls, Forms, Dialogs,
+ ComCtrls, ActnList, Menus, ClipBrd, ImgList, ToolWin,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclDebug,
+ JclOtaUtils;
+
+type
+ TUnitItem = record
+ Name: string;
+ Size: Integer;
+ Group: string;
+ end;
+
+ TPackageUnitItem = record
+ UnitName: string;
+ PackageName: string;
+ end;
+
+ TProjectAnalyserView = (pavDetails, pavSummary, pavDfms);
+
+ TProjectAnalyzerForm = class(TForm)
+ UnitListView: TListView;
+ ExplorerItemImages: TImageList;
+ ToolBarMain: TToolBar;
+ ActionListProjectAnalyser: TActionList;
+ PopupMenuUnitView: TPopupMenu;
+ ToolButtonDetails: TToolButton;
+ ActionShowDetails: TAction;
+ ActionShowSummary: TAction;
+ MenuItemDetails: TMenuItem;
+ MenuItemSummary: TMenuItem;
+ ToolButtonSummary: TToolButton;
+ ToolButtonSeparator1: TToolButton;
+ ToolButtonCopy: TToolButton;
+ ToolButtonSave: TToolButton;
+ ActionCopy: TAction;
+ ActionSave: TAction;
+ PopupMenuToolbar: TPopupMenu;
+ TextLabelsItem: TMenuItem;
+ MenuItemSeparator: TMenuItem;
+ MenuItemCopy: TMenuItem;
+ MenuItemSave: TMenuItem;
+ SaveDialogProjectAnalyser: TSaveDialog;
+ StatusBarMain: TStatusBar;
+ ActionShowDfms: TAction;
+ ToolButtonDfms: TToolButton;
+ MenuItemDfms: TMenuItem;
+ ToolButtonSeparator2: TToolButton;
+ ToolButtonShowPackages: TToolButton;
+ ActionShowPackages: TAction;
+ procedure ActionShowDfmsUpdate(Sender: TObject);
+ procedure ActionShowSummaryUpdate(Sender: TObject);
+ procedure FormCreate(Sender: TObject);
+ procedure FormDestroy(Sender: TObject);
+ procedure UnitListViewColumnClick(Sender: TObject; Column: TListColumn);
+ procedure UnitListViewCompare(Sender: TObject; Item1, Item2: TListItem;
+ Data: Integer; var Compare: Integer);
+ procedure ActionShowDetailsExecute(Sender: TObject);
+ procedure ActionShowSummaryExecute(Sender: TObject);
+ procedure TextLabelsItemClick(Sender: TObject);
+ procedure ActionCopyExecute(Sender: TObject);
+ procedure ActionSaveExecute(Sender: TObject);
+ procedure ActionShowDfmsExecute(Sender: TObject);
+ procedure ActionShowDetailsUpdate(Sender: TObject);
+ procedure ActionShowPackagesExecute(Sender: TObject);
+ procedure ActionShowPackagesUpdate(Sender: TObject);
+ private
+ FCodeSize: Integer;
+ FICodeSize: Integer;
+ FDataSize: Integer;
+ FBssSize: Integer;
+ FPackageUnits: array of TPackageUnitItem;
+ FUnits: array of TUnitItem;
+ FDfms: array of TUnitItem;
+ FUnitsSum: TStringList;
+ FSettings: TJclOtaSettings;
+ FShowPackages: Boolean;
+ FView: TProjectAnalyserView;
+ procedure OnMapSegmentEvent(Sender: TObject; const Address: TJclMapAddress;
+ Length: Integer; const ClassName, UnitName: string);
+ procedure SetStatusBarText(const Value: string);
+ procedure ClearData;
+ protected
+ procedure CreateParams(var Params: TCreateParams); override;
+ public
+ constructor Create(AOwner: TComponent; ASettings: TJclOtaSettings); reintroduce;
+ destructor Destroy; override;
+ procedure ClearContent;
+ function FindPackageForUnitName(const UnitName: string): string;
+ procedure ShowDfms;
+ procedure ShowDetails;
+ procedure ShowSummary;
+ procedure SetFileName(const FileName, MapFileName: TFileName; const ProjectName: string);
+ property StatusBarText: string write SetStatusBarText;
+ property Settings: TJclOtaSettings read FSettings;
+ property View: TProjectAnalyserView read FView;
+ property ShowPackages: Boolean read FShowPackages;
+ end;
+
+var
+ ProjectAnalyzerForm: TProjectAnalyzerForm;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\projectanalyser';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+{$R *.dfm}
+
+uses
+ JclLogic, JclOtaResources, JclPeImage, JclStrings,
+ JclOtaConsts;
+
+procedure JvListViewSortClick(Column: TListColumn; AscendingSortImage: Integer;
+ DescendingSortImage: Integer);
+var
+ ListView: TListView;
+ I: Integer;
+begin
+ ListView := TListColumns(Column.Collection).Owner as TListView;
+ ListView.Columns.BeginUpdate;
+ try
+ for I := 0 to ListView.Columns.Count - 1 do
+ ListView.Columns.Items[I].ImageIndex := -1;
+ if ListView.Tag and $FF = Column.Index then
+ ListView.Tag := ListView.Tag xor $100
+ else
+ ListView.Tag := Column.Index;
+ if ListView.Tag and $100 = 0 then
+ Column.ImageIndex := AscendingSortImage
+ else
+ Column.ImageIndex := DescendingSortImage;
+ finally
+ ListView.Columns.EndUpdate;
+ end;
+end;
+
+procedure JvListViewCompare(ListView: TListView; Item1, Item2: TListItem; var Compare: Integer);
+var
+ ColIndex: Integer;
+
+ function FmtStrToInt(S: string): Integer;
+ var
+ I: Integer;
+ begin
+ I := 1;
+ while I <= Length(S) do
+ if not CharIsNumberChar(S[I]) then
+ Delete(S, I, 1)
+ else
+ Inc(I);
+ Result := StrToInt(S);
+ end;
+
+begin
+ with ListView do
+ begin
+ ColIndex := Tag and $FF - 1;
+ if Columns[ColIndex + 1].Alignment = taLeftJustify then
+ begin
+ if ColIndex = -1 then
+ Compare := AnsiCompareText(Item1.Caption, Item2.Caption)
+ else
+ Compare := AnsiCompareText(Item1.SubItems[ColIndex], Item2.SubItems[ColIndex]);
+ end
+ else
+ begin
+ if ColIndex = -1 then
+ Compare := FmtStrToInt(Item1.Caption) - FmtStrToInt(Item2.Caption)
+ else
+ Compare := FmtStrToInt(Item1.SubItems[ColIndex]) - FmtStrToInt(Item2.SubItems[ColIndex]);
+ end;
+ if (Tag and $100) <> 0 then
+ Compare := -Compare;
+ end;
+end;
+
+procedure JvListViewToStrings(ListView: TListView; Strings: TStrings;
+ SelectedOnly: Boolean; Headers: Boolean);
+var
+ R, C: Integer;
+ ColWidths: array of Word;
+ S: string;
+
+ procedure AddLine;
+ begin
+ Strings.Add(TrimRight(S));
+ end;
+
+ function MakeCellStr(const Text: string; Index: Integer): string;
+ begin
+ with ListView.Columns[Index] do
+ if Alignment = taLeftJustify then
+ Result := StrPadRight(Text, ColWidths[Index] + 1)
+ else
+ Result := StrPadLeft(Text, ColWidths[Index]) + ' ';
+ end;
+
+begin
+ SetLength(S, 256);
+ with ListView do
+ begin
+ SetLength(ColWidths, Columns.Count);
+ if Headers then
+ for C := 0 to Columns.Count - 1 do
+ ColWidths[C] := Length(Trim(Columns[C].Caption));
+ for R := 0 to Items.Count - 1 do
+ if not SelectedOnly or Items[R].Selected then
+ begin
+ ColWidths[0] := Max(ColWidths[0], Length(Trim(Items[R].Caption)));
+ for C := 0 to Items[R].SubItems.Count - 1 do
+ ColWidths[C + 1] := Max(ColWidths[C + 1], Length(Trim(Items[R].SubItems[C])));
+ end;
+ Strings.BeginUpdate;
+ try
+ if Headers then
+ with Columns do
+ begin
+ S := '';
+ for C := 0 to Count - 1 do
+ S := S + MakeCellStr(Items[C].Caption, C);
+ AddLine;
+ S := '';
+ for C := 0 to Count - 1 do
+ S := S + StringOfChar('-', ColWidths[C]) + ' ';
+ AddLine;
+ end;
+ for R := 0 to Items.Count - 1 do
+ if not SelectedOnly or Items[R].Selected then
+ with Items[R] do
+ begin
+ S := MakeCellStr(Caption, 0);
+ for C := 0 to Min(SubItems.Count, Columns.Count - 1) - 1 do
+ S := S + MakeCellStr(SubItems[C], C + 1);
+ AddLine;
+ end;
+ finally
+ Strings.EndUpdate;
+ end;
+ end;
+end;
+
+function IntToExtended(I: Integer): Extended;
+begin
+ Result := I;
+end;
+
+//=== { TProjectAnalyzerForm } ===============================================
+
+procedure TProjectAnalyzerForm.FormCreate(Sender: TObject);
+var
+ Index: Integer;
+begin
+ FUnitsSum := TStringList.Create;
+ FUnitsSum.Sorted := True;
+ FUnitsSum.Duplicates := dupIgnore;
+
+ SetBounds(Settings.LoadInteger(JclLeft, Left),
+ Settings.LoadInteger(JclTop, Top),
+ Settings.LoadInteger(JclWidth, Width),
+ Settings.LoadInteger(JclHeight, Height));
+
+ ActionCopy.Caption := LoadResString(@RsCopy);
+ ActionSave.Caption := LoadResString(@RsSave);
+ ActionShowDetails.Caption := LoadResString(@RsDetails);
+ ActionShowSummary.Caption := LoadResString(@RsSummary);
+ ActionShowDfms.Caption := LoadResString(@RsForms);
+ ActionShowPackages.Caption := LoadResString(@RsShowPackages);
+ TextLabelsItem.Caption := LoadResString(@RsTextLabels);
+ UnitListView.Columns[0].Caption := LoadResString(@RsName);
+ UnitListView.Columns[1].Caption := LoadResString(@RsSize);
+ UnitListView.Columns[2].Caption := LoadResString(@RsGroup);
+ UnitListView.Columns[3].Caption := LoadResString(@RsPackage);
+
+ FView := TProjectAnalyserView(Settings.LoadInteger(AnalyzerViewName, Integer(pavDetails)));
+ FShowPackages := Settings.LoadBool(AnalyzerShowPackagesName, True);
+
+ for Index := 0 to UnitListView.Columns.Count - 1 do
+ UnitListView.Columns.Items[Index].Width := Settings.LoadInteger(Format(ColumnRegName, [Index]),
+ UnitListView.Columns.Items[Index].Width);
+end;
+
+procedure TProjectAnalyzerForm.FormDestroy(Sender: TObject);
+var
+ Index: Integer;
+begin
+ Settings.SaveInteger(JclLeft, Left);
+ Settings.SaveInteger(JclTop, Top);
+ Settings.SaveInteger(JclWidth, Width);
+ Settings.SaveInteger(JclHeight, Height);
+ Settings.SaveInteger(AnalyzerViewName, Integer(FView));
+ Settings.SaveBool(AnalyzerShowPackagesName, ShowPackages);
+ for Index := 0 to UnitListView.Columns.Count - 1 do
+ Settings.SaveInteger(Format(ColumnRegName, [Index]), UnitListView.Columns.Items[Index].Width);
+
+ FreeAndNil(FUnitsSum);
+end;
+
+procedure TProjectAnalyzerForm.SetFileName(const FileName, MapFileName: TFileName; const ProjectName: string);
+var
+ MapParser: TJclMapParser;
+ BorImage: TJclPeBorImage;
+ PackagesList: TStringList;
+ I, U, C, ResourcesSize: Integer;
+ ShortPackageName: string;
+begin
+ ClearData;
+ Caption := Format(LoadResString(@RsFormCaption), [ProjectName]);
+ MapParser := TJclMapParser.Create(MapFileName);
+ try
+ MapParser.OnSegment := OnMapSegmentEvent;
+ MapParser.Parse;
+ finally
+ MapParser.Free;
+ end;
+ BorImage := TJclPeBorImage.Create(True);
+ PackagesList := TStringList.Create;
+ try
+ PeImportedLibraries(FileName, PackagesList, False, True);
+ C := 0;
+ for I := 0 to PackagesList.Count - 1 do
+ begin
+ BorImage.FileName := PackagesList[I];
+ if BorImage.IsPackage then
+ begin
+ ShortPackageName := ExtractFileName(PackagesList[I]);
+ with BorImage.PackageInfo do
+ for U := 0 to ContainsCount - 1 do
+ begin
+ SetLength(FPackageUnits, C + 1);
+ FPackageUnits[C].UnitName := ContainsNames[U];
+ FPackageUnits[C].PackageName := ShortPackageName;
+ Inc(C);
+ end;
+ end;
+ end;
+ BorImage.FileName := FileName;
+ ResourcesSize := BorImage.Directories[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size;
+ with BorImage do
+ begin
+ SetLength(FDfms, FormCount);
+ for I := 0 to FormCount - 1 do
+ begin
+ FDfms[I].Name := Forms[I].FormObjectName;
+ FDfms[I].Size := Forms[I].ResItem.RawEntryDataSize;
+ end;
+ end;
+ finally
+ BorImage.Free;
+ PackagesList.Free;
+ end;
+ StatusBarMain.Panels[0].Text := Format(LoadResString(@RsStatusText),
+ [FUnitsSum.Count, Length(FDfms), FCodeSize, FICodeSize, FDataSize, FBssSize, ResourcesSize]);
+ case View of
+ pavDetails:
+ ShowDetails;
+ pavSummary:
+ ShowSummary;
+ else
+ ShowDfms;
+ end;
+end;
+
+procedure TProjectAnalyzerForm.ShowDetails;
+var
+ I: Integer;
+ PackageName: string;
+ AItem: TListItem;
+begin
+ FView := pavDetails;
+ UnitListView.Items.BeginUpdate;
+ try
+ UnitListView.Items.Clear;
+ for I := 0 to Length(FUnits) - 1 do
+ begin
+ PackageName := FindPackageForUnitName(FUnits[I].Name);
+ if ShowPackages or (PackageName = '') then
+ begin
+ AItem := UnitListView.Items.Add;
+ AItem.Caption := FUnits[I].Name;
+ AItem.SubItems.Add(Format('%.0n', [IntToExtended(FUnits[I].Size)]));
+ AItem.SubItems.Add(FUnits[I].Group);
+ AItem.SubItems.Add(PackageName);
+ case FUnits[I].Group[1] of
+ 'D':
+ AItem.ImageIndex := 3;
+ 'B':
+ AItem.ImageIndex := 4;
+ else
+ AItem.ImageIndex := 2;
+ end;
+ end;
+ end;
+ UnitListView.AlphaSort;
+ finally
+ UnitListView.Items.EndUpdate;
+ end;
+end;
+
+procedure TProjectAnalyzerForm.ShowSummary;
+var
+ I: Integer;
+ PackageName: string;
+ AItem: TListItem;
+begin
+ FView := pavSummary;
+ UnitListView.Items.BeginUpdate;
+ try
+ UnitListView.Items.Clear;
+ for I := 0 to FUnitsSum.Count - 1 do
+ begin
+ PackageName := FindPackageForUnitName(FUnitsSum.Strings[I]);
+ if ShowPackages or (PackageName = '') then
+ begin
+ AItem := UnitListView.Items.Add;
+ AItem.Caption := FUnitsSum.Strings[I];
+ AItem.SubItems.Add(Format('%.0n', [IntToExtended(Integer(FUnitsSum.Objects[I]))]));
+ AItem.SubItems.Add(LoadResString(@RsCodeData));
+ AItem.SubItems.Add(PackageName);
+ AItem.ImageIndex := 2;
+ end;
+ end;
+ UnitListView.AlphaSort;
+ finally
+ UnitListView.Items.EndUpdate;
+ end;
+end;
+
+procedure TProjectAnalyzerForm.ShowDfms;
+var
+ I: Integer;
+begin
+ FView := pavDfms;
+ with UnitListView do
+ begin
+ Items.BeginUpdate;
+ Items.Clear;
+ for I := 0 to Length(FDfms) - 1 do
+ with Items.Add do
+ begin
+ Caption := FDfms[I].Name;
+ SubItems.Add(Format('%.0n', [IntToExtended(FDfms[I].Size)]));
+ SubItems.Add('');
+ SubItems.Add('');
+ ImageIndex := ActionShowDfms.ImageIndex;
+ end;
+ AlphaSort;
+ Items.EndUpdate;
+ end;
+end;
+
+procedure TProjectAnalyzerForm.OnMapSegmentEvent(Sender: TObject; const Address: TJclMapAddress;
+ Length: Integer; const ClassName, UnitName: string);
+var
+ C: Integer;
+ ClassName1: Char;
+begin
+ C := System.Length(FUnits);
+ SetLength(FUnits, C + 1);
+ if System.Length(ClassName) > 0 then
+ ClassName1 := ClassName[1]
+ else
+ ClassName1 := #0;
+ FUnits[C].Name := UnitName;
+ FUnits[C].Size := Length;
+ FUnits[C].Group := ClassName;
+ case ClassName1 of
+ 'B':
+ begin
+ Inc(FBssSize, Length);
+ Length := 0;
+ end;
+ 'C':
+ Inc(FCodeSize, Length);
+ 'D':
+ Inc(FDataSize, Length);
+ 'I':
+ Inc(FICodeSize, Length);
+ end;
+ C := FUnitsSum.IndexOf(UnitName);
+ if C = -1 then
+ FUnitsSum.AddObject(UnitName, Pointer(Length))
+ else
+ FUnitsSum.Objects[C] := Pointer(Integer(FUnitsSum.Objects[C]) + Length);
+end;
+
+procedure TProjectAnalyzerForm.UnitListViewColumnClick(Sender: TObject; Column: TListColumn);
+begin
+ JvListViewSortClick(Column, 0, 1);
+ TListView(Sender).AlphaSort;
+end;
+
+procedure TProjectAnalyzerForm.UnitListViewCompare(Sender: TObject;
+ Item1, Item2: TListItem; Data: Integer; var Compare: Integer);
+begin
+ JvListViewCompare(TListView(Sender), Item1, Item2, Compare);
+end;
+
+procedure TProjectAnalyzerForm.ActionShowDetailsExecute(Sender: TObject);
+begin
+ ShowDetails;
+end;
+
+procedure TProjectAnalyzerForm.ActionShowDetailsUpdate(Sender: TObject);
+var
+ AAction: TAction;
+begin
+ AAction := Sender as TAction;
+
+ AAction.Enabled := (Length(FUnits) > 0);
+ AAction.Checked := View = pavDetails;
+end;
+
+procedure TProjectAnalyzerForm.ActionShowSummaryExecute(Sender: TObject);
+begin
+ ShowSummary;
+end;
+
+procedure TProjectAnalyzerForm.ActionShowSummaryUpdate(Sender: TObject);
+var
+ AAction: TAction;
+begin
+ AAction := Sender as TAction;
+
+ AAction.Enabled := (Length(FUnits) > 0);
+ AAction.Checked := View = pavSummary;
+end;
+
+procedure TProjectAnalyzerForm.ActionShowDfmsExecute(Sender: TObject);
+begin
+ ShowDfms;
+end;
+
+procedure TProjectAnalyzerForm.ActionShowDfmsUpdate(Sender: TObject);
+var
+ AAction: TAction;
+begin
+ AAction := Sender as TAction;
+
+ AAction.Enabled := (Length(FUnits) > 0);
+ AAction.Checked := View = pavDfms;
+end;
+
+procedure TProjectAnalyzerForm.ActionShowPackagesExecute(Sender: TObject);
+begin
+ FShowPackages := not FShowPackages;
+ ActionShowPackages.Checked := not ActionShowPackages.Checked;
+ case FView of
+ pavDetails:
+ ShowDetails;
+ pavSummary:
+ ShowSummary;
+ pavDfms:
+ ShowDfms;
+ end;
+end;
+
+procedure TProjectAnalyzerForm.ActionShowPackagesUpdate(Sender: TObject);
+var
+ AAction: TAction;
+begin
+ AAction := Sender as TAction;
+
+ AAction.Enabled := (Length(FUnits) > 0);
+ AAction.Checked := ShowPackages;
+end;
+
+procedure TProjectAnalyzerForm.TextLabelsItemClick(Sender: TObject);
+begin
+ TextLabelsItem.Checked := not TextLabelsItem.Checked;
+ ToolBarMain.ShowCaptions := TextLabelsItem.Checked;
+ ToolBarMain.ButtonHeight := 0;
+ ToolBarMain.ButtonWidth := 0;
+end;
+
+procedure TProjectAnalyzerForm.ActionCopyExecute(Sender: TObject);
+var
+ SL: TStringList;
+begin
+ SL := TStringList.Create;
+ try
+ JvListViewToStrings(UnitListView, SL, False, True);
+ SL.Add('');
+ SL.Add(StatusBarMain.Panels[0].Text);
+ Clipboard.AsText := SL.Text;
+ finally
+ SL.Free;
+ end;
+end;
+
+constructor TProjectAnalyzerForm.Create(AOwner: TComponent;
+ ASettings: TJclOtaSettings);
+begin
+ inherited Create(AOwner);
+ FSettings := ASettings;
+end;
+
+procedure TProjectAnalyzerForm.CreateParams(var Params: TCreateParams);
+begin
+ inherited CreateParams(Params);
+
+ // Fixing the Window Ghosting "bug"
+ Params.Style := params.Style or WS_POPUP;
+ if Assigned(Screen.ActiveForm) then
+ Params.WndParent := Screen.ActiveForm.Handle
+ else if Assigned (Application.MainForm) then
+ Params.WndParent := Application.MainForm.Handle
+ else
+ Params.WndParent := Application.Handle;
+end;
+
+destructor TProjectAnalyzerForm.Destroy;
+begin
+ ProjectAnalyzerForm := nil;
+ inherited Destroy;
+end;
+
+procedure TProjectAnalyzerForm.ActionSaveExecute(Sender: TObject);
+var
+ SL: TStringList;
+begin
+ with SaveDialogProjectAnalyser do
+ begin
+ FileName := '';
+ if Execute then
+ begin
+ SL := TStringList.Create;
+ try
+ JvListViewToStrings(UnitListView, SL, False, True);
+ SL.SaveToFile(FileName);
+ finally
+ SL.Free;
+ end;
+ end;
+ end;
+end;
+
+function TProjectAnalyzerForm.FindPackageForUnitName(const UnitName: string): string;
+var
+ I: Integer;
+begin
+ Result := '';
+ if UnitName <> 'SysInit' then
+ for I := 0 to Length(FPackageUnits) - 1 do
+ if FPackageUnits[I].UnitName = UnitName then
+ begin
+ Result := FPackageUnits[I].PackageName;
+ Break;
+ end;
+end;
+
+procedure TProjectAnalyzerForm.SetStatusBarText(const Value: string);
+begin
+ with StatusBarMain do
+ begin
+ Panels[0].Text := Value;
+ Repaint;
+ end;
+end;
+
+procedure TProjectAnalyzerForm.ClearContent;
+begin
+ ClearData;
+ StatusBarText := '';
+ UnitListView.Items.BeginUpdate;
+ UnitListView.Items.Clear;
+ UnitListView.Items.EndUpdate;
+ Show;
+ Repaint;
+end;
+
+procedure TProjectAnalyzerForm.ClearData;
+begin
+ FDfms := nil;
+ FUnits := nil;
+ FUnitsSum.Clear;
+ FCodeSize := 0;
+ FICodeSize := 0;
+ FDataSize := 0;
+ FBssSize := 0;
+ FPackageUnits := nil;
+end;
+
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
+end.
Copied: trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerIcon.res (from rev 3277, trunk/jcl/experts/projectanalyzer/ProjAnalyzerIcon.res)
===================================================================
(Binary files differ)
Copied: trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerImpl.pas (from rev 3277, trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas)
===================================================================
--- trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerImpl.pas (rev 0)
+++ trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerImpl.pas 2010-08-07 09:44:18 UTC (rev 3279)
@@ -0,0 +1,544 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is ProjAnalyzerImpl.pas. }
+{ }
+{ The Initial Developer of the Original Code is documented in the accompanying }
+{ help file JCL.chm. Portions created by these individuals are Copyright (C) of these individuals. }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclProjectAnalyzerImpl;
+
+{$I jcl.inc}
+
+interface
+
+uses
+ Classes, Menus, ActnList, ToolsAPI, SysUtils, Graphics, Dialogs, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclOtaUtils, JclProjectAnalyzerFrm;
+
+type
+ TJclProjectAnalyzerExpert = class(TJclOTAExpert)
+ private
+ FBuildMenuItem: TMenuItem;
+ FBuildAction: TAction;
+ {$IFDEF BDS4_UP}
+ FProjectManagerNotifierIndex: Integer;
+ {$ENDIF BDS4_UP}
+ procedure ActionExecute(Sender: TObject);
+ procedure ActionUpdate(Sender: TObject);
+ procedure AnalyzeProject(const AProject: IOTAProject);
+ public
+ constructor Create; reintroduce;
+ destructor Destroy; override;
+ procedure RegisterCommands; override;
+ procedure UnregisterCommands; override;
+ end;
+
+ {$IFDEF BDS7_UP}
+ // RAD Studio 2010 and newer
+ TProjectManagerMultipleNotifier = class(TNotifierObject, IOTANotifier, IOTAProjectMenuItemCreatorNotifier)
+ private
+ FProjectAnalyser: TJclProjectAnalyzerExpert;
+ public
+ constructor Create(AProjectAnalyzer: TJclProjectAnalyzerExpert);
+ procedure MenuExecute(const MenuContextList: IInterfaceList);
+ { IOTAProjectMenuItemCreatorNotifier }
+ procedure AddMenu(const Project: IOTAProject; const Ident: TStrings;
+ const ProjectManagerMenuList: IInterfaceList; IsMultiSelect: Boolean);
+ end;
+ {$ELSE ~BDS7_UP}
+ {$IFDEF BDS4_UP}
+ // BDS 2006, RAD Studio 2007 and RAD Studio 200...
[truncated message content] |
|
From: <ou...@us...> - 2010-08-07 09:24:37
|
Revision: 3278
http://jcl.svn.sourceforge.net/jcl/?rev=3278&view=rev
Author: outchy
Date: 2010-08-07 09:24:29 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
Renamed IdeOpenDlgFavoriteUnit to JclIdeOpenDlgFavoriteUnit.
Modified Paths:
--------------
trunk/jcl/packages/c6/JclFavoriteFoldersExpert.bpk
trunk/jcl/packages/c6/JclFavoriteFoldersExpert.dpk
trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.bpf
trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.bpr
trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/d10/JclFavoriteFoldersExpert.dpk
trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dpk
trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dpk
trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dproj
trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dproj
trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dpk
trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dproj
trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dproj
trunk/jcl/packages/d6/JclFavoriteFoldersExpert.dpk
trunk/jcl/packages/d6/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/d7/JclFavoriteFoldersExpert.dpk
trunk/jcl/packages/d7/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/d9/JclFavoriteFoldersExpert.dpk
trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.dpr
trunk/jcl/packages/xml/JclFavoriteFoldersExpert-D.xml
trunk/jcl/packages/xml/JclFavoriteFoldersExpertDLL-L.xml
Added Paths:
-----------
trunk/jcl/experts/favfolders/JclIdeOpenDlgFavoriteUnit.pas
Removed Paths:
-------------
trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas
Deleted: trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas
===================================================================
--- trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas 2010-08-07 09:24:29 UTC (rev 3278)
@@ -1,168 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is IdeOpenDlgFavoriteUnit.pas. }
-{ }
-{ The Initial Developer of the Original Code is Petr Vones. }
-{ Portions created by Petr Vones are Copyright (C) of Petr Vones. }
-{ }
-{**************************************************************************************************}
-{ }
-{ Last modified: $Date:: $ }
-{ Revision: $Rev:: $ }
-{ Author: $Author:: $ }
-{ }
-{**************************************************************************************************}
-
-unit IdeOpenDlgFavoriteUnit;
-
-interface
-
-{$I jcl.inc}
-
-uses
- SysUtils,
- ToolsAPI, JclOpenDialogFavorites,
- {$IFDEF UNITVERSIONING}
- JclUnitVersioning,
- {$ENDIF UNITVERSIONING}
- JclOtaUtils;
-
-type
- TJclOpenDialogsFavoriteExpert = class(TJclOTAExpert)
- private
- FOpenDialog: TJclOpenDialogFavoritesHook;
- procedure DialogClose(Sender: TObject);
- procedure DialogShow(Sender: TObject);
- public
- constructor Create; reintroduce;
- procedure RegisterCommands; override;
- procedure UnregisterCommands; override;
- end;
-
-// design package entry point
-procedure Register;
-
-// expert DLL entry point
-function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
- RegisterProc: TWizardRegisterProc;
- var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
-
-{$IFDEF UNITVERSIONING}
-const
- UnitVersioning: TUnitVersionInfo = (
- RCSfile: '$URL$';
- Revision: '$Revision$';
- Date: '$Date$';
- LogPath: 'JCL\experts\favfolders';
- Extra: '';
- Data: nil
- );
-{$ENDIF UNITVERSIONING}
-
-implementation
-
-uses
- JclFileUtils, JclSysInfo,
- JclOtaConsts, JclOtaResources;
-
-procedure Register;
-begin
- try
- RegisterPackageWizard(TJclOpenDialogsFavoriteExpert.Create);
- except
- on ExceptionObj: TObject do
- begin
- JclExpertShowExceptionDialog(ExceptionObj);
- end;
- end;
-end;
-
-var
- JCLWizardIndex: Integer = -1;
-
-procedure JclWizardTerminate;
-begin
- try
- if JCLWizardIndex <> -1 then
- TJclOTAExpertBase.GetOTAWizardServices.RemoveWizard(JCLWizardIndex);
- except
- on ExceptionObj: TObject do
- begin
- JclExpertShowExceptionDialog(ExceptionObj);
- end;
- end;
-end;
-
-function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
- RegisterProc: TWizardRegisterProc;
- var TerminateProc: TWizardTerminateProc): Boolean stdcall;
-begin
- try
- TerminateProc := JclWizardTerminate;
-
- JCLWizardIndex := TJclOTAExpertBase.GetOTAWizardServices.AddWizard(TJclOpenDialogsFavoriteExpert.Create);
-
- Result := True;
- except
- on ExceptionObj: TObject do
- begin
- JclExpertShowExceptionDialog(ExceptionObj);
- Result := False;
- end;
- end;
-end;
-
-constructor TJclOpenDialogsFavoriteExpert.Create;
-begin
- inherited Create(JclFavoritesExpertName);
-end;
-
-procedure TJclOpenDialogsFavoriteExpert.DialogClose(Sender: TObject);
-begin
- Settings.SaveStrings(JclFavoritesListSubKey, FOpenDialog.FavoriteFolders);
- Settings.SaveString(PictDialogFolderItemName, FOpenDialog.PictureDialogLastFolder);
-end;
-
-procedure TJclOpenDialogsFavoriteExpert.DialogShow(Sender: TObject);
-begin
- Settings.LoadStrings(JclFavoritesListSubKey, FOpenDialog.FavoriteFolders);
-end;
-
-procedure TJclOpenDialogsFavoriteExpert.RegisterCommands;
-begin
- inherited RegisterCommands;
- FOpenDialog := InitializeOpenDialogFavorites;
- FOpenDialog.DisableHelpButton := True;
- FOpenDialog.HookDialogs;
- FOpenDialog.OnClose := DialogClose;
- FOpenDialog.OnShow := DialogShow;
- FOpenDialog.PictureDialogLastFolder := Settings.LoadString(PictDialogFolderItemName,
- PathAddSeparator(GetCommonFilesFolder) + BorlandImagesPath);
-end;
-
-procedure TJclOpenDialogsFavoriteExpert.UnregisterCommands;
-begin
- FOpenDialog.UnhookDialogs;
- FinalizeOpenDialogFavorites;
- inherited UnregisterCommands;
-end;
-
-{$IFDEF UNITVERSIONING}
-initialization
- RegisterUnitVersion(HInstance, UnitVersioning);
-
-finalization
- UnregisterUnitVersion(HInstance);
-{$ENDIF UNITVERSIONING}
-
-end.
Copied: trunk/jcl/experts/favfolders/JclIdeOpenDlgFavoriteUnit.pas (from rev 3277, trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas)
===================================================================
--- trunk/jcl/experts/favfolders/JclIdeOpenDlgFavoriteUnit.pas (rev 0)
+++ trunk/jcl/experts/favfolders/JclIdeOpenDlgFavoriteUnit.pas 2010-08-07 09:24:29 UTC (rev 3278)
@@ -0,0 +1,168 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is IdeOpenDlgFavoriteUnit.pas. }
+{ }
+{ The Initial Developer of the Original Code is Petr Vones. }
+{ Portions created by Petr Vones are Copyright (C) of Petr Vones. }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclIdeOpenDlgFavoriteUnit;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ SysUtils,
+ ToolsAPI, JclOpenDialogFavorites,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclOtaUtils;
+
+type
+ TJclOpenDialogsFavoriteExpert = class(TJclOTAExpert)
+ private
+ FOpenDialog: TJclOpenDialogFavoritesHook;
+ procedure DialogClose(Sender: TObject);
+ procedure DialogShow(Sender: TObject);
+ public
+ constructor Create; reintroduce;
+ procedure RegisterCommands; override;
+ procedure UnregisterCommands; override;
+ end;
+
+// design package entry point
+procedure Register;
+
+// expert DLL entry point
+function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
+ RegisterProc: TWizardRegisterProc;
+ var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\favfolders';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+uses
+ JclFileUtils, JclSysInfo,
+ JclOtaConsts, JclOtaResources;
+
+procedure Register;
+begin
+ try
+ RegisterPackageWizard(TJclOpenDialogsFavoriteExpert.Create);
+ except
+ on ExceptionObj: TObject do
+ begin
+ JclExpertShowExceptionDialog(ExceptionObj);
+ end;
+ end;
+end;
+
+var
+ JCLWizardIndex: Integer = -1;
+
+procedure JclWizardTerminate;
+begin
+ try
+ if JCLWizardIndex <> -1 then
+ TJclOTAExpertBase.GetOTAWizardServices.RemoveWizard(JCLWizardIndex);
+ except
+ on ExceptionObj: TObject do
+ begin
+ JclExpertShowExceptionDialog(ExceptionObj);
+ end;
+ end;
+end;
+
+function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
+ RegisterProc: TWizardRegisterProc;
+ var TerminateProc: TWizardTerminateProc): Boolean stdcall;
+begin
+ try
+ TerminateProc := JclWizardTerminate;
+
+ JCLWizardIndex := TJclOTAExpertBase.GetOTAWizardServices.AddWizard(TJclOpenDialogsFavoriteExpert.Create);
+
+ Result := True;
+ except
+ on ExceptionObj: TObject do
+ begin
+ JclExpertShowExceptionDialog(ExceptionObj);
+ Result := False;
+ end;
+ end;
+end;
+
+constructor TJclOpenDialogsFavoriteExpert.Create;
+begin
+ inherited Create(JclFavoritesExpertName);
+end;
+
+procedure TJclOpenDialogsFavoriteExpert.DialogClose(Sender: TObject);
+begin
+ Settings.SaveStrings(JclFavoritesListSubKey, FOpenDialog.FavoriteFolders);
+ Settings.SaveString(PictDialogFolderItemName, FOpenDialog.PictureDialogLastFolder);
+end;
+
+procedure TJclOpenDialogsFavoriteExpert.DialogShow(Sender: TObject);
+begin
+ Settings.LoadStrings(JclFavoritesListSubKey, FOpenDialog.FavoriteFolders);
+end;
+
+procedure TJclOpenDialogsFavoriteExpert.RegisterCommands;
+begin
+ inherited RegisterCommands;
+ FOpenDialog := InitializeOpenDialogFavorites;
+ FOpenDialog.DisableHelpButton := True;
+ FOpenDialog.HookDialogs;
+ FOpenDialog.OnClose := DialogClose;
+ FOpenDialog.OnShow := DialogShow;
+ FOpenDialog.PictureDialogLastFolder := Settings.LoadString(PictDialogFolderItemName,
+ PathAddSeparator(GetCommonFilesFolder) + BorlandImagesPath);
+end;
+
+procedure TJclOpenDialogsFavoriteExpert.UnregisterCommands;
+begin
+ FOpenDialog.UnhookDialogs;
+ FinalizeOpenDialogFavorites;
+ inherited UnregisterCommands;
+end;
+
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
+end.
Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpert.bpk
===================================================================
--- trunk/jcl/packages/c6/JclFavoriteFoldersExpert.bpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/c6/JclFavoriteFoldersExpert.bpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:22 UTC
+ Last generated: 07-08-2010 09:11:48 UTC
*****************************************************************************
-->
<PROJECT>
@@ -14,7 +14,7 @@
<PROJECT value="JclFavoriteFoldersExpertC60.bpl"/>
<OBJFILES value="
..\..\lib\c6\JclFavoriteFoldersExpert.obj
- ..\..\lib\c6\IdeOpenDlgFavoriteUnit.obj
+ ..\..\lib\c6\JclIdeOpenDlgFavoriteUnit.obj
"/>
<RESFILES value="JclFavoriteFoldersExpert.res"/>
<IDLFILES value=""/>
@@ -75,7 +75,7 @@
<FILE FILENAME="Jcl.bpi" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclVcl.bpi" FORMNAME="" UNITNAME="JclVcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas" FORMNAME="" UNITNAME="IdeOpenDlgFavoriteUnit" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas" FORMNAME="" UNITNAME="JclIdeOpenDlgFavoriteUnit" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/c6/JclFavoriteFoldersExpert.dpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/c6/JclFavoriteFoldersExpert.dpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:23 UTC
+ Last generated: 07-08-2010 09:11:48 UTC
-----------------------------------------------------------------------------
}
@@ -50,6 +50,6 @@
JclBaseExpert
;
contains
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
end.
Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.bpf
===================================================================
--- trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.bpf 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.bpf 2010-08-07 09:24:29 UTC (rev 3278)
@@ -1,4 +1,4 @@
-USEUNIT("..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas");
+USEUNIT("..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas");
USEDEF("JclFavoriteFoldersExpertDLL.def");
Project file
DllEntryPoint
Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.bpr
===================================================================
--- trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.bpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.bpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:22 UTC
+ Last generated: 07-08-2010 09:11:48 UTC
*****************************************************************************
-->
<PROJECT>
@@ -14,7 +14,7 @@
<PROJECT value="JclFavoriteFoldersExpertDLLC60.dll"/>
<OBJFILES value="
..\..\lib\c6\JclFavoriteFoldersExpertDLL.obj
- ..\..\lib\c6\IdeOpenDlgFavoriteUnit.obj
+ ..\..\lib\c6\JclIdeOpenDlgFavoriteUnit.obj
"/>
<RESFILES value=""/>
<IDLFILES value=""/>
@@ -74,7 +74,7 @@
<FILE FILENAME="Jcl.bpi" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclVcl.bpi" FORMNAME="" UNITNAME="JclVcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas" FORMNAME="" UNITNAME="IdeOpenDlgFavoriteUnit" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas" FORMNAME="" UNITNAME="JclIdeOpenDlgFavoriteUnit" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:26 UTC
+ Last generated: 07-08-2010 09:11:58 UTC
-----------------------------------------------------------------------------
}
@@ -39,7 +39,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/d10/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/d10/JclFavoriteFoldersExpert.dpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d10/JclFavoriteFoldersExpert.dpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 07-08-2010 09:12:05 UTC
-----------------------------------------------------------------------------
}
@@ -51,7 +51,7 @@
;
contains
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
end.
Modified: trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 07-08-2010 09:12:06 UTC
-----------------------------------------------------------------------------
}
@@ -42,7 +42,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 07-08-2010 09:12:07 UTC
-----------------------------------------------------------------------------
}
@@ -52,7 +52,7 @@
;
contains
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
end.
Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj 2010-08-07 09:24:29 UTC (rev 3278)
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{3BF49751-D079-4734-9AB6-F333FA52FDBA}</ProjectGuid>
<MainSource>JclFavoriteFoldersExpert.dpk</MainSource>
@@ -91,6 +91,6 @@
<DCCReference Include="Jcl.dcp"/>
<DCCReference Include="JclVcl.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
- <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas"/>
+ <DCCReference Include="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas"/>
</ItemGroup>
</Project>
Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:28 UTC
+ Last generated: 07-08-2010 09:12:08 UTC
-----------------------------------------------------------------------------
}
@@ -43,7 +43,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj 2010-08-07 09:24:29 UTC (rev 3278)
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{DCDB1939-E79B-4AF6-855E-78310CAF8467}</ProjectGuid>
<MainSource>JclFavoriteFoldersExpertDLL.dpr</MainSource>
@@ -91,6 +91,6 @@
<DCCReference Include="Jcl.dcp"/>
<DCCReference Include="JclVcl.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
- <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas"/>
+ <DCCReference Include="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas"/>
</ItemGroup>
</Project>
Modified: trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:28 UTC
+ Last generated: 07-08-2010 09:12:11 UTC
-----------------------------------------------------------------------------
}
@@ -51,7 +51,7 @@
;
contains
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
end.
Modified: trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dproj
===================================================================
--- trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dproj 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dproj 2010-08-07 09:24:29 UTC (rev 3278)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{3BF49751-D079-4734-9AB6-F333FA52FDBA}</ProjectGuid>
<MainSource>JclFavoriteFoldersExpert.dpk</MainSource>
@@ -66,7 +66,7 @@
<DCCReference Include="Jcl.dcp"/>
<DCCReference Include="JclVcl.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
- <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas"/>
+ <DCCReference Include="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:28 UTC
+ Last generated: 07-08-2010 09:12:11 UTC
-----------------------------------------------------------------------------
}
@@ -42,7 +42,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dproj 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dproj 2010-08-07 09:24:29 UTC (rev 3278)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{DCDB1939-E79B-4AF6-855E-78310CAF8467}</ProjectGuid>
<MainSource>JclFavoriteFoldersExpertDLL.dpr</MainSource>
@@ -66,7 +66,7 @@
<DCCReference Include="Jcl.dcp"/>
<DCCReference Include="JclVcl.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
- <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas"/>
+ <DCCReference Include="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:29 UTC
+ Last generated: 07-08-2010 09:12:12 UTC
-----------------------------------------------------------------------------
}
@@ -51,7 +51,7 @@
;
contains
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
end.
Modified: trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dproj
===================================================================
--- trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dproj 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dproj 2010-08-07 09:24:29 UTC (rev 3278)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{3BF49751-D079-4734-9AB6-F333FA52FDBA}</ProjectGuid>
<MainSource>JclFavoriteFoldersExpert.dpk</MainSource>
@@ -68,7 +68,7 @@
<DCCReference Include="Jcl.dcp"/>
<DCCReference Include="JclVcl.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
- <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas"/>
+ <DCCReference Include="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:29 UTC
+ Last generated: 07-08-2010 09:12:13 UTC
-----------------------------------------------------------------------------
}
@@ -42,7 +42,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dproj 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dproj 2010-08-07 09:24:29 UTC (rev 3278)
@@ -1,4 +1,4 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{DCDB1939-E79B-4AF6-855E-78310CAF8467}</ProjectGuid>
<MainSource>JclFavoriteFoldersExpertDLL.dpr</MainSource>
@@ -68,7 +68,7 @@
<DCCReference Include="Jcl.dcp"/>
<DCCReference Include="JclVcl.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
- <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas"/>
+ <DCCReference Include="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas"/>
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d6/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/d6/JclFavoriteFoldersExpert.dpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d6/JclFavoriteFoldersExpert.dpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 07-08-2010 09:11:51 UTC
-----------------------------------------------------------------------------
}
@@ -50,7 +50,7 @@
;
contains
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
end.
Modified: trunk/jcl/packages/d6/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d6/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d6/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 07-08-2010 09:11:52 UTC
-----------------------------------------------------------------------------
}
@@ -41,7 +41,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/d7/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/d7/JclFavoriteFoldersExpert.dpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d7/JclFavoriteFoldersExpert.dpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 07-08-2010 09:11:55 UTC
-----------------------------------------------------------------------------
}
@@ -50,7 +50,7 @@
;
contains
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
end.
Modified: trunk/jcl/packages/d7/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d7/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d7/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 07-08-2010 09:11:56 UTC
-----------------------------------------------------------------------------
}
@@ -41,7 +41,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:26 UTC
+ Last generated: 07-08-2010 09:11:57 UTC
-----------------------------------------------------------------------------
}
@@ -39,7 +39,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/d9/JclFavoriteFoldersExpert.dpk
===================================================================
--- trunk/jcl/packages/d9/JclFavoriteFoldersExpert.dpk 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d9/JclFavoriteFoldersExpert.dpk 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpert-D.xml)
- Last generated: 07-05-2010 18:24:26 UTC
+ Last generated: 07-08-2010 09:12:00 UTC
-----------------------------------------------------------------------------
}
@@ -50,7 +50,7 @@
;
contains
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
end.
Modified: trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.dpr 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.dpr 2010-08-07 09:24:29 UTC (rev 3278)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclFavoriteFoldersExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 07-08-2010 09:12:00 UTC
-----------------------------------------------------------------------------
}
@@ -41,7 +41,7 @@
uses
ToolsAPI,
- IdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas'
+ JclIdeOpenDlgFavoriteUnit in '..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas'
;
exports
Modified: trunk/jcl/packages/xml/JclFavoriteFoldersExpert-D.xml
===================================================================
--- trunk/jcl/packages/xml/JclFavoriteFoldersExpert-D.xml 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/xml/JclFavoriteFoldersExpert-D.xml 2010-08-07 09:24:29 UTC (rev 3278)
@@ -15,6 +15,6 @@
<Package Name="JclBaseExpert-D" Targets="all" Condition=""/>
</Requires>
<Contains>
- <File Name="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas" Targets="runtimeIDE" Formname="" Condition=""/>
+ <File Name="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas" Targets="runtimeIDE" Formname="" Condition=""/>
</Contains>
</Package>
Modified: trunk/jcl/packages/xml/JclFavoriteFoldersExpertDLL-L.xml
===================================================================
--- trunk/jcl/packages/xml/JclFavoriteFoldersExpertDLL-L.xml 2010-08-02 21:13:42 UTC (rev 3277)
+++ trunk/jcl/packages/xml/JclFavoriteFoldersExpertDLL-L.xml 2010-08-07 09:24:29 UTC (rev 3278)
@@ -15,6 +15,6 @@
<Package Name="JclBaseExpert-D" Targets="all" Condition=""/>
</Requires>
<Contains>
- <File Name="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas" Targets="designtimeIDE" Formname="" Condition=""/>
+ <File Name="..\..\experts\favfolders\JclIdeOpenDlgFavoriteUnit.pas" Targets="designtimeIDE" Formname="" Condition=""/>
</Contains>
</Package>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-02 21:13:48
|
Revision: 3277
http://jcl.svn.sourceforge.net/jcl/?rev=3277&view=rev
Author: outchy
Date: 2010-08-02 21:13:42 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
Compatibility with C6, D6 and D7.
Modified Paths:
--------------
trunk/jcl/devtools/jpp/Templates/JclContainerTemplates.pas
Modified: trunk/jcl/devtools/jpp/Templates/JclContainerTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclContainerTemplates.pas 2010-08-02 19:27:59 UTC (rev 3276)
+++ trunk/jcl/devtools/jpp/Templates/JclContainerTemplates.pas 2010-08-02 21:13:42 UTC (rev 3277)
@@ -324,6 +324,7 @@
AliasTypeAttributes: PKnownTypeAttributes;
AliasMapAttributes: PKnownMapAttributes;
begin
+ SetLength(AMacroParams, 0);
FindContainerParams(AName, InterfaceParamsClass, ImplementationParamsClass);
if InterfaceParamsClass <> nil then
begin
@@ -448,13 +449,21 @@
begin
PropInfo := GetPropInfo(ImplementationParams, AMacro.Strings[Index]);
if Assigned(PropInfo) then
+ {$IFDEF COMPILER8_UP}
AMacroParams[Index] := GetPropValue(ImplementationParams, PropInfo);
+ {$ELSE ~COMPILER8_UP}
+ AMacroParams[Index] := GetPropValue(ImplementationParams, AMacro.Strings[Index]);
+ {$ENDIF ~COMPILER8_UP}
end
else
begin
PropInfo := GetPropInfo(InterfaceParams, AMacro.Strings[Index]);
if Assigned(PropInfo) then
+ {$IFDEF COMPILER8_UP}
AMacroParams[Index] := GetPropValue(InterfaceParams, PropInfo);
+ {$ELSE ~COMPILER8_UP}
+ AMacroParams[Index] := GetPropValue(InterfaceParams, AMacro.Strings[Index]);
+ {$ENDIF ~COMPILER8_UP}
end;
end;
Params[Index].VType := vtPWideChar;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-02 19:28:05
|
Revision: 3276
http://jcl.svn.sourceforge.net/jcl/?rev=3276&view=rev
Author: outchy
Date: 2010-08-02 19:27:59 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
regenerated with latest JPP.
Modified Paths:
--------------
trunk/jcl/source/windows/JclWin32.pas
Modified: trunk/jcl/source/windows/JclWin32.pas
===================================================================
--- trunk/jcl/source/windows/JclWin32.pas 2010-08-02 19:26:45 UTC (rev 3275)
+++ trunk/jcl/source/windows/JclWin32.pas 2010-08-02 19:27:59 UTC (rev 3276)
@@ -2973,6 +2973,7 @@
// line 3189
+
function BackupSeek(hFile: THandle; dwLowBytesToSeek, dwHighBytesToSeek: DWORD;
out lpdwLowByteSeeked, lpdwHighByteSeeked: DWORD;
var lpContext: Pointer): BOOL; stdcall;
@@ -3096,15 +3097,18 @@
{$EXTERNALSYM SetExtendedFeaturesMask}
+
// From JwaAclApi
// line 185
+
function SetNamedSecurityInfoW(pObjectName: LPWSTR; ObjectType: SE_OBJECT_TYPE;
SecurityInfo: SECURITY_INFORMATION; psidOwner, psidGroup: PSID;
pDacl, pSacl: PACL): DWORD; stdcall;
{$EXTERNALSYM SetNamedSecurityInfoW}
+
const
IMAGE_SEPARATION = (64*1024);
{$EXTERNALSYM IMAGE_SEPARATION}
@@ -3135,6 +3139,7 @@
// line 152
+
function ReBaseImage(CurrentImageName: PAnsiChar; SymbolPath: PAnsiChar; fReBase: BOOL;
fRebaseSysfileOk: BOOL; fGoingDown: BOOL; CheckImageSize: ULONG;
var OldImageSize: ULONG; var OldImageBase: ULONG_PTR; var NewImageSize: ULONG;
@@ -3189,6 +3194,7 @@
{$EXTERNALSYM ImageRvaToVa}
+
// line 461
//
@@ -4577,7 +4583,6 @@
//
-
function NetUserAdd(servername: LPCWSTR; level: DWORD; buf: PByte; parm_err: LPDWORD): NET_API_STATUS; stdcall;
{$EXTERNALSYM NetUserAdd}
@@ -4612,7 +4617,6 @@
{$EXTERNALSYM NetUserChangePassword}
-
//
// Data Structures - User
//
@@ -4823,7 +4827,6 @@
//
-
function NetGroupAdd(servername: LPCWSTR; level: DWORD; buf: PByte; parm_err: LPDWORD): NET_API_STATUS; stdcall;
{$EXTERNALSYM NetGroupAdd}
@@ -4853,7 +4856,6 @@
{$EXTERNALSYM NetGroupSetUsers}
-
//
// Data Structures - Group
//
@@ -4897,7 +4899,6 @@
//
-
function NetLocalGroupAdd(servername: LPCWSTR; level: DWORD; buf: PByte; parm_err: LPDWORD): NET_API_STATUS; stdcall;
{$EXTERNALSYM NetLocalGroupAdd}
@@ -4933,7 +4934,6 @@
{$EXTERNALSYM NetLocalGroupDelMembers}
-
//
// Data Structures - LocalGroup
//
@@ -5041,11 +5041,9 @@
PLocalGroupMembersInfo3 = PLOCALGROUP_MEMBERS_INFO_3;
{$ENDIF ~FPC}
-
function NetApiBufferFree(Buffer: Pointer): NET_API_STATUS; stdcall;
{$EXTERNALSYM NetApiBufferFree}
-
(****************************************************************
* *
* Data structure templates *
@@ -5478,11 +5476,9 @@
* Usage: result = Netbios( pncb ); *
****************************************************************)
-
function Netbios(pncb: PNCB): UCHAR; stdcall;
{$EXTERNALSYM Netbios}
-
type
PRasDialDlg = ^TRasDialDlg;
tagRASDIALDLG = packed record
@@ -6651,7 +6647,6 @@
// line 1635
-
function GetCalendarInfoA(Locale: LCID; Calendar: CALID; CalType: CALTYPE;
lpCalData: LPSTR; cchData: Integer; lpValue: LPDWORD): Integer; stdcall;
{$EXTERNALSYM GetCalendarInfoA}
@@ -6666,7 +6661,6 @@
{$EXTERNALSYM EnumCalendarInfoExW}
-
{$IFNDEF FPC}
type
MAKEINTRESOURCEA = LPSTR;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-02 19:26:51
|
Revision: 3275
http://jcl.svn.sourceforge.net/jcl/?rev=3275&view=rev
Author: outchy
Date: 2010-08-02 19:26:45 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
prototype update of revision 3250.
Revision Links:
--------------
http://jcl.svn.sourceforge.net/jcl/?rev=3250&view=rev
Modified Paths:
--------------
trunk/jcl/source/prototypes/_Graphics.pas
Modified: trunk/jcl/source/prototypes/_Graphics.pas
===================================================================
--- trunk/jcl/source/prototypes/_Graphics.pas 2010-08-02 19:19:26 UTC (rev 3274)
+++ trunk/jcl/source/prototypes/_Graphics.pas 2010-08-02 19:26:45 UTC (rev 3275)
@@ -528,7 +528,7 @@
{$IFDEF VCL}
function CreateRegionFromBitmap(Bitmap: TBitmap; RegionColor: TColor;
- RegionBitmapMode: TJclRegionBitmapMode): HRGN;
+ RegionBitmapMode: TJclRegionBitmapMode; UseAlphaChannel: Boolean = False): HRGN;
procedure ScreenShot(bm: TBitmap; Left, Top, Width, Height: Integer; Window: THandle = HWND_DESKTOP); overload;
procedure ScreenShot(bm: TBitmap; IncludeTaskBar: Boolean = True); overload;
function MapWindowRect(hWndFrom, hWndTo: THandle; ARect: TRect):TRect;
@@ -2029,12 +2029,14 @@
{$IFDEF VCL}
function CreateRegionFromBitmap(Bitmap: TBitmap; RegionColor: TColor;
- RegionBitmapMode: TJclRegionBitmapMode): HRGN;
+ RegionBitmapMode: TJclRegionBitmapMode; UseAlphaChannel: Boolean): HRGN;
var
- FBitmap: TBitmap;
- X, Y: Integer;
+ LBitmap: TBitmap;
+ X, Y, Width: Integer;
StartX: Integer;
Region: HRGN;
+ P: PBGRA;
+ Mask: TColor;
begin
Result := 0;
@@ -2044,63 +2046,77 @@
if (Bitmap.Width = 0) or (Bitmap.Height = 0) then
Exit;
- FBitmap := TBitmap.Create;
+ if UseAlphaChannel then
+ begin
+ Mask := TColor($FF000000);
+ // A region can represent only full transparent alpha values
+ RegionColor := 0;
+ end
+ else
+ begin
+ Mask := TColor($00FFFFFF);
+ RegionColor := ColorToRGB(RegionColor);
+ end;
+
+ LBitmap := TBitmap.Create;
try
- FBitmap.Assign(Bitmap);
+ LBitmap.Assign(Bitmap);
+ LBitmap.PixelFormat := pf32bit;
- for Y := 0 to FBitmap.Height - 1 do
+ Width := LBitmap.Width;
+ for Y := 0 to LBitmap.Height - 1 do
begin
+ P := LBitmap.ScanLine[Y];
X := 0;
- while X < FBitmap.Width do
+ while X < Width do
begin
-
if RegionBitmapMode = rmExclude then
begin
- while FBitmap.Canvas.Pixels[X,Y] = RegionColor do
+ while (TColor(P^) and Mask) = RegionColor do
begin
Inc(X);
- if X = FBitmap.Width then
+ Inc(P);
+ if X = Width then
Break;
end;
end
else
begin
- while FBitmap.Canvas.Pixels[X,Y] <> RegionColor do
+ while (TColor(P^) and Mask) <> RegionColor do
begin
Inc(X);
- if X = FBitmap.Width then
+ Inc(P);
+ if X = Width then
Break;
end;
end;
- if X = FBitmap.Width then
+ if X = Width then
Break;
StartX := X;
if RegionBitmapMode = rmExclude then
begin
- while FBitmap.Canvas.Pixels[X,Y] <> RegionColor do
+ while (X < Width) and ((TColor(P^) and Mask) <> RegionColor) do
begin
- if X = FBitmap.Width then
- Break;
Inc(X);
+ Inc(P);
end;
end
else
begin
- while FBitmap.Canvas.Pixels[X,Y] = RegionColor do
+ while (X < Width) and ((TColor(P^) and Mask) = RegionColor) do
begin
- if X = FBitmap.Width then
- Break;
Inc(X);
+ Inc(P);
end;
end;
+ Region := CreateRectRgn(StartX, Y, X, Y + 1);
if Result = 0 then
- Result := CreateRectRgn(StartX, Y, X, Y + 1)
+ Result := Region
else
begin
- Region := CreateRectRgn(StartX, Y, X, Y + 1);
if Region <> 0 then
begin
CombineRgn(Result, Result, Region, RGN_OR);
@@ -2110,7 +2126,7 @@
end;
end;
finally
- FBitmap.Free;
+ LBitmap.Free;
end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-02 19:19:35
|
Revision: 3274
http://jcl.svn.sourceforge.net/jcl/?rev=3274&view=rev
Author: outchy
Date: 2010-08-02 19:19:26 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
update for latest JclPCRE.pas code.
Modified Paths:
--------------
trunk/jcl/examples/common/pcre/PCREDemoMain.dfm
trunk/jcl/examples/common/pcre/PCREDemoMain.pas
Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.dfm
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.dfm 2010-08-02 19:09:40 UTC (rev 3273)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.dfm 2010-08-02 19:19:26 UTC (rev 3274)
@@ -1,11 +1,11 @@
object frmMain: TfrmMain
Left = 300
Top = 115
- ClientWidth = 462
- ClientHeight = 334
Caption = 'JclPCRE Demo'
+ ClientHeight = 334
+ ClientWidth = 462
Color = clBtnFace
- Constraints.MinHeight = 370
+ Constraints.MinHeight = 361
Constraints.MinWidth = 470
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -198,14 +198,13 @@
end
object sbMain: TStatusBar
Left = 0
- Top = 324
+ Top = 315
Width = 462
Height = 19
Panels = <
item
Width = 50
end>
- SimplePanel = False
end
object alMain: TActionList
Left = 144
Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.pas
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.pas 2010-08-02 19:09:40 UTC (rev 3273)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.pas 2010-08-02 19:19:26 UTC (rev 3274)
@@ -42,11 +42,11 @@
private
{ Private declarations }
- RE: TJclRegEx;
+ RE: TJclAnsiRegEx;
FMatchIndex: integer;
- procedure SelectText(Range: TJclCaptureRange);
+ procedure SelectText(const Range: TJclAnsiCaptureOffset);
procedure Match;
- function GetUIOptions: TJclRegExOptions;
+ function GetUIOptions: TJclAnsiRegExOptions;
procedure UpdateUIOptions;
procedure LoadFromFile(const Filename:string);
protected
@@ -73,7 +73,7 @@
procedure TfrmMain.acFindExecute(Sender: TObject);
begin
FreeAndNil(RE);
- RE := TJclRegEx.Create;
+ RE := TJclAnsiRegEx.Create;
RE.Options := GetUIOptions;
RE.Compile(edRegExpr.Text, false, false);
FMatchIndex := 1;
@@ -88,7 +88,7 @@
Match;
end;
-procedure TfrmMain.SelectText(Range: TJclCaptureRange);
+procedure TfrmMain.SelectText(const Range: TJclAnsiCaptureOffset);
begin
reFile.SelStart := Range.FirstPos - 1;
reFile.SelLength := Range.LastPos - Range.FirstPos + 1;
@@ -104,13 +104,13 @@
end
else
begin
- SelectText(RE.CaptureRanges[0]);
- FMatchIndex := RE.CaptureRanges[0].LastPos + 1;
+ SelectText(RE.CaptureOffset[0]);
+ FMatchIndex := RE.CaptureOffset[0].LastPos + 1;
end;
UpdateUIOptions;
end;
-function TfrmMain.GetUIOptions: TJclRegExOptions;
+function TfrmMain.GetUIOptions: TJclAnsiRegExOptions;
begin
Result := [];
if chkIgnoreCase.Checked then
@@ -141,7 +141,7 @@
procedure TfrmMain.UpdateUIOptions;
var
- Options: TJclRegExOptions;
+ Options: TJclAnsiRegExOptions;
begin
if RE = nil then Exit;
Options := RE.Options;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-08-02 19:09:48
|
Revision: 3273
http://jcl.svn.sourceforge.net/jcl/?rev=3273&view=rev
Author: outchy
Date: 2010-08-02 19:09:40 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
JCL containers are now created from templates.
Modified Paths:
--------------
trunk/jcl/devtools/jpp/JppParser.pas
trunk/jcl/devtools/jpp/JppState.pas
trunk/jcl/packages/c6/JclDeveloperTools.bpk
trunk/jcl/packages/c6/JclDeveloperTools.dpk
trunk/jcl/packages/cs1/JclDeveloperTools.dpk
trunk/jcl/packages/d10/JclDeveloperTools.dpk
trunk/jcl/packages/d11/JclDeveloperTools.dpk
trunk/jcl/packages/d11/JclDeveloperTools.dproj
trunk/jcl/packages/d12/JclDeveloperTools.dpk
trunk/jcl/packages/d12/JclDeveloperTools.dproj
trunk/jcl/packages/d14/JclDeveloperTools.dpk
trunk/jcl/packages/d14/JclDeveloperTools.dproj
trunk/jcl/packages/d6/JclDeveloperTools.dpk
trunk/jcl/packages/d7/JclDeveloperTools.dpk
trunk/jcl/packages/d8/JclDeveloperTools.dpk
trunk/jcl/packages/d9/JclDeveloperTools.dpk
trunk/jcl/packages/fpc/JclDeveloperTools.lpk
trunk/jcl/packages/fpc/JclDeveloperTools.pas
trunk/jcl/packages/xml/JclDeveloperTools-R.xml
trunk/jcl/source/common/JclAlgorithms.pas
trunk/jcl/source/common/JclArrayLists.pas
trunk/jcl/source/common/JclArraySets.pas
trunk/jcl/source/common/JclBinaryTrees.pas
trunk/jcl/source/common/JclContainerIntf.pas
trunk/jcl/source/common/JclHashMaps.pas
trunk/jcl/source/common/JclLinkedLists.pas
trunk/jcl/source/common/JclQueues.pas
trunk/jcl/source/common/JclSortedMaps.pas
trunk/jcl/source/common/JclStacks.pas
trunk/jcl/source/common/JclTrees.pas
trunk/jcl/source/common/JclVectors.pas
trunk/jcl/source/prototypes/JclAlgorithms.pas
trunk/jcl/source/prototypes/JclArrayLists.pas
trunk/jcl/source/prototypes/JclArraySets.pas
trunk/jcl/source/prototypes/JclBinaryTrees.pas
trunk/jcl/source/prototypes/JclContainerIntf.pas
trunk/jcl/source/prototypes/JclLinkedLists.pas
trunk/jcl/source/prototypes/JclQueues.pas
trunk/jcl/source/prototypes/JclStacks.pas
trunk/jcl/source/prototypes/JclTrees.pas
trunk/jcl/source/prototypes/JclVectors.pas
trunk/jcl/source/prototypes/Makefile.mak
trunk/jcl/source/prototypes/containers/JclAlgorithms.int
trunk/jcl/source/prototypes/containers/JclArrayLists.int
trunk/jcl/source/prototypes/containers/JclArraySets.int
trunk/jcl/source/prototypes/containers/JclBinaryTrees.imp
trunk/jcl/source/prototypes/containers/JclBinaryTrees.int
trunk/jcl/source/prototypes/containers/JclContainerIntf.int
trunk/jcl/source/prototypes/containers/JclLinkedLists.imp
trunk/jcl/source/prototypes/containers/JclLinkedLists.int
trunk/jcl/source/prototypes/containers/JclQueues.int
trunk/jcl/source/prototypes/containers/JclStacks.int
trunk/jcl/source/prototypes/containers/JclTrees.int
trunk/jcl/source/prototypes/containers/JclVectors.int
Added Paths:
-----------
trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclArrayListsTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclArraySetsTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclBinaryTreesTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainer1DTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainer2DTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainerIntfTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainerKnownMaps.pas
trunk/jcl/devtools/jpp/Templates/JclContainerKnownTypes.pas
trunk/jcl/devtools/jpp/Templates/JclContainerTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclContainerTypes.pas
trunk/jcl/devtools/jpp/Templates/JclLinkedListsTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclQueuesTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclStacksTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclTreesTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclVectorsTemplates.pas
trunk/jcl/devtools/jpp/jppContainers.dpr
Modified: trunk/jcl/devtools/jpp/JppParser.pas
===================================================================
--- trunk/jcl/devtools/jpp/JppParser.pas 2010-07-29 18:30:12 UTC (rev 3272)
+++ trunk/jcl/devtools/jpp/JppParser.pas 2010-08-02 19:09:40 UTC (rev 3273)
@@ -233,10 +233,15 @@
SetLength(ParamNames, Length(ParamNames) + 1);
ParamNames[High(ParamNames)] := Copy(MacroText, J, I - J);
StrReplace(ParamNames[High(ParamNames)], '\,', ',', [rfReplaceAll]);
+ if (I < Length(MacroText)) and (MacroText[I] = ')') then
+ begin
+ J := I;
+ Break;
+ end;
if (I < Length(MacroText)) and (MacroText[I] = ',') then
Inc(I);
J := I;
- until (J > Length(MacroText)) or (MacroText[J] = ')');
+ until J > Length(MacroText);
end;
if J <= Length(MacroText) then
begin
@@ -276,7 +281,7 @@
procedure TJppParser.AddResult(const S: string; FixIndent: Boolean);
var
I, J: Integer;
- LinePrefix, AResult: string;
+ LinePrefix, AResult, Line: string;
TempMemoryStream: TMemoryStream;
TempStringStream: TJclAutoStream;
TempLexer: TJppLexer;
@@ -298,7 +303,12 @@
Break;
ptJppDefineMacro,
ptJppExpandMacro,
- ptJppUndefMacro,
+ ptJppUndefMacro:
+ if poProcessMacros in State.Options then
+ begin
+ Recurse := True;
+ Break;
+ end;
ptJppGetStrValue,
ptJppGetIntValue,
ptJppGetBoolValue,
@@ -306,6 +316,7 @@
ptJppSetIntValue,
ptJppSetBoolValue,
ptJppLoop:
+ if poProcessValues in State.Options then
begin
Recurse := True;
Break;
@@ -371,7 +382,11 @@
// fix line offsets
if LinePrefix <> '' then
for I := 1 to Lines.Count - 1 do
- Lines.Strings[I] := LinePrefix + Lines.Strings[I];
+ begin
+ Line := Lines.Strings[I];
+ if Line <> '' then
+ Lines.Strings[I] := LinePrefix + Line;
+ end;
AResult := StringsToStr(Lines, NativeLineBreak);
finally
Lines.Free;
@@ -689,6 +704,7 @@
State.IntegerValues[IndexName] := RepeatIndex;
AddResult(RepeatText);
end;
+ State.IntegerValues[IndexName] := -1;
NextToken;
end;
Modified: trunk/jcl/devtools/jpp/JppState.pas
===================================================================
--- trunk/jcl/devtools/jpp/JppState.pas 2010-07-29 18:30:12 UTC (rev 3272)
+++ trunk/jcl/devtools/jpp/JppState.pas 2010-08-02 19:09:40 UTC (rev 3273)
@@ -94,6 +94,10 @@
function GetOptions: TPppOptions;
procedure SetOptions(AOptions: TPppOptions);
+ function FindMacro(const AMacroName: string): IJclStrList;
+ function AssociateParameters(const ParamNames: IJclStrList;
+ const ParamValues: TDynStringArray): TDynWideStringArray;
+
function GetBoolValue(const Name: string): Boolean; override;
function GetDefine(const ASymbol: string): TTriState; override;
function GetIntegerValue(const Name: string): Integer; override;
@@ -121,7 +125,7 @@
procedure AddFileToExclusionList(const AName: string);
function IsFileExcluded(const AName: string): Boolean;
- function ExpandMacro(const AName: string; const ParamValues: TDynStringArray): string;
+ function ExpandMacro(const AName: string; const ParamValues: TDynStringArray): string; virtual;
procedure DefineMacro(const AName: string; const ParamNames: TDynStringArray;
const Value: string);
procedure UndefMacro(const AName: string; const ParamNames: TDynStringArray);
@@ -129,6 +133,8 @@
property Options: TPppOptions read GetOptions write SetOptions;
end;
+ TPppStateClass = class of TPppState;
+
{$IFDEF UNITVERSIONING}
const
UnitVersioning: TUnitVersionInfo = (
@@ -181,68 +187,67 @@
InternalPeekSearchPath.Add(AName);
end;
+function TPppState.AssociateParameters(const ParamNames: IJclStrList;
+ const ParamValues: TDynStringArray): TDynWideStringArray;
+var
+ StrParams: TStrings;
+ AssociationByName: Boolean;
+ Index, ParamIndex: Integer;
+ AParamName, AParamText: string;
+begin
+ SetLength(Result, Length(ParamValues));
+ AssociationByName := True;
+ StrParams := TStringList.Create;
+ try
+ for Index := Low(ParamValues) to High(ParamValues) do
+ begin
+ StrParams.Add(ParamValues[Index]);
+ AParamName := StrParams.Names[Index];
+ if AParamName <> '' then
+ begin
+ // verify parameter names
+ ParamIndex := ParamNames.IndexOf(AParamName);
+ if ParamIndex < 0 then
+ AssociationByName := False;
+ end
+ else
+ AssociationByName := False;
+ end;
+ for Index := Low(ParamValues) to High(ParamValues) do
+ begin
+ if AssociationByName then
+ AParamText := StrParams.Values[ParamNames.Strings[Index]]
+ else
+ AParamText := StrParams.Strings[Index];
+ Result[Index] := WideString(AParamText);
+ end;
+ finally
+ StrParams.Free;
+ end;
+end;
+
function TPppState.ExpandMacro(const AName: string;
const ParamValues: TDynStringArray): string;
var
- AMacros: IJclStrIntfMap;
AMacro: IJclStrList;
- AMacroNames: IJclStrIterator;
- AMacroName, AMacroText, AParamName, AParamText: string;
- Index, ParamIndex: Integer;
+ AMacroName, AMacroText: string;
+ Index: Integer;
Params: array of TVarRec;
- StrParams: TStrings;
- AssociationByName: Boolean;
+ AMacroParams: TDynWideStringArray;
begin
- AMacros := InternalPeekMacros;
AMacroName := Format('%s`%d', [AName, Length(ParamValues)]);
- AMacroNames := AMacros.KeySet.First;
- while AMacroNames.HasNext do
+ AMacro := FindMacro(AMacroName);
+ // the macro text is the last item, previous items are the macro parameter names
+ AMacroText := AMacro.Strings[AMacro.Size - 1];
+ AMacroParams := AssociateParameters(AMacro.SubList(0, AMacro.Size - 1), ParamValues);
+
+ SetLength(Params, Length(ParamValues));
+ for Index := Low(ParamValues) to High(ParamValues) do
begin
- if JclStrings.StrSame(AMacroNames.Next, AMacroName) then
- begin
- AMacro := AMacros.Items[AMacroNames.GetString] as IJclStrList;
- // the macro text is the last item, previous items are the macro parameter names
- AMacroText := AMacro.Strings[AMacro.Size - 1];
- AssociationByName := True;
- StrParams := TStringList.Create;
- try
- for Index := Low(ParamValues) to High(ParamValues) do
- begin
- StrParams.Add(ParamValues[Index]);
- AParamName := StrParams.Names[Index];
- if AParamName <> '' then
- begin
- // verify parameter names
- ParamIndex := AMacro.IndexOf(AParamName);
- if (ParamIndex < 0) or (ParamIndex > (AMacro.Size - 1)) then
- AssociationByName := False;
- end
- else
- AssociationByName := False;
- end;
- SetLength(Params, Length(ParamValues));
- for Index := Low(ParamValues) to High(ParamValues) do
- begin
- if AssociationByName then
- AParamText := StrParams.Values[AMacro.Strings[Index]]
- else
- AParamText := StrParams.Strings[Index];
- {$IFDEF SUPPORTS_UNICODE}
- Params[Index].VType := vtPWideChar;
- Params[Index].VPWideChar := PWideChar(AParamText);
- {$ELSE ~SUPPORTS_UNICODE}
- Params[Index].VType := vtPChar;
- Params[Index].VPChar := PAnsiChar(AParamText);
- {$ENDIF ~SUPPORTS_UNICODE}
- end;
- Result := Format(AMacroText, Params);
- finally
- StrParams.Free;
- end;
- Exit;
- end;
+ Params[Index].VType := vtPWideChar;
+ Params[Index].VPWideChar := PWideChar(AMacroParams[Index]);
end;
- raise EPppState.CreateFmt('unknown macro "%s"', [AMacroName]);
+ Result := Format(AMacroText, Params);
end;
procedure TPppState.Define(const ASymbol: string);
@@ -303,6 +308,24 @@
Result := TFileStream.Create(fn, fmOpenRead or fmShareDenyWrite);
end;
+function TPppState.FindMacro(const AMacroName: string): IJclStrList;
+var
+ AMacros: IJclStrIntfMap;
+ AMacroNames: IJclStrIterator;
+begin
+ AMacros := InternalPeekMacros;
+ AMacroNames := AMacros.KeySet.First;
+ while AMacroNames.HasNext do
+ begin
+ if JclStrings.StrSame(AMacroNames.Next, AMacroName) then
+ begin
+ Result := AMacros.Items[AMacroNames.GetString] as IJclStrList;
+ Exit;
+ end;
+ end;
+ raise EPppState.CreateFmt('unknown macro "%s"', [AMacroName]);
+end;
+
function TPppState.GetBoolValue(const Name: string): Boolean;
var
VariantValue: Variant;
Added: trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas (rev 0)
+++ trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas 2010-08-02 19:09:40 UTC (rev 3273)
@@ -0,0 +1,533 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is JclAlgorithmsTemplates.pas. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclAlgorithmsTemplates;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclContainerTypes,
+ JclContainerTemplates,
+ JclContainer1DTemplates;
+
+type
+ TJclAlgorithmsIntParams = class(TJclContainerInterfaceParams)
+ protected
+ // function CodeUnit: string; override;
+ end;
+
+ TJclAlgorithmsIntProcParams = class(TJclAlgorithmsIntParams)
+ protected
+ FOverload: string;
+ FProcName: string;
+ function GetProcName: string; virtual;
+ function IsProcNameStored: Boolean;
+ public
+ property Overload: string read FOverload write FOverload;
+ property ProcName: string read GetProcName write FProcName stored IsProcNameStored;
+ end;
+
+ TJclAlgorithmsImpProcParams = class(TJclContainerImplementationParams)
+ protected
+ function GetProcName: string;
+ procedure SetProcName(const Value: string);
+ // function CodeUnit: string; override;
+ public
+ property ProcName: string read GetProcName write SetProcName stored False;
+ end;
+
+ (* APPLYINT(PROCNAME, ITRINTERFACENAME, CALLBACKTYPE, OVERLOAD) *)
+ TJclApplyIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property Overload;
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taApplyFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* APPLYIMP(PROCNAME, ITRINTERFACENAME, CALLBACKTYPE, SETTERNAME) *)
+ TJclApplyImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taApplyFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* SIMPLECOMPAREINT(PROCNAME, CONSTKEYWORD, TYPENAME) *)
+ TJclSimpleCompareIntParams = class(TJclAlgorithmsIntParams)
+ published
+ property ProcName: string index taSimpleCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored IsTypeAttributeStored;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* SIMPLEEQUALITYCOMPAREINT(PROCNAME, CONSTKEYWORD, TYPENAME) *)
+ TJclSimpleEqualityCompareIntParams = class(TJclAlgorithmsIntParams)
+ published
+ property ProcName: string index taSimpleEqualityCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored IsTypeAttributeStored;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* FINDINT(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE, OVERLOAD) *)
+ TJclFindIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* FINDIMP(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE) *)
+ TJclFindImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* FINDEQINT(PROCNAME,ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE, OVERLOAD) *)
+ TJclFindEqIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taEqualityCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* FINDEQIMP(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE) *)
+ TJclFindEqImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taEqualityCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* COUNTOBJECTINT(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE, OVERLOAD) *)
+ TJclCountObjectIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* COUNTOBJECTIMP(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE) *)
+ TJclCountObjectImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* COUNTOBJECTEQINT(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE, OVERLOAD) *)
+ TJclCountObjectEqIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taEqualityCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* COUNTOBJECTEQIMP(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, CALLBACKTYPE) *)
+ TJclCountObjectEqImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CallbackType: string index taEqualityCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* COPYINT(PROCNAME, ITRINTERFACENAME, OVERLOAD) *)
+ TJclCopyIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* COPYIMP(PROCNAME, ITRINTERFACENAME, SETTERNAME) *)
+ TJclCopyImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* GENERATEINT(PROCNAME, LISTINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, OVERLOAD) *)
+ TJclGenerateIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* GENERATEIMP(PROCNAME, LISTINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME) *)
+ TJclGenerateImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* FILLINT(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, OVERLOAD) *)
+ TJclFillIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* FILLIMP(PROCNAME, ITRINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, TYPENAME, SETTERNAME) *)
+ TJclFillImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* REVERSEINT(PROCNAME, ITRINTERFACENAME, OVERLOAD) *)
+ TJclReverseIntParams = class(TJclAlgorithmsIntProcParams)
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* REVERSEIMP(PROCNAME, ITRINTERFACENAME, TYPENAME, GETTERNAME, SETTERNAME) *)
+ TJclReverseImpParams = class(TJclAlgorithmsImpProcParams)
+ published
+ property ProcName;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property GetterName: string index taGetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* SORTINT(PROCNAME, LISTINTERFACENAME, LEFT, RIGHT, CALLBACKTYPE, OVERLOAD) *)
+ TJclSortIntParams = class(TJclAlgorithmsIntProcParams)
+ private
+ FLeft: string;
+ FRight: string;
+ function GetLeft: string;
+ function GetRight: string;
+ function IsLeftStored: Boolean;
+ function IsRightStored: Boolean;
+ protected
+ function GetProcName: string; override;
+ published
+ property ProcName;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property Left: string read GetLeft write FLeft stored IsLeftStored;
+ property Right: string read GetRight write FRight stored IsRightStored;
+ property CallbackType: string index taCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* QUICKSORTIMP(PROCNAME, LISTINTERFACENAME, LEFT, RIGHT, CALLBACKTYPE, TYPENAME, GETTERNAME, SETTERNAME) *)
+ TJclQuickSortImpParams = class(TJclAlgorithmsImpProcParams)
+ private
+ function GetLeft: string;
+ function GetRight: string;
+ procedure SetLeft(const Value: string);
+ procedure SetRight(const Value: string);
+ published
+ property ProcName;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property Left: string read GetLeft write SetLeft stored False;
+ property Right: string read GetRight write SetRight stored False;
+ property CallbackType: string index taCompareFunctionName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property GetterName: string index taGetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\devtools\jpp\Templates';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+procedure RegisterJclContainers;
+begin
+ RegisterContainerParams('APPLYINT', TJclApplyIntParams);
+ RegisterContainerParams('SIMPLECOMPAREINT', TJclSimpleCompareIntParams);
+ RegisterContainerParams('SIMPLEEQUALITYCOMPAREINT', TJclSimpleEqualityCompareIntParams);
+ RegisterContainerParams('FINDINT', TJclFindIntParams);
+ RegisterContainerParams('FINDEQINT', TJclFindEqIntParams);
+ RegisterContainerParams('COUNTOBJECTINT', TJclCountObjectIntParams);
+ RegisterContainerParams('COUNTOBJECTEQINT', TJclCountObjectEqIntParams);
+ RegisterContainerParams('COPYINT', TJclCopyIntParams);
+ RegisterContainerParams('GENERATEINT', TJclGenerateIntParams);
+ RegisterContainerParams('FILLINT', TJclFillIntParams);
+ RegisterContainerParams('REVERSEINT', TJclReverseIntParams);
+ RegisterContainerParams('SORTINT', TJclSortIntParams);
+
+ RegisterContainerParams('APPLYIMP', TJclApplyImpParams, TJclApplyIntParams);
+ RegisterContainerParams('FINDIMP', TJclFindImpParams, TJclFindIntParams);
+ RegisterContainerParams('FINDEQIMP', TJclFindEqImpParams, TJclFindEqIntParams);
+ RegisterContainerParams('COUNTOBJECTIMP', TJclCountObjectImpParams, TJclCountObjectIntParams);
+ RegisterContainerParams('COUNTOBJECTEQIMP', TJclCountObjectEqImpParams, TJclCountObjectEqIntParams);
+ RegisterContainerParams('COPYIMP', TJclCopyImpParams, TJclCopyIntParams);
+ RegisterContainerParams('GENERATEIMP', TJclGenerateImpParams, TJclGenerateIntParams);
+ RegisterContainerParams('FILLIMP', TJclFillImpParams, TJclFillIntParams);
+ RegisterContainerParams('REVERSEIMP', TJclReverseImpParams, TJclReverseIntParams);
+ RegisterContainerParams('QUICKSORTIMP', TJclQuickSortImpParams, TJclSortIntParams);
+end;
+
+//=== { TJclAlgorithmsIntFunctionParams } ====================================
+
+function TJclAlgorithmsIntProcParams.GetProcName: string;
+begin
+ Result := FProcName;
+ // override to customize
+end;
+
+function TJclAlgorithmsIntProcParams.IsProcNameStored: Boolean;
+begin
+ Result := FProcName <> '';
+end;
+
+//=== { TJclAlgorithmsImpProcParams } ========================================
+
+function TJclAlgorithmsImpProcParams.GetProcName: string;
+begin
+ Result := (InterfaceParams as TJclAlgorithmsIntProcParams).ProcName;
+end;
+
+procedure TJclAlgorithmsImpProcParams.SetProcName(const Value: string);
+begin
+ (InterfaceParams as TJclAlgorithmsIntProcParams).ProcName := Value;
+end;
+
+//=== { TJclApplyIntParams } =================================================
+
+function TJclApplyIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'Apply';
+end;
+
+//=== { TJclFindIntParams } ==================================================
+
+function TJclFindIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'Find';
+end;
+
+//=== { TJclFindEqIntParams } ================================================
+
+function TJclFindEqIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'Find';
+end;
+
+//=== { TJclCountObjectIntParams } ===========================================
+
+function TJclCountObjectIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'CountObject';
+end;
+
+//=== { TJclCountObjectEqIntParams } =========================================
+
+function TJclCountObjectEqIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'CountObject';
+end;
+
+//=== { TJclCopyIntParams } ==================================================
+
+function TJclCopyIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'Copy';
+end;
+
+//=== { TJclGenerateIntParams } ==============================================
+
+function TJclGenerateIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'Generate';
+end;
+
+//=== { TJclFillIntParams } ==================================================
+
+function TJclFillIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'Fill';
+end;
+
+//=== { TJclReverseIntParams } ===============================================
+
+function TJclReverseIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'Reverse';
+end;
+
+//=== { TJclSortIntParams } ==================================================
+
+function TJclSortIntParams.GetLeft: string;
+begin
+ Result := FLeft;
+ if Result = '' then
+ Result := 'L';
+end;
+
+function TJclSortIntParams.GetProcName: string;
+begin
+ Result := inherited GetProcName;
+ if Result = '' then
+ Result := 'QuickSort';
+end;
+
+function TJclSortIntParams.GetRight: string;
+begin
+ Result := FRight;
+ if Result = '' then
+ Result := 'R';
+end;
+
+function TJclSortIntParams.IsLeftStored: Boolean;
+begin
+ Result := FLeft <> '';
+end;
+
+function TJclSortIntParams.IsRightStored: Boolean;
+begin
+ Result := FRight <> '';
+end;
+
+//=== { TJclQuickSortImpParams } =============================================
+
+function TJclQuickSortImpParams.GetLeft: string;
+begin
+ Result := (InterfaceParams as TJclSortIntParams).Left;
+end;
+
+function TJclQuickSortImpParams.GetRight: string;
+begin
+ Result := (InterfaceParams as TJclSortIntParams).Right;
+end;
+
+procedure TJclQuickSortImpParams.SetLeft(const Value: string);
+begin
+ (InterfaceParams as TJclSortIntParams).Left := Value;
+end;
+
+procedure TJclQuickSortImpParams.SetRight(const Value: string);
+begin
+ (InterfaceParams as TJclSortIntParams).Right := Value;
+end;
+
+initialization
+ RegisterJclContainers;
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
+
+finalization
+ {$IFDEF UNITVERSIONING}
+ UnregisterUnitVersion(HInstance);
+ {$ENDIF UNITVERSIONING}
+
+end.
+
Property changes on: trunk/jcl/devtools/jpp/Templates/JclAlgorithmsTemplates.pas
___________________________________________________________________
Added: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: svn:eol-style
+ native
Added: trunk/jcl/devtools/jpp/Templates/JclArrayListsTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclArrayListsTemplates.pas (rev 0)
+++ trunk/jcl/devtools/jpp/Templates/JclArrayListsTemplates.pas 2010-08-02 19:09:40 UTC (rev 3273)
@@ -0,0 +1,206 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is JclArrayListsTemplates.pas. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclArrayListsTemplates;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclContainerTypes,
+ JclContainerTemplates,
+ JclContainer1DTemplates;
+
+type
+ (* JCLARRAYLISTINT(SELFCLASSNAME, ANCESTORCLASSNAME, COLLECTIONINTERFACENAME, LISTINTERFACENAME,
+ ARRAYINTERFACENAME, ITRINTERFACENAME, DYNARRAYTYPE, INTERFACEADDITIONAL,
+ SECTIONADDITIONAL, COLLECTIONFLAGS, OWNERSHIPDECLARATION, CONSTKEYWORD,
+ PARAMETERNAME, TYPENAME, GETTERNAME, SETTERNAME) *)
+ TJclArrayListIntParams = class(TJclCollectionInterfaceParams)
+ protected
+ // function CodeUnit: string; override;
+ function GetInterfaceAdditional: string; override;
+ public
+ function AliasAttributeIDs: TAllTypeAttributeIDs; override;
+ published
+ property SelfClassName: string index taArrayListClassName read GetTypeAttribute write SetTypeAttribute stored IsTypeAttributeStored;
+ property AncestorClassName;
+ property CollectionInterfaceName: string index taCollectionInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property EqualityComparerInterfaceName: string index taEqualityComparerInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ArrayInterfaceName: string index taArrayInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property DynArrayType: string index taDynArrayTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property InterfaceAdditional;
+ property SectionAdditional;
+ property CollectionFlags;
+ property OwnershipDeclaration;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property GetterName: string index taGetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* JCLARRAYLISTITRINT(SELFCLASSNAME, ITRINTERFACENAME, LISTINTERFACENAME, CONSTKEYWORD, PARAMETERNAME,
+ TYPENAME, GETTERNAME, SETTERNAME) *)
+ TJclArrayListItrIntParams = class(TJclContainerInterfaceParams)
+ protected
+ // function CodeUnit: string; override;
+ public
+ function AliasAttributeIDs: TAllTypeAttributeIDs; override;
+ published
+ property SelfClassName: string index taArrayIteratorClassName read GetTypeAttribute write SetTypeAttribute stored IsTypeAttributeStored;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property GetterName: string index taGetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* JCLARRAYLISTIMP(SELFCLASSNAME, OWNERSHIPDECLARATION, OWNERSHIPPARAMETER, COLLECTIONINTERFACENAME,
+ ITRINTERFACENAME, ITRCLASSNAME, LISTINTERFACENAME, CONSTKEYWORD, PARAMETERNAME, GETTERNAME,
+ SETTERNAME, RELEASERNAME, TYPENAME, DEFAULTVALUE) *)
+ TJclArrayListImpParams = class(TJclCollectionImplementationParams)
+ protected
+ // function CodeUnit: string; override;
+ public
+ function GetConstructorParameters: string; override;
+ function GetSelfClassName: string; override;
+ published
+ property SelfClassName: string index taArrayListClassName read GetTypeAttribute write SetTypeAttribute stored False;
+ property OwnershipDeclaration;
+ property OwnershipParameter: string index taOwnershipParameter read GetTypeAttribute write SetTypeAttribute stored False;
+ property CollectionInterfaceName: string index taCollectionInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ItrClassName: string index taArrayIteratorClassName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property GetterName: string index taGetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ReleaserName: string index taReleaserName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property DefaultValue: string index taDefaultValue read GetTypeAttribute write SetTypeAttribute stored False;
+ property MacroFooter;
+ end;
+
+ (* JCLARRAYLISTITRIMP(SELFCLASSNAME, ITRINTERFACENAME, LISTINTERFACENAME,
+ CONSTKEYWORD, PARAMETERNAME, TYPENAME, GETTERNAME, SETTERNAME) *)
+ TJclArrayListItrImpParams = class(TJclContainerImplementationParams)
+ protected
+ // function CodeUnit: string; override;
+ published
+ property SelfClassName: string index taArrayIteratorClassName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property GetterName: string index taGetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetterName: string index taSetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\devtools\jpp\Templates';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+uses
+ SysUtils,
+ JclStrings;
+
+procedure RegisterJclContainers;
+begin
+ RegisterContainerParams('JCLARRAYLISTINT', TJclArrayListIntParams);
+ RegisterContainerParams('JCLARRAYLISTITRINT', TJclArrayListItrIntParams);
+ RegisterContainerParams('JCLARRAYLISTIMP', TJclArrayListImpParams, TJclArrayListIntParams);
+ RegisterContainerParams('JCLARRAYLISTITRIMP', TJclArrayListItrImpParams, TJclArrayListItrIntParams);
+end;
+
+//=== { TJclArrayListIntParams } =============================================
+
+function TJclArrayListIntParams.AliasAttributeIDs: TAllTypeAttributeIDs;
+begin
+ Result := [taArrayListClassName];
+end;
+
+function TJclArrayListIntParams.GetInterfaceAdditional: string;
+begin
+ Result := FInterfaceAdditional;
+ if Result = '' then
+ Result := Format('%s %s,', [inherited GetInterfaceAdditional, EqualityComparerInterfaceName]);
+end;
+
+//=== { TJclArrayListItrIntParams } ==========================================
+
+function TJclArrayListItrIntParams.AliasAttributeIDs: TAllTypeAttributeIDs;
+begin
+ Result := [taArrayIteratorClassName];
+end;
+
+//=== { TJclArrayListImpParams } =============================================
+
+function TJclArrayListImpParams.GetConstructorParameters: string;
+begin
+ Result := 'FSize';
+end;
+
+function TJclArrayListImpParams.GetSelfClassName: string;
+begin
+ Result := SelfClassName;
+end;
+
+initialization
+ RegisterJclContainers;
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
+
+finalization
+ {$IFDEF UNITVERSIONING}
+ UnregisterUnitVersion(HInstance);
+ {$ENDIF UNITVERSIONING}
+
+end.
+
Property changes on: trunk/jcl/devtools/jpp/Templates/JclArrayListsTemplates.pas
___________________________________________________________________
Added: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: svn:eol-style
+ native
Added: trunk/jcl/devtools/jpp/Templates/JclArraySetsTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclArraySetsTemplates.pas (rev 0)
+++ trunk/jcl/devtools/jpp/Templates/JclArraySetsTemplates.pas 2010-08-02 19:09:40 UTC (rev 3273)
@@ -0,0 +1,152 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is JclArraySetsTemplates.pas. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclArraySetsTemplates;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclContainerTypes,
+ JclContainerTemplates,
+ JclContainer1DTemplates;
+
+type
+ (* JCLARRAYSETINT(SELFCLASSNAME, ANCESTORCLASSNAME, COLLECTIONINTERFACENAME, LISTINTERFACENAME,
+ ARRAYINTERFACENAME, SETINTERFACENAME, INTERFACEADDITIONAL, SECTIONADDITIONAL,
+ COLLECTIONFLAGS, CONSTKEYWORD, PARAMETERNAME, TYPENAME) *)
+ TJclArraySetIntParams = class(TJclCollectionInterfaceParams)
+ protected
+ // function CodeUnit: string; override;
+ function GetInterfaceAdditional: string; override;
+ public
+ function AliasAttributeIDs: TAllTypeAttributeIDs; override;
+ published
+ property SelfClassName: string index taArraySetClassName read GetTypeAttribute write SetTypeAttribute stored IsTypeAttributeStored;
+ property AncestorClassName: string index taArrayListClassName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CollectionInterfaceName: string index taCollectionInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property EqualityComparerInterfaceName: string index taEqualityComparerInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ComparerInterfaceName: string index taComparerInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ListInterfaceName: string index taListInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ArrayInterfaceName: string index taArrayInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property SetInterfaceName: string index taSetInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property InterfaceAdditional;
+ property SectionAdditional;
+ property CollectionFlags;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ end;
+
+ (* JCLARRAYSETIMP(SELFCLASSNAME, COLLECTIONINTERFACENAME, ITRINTERFACENAME, CONSTKEYWORD,
+ PARAMETERNAME, TYPENAME, DEFAULTVALUE, GETTERNAME) *)
+ TJclArraySetImpParams = class(TJclCollectionImplementationParams)
+ protected
+ // function CodeUnit: string; override;
+ public
+ function GetConstructorParameters: string; override;
+ function GetSelfClassName: string; override;
+ published
+ property SelfClassName: string index taArraySetClassName read GetTypeAttribute write SetTypeAttribute stored False;
+ property CollectionInterfaceName: string index taCollectionInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ItrInterfaceName: string index taIteratorInterfaceName read GetTypeAttribute write SetTypeAttribute stored False;
+ property ConstKeyword: string index taConstKeyword read GetTypeAttribute write SetTypeAttribute stored False;
+ property ParameterName: string index taParameterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property TypeName: string index taTypeName read GetTypeAttribute write SetTypeAttribute stored False;
+ property DefaultValue: string index taDefaultValue read GetTypeAttribute write SetTypeAttribute stored False;
+ property GetterName: string index taGetterName read GetTypeAttribute write SetTypeAttribute stored False;
+ property MacroFooter;
+ end;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\devtools\jpp\Templates';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+uses
+ SysUtils,
+ JclStrings;
+
+procedure RegisterJclContainers;
+begin
+ RegisterContainerParams('JCLARRAYSETINT', TJclArraySetIntParams);
+ RegisterContainerParams('JCLARRAYSETIMP', TJclArraySetImpParams, TJclArraySetIntParams);
+end;
+
+//=== { TJclArraySetIntParams } ==============================================
+
+function TJclArraySetIntParams.AliasAttributeIDs: TAllTypeAttributeIDs;
+begin
+ Result := [taArraySetClassName];
+end;
+
+function TJclArraySetIntParams.GetInterfaceAdditional: string;
+begin
+ Result := FInterfaceAdditional;
+ if Result = '' then
+ Result := Format('%s %s, %s,', [inherited GetInterfaceAdditional, EqualityComparerInterfaceName, ComparerInterfaceName]);
+end;
+
+//=== { TJclArraySetImpParams } ==============================================
+
+function TJclArraySetImpParams.GetConstructorParameters: string;
+begin
+ Result := 'Size';
+end;
+
+function TJclArraySetImpParams.GetSelfClassName: string;
+begin
+ Result := SelfClassName;
+end;
+
+initialization
+ RegisterJclContainers;
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
+
+finalization
+ {$IFDEF UNITVERSIONING}
+ UnregisterUnitVersion(HInstance);
+ {$ENDIF UNITVERSIONING}
+
+end.
+
Property changes on: trunk/jcl/devtools/jpp/Templates/JclArraySetsTemplates.pas
___________________________________________________________________
Added: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: svn:eol-style
+ native
Added: trunk/jcl/devtools/jpp/Templates/JclBinaryTreesTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclBinaryTreesTemplates.pas (rev 0)
+++ trunk/jcl/devtools/jpp/Templates/JclBinaryTreesTemplates.pas 2010-08-02 19:09:40 UTC (rev 3273)
@@ -0,0 +1,300 @@
+{**************************************************************************************************}
+{ ...
[truncated message content] |
|
From: <ou...@us...> - 2010-07-29 18:30:20
|
Revision: 3272
http://jcl.svn.sourceforge.net/jcl/?rev=3272&view=rev
Author: outchy
Date: 2010-07-29 18:30:12 +0000 (Thu, 29 Jul 2010)
Log Message:
-----------
moved CreateStdDialogs.dpr from repository expert directory to the JPP directory.
Added Paths:
-----------
trunk/jcl/devtools/howto-jppExceptionDialogs.txt
trunk/jcl/devtools/jpp/jppExceptionDialogs.dpr
Removed Paths:
-------------
trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr
Copied: trunk/jcl/devtools/howto-jppExceptionDialogs.txt (from rev 3267, trunk/jcl/devtools/howto-jpp.txt)
===================================================================
--- trunk/jcl/devtools/howto-jppExceptionDialogs.txt (rev 0)
+++ trunk/jcl/devtools/howto-jppExceptionDialogs.txt 2010-07-29 18:30:12 UTC (rev 3272)
@@ -0,0 +1,2 @@
+JPP (JEDI PreProcessor) executable has to be placed in this directory.
+It can be built from the source jppExceptionDialogs.dpr available in the jpp subdirectory.
Copied: trunk/jcl/devtools/jpp/jppExceptionDialogs.dpr (from rev 3270, trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr)
===================================================================
--- trunk/jcl/devtools/jpp/jppExceptionDialogs.dpr (rev 0)
+++ trunk/jcl/devtools/jpp/jppExceptionDialogs.dpr 2010-07-29 18:30:12 UTC (rev 3272)
@@ -0,0 +1,124 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is CreateStdDialogs.dpr. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+program jppExceptionDialogs;
+
+{$APPTYPE CONSOLE}
+
+uses
+ SysUtils,
+ Classes,
+ JclIDEUtils,
+ JclTemplates in 'Templates\JclTemplates.pas',
+ JclExcDlgTemplates in 'Templates\JclExcDlgTemplates.pas',
+ JppState in 'JppState.pas',
+ JppLexer in 'JppLexer.pas',
+ JppParser in 'JppParser.pas';
+
+const
+ TemplateDirectory = '..\experts\repository\ExceptionDialog\Templates\';
+ StdDlgsDirectory = '..\experts\repository\ExceptionDialog\StandardDialogs\';
+
+function LoadTemplate(const FileName: TFileName): string;
+var
+ AFileStream: TFileStream;
+ Buffer: AnsiString;
+begin
+ AFileStream := TFileStream.Create(FileName, fmOpenRead, fmShareDenyWrite);
+ try
+ SetLength(Buffer, AFileStream.Size);
+ AFileStream.ReadBuffer(Buffer[1], AFileStream.Size);
+ Result := string(Buffer);
+ finally
+ AFileStream.Free;
+ end;
+end;
+
+procedure SaveFile(const FileName: TFileName; const FileContent: string);
+var
+ AFileStream: TFileStream;
+ Buffer: AnsiString;
+begin
+ AFileStream := TFileStream.Create(FileName, fmOpenWrite, fmShareExclusive);
+ try
+ Buffer := AnsiString(FileContent);
+ AFileStream.Size := 0;
+ AFileStream.Write(Buffer[1], Length(Buffer));
+ finally
+ AFileStream.Free;
+ end;
+end;
+
+var
+ Params: TJclExcDlgParams;
+begin
+ try
+ Params := TJclExcDlgParams.Create;
+ try
+ Params.ActivePersonality := bpDelphi32;
+ Params.FormName := 'ExceptionDialog';
+ Params.FormAncestor := 'TForm';
+ Params.ModalDialog := True;
+ Params.SendEMail := False;
+ Params.SizeableDialog := True;
+ Params.AutoScrollBars := True;
+ Params.DelayedTrace := True;
+ Params.HookDll := True;
+ Params.LogFile := True;
+ Params.LogSaveDialog := True;
+ Params.LogFileName := '''filename.log''';
+ Params.OSInfo := True;
+ Params.ModuleList := True;
+ Params.ActiveControls := True;
+ Params.AllThreads := True;
+ Params.TraceAllExceptions := False;
+ Params.StackList := True;
+ Params.RawData := True;
+ Params.ModuleName := True;
+ Params.ModuleOffset := True;
+ Params.CodeDetails := True;
+ Params.VirtualAddress := True;
+
+ SaveFile(StdDlgsDirectory + 'ExceptDlg.pas', GetFinalSourceContent(ApplyTemplate(LoadTemplate(TemplateDirectory + 'ExceptDlg.Delphi32.pas'), Params), 'ExceptDlg', 'ExceptionDialog', 'TForm'));
+ SaveFile(StdDlgsDirectory + 'ExceptDlg.dfm', GetFinalSourceContent(ApplyTemplate(LoadTemplate(TemplateDirectory + 'ExceptDlg.Delphi32.dfm'), Params), 'ExceptDlg', 'ExceptionDialog', 'TForm'));
+
+ Params.FormName := 'ExceptionDialogMail';
+ Params.SendEMail := True;
+ Params.EMailAddress := 'name@domain.ext';
+ Params.EMailSubject := 'email subject';
+
+ SaveFile(StdDlgsDirectory + 'ExceptDlgMail.pas', GetFinalSourceContent(ApplyTemplate(LoadTemplate(TemplateDirectory + 'ExceptDlg.Delphi32.pas'), Params), 'ExceptDlgMail', 'ExceptionDialogMail', 'TForm'));
+ SaveFile(StdDlgsDirectory + 'ExceptDlgMail.dfm', GetFinalSourceContent(ApplyTemplate(LoadTemplate(TemplateDirectory + 'ExceptDlg.Delphi32.dfm'), Params), 'ExceptDlgMail', 'ExceptionDialogMail', 'TForm'));
+ finally
+ Params.Free;
+ end;
+ except
+ on E:Exception do
+ Writeln(E.Classname, ': ', E.Message);
+ end;
+end.
Deleted: trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr 2010-07-29 18:20:41 UTC (rev 3271)
+++ trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr 2010-07-29 18:30:12 UTC (rev 3272)
@@ -1,120 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is CreateStdDialogs.dpr. }
-{ }
-{ The Initial Developer of the Original Code is Florent Ouchet }
-{ <outchy att users dott sourceforge dott net> }
-{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
-{ }
-{ Contributors: }
-{ }
-{**************************************************************************************************}
-{ }
-{ Last modified: $Date:: $ }
-{ Revision: $Rev:: $ }
-{ Author: $Author:: $ }
-{ }
-{**************************************************************************************************}
-
-program CreateStdDialogs;
-
-{$APPTYPE CONSOLE}
-
-uses
- SysUtils,
- Classes,
- JclIDEUtils,
- JclTemplates in '..\..\..\devtools\jpp\Templates\JclTemplates.pas',
- JclExcDlgTemplates in '..\..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas',
- JppState in '..\..\..\devtools\jpp\JppState.pas',
- JppLexer in '..\..\..\devtools\jpp\JppLexer.pas',
- JppParser in '..\..\..\devtools\jpp\JppParser.pas';
-
-function LoadTemplate(const FileName: TFileName): string;
-var
- AFileStream: TFileStream;
- Buffer: AnsiString;
-begin
- AFileStream := TFileStream.Create(FileName, fmOpenRead, fmShareDenyWrite);
- try
- SetLength(Buffer, AFileStream.Size);
- AFileStream.ReadBuffer(Buffer[1], AFileStream.Size);
- Result := string(Buffer);
- finally
- AFileStream.Free;
- end;
-end;
-
-procedure SaveFile(const FileName: TFileName; const FileContent: string);
-var
- AFileStream: TFileStream;
- Buffer: AnsiString;
-begin
- AFileStream := TFileStream.Create(FileName, fmOpenWrite, fmShareExclusive);
- try
- Buffer := AnsiString(FileContent);
- AFileStream.Size := 0;
- AFileStream.Write(Buffer[1], Length(Buffer));
- finally
- AFileStream.Free;
- end;
-end;
-
-var
- Params: TJclExcDlgParams;
-begin
- try
- Params := TJclExcDlgParams.Create;
- try
- Params.ActivePersonality := bpDelphi32;
- Params.FormName := 'ExceptionDialog';
- Params.FormAncestor := 'TForm';
- Params.ModalDialog := True;
- Params.SendEMail := False;
- Params.SizeableDialog := True;
- Params.AutoScrollBars := True;
- Params.DelayedTrace := True;
- Params.HookDll := True;
- Params.LogFile := True;
- Params.LogSaveDialog := True;
- Params.LogFileName := '''filename.log''';
- Params.OSInfo := True;
- Params.ModuleList := True;
- Params.ActiveControls := True;
- Params.AllThreads := True;
- Params.TraceAllExceptions := False;
- Params.StackList := True;
- Params.RawData := True;
- Params.ModuleName := True;
- Params.ModuleOffset := True;
- Params.CodeDetails := True;
- Params.VirtualAddress := True;
-
- SaveFile('StandardDialogs\ExceptDlg.pas', GetFinalSourceContent(ApplyTemplate(LoadTemplate('Templates\ExceptDlg.Delphi32.pas'), Params), 'ExceptDlg', 'ExceptionDialog', 'TForm'));
- SaveFile('StandardDialogs\ExceptDlg.dfm', GetFinalSourceContent(ApplyTemplate(LoadTemplate('Templates\ExceptDlg.Delphi32.dfm'), Params), 'ExceptDlg', 'ExceptionDialog', 'TForm'));
-
- Params.FormName := 'ExceptionDialogMail';
- Params.SendEMail := True;
- Params.EMailAddress := 'name@domain.ext';
- Params.EMailSubject := 'email subject';
-
- SaveFile('StandardDialogs\ExceptDlgMail.pas', GetFinalSourceContent(ApplyTemplate(LoadTemplate('Templates\ExceptDlg.Delphi32.pas'), Params), 'ExceptDlgMail', 'ExceptionDialogMail', 'TForm'));
- SaveFile('StandardDialogs\ExceptDlgMail.dfm', GetFinalSourceContent(ApplyTemplate(LoadTemplate('Templates\ExceptDlg.Delphi32.dfm'), Params), 'ExceptDlgMail', 'ExceptionDialogMail', 'TForm'));
- finally
- Params.Free;
- end;
- except
- on E:Exception do
- Writeln(E.Classname, ': ', E.Message);
- end;
-end.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-07-29 18:20:47
|
Revision: 3271
http://jcl.svn.sourceforge.net/jcl/?rev=3271&view=rev
Author: outchy
Date: 2010-07-29 18:20:41 +0000 (Thu, 29 Jul 2010)
Log Message:
-----------
refactoring to allow different state classes in JppMain.Params.
Modified Paths:
--------------
trunk/jcl/devtools/jpp/JppMain.pas
trunk/jcl/devtools/jpp/jpp.dpr
Modified: trunk/jcl/devtools/jpp/JppMain.pas
===================================================================
--- trunk/jcl/devtools/jpp/JppMain.pas 2010-07-29 15:12:03 UTC (rev 3270)
+++ trunk/jcl/devtools/jpp/JppMain.pas 2010-07-29 18:20:41 UTC (rev 3271)
@@ -55,7 +55,7 @@
JppParser;
procedure Syntax;
-procedure Params(ACommandLine: PChar);
+procedure Params(State: TPppState; ACommandLine: PChar);
implementation
@@ -180,9 +180,8 @@
S := Result;
end;
-procedure Params(ACommandLine: PChar);
+procedure Params(State: TPppState; ACommandLine: PChar);
var
- pppState: TPppState;
StripLength: Integer; // RR
Prefix, ReplaceString: string; // RR
N: Integer;
@@ -216,16 +215,16 @@
case cp^ of
'+':
begin
- pppState.Options := pppState.Options + [AOpt];
+ State.Options := State.Options + [AOpt];
Result := cp + 1;
end;
'-':
begin
- pppState.Options := pppState.Options - [AOpt];
+ State.Options := State.Options - [AOpt];
Result := cp + 1;
end;
else
- pppState.Options := pppState.Options + [AOpt];
+ State.Options := State.Options + [AOpt];
Result := cp;
end;
end;
@@ -255,7 +254,7 @@
begin
cp := ReadStringDoubleQuotedMaybe(CheckOpt(cp + 1, poProcessIncludes), tmp);
for i := 0 to ListItemCount(tmp, DirSeparator) - 1 do
- pppState.AddFileToExclusionList(ListGetItem(tmp, DirSeparator, i));
+ State.AddFileToExclusionList(ListGetItem(tmp, DirSeparator, i));
end;
'c':
@@ -274,14 +273,14 @@
begin
Inc(cp);
cp := ReadStringDoubleQuotedMaybe(cp, tmp);
- pppState.AddToSearchPath(ExpandUNCFileName(tmp));
+ State.AddToSearchPath(ExpandUNCFileName(tmp));
end;
'd':
begin
Inc(cp);
StrIdent(cp, tmp);
- pppState.Define(tmp);
+ State.Define(tmp);
end;
'r':
@@ -295,7 +294,7 @@
begin
Inc(cp);
StrIdent(cp, tmp);
- pppState.Undef(tmp);
+ State.Undef(tmp);
end;
'x', 'X': // RR
@@ -348,7 +347,7 @@
if FileName = NewName then
ChangeFileExt(NewName, ProcessedExtension);
- Process(pppState, FileName, NewName);
+ Process(State, FileName, NewName);
except
on e: Exception do
Writeln(Format('Error: %s %s', [e.Message, FileName]));
@@ -368,17 +367,14 @@
begin
cp := ACommandLine;
StripLength := 0;
- pppState := nil;
ReplaceStrings := nil;
try
- pppState := TPppState.Create;
ReplaceStrings := TStringList.Create;
repeat
cp := HandleOptions(cp);
cp := HandleFiles(cp);
until cp^ = #0;
finally
- pppState.Free;
ReplaceStrings.Free;
end;
end;
Modified: trunk/jcl/devtools/jpp/jpp.dpr
===================================================================
--- trunk/jcl/devtools/jpp/jpp.dpr 2010-07-29 15:12:03 UTC (rev 3270)
+++ trunk/jcl/devtools/jpp/jpp.dpr 2010-07-29 18:20:41 UTC (rev 3271)
@@ -51,21 +51,27 @@
JppMain in 'JppMain.pas';
var
+ State: TPppState;
CommandLine: string;
i: Integer;
begin
try
- i := 1;
- if ParamCount = 0 then
- Syntax
- else
- begin
- while i <= ParamCount do
+ State := TPppState.Create;
+ try
+ i := 1;
+ if ParamCount = 0 then
+ Syntax
+ else
begin
- CommandLine := CommandLine + ' ' + ParamStr(i);
- Inc(i);
+ while i <= ParamCount do
+ begin
+ CommandLine := CommandLine + ' ' + ParamStr(i);
+ Inc(i);
+ end;
+ Params(State, PChar(CommandLine));
end;
- Params(PChar(CommandLine));
+ finally
+ State.Free;
end;
except
on e: Exception do
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2010-07-29 15:12:10
|
Revision: 3270
http://jcl.svn.sourceforge.net/jcl/?rev=3270&view=rev
Author: outchy
Date: 2010-07-29 15:12:03 +0000 (Thu, 29 Jul 2010)
Log Message:
-----------
moving JPP templates to a dedicated directory.
Modified Paths:
--------------
trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr
trunk/jcl/packages/c6/JclDeveloperTools.bpk
trunk/jcl/packages/c6/JclDeveloperTools.dpk
trunk/jcl/packages/cs1/JclDeveloperTools.dpk
trunk/jcl/packages/d10/JclDeveloperTools.dpk
trunk/jcl/packages/d11/JclDeveloperTools.dpk
trunk/jcl/packages/d11/JclDeveloperTools.dproj
trunk/jcl/packages/d12/JclDeveloperTools.dpk
trunk/jcl/packages/d12/JclDeveloperTools.dproj
trunk/jcl/packages/d14/JclDeveloperTools.dpk
trunk/jcl/packages/d14/JclDeveloperTools.dproj
trunk/jcl/packages/d6/JclDeveloperTools.dpk
trunk/jcl/packages/d7/JclDeveloperTools.dpk
trunk/jcl/packages/d8/JclDeveloperTools.dpk
trunk/jcl/packages/d9/JclDeveloperTools.dpk
trunk/jcl/packages/fpc/JclDeveloperTools.lpk
trunk/jcl/packages/xml/JclDeveloperTools-R.xml
trunk/thirdparty/svn_cleaner/SvnCleaner.xml
Added Paths:
-----------
trunk/jcl/devtools/jpp/Templates/
trunk/jcl/devtools/jpp/Templates/JclExcDlgTemplates.pas
trunk/jcl/devtools/jpp/Templates/JclTemplates.pas
Removed Paths:
-------------
trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas
trunk/jcl/devtools/jpp/JclTemplates.pas
Deleted: trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas 2010-07-29 15:12:03 UTC (rev 3270)
@@ -1,261 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgRepository.pas. }
-{ }
-{ The Initial Developer of the Original Code is Florent Ouchet }
-{ <outchy att users dott sourceforge dott net> }
-{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
-{ }
-{ Contributors: }
-{ }
-{**************************************************************************************************}
-{ }
-{ Last modified: $Date:: $ }
-{ Revision: $Rev:: $ }
-{ Author: $Author:: $ }
-{ }
-{**************************************************************************************************}
-
-unit JclExcDlgTemplates;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Classes, Forms,
- {$IFDEF UNITVERSIONING}
- JclUnitVersioning,
- {$ENDIF UNITVERSIONING}
- JclIDEUtils,
- JclTemplates;
-
-type
- TJclExcDlgParams = class(TJclTemplateParams)
- private
- FHookDll: Boolean;
- FFileName: string;
- FCodeDetails: Boolean;
- FModuleName: Boolean;
- FModuleOffset: Boolean;
- FDelayedTrace: Boolean;
- FFormName: string;
- FLogFile: Boolean;
- FLogFileName: string;
- FAutoSaveWorkingDirectory: Boolean;
- FAutoSaveApplicationDirectory: Boolean;
- FAutoSaveDesktopDirectory: Boolean;
- FLogSaveDialog: Boolean;
- FAddressOffset: Boolean;
- FVirtualAddress: Boolean;
- FActivePersonality: TJclBorPersonality;
- FLanguage: TJclBorPersonality;
- FLanguages: TJclBorPersonalities;
- FRawData: Boolean;
- FSendEMail: Boolean;
- FEMailAddress: string;
- FFormAncestor: string;
- FModalDialog: Boolean;
- FSizeableDialog: Boolean;
- FEMailSubject: string;
- FDesigner: TJclBorDesigner;
- FModuleList: Boolean;
- FUnitVersioning: Boolean;
- FOSInfo: Boolean;
- FActiveControls: Boolean;
- FDisableIfDebuggerAttached: Boolean;
- FStackList: Boolean;
- FAutoScrollBars: Boolean;
- FCatchMainThread: Boolean;
- FAllThreads: Boolean;
- FAllRegisteredThreads: Boolean;
- FMainExceptionThreads: Boolean;
- FExceptionThread: Boolean;
- FMainThread: Boolean;
- FTraceEAbort: Boolean;
- FIgnoredExceptions: TStrings;
- FIgnoredExceptionsIndex: Integer;
- FTraceAllExceptions: Boolean;
- function GetIgnoredExceptionsCount: Integer;
- function GetReportAllThreads: Boolean;
- function GetReportExceptionThread: Boolean;
- function GetReportMainThread: Boolean;
- function GetIgnoredException: string;
- public
- constructor Create; reintroduce;
- destructor Destroy; override;
- published
- // file options
- property Language: TJclBorPersonality read FLanguage write FLanguage;
- property Languages: TJclBorPersonalities read FLanguages write FLanguages;
- property ActivePersonality: TJclBorPersonality read FActivePersonality
- write FActivePersonality;
- property FileName: string read FFileName write FFileName;
- property FormName: string read FFormName write FFormName;
- property FormAncestor: string read FFormAncestor write FFormAncestor;
- property Designer: TJclBorDesigner read FDesigner write FDesigner;
- // form options
- property ModalDialog: Boolean read FModalDialog write FModalDialog;
- property SendEMail: Boolean read FSendEMail write FSendEMail;
- property EMailAddress: string read FEMailAddress write FEMailAddress;
- property EMailSubject: string read FEMailSubject write FEMailSubject;
- property SizeableDialog: Boolean read FSizeableDialog write FSizeableDialog;
- property AutoScrollBars: Boolean read FAutoScrollBars write FAutoScrollBars;
- // system options
- property DelayedTrace: Boolean read FDelayedTrace write FDelayedTrace;
- property HookDll: Boolean read FHookDll write FHookDll;
- property OSInfo: Boolean read FOSInfo write FOSInfo;
- property ModuleList: Boolean read FModuleList write FModuleList;
- property UnitVersioning: Boolean read FUnitVersioning write FUnitVersioning;
- property ActiveControls: Boolean read FActiveControls write FActiveControls;
- property CatchMainThread: Boolean read FCatchMainThread write FCatchMainThread;
- property DisableIfDebuggerAttached: Boolean read FDisableIfDebuggerAttached write FDisableIfDebuggerAttached;
- // log options
- property LogFile: Boolean read FLogFile write FLogFile;
- property LogFileName: string read FLogFileName write FLogFileName;
- property AutoSaveWorkingDirectory: Boolean read FAutoSaveWorkingDirectory write FAutoSaveWorkingDirectory;
- property AutoSaveApplicationDirectory: Boolean read FAutoSaveApplicationDirectory write FAutoSaveApplicationDirectory;
- property AutoSaveDesktopDirectory: Boolean read FAutoSaveDesktopDirectory write FAutoSaveDesktopDirectory;
- property LogSaveDialog: Boolean read FLogSaveDialog write FLogSaveDialog;
- // ignored exceptions
- property TraceAllExceptions: Boolean read FTraceAllExceptions
- write FTraceAllExceptions;
- property TraceEAbort: Boolean read FTraceEAbort write FTraceEAbort;
- property IgnoredException: string read GetIgnoredException;
- property IgnoredExceptions: TStrings read FIgnoredExceptions write FIgnoredExceptions;
- property IgnoredExceptionsIndex: Integer read FIgnoredExceptionsIndex write FIgnoredExceptionsIndex;
- property IgnoredExceptionsCount: Integer read GetIgnoredExceptionsCount;
- // trace options
- property StackList: Boolean read FStackList write FStackList;
- property RawData: Boolean read FRawData write FRawData;
- property ModuleName: Boolean read FModuleName write FModuleName;
- property ModuleOffset: Boolean read FModuleOffset write FModuleOffset;
- // thread options (mutually exclusives)
- property AllThreads: Boolean read FAllThreads write FAllThreads;
- property AllRegisterThreads: Boolean read FAllRegisteredThreads write FAllRegisteredThreads;
- property MainExceptionThreads: Boolean read FMainExceptionThreads write FMainExceptionThreads;
- property ExceptionThread: Boolean read FExceptionThread write FExceptionThread;
- property MainThread: Boolean read FMainThread write FMainThread;
- // composite properties
- property ReportMainThread: Boolean read GetReportMainThread;
- property ReportAllThreads: Boolean read GetReportAllThreads;
- property ReportExceptionThread: Boolean read GetReportExceptionThread;
- //property AddressOffset: Boolean read FAddressOffset write FAddressOffset;
- property CodeDetails: Boolean read FCodeDetails write FCodeDetails;
- property VirtualAddress: Boolean read FVirtualAddress write FVirtualAddress;
- end;
-
-{$IFDEF UNITVERSIONING}
-const
- UnitVersioning: TUnitVersionInfo = (
- RCSfile: '$URL$';
- Revision: '$Revision$';
- Date: '$Date$';
- LogPath: 'JCL\devtools\jpp';
- Extra: '';
- Data: nil
- );
-{$ENDIF UNITVERSIONING}
-
-implementation
-
-//=== { TJclExcDlgParams } ===================================================
-
-constructor TJclExcDlgParams.Create;
-begin
- inherited Create;
-
- FHookDll := True;
- FLanguage := bpUnknown;
- FLanguages := [bpUnknown];
- FFileName := '';
- FCodeDetails := True;
- FModuleName := True;
- FModuleOffset := False;
- FDelayedTrace := True;
- FFormName := 'ExceptionDialog';
- FFormAncestor := TForm.ClassName;
- FLogFile := False;
- FLogFileName := 'ExtractFileName(Application.ExeName) + ''-exception-'' + FormatDateTime(''yyyy-mm-dd'', Date) + ''.log''';
- FAutoSaveWorkingDirectory := False;
- FAutoSaveApplicationDirectory := False;
- FAutoSaveDesktopDirectory := False;
- FLogSaveDialog := False;
- FAddressOffset := True;
- FVirtualAddress := False;
- FActivePersonality := bpUnknown;
- FRawData := False;
- FSendEMail := False;
- FEMailAddress := '';
- FEMailSubject := '';
- FModalDialog := True;
- FSizeableDialog := False;
- FDesigner := bdVCL;
- FModuleList := True;
- FUnitVersioning := True;
- FOSInfo := True;
- FActiveControls := True;
- FDisableIfDebuggerAttached := False;
- FStackList := True;
- FAutoScrollBars := True;
- FCatchMainThread := False;
- FTraceEAbort := False;
- FTraceAllExceptions := False;
- FIgnoredExceptions := TStringList.Create;
- FAllThreads := True;
- FAllRegisteredThreads := False;
- FMainExceptionThreads := False;
- FExceptionThread := False;
- FMainThread := False;
-end;
-
-destructor TJclExcDlgParams.Destroy;
-begin
- FIgnoredExceptions.Free;
- inherited Destroy;
-end;
-
-function TJclExcDlgParams.GetIgnoredException: string;
-begin
- Result := FIgnoredExceptions.Strings[FIgnoredExceptionsIndex];
-end;
-
-function TJclExcDlgParams.GetIgnoredExceptionsCount: Integer;
-begin
- Result := FIgnoredExceptions.Count;
-end;
-
-function TJclExcDlgParams.GetReportAllThreads: Boolean;
-begin
- Result := FAllThreads or FAllRegisteredThreads;
-end;
-
-function TJclExcDlgParams.GetReportExceptionThread: Boolean;
-begin
- Result := FExceptionThread or FMainExceptionThreads;
-end;
-
-function TJclExcDlgParams.GetReportMainThread: Boolean;
-begin
- Result := FMainThread or FMainExceptionThreads or FAllThreads or FAllRegisteredThreads;
-end;
-
-{$IFDEF UNITVERSIONING}
-initialization
- RegisterUnitVersion(HInstance, UnitVersioning);
-
-finalization
- UnregisterUnitVersion(HInstance);
-{$ENDIF UNITVERSIONING}
-
-end.
Deleted: trunk/jcl/devtools/jpp/JclTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/JclTemplates.pas 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/devtools/jpp/JclTemplates.pas 2010-07-29 15:12:03 UTC (rev 3270)
@@ -1,137 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaTemplates.pas. }
-{ }
-{ The Initial Developer of the Original Code is Florent Ouchet }
-{ <outchy att users dott sourceforge dott net> }
-{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
-{ }
-{ Contributors: }
-{ }
-{**************************************************************************************************}
-{ }
-{ Last modified: $Date:: $ }
-{ Revision: $Rev:: $ }
-{ Author: $Author:: $ }
-{ }
-{**************************************************************************************************}
-
-unit JclTemplates;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Classes,
- {$IFDEF UNITVERSIONING}
- JclUnitVersioning,
- {$ENDIF UNITVERSIONING}
- JppState;
-
-type
- TJclTemplateParams = class(TPppState)
- public
- constructor Create;
- end;
-
-const
- ModulePattern = '%MODULENAME%';
- FormPattern = '%FORMNAME%';
- AncestorPattern = '%ANCESTORNAME%';
-
-function GetFinalFormContent(const Content, FormIdent,
- AncestorIdent: string): string;
-function GetFinalHeaderContent(const Content, ModuleIdent, FormIdent,
- AncestorIdent: string): string;
-function GetFinalSourceContent(const Content, ModuleIdent, FormIdent,
- AncestorIdent: string): string;
-
-function ApplyTemplate(const Template: string; const Params: TJclTemplateParams): string;
-
-{$IFDEF UNITVERSIONING}
-const
- UnitVersioning: TUnitVersionInfo = (
- RCSfile: '$URL$';
- Revision: '$Revision$';
- Date: '$Date$';
- LogPath: 'JCL\devtools\jpp';
- Extra: '';
- Data: nil
- );
-{$ENDIF UNITVERSIONING}
-
-implementation
-
-uses
- SysUtils,
- TypInfo,
- JclStrings, JclSysUtils,
- JppParser;
-
-//=== { TJclTemplateParams } =================================================
-
-constructor TJclTemplateParams.Create;
-begin
- inherited Create;
- Options := Options + [poProcessDefines, poProcessMacros, poProcessValues];
-end;
-
-function GetFinalFormContent(const Content, FormIdent,
- AncestorIdent: string): string;
-begin
- Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
-end;
-
-function GetFinalHeaderContent(const Content, ModuleIdent, FormIdent,
- AncestorIdent: string): string;
-begin
- Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, ModulePattern, ModuleIdent, [rfReplaceAll, rfIgnoreCase]);
-end;
-
-function GetFinalSourceContent(const Content, ModuleIdent, FormIdent, AncestorIdent: string): string;
-begin
- Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, ModulePattern, ModuleIdent, [rfReplaceAll, rfIgnoreCase]);
-end;
-
-function ApplyTemplate(const Template: string; const Params: TJclTemplateParams): string;
-var
- JppParser: TJppParser;
-begin
- Params.PushState;
- try
- JppParser := TJppParser.Create(Template, Params);
- try
- Result := JppParser.Parse;
- finally
- JppParser.Free;
- end;
- finally
- Params.PopState;
- end;
-end;
-
-{$IFDEF UNITVERSIONING}
-initialization
- RegisterUnitVersion(HInstance, UnitVersioning);
-
-finalization
- UnregisterUnitVersion(HInstance);
-{$ENDIF UNITVERSIONING}
-
-end.
Property changes on: trunk/jcl/devtools/jpp/Templates
___________________________________________________________________
Added: tsvn:projectlanguage
+ 0x0409
Added: bugtraq:url
+ http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
+ (Mantis #%BUGID%)
Added: svn:ignore
+ __history
*.dcu
*.hpp
Added: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/devtools/jpp/Templates/JclExcDlgTemplates.pas (from rev 3269, trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas)
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclExcDlgTemplates.pas (rev 0)
+++ trunk/jcl/devtools/jpp/Templates/JclExcDlgTemplates.pas 2010-07-29 15:12:03 UTC (rev 3270)
@@ -0,0 +1,261 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is JclOtaExcDlgRepository.pas. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclExcDlgTemplates;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ Classes, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclIDEUtils,
+ JclTemplates;
+
+type
+ TJclExcDlgParams = class(TJclTemplateParams)
+ private
+ FHookDll: Boolean;
+ FFileName: string;
+ FCodeDetails: Boolean;
+ FModuleName: Boolean;
+ FModuleOffset: Boolean;
+ FDelayedTrace: Boolean;
+ FFormName: string;
+ FLogFile: Boolean;
+ FLogFileName: string;
+ FAutoSaveWorkingDirectory: Boolean;
+ FAutoSaveApplicationDirectory: Boolean;
+ FAutoSaveDesktopDirectory: Boolean;
+ FLogSaveDialog: Boolean;
+ FAddressOffset: Boolean;
+ FVirtualAddress: Boolean;
+ FActivePersonality: TJclBorPersonality;
+ FLanguage: TJclBorPersonality;
+ FLanguages: TJclBorPersonalities;
+ FRawData: Boolean;
+ FSendEMail: Boolean;
+ FEMailAddress: string;
+ FFormAncestor: string;
+ FModalDialog: Boolean;
+ FSizeableDialog: Boolean;
+ FEMailSubject: string;
+ FDesigner: TJclBorDesigner;
+ FModuleList: Boolean;
+ FUnitVersioning: Boolean;
+ FOSInfo: Boolean;
+ FActiveControls: Boolean;
+ FDisableIfDebuggerAttached: Boolean;
+ FStackList: Boolean;
+ FAutoScrollBars: Boolean;
+ FCatchMainThread: Boolean;
+ FAllThreads: Boolean;
+ FAllRegisteredThreads: Boolean;
+ FMainExceptionThreads: Boolean;
+ FExceptionThread: Boolean;
+ FMainThread: Boolean;
+ FTraceEAbort: Boolean;
+ FIgnoredExceptions: TStrings;
+ FIgnoredExceptionsIndex: Integer;
+ FTraceAllExceptions: Boolean;
+ function GetIgnoredExceptionsCount: Integer;
+ function GetReportAllThreads: Boolean;
+ function GetReportExceptionThread: Boolean;
+ function GetReportMainThread: Boolean;
+ function GetIgnoredException: string;
+ public
+ constructor Create; reintroduce;
+ destructor Destroy; override;
+ published
+ // file options
+ property Language: TJclBorPersonality read FLanguage write FLanguage;
+ property Languages: TJclBorPersonalities read FLanguages write FLanguages;
+ property ActivePersonality: TJclBorPersonality read FActivePersonality
+ write FActivePersonality;
+ property FileName: string read FFileName write FFileName;
+ property FormName: string read FFormName write FFormName;
+ property FormAncestor: string read FFormAncestor write FFormAncestor;
+ property Designer: TJclBorDesigner read FDesigner write FDesigner;
+ // form options
+ property ModalDialog: Boolean read FModalDialog write FModalDialog;
+ property SendEMail: Boolean read FSendEMail write FSendEMail;
+ property EMailAddress: string read FEMailAddress write FEMailAddress;
+ property EMailSubject: string read FEMailSubject write FEMailSubject;
+ property SizeableDialog: Boolean read FSizeableDialog write FSizeableDialog;
+ property AutoScrollBars: Boolean read FAutoScrollBars write FAutoScrollBars;
+ // system options
+ property DelayedTrace: Boolean read FDelayedTrace write FDelayedTrace;
+ property HookDll: Boolean read FHookDll write FHookDll;
+ property OSInfo: Boolean read FOSInfo write FOSInfo;
+ property ModuleList: Boolean read FModuleList write FModuleList;
+ property UnitVersioning: Boolean read FUnitVersioning write FUnitVersioning;
+ property ActiveControls: Boolean read FActiveControls write FActiveControls;
+ property CatchMainThread: Boolean read FCatchMainThread write FCatchMainThread;
+ property DisableIfDebuggerAttached: Boolean read FDisableIfDebuggerAttached write FDisableIfDebuggerAttached;
+ // log options
+ property LogFile: Boolean read FLogFile write FLogFile;
+ property LogFileName: string read FLogFileName write FLogFileName;
+ property AutoSaveWorkingDirectory: Boolean read FAutoSaveWorkingDirectory write FAutoSaveWorkingDirectory;
+ property AutoSaveApplicationDirectory: Boolean read FAutoSaveApplicationDirectory write FAutoSaveApplicationDirectory;
+ property AutoSaveDesktopDirectory: Boolean read FAutoSaveDesktopDirectory write FAutoSaveDesktopDirectory;
+ property LogSaveDialog: Boolean read FLogSaveDialog write FLogSaveDialog;
+ // ignored exceptions
+ property TraceAllExceptions: Boolean read FTraceAllExceptions
+ write FTraceAllExceptions;
+ property TraceEAbort: Boolean read FTraceEAbort write FTraceEAbort;
+ property IgnoredException: string read GetIgnoredException;
+ property IgnoredExceptions: TStrings read FIgnoredExceptions write FIgnoredExceptions;
+ property IgnoredExceptionsIndex: Integer read FIgnoredExceptionsIndex write FIgnoredExceptionsIndex;
+ property IgnoredExceptionsCount: Integer read GetIgnoredExceptionsCount;
+ // trace options
+ property StackList: Boolean read FStackList write FStackList;
+ property RawData: Boolean read FRawData write FRawData;
+ property ModuleName: Boolean read FModuleName write FModuleName;
+ property ModuleOffset: Boolean read FModuleOffset write FModuleOffset;
+ // thread options (mutually exclusives)
+ property AllThreads: Boolean read FAllThreads write FAllThreads;
+ property AllRegisterThreads: Boolean read FAllRegisteredThreads write FAllRegisteredThreads;
+ property MainExceptionThreads: Boolean read FMainExceptionThreads write FMainExceptionThreads;
+ property ExceptionThread: Boolean read FExceptionThread write FExceptionThread;
+ property MainThread: Boolean read FMainThread write FMainThread;
+ // composite properties
+ property ReportMainThread: Boolean read GetReportMainThread;
+ property ReportAllThreads: Boolean read GetReportAllThreads;
+ property ReportExceptionThread: Boolean read GetReportExceptionThread;
+ //property AddressOffset: Boolean read FAddressOffset write FAddressOffset;
+ property CodeDetails: Boolean read FCodeDetails write FCodeDetails;
+ property VirtualAddress: Boolean read FVirtualAddress write FVirtualAddress;
+ end;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\devtools\jpp\Templates';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+//=== { TJclExcDlgParams } ===================================================
+
+constructor TJclExcDlgParams.Create;
+begin
+ inherited Create;
+
+ FHookDll := True;
+ FLanguage := bpUnknown;
+ FLanguages := [bpUnknown];
+ FFileName := '';
+ FCodeDetails := True;
+ FModuleName := True;
+ FModuleOffset := False;
+ FDelayedTrace := True;
+ FFormName := 'ExceptionDialog';
+ FFormAncestor := TForm.ClassName;
+ FLogFile := False;
+ FLogFileName := 'ExtractFileName(Application.ExeName) + ''-exception-'' + FormatDateTime(''yyyy-mm-dd'', Date) + ''.log''';
+ FAutoSaveWorkingDirectory := False;
+ FAutoSaveApplicationDirectory := False;
+ FAutoSaveDesktopDirectory := False;
+ FLogSaveDialog := False;
+ FAddressOffset := True;
+ FVirtualAddress := False;
+ FActivePersonality := bpUnknown;
+ FRawData := False;
+ FSendEMail := False;
+ FEMailAddress := '';
+ FEMailSubject := '';
+ FModalDialog := True;
+ FSizeableDialog := False;
+ FDesigner := bdVCL;
+ FModuleList := True;
+ FUnitVersioning := True;
+ FOSInfo := True;
+ FActiveControls := True;
+ FDisableIfDebuggerAttached := False;
+ FStackList := True;
+ FAutoScrollBars := True;
+ FCatchMainThread := False;
+ FTraceEAbort := False;
+ FTraceAllExceptions := False;
+ FIgnoredExceptions := TStringList.Create;
+ FAllThreads := True;
+ FAllRegisteredThreads := False;
+ FMainExceptionThreads := False;
+ FExceptionThread := False;
+ FMainThread := False;
+end;
+
+destructor TJclExcDlgParams.Destroy;
+begin
+ FIgnoredExceptions.Free;
+ inherited Destroy;
+end;
+
+function TJclExcDlgParams.GetIgnoredException: string;
+begin
+ Result := FIgnoredExceptions.Strings[FIgnoredExceptionsIndex];
+end;
+
+function TJclExcDlgParams.GetIgnoredExceptionsCount: Integer;
+begin
+ Result := FIgnoredExceptions.Count;
+end;
+
+function TJclExcDlgParams.GetReportAllThreads: Boolean;
+begin
+ Result := FAllThreads or FAllRegisteredThreads;
+end;
+
+function TJclExcDlgParams.GetReportExceptionThread: Boolean;
+begin
+ Result := FExceptionThread or FMainExceptionThreads;
+end;
+
+function TJclExcDlgParams.GetReportMainThread: Boolean;
+begin
+ Result := FMainThread or FMainExceptionThreads or FAllThreads or FAllRegisteredThreads;
+end;
+
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
+end.
Copied: trunk/jcl/devtools/jpp/Templates/JclTemplates.pas (from rev 3269, trunk/jcl/devtools/jpp/JclTemplates.pas)
===================================================================
--- trunk/jcl/devtools/jpp/Templates/JclTemplates.pas (rev 0)
+++ trunk/jcl/devtools/jpp/Templates/JclTemplates.pas 2010-07-29 15:12:03 UTC (rev 3270)
@@ -0,0 +1,137 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is JclOtaTemplates.pas. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclTemplates;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ Classes,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JppState;
+
+type
+ TJclTemplateParams = class(TPppState)
+ public
+ constructor Create;
+ end;
+
+const
+ ModulePattern = '%MODULENAME%';
+ FormPattern = '%FORMNAME%';
+ AncestorPattern = '%ANCESTORNAME%';
+
+function GetFinalFormContent(const Content, FormIdent,
+ AncestorIdent: string): string;
+function GetFinalHeaderContent(const Content, ModuleIdent, FormIdent,
+ AncestorIdent: string): string;
+function GetFinalSourceContent(const Content, ModuleIdent, FormIdent,
+ AncestorIdent: string): string;
+
+function ApplyTemplate(const Template: string; const Params: TJclTemplateParams): string;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\devtools\jpp\Templates';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+uses
+ SysUtils,
+ TypInfo,
+ JclStrings, JclSysUtils,
+ JppParser;
+
+//=== { TJclTemplateParams } =================================================
+
+constructor TJclTemplateParams.Create;
+begin
+ inherited Create;
+ Options := Options + [poProcessDefines, poProcessMacros, poProcessValues];
+end;
+
+function GetFinalFormContent(const Content, FormIdent,
+ AncestorIdent: string): string;
+begin
+ Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
+end;
+
+function GetFinalHeaderContent(const Content, ModuleIdent, FormIdent,
+ AncestorIdent: string): string;
+begin
+ Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, ModulePattern, ModuleIdent, [rfReplaceAll, rfIgnoreCase]);
+end;
+
+function GetFinalSourceContent(const Content, ModuleIdent, FormIdent, AncestorIdent: string): string;
+begin
+ Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, ModulePattern, ModuleIdent, [rfReplaceAll, rfIgnoreCase]);
+end;
+
+function ApplyTemplate(const Template: string; const Params: TJclTemplateParams): string;
+var
+ JppParser: TJppParser;
+begin
+ Params.PushState;
+ try
+ JppParser := TJppParser.Create(Template, Params);
+ try
+ Result := JppParser.Parse;
+ finally
+ JppParser.Free;
+ end;
+ finally
+ Params.PopState;
+ end;
+end;
+
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
+end.
Modified: trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr 2010-07-29 15:12:03 UTC (rev 3270)
@@ -34,8 +34,8 @@
SysUtils,
Classes,
JclIDEUtils,
- JclTemplates in '..\..\..\devtools\jpp\JclTemplates.pas',
- JclExcDlgTemplates in '..\..\..\devtools\jpp\JclExcDlgTemplates.pas',
+ JclTemplates in '..\..\..\devtools\jpp\Templates\JclTemplates.pas',
+ JclExcDlgTemplates in '..\..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas',
JppState in '..\..\..\devtools\jpp\JppState.pas',
JppLexer in '..\..\..\devtools\jpp\JppLexer.pas',
JppParser in '..\..\..\devtools\jpp\JppParser.pas';
Modified: trunk/jcl/packages/c6/JclDeveloperTools.bpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:10 UTC
*****************************************************************************
-->
<PROJECT>
@@ -43,7 +43,7 @@
JclContainers.bpi
"/>
<PATHCPP value=".;"/>
- <PATHPAS value=".;..\..\devtools\jpp;..\..\source\common;..\..\source\windows;"/>
+ <PATHPAS value=".;..\..\devtools\jpp;..\..\devtools\jpp\Templates;..\..\source\common;..\..\source\windows;"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
@@ -53,7 +53,7 @@
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="JclDeveloperTools.cpp"/>
<INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\..\devtools\jpp;..\..\devtools\jpp;..\..\source\common;..\..\source\windows;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <LIBPATH value="..\..\devtools\jpp;..\..\devtools\jpp;..\..\devtools\jpp\Templates;..\..\source\common;..\..\source\windows;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
@@ -84,8 +84,8 @@
<FILE FILENAME="..\..\devtools\jpp\JppState.pas" FORMNAME="" UNITNAME="JppState" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\devtools\jpp\JppLexer.pas" FORMNAME="" UNITNAME="JppLexer" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\devtools\jpp\JppParser.pas" FORMNAME="" UNITNAME="JppParser" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\devtools\jpp\JclTemplates.pas" FORMNAME="" UNITNAME="JclTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\devtools\jpp\JclExcDlgTemplates.pas" FORMNAME="" UNITNAME="JclExcDlgTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\devtools\jpp\Templates\JclTemplates.pas" FORMNAME="" UNITNAME="JclTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas" FORMNAME="" UNITNAME="JclExcDlgTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclCompilerUtils.pas" FORMNAME="" UNITNAME="JclCompilerUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclDevToolsResources.pas" FORMNAME="" UNITNAME="JclDevToolsResources" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclIDEUtils.pas" FORMNAME="" UNITNAME="JclIDEUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/c6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:10 UTC
-----------------------------------------------------------------------------
}
@@ -51,8 +51,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/cs1/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:11 UTC
-----------------------------------------------------------------------------
}
@@ -50,8 +50,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d10/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:12 UTC
-----------------------------------------------------------------------------
}
@@ -52,8 +52,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d11/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d11/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d11/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:12 UTC
-----------------------------------------------------------------------------
}
@@ -53,8 +53,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d11/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d11/JclDeveloperTools.dproj 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d11/JclDeveloperTools.dproj 2010-07-29 15:12:03 UTC (rev 3270)
@@ -92,8 +92,8 @@
<DCCReference Include="..\..\devtools\jpp\JppState.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppParser.pas"/>
- <DCCReference Include="..\..\devtools\jpp\JclTemplates.pas"/>
- <DCCReference Include="..\..\devtools\jpp\JclExcDlgTemplates.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\Templates\JclTemplates.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas"/>
<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
Modified: trunk/jcl/packages/d12/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d12/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d12/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:12 UTC
-----------------------------------------------------------------------------
}
@@ -52,8 +52,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d12/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d12/JclDeveloperTools.dproj 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d12/JclDeveloperTools.dproj 2010-07-29 15:12:03 UTC (rev 3270)
@@ -67,8 +67,8 @@
<DCCReference Include="..\..\devtools\jpp\JppState.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppParser.pas"/>
- <DCCReference Include="..\..\devtools\jpp\JclTemplates.pas"/>
- <DCCReference Include="..\..\devtools\jpp\JclExcDlgTemplates.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\Templates\JclTemplates.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas"/>
<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
Modified: trunk/jcl/packages/d14/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d14/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d14/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:12 UTC
-----------------------------------------------------------------------------
}
@@ -52,8 +52,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d14/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d14/JclDeveloperTools.dproj 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d14/JclDeveloperTools.dproj 2010-07-29 15:12:03 UTC (rev 3270)
@@ -69,8 +69,8 @@
<DCCReference Include="..\..\devtools\jpp\JppState.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppParser.pas"/>
- <DCCReference Include="..\..\devtools\jpp\JclTemplates.pas"/>
- <DCCReference Include="..\..\devtools\jpp\JclExcDlgTemplates.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\Templates\JclTemplates.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas"/>
<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
Modified: trunk/jcl/packages/d6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d6/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d6/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:11 UTC
-----------------------------------------------------------------------------
}
@@ -51,8 +51,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d7/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d7/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d7/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:11 UTC
-----------------------------------------------------------------------------
}
@@ -51,8 +51,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d8/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:11 UTC
-----------------------------------------------------------------------------
}
@@ -50,8 +50,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d9/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d9/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/d9/JclDeveloperTools.dpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:50:27 UTC
+ Last generated: 29-07-2010 15:08:11 UTC
-----------------------------------------------------------------------------
}
@@ -51,8 +51,8 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
- JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
- JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
+ JclTemplates in '..\..\devtools\jpp\Templates\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/fpc/JclDeveloperTools.lpk
===================================================================
--- trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-07-29 15:12:03 UTC (rev 3270)
@@ -11,7 +11,7 @@
<PathDelim Value="\"/>
<SearchPaths>
<IncludeFiles Value="..\..\source\include\"/>
- <OtherUnitFiles Value=".;..\..\devtools\jpp;..\..\source\common;..\..\source\windows;"/>
+ <OtherUnitFiles Value=".;..\..\devtools\jpp;..\..\devtools\jpp\Templates;..\..\source\common;..\..\source\windows;"/>
<UnitOutputDirectory Value="..\..\lib\fpc\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Parsing>
@@ -53,11 +53,11 @@
<UnitName Value="JppParser"/>
</Item3>
<Item4>
- <Filename Value="..\..\devtools\jpp\JclTemplates.pas"/>
+ <Filename Value="..\..\devtools\jpp\Templates\JclTemplates.pas"/>
<UnitName Value="JclTemplates"/>
</Item4>
<Item5>
- <Filename Value="..\..\devtools\jpp\JclExcDlgTemplates.pas"/>
+ <Filename Value="..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas"/>
<UnitName Value="JclExcDlgTemplates"/>
</Item5>
<Item6>
Modified: trunk/jcl/packages/xml/JclDeveloperTools-R.xml
===================================================================
--- trunk/jcl/packages/xml/JclDeveloperTools-R.xml 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/jcl/packages/xml/JclDeveloperTools-R.xml 2010-07-29 15:12:03 UTC (rev 3270)
@@ -19,8 +19,8 @@
<File Name="..\..\devtools\jpp\JppState.pas" Targets="all" Formname="" Condition=""/>
<File Name="..\..\devtools\jpp\JppLexer.pas" Targets="all" Formname="" Condition=""/>
<File Name="..\..\devtools\jpp\JppParser.pas" Targets="all" Formname="" Condition=""/>
- <File Name="..\..\devtools\jpp\JclTemplates.pas" Targets="all" Formname="" Condition=""/>
- <File Name="..\..\devtools\jpp\JclExcDlgTemplates.pas" Targets="all" Formname="" Condition=""/>
+ <File Name="..\..\devtools\jpp\Templates\JclTemplates.pas" Targets="all" Formname="" Condition=""/>
+ <File Name="..\..\devtools\jpp\Templates\JclExcDlgTemplates.pas" Targets="all" Formname="" Condition=""/>
<File Name="..\..\source\common\JclCompilerUtils.pas" Targets="all" Formname="" Condition=""/>
<File Name="..\..\source\common\JclDevToolsResources.pas" Targets="all" Formname="" Condition=""/>
<File Name="..\..\source\common\JclIDEUtils.pas" Targets="all" Formname="" Condition=""/>
Modified: trunk/thirdparty/svn_cleaner/SvnCleaner.xml
===================================================================
--- trunk/thirdparty/svn_cleaner/SvnCleaner.xml 2010-07-29 14:58:43 UTC (rev 3269)
+++ trunk/thirdparty/svn_cleaner/SvnCleaner.xml 2010-07-29 15:12:03 UTC (rev 3270)
@@ -131,6 +131,13 @@
<value>*.bdsproj</value>
<value>*.hpp</value>
</property>
+ <se...
[truncated message content] |
|
From: <ou...@us...> - 2010-07-29 14:58:51
|
Revision: 3269
http://jcl.svn.sourceforge.net/jcl/?rev=3269&view=rev
Author: outchy
Date: 2010-07-29 14:58:43 +0000 (Thu, 29 Jul 2010)
Log Message:
-----------
JclOtaExcDlgParams is a runtime unit: moving it to the JPP directory and renaming it to JclExcDlgTemplates.
Modified Paths:
--------------
trunk/jcl/devtools/jpp/JclTemplates.pas
trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgFileFrame.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgFormFrame.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgIgnoreFrame.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgLogFrame.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgSystemFrame.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgThreadFrame.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTraceFrame.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgWizard.pas
trunk/jcl/packages/c6/JclDeveloperTools.bpk
trunk/jcl/packages/c6/JclDeveloperTools.dpk
trunk/jcl/packages/c6/JclRepositoryExpert.bpk
trunk/jcl/packages/c6/JclRepositoryExpert.dpk
trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf
trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr
trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj
trunk/jcl/packages/cs1/JclDeveloperTools.dpk
trunk/jcl/packages/d10/JclDeveloperTools.bdsproj
trunk/jcl/packages/d10/JclDeveloperTools.dpk
trunk/jcl/packages/d10/JclRepositoryExpert.dpk
trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d11/JclDeveloperTools.dpk
trunk/jcl/packages/d11/JclDeveloperTools.dproj
trunk/jcl/packages/d11/JclRepositoryExpert.dpk
trunk/jcl/packages/d11/JclRepositoryExpert.dproj
trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d12/JclDeveloperTools.dpk
trunk/jcl/packages/d12/JclDeveloperTools.dproj
trunk/jcl/packages/d12/JclRepositoryExpert.dpk
trunk/jcl/packages/d12/JclRepositoryExpert.dproj
trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d14/JclDeveloperTools.dpk
trunk/jcl/packages/d14/JclDeveloperTools.dproj
trunk/jcl/packages/d14/JclRepositoryExpert.dpk
trunk/jcl/packages/d14/JclRepositoryExpert.dproj
trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d6/JclDeveloperTools.dpk
trunk/jcl/packages/d6/JclRepositoryExpert.dpk
trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d7/JclDeveloperTools.dpk
trunk/jcl/packages/d7/JclRepositoryExpert.dpk
trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d8/JclDeveloperTools.bdsproj
trunk/jcl/packages/d8/JclDeveloperTools.dpk
trunk/jcl/packages/d9/JclDeveloperTools.bdsproj
trunk/jcl/packages/d9/JclDeveloperTools.dpk
trunk/jcl/packages/d9/JclRepositoryExpert.dpk
trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/fpc/JclDeveloperTools.lpk
trunk/jcl/packages/fpc/JclDeveloperTools.pas
trunk/jcl/packages/xml/JclDeveloperTools-R.xml
trunk/jcl/packages/xml/JclRepositoryExpert-D.xml
trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml
Added Paths:
-----------
trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas
Removed Paths:
-------------
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas
Copied: trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas (from rev 3268, trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas)
===================================================================
--- trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas (rev 0)
+++ trunk/jcl/devtools/jpp/JclExcDlgTemplates.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -0,0 +1,261 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is JclOtaExcDlgRepository.pas. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclExcDlgTemplates;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ Classes, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclIDEUtils,
+ JclTemplates;
+
+type
+ TJclExcDlgParams = class(TJclTemplateParams)
+ private
+ FHookDll: Boolean;
+ FFileName: string;
+ FCodeDetails: Boolean;
+ FModuleName: Boolean;
+ FModuleOffset: Boolean;
+ FDelayedTrace: Boolean;
+ FFormName: string;
+ FLogFile: Boolean;
+ FLogFileName: string;
+ FAutoSaveWorkingDirectory: Boolean;
+ FAutoSaveApplicationDirectory: Boolean;
+ FAutoSaveDesktopDirectory: Boolean;
+ FLogSaveDialog: Boolean;
+ FAddressOffset: Boolean;
+ FVirtualAddress: Boolean;
+ FActivePersonality: TJclBorPersonality;
+ FLanguage: TJclBorPersonality;
+ FLanguages: TJclBorPersonalities;
+ FRawData: Boolean;
+ FSendEMail: Boolean;
+ FEMailAddress: string;
+ FFormAncestor: string;
+ FModalDialog: Boolean;
+ FSizeableDialog: Boolean;
+ FEMailSubject: string;
+ FDesigner: TJclBorDesigner;
+ FModuleList: Boolean;
+ FUnitVersioning: Boolean;
+ FOSInfo: Boolean;
+ FActiveControls: Boolean;
+ FDisableIfDebuggerAttached: Boolean;
+ FStackList: Boolean;
+ FAutoScrollBars: Boolean;
+ FCatchMainThread: Boolean;
+ FAllThreads: Boolean;
+ FAllRegisteredThreads: Boolean;
+ FMainExceptionThreads: Boolean;
+ FExceptionThread: Boolean;
+ FMainThread: Boolean;
+ FTraceEAbort: Boolean;
+ FIgnoredExceptions: TStrings;
+ FIgnoredExceptionsIndex: Integer;
+ FTraceAllExceptions: Boolean;
+ function GetIgnoredExceptionsCount: Integer;
+ function GetReportAllThreads: Boolean;
+ function GetReportExceptionThread: Boolean;
+ function GetReportMainThread: Boolean;
+ function GetIgnoredException: string;
+ public
+ constructor Create; reintroduce;
+ destructor Destroy; override;
+ published
+ // file options
+ property Language: TJclBorPersonality read FLanguage write FLanguage;
+ property Languages: TJclBorPersonalities read FLanguages write FLanguages;
+ property ActivePersonality: TJclBorPersonality read FActivePersonality
+ write FActivePersonality;
+ property FileName: string read FFileName write FFileName;
+ property FormName: string read FFormName write FFormName;
+ property FormAncestor: string read FFormAncestor write FFormAncestor;
+ property Designer: TJclBorDesigner read FDesigner write FDesigner;
+ // form options
+ property ModalDialog: Boolean read FModalDialog write FModalDialog;
+ property SendEMail: Boolean read FSendEMail write FSendEMail;
+ property EMailAddress: string read FEMailAddress write FEMailAddress;
+ property EMailSubject: string read FEMailSubject write FEMailSubject;
+ property SizeableDialog: Boolean read FSizeableDialog write FSizeableDialog;
+ property AutoScrollBars: Boolean read FAutoScrollBars write FAutoScrollBars;
+ // system options
+ property DelayedTrace: Boolean read FDelayedTrace write FDelayedTrace;
+ property HookDll: Boolean read FHookDll write FHookDll;
+ property OSInfo: Boolean read FOSInfo write FOSInfo;
+ property ModuleList: Boolean read FModuleList write FModuleList;
+ property UnitVersioning: Boolean read FUnitVersioning write FUnitVersioning;
+ property ActiveControls: Boolean read FActiveControls write FActiveControls;
+ property CatchMainThread: Boolean read FCatchMainThread write FCatchMainThread;
+ property DisableIfDebuggerAttached: Boolean read FDisableIfDebuggerAttached write FDisableIfDebuggerAttached;
+ // log options
+ property LogFile: Boolean read FLogFile write FLogFile;
+ property LogFileName: string read FLogFileName write FLogFileName;
+ property AutoSaveWorkingDirectory: Boolean read FAutoSaveWorkingDirectory write FAutoSaveWorkingDirectory;
+ property AutoSaveApplicationDirectory: Boolean read FAutoSaveApplicationDirectory write FAutoSaveApplicationDirectory;
+ property AutoSaveDesktopDirectory: Boolean read FAutoSaveDesktopDirectory write FAutoSaveDesktopDirectory;
+ property LogSaveDialog: Boolean read FLogSaveDialog write FLogSaveDialog;
+ // ignored exceptions
+ property TraceAllExceptions: Boolean read FTraceAllExceptions
+ write FTraceAllExceptions;
+ property TraceEAbort: Boolean read FTraceEAbort write FTraceEAbort;
+ property IgnoredException: string read GetIgnoredException;
+ property IgnoredExceptions: TStrings read FIgnoredExceptions write FIgnoredExceptions;
+ property IgnoredExceptionsIndex: Integer read FIgnoredExceptionsIndex write FIgnoredExceptionsIndex;
+ property IgnoredExceptionsCount: Integer read GetIgnoredExceptionsCount;
+ // trace options
+ property StackList: Boolean read FStackList write FStackList;
+ property RawData: Boolean read FRawData write FRawData;
+ property ModuleName: Boolean read FModuleName write FModuleName;
+ property ModuleOffset: Boolean read FModuleOffset write FModuleOffset;
+ // thread options (mutually exclusives)
+ property AllThreads: Boolean read FAllThreads write FAllThreads;
+ property AllRegisterThreads: Boolean read FAllRegisteredThreads write FAllRegisteredThreads;
+ property MainExceptionThreads: Boolean read FMainExceptionThreads write FMainExceptionThreads;
+ property ExceptionThread: Boolean read FExceptionThread write FExceptionThread;
+ property MainThread: Boolean read FMainThread write FMainThread;
+ // composite properties
+ property ReportMainThread: Boolean read GetReportMainThread;
+ property ReportAllThreads: Boolean read GetReportAllThreads;
+ property ReportExceptionThread: Boolean read GetReportExceptionThread;
+ //property AddressOffset: Boolean read FAddressOffset write FAddressOffset;
+ property CodeDetails: Boolean read FCodeDetails write FCodeDetails;
+ property VirtualAddress: Boolean read FVirtualAddress write FVirtualAddress;
+ end;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\devtools\jpp';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+//=== { TJclExcDlgParams } ===================================================
+
+constructor TJclExcDlgParams.Create;
+begin
+ inherited Create;
+
+ FHookDll := True;
+ FLanguage := bpUnknown;
+ FLanguages := [bpUnknown];
+ FFileName := '';
+ FCodeDetails := True;
+ FModuleName := True;
+ FModuleOffset := False;
+ FDelayedTrace := True;
+ FFormName := 'ExceptionDialog';
+ FFormAncestor := TForm.ClassName;
+ FLogFile := False;
+ FLogFileName := 'ExtractFileName(Application.ExeName) + ''-exception-'' + FormatDateTime(''yyyy-mm-dd'', Date) + ''.log''';
+ FAutoSaveWorkingDirectory := False;
+ FAutoSaveApplicationDirectory := False;
+ FAutoSaveDesktopDirectory := False;
+ FLogSaveDialog := False;
+ FAddressOffset := True;
+ FVirtualAddress := False;
+ FActivePersonality := bpUnknown;
+ FRawData := False;
+ FSendEMail := False;
+ FEMailAddress := '';
+ FEMailSubject := '';
+ FModalDialog := True;
+ FSizeableDialog := False;
+ FDesigner := bdVCL;
+ FModuleList := True;
+ FUnitVersioning := True;
+ FOSInfo := True;
+ FActiveControls := True;
+ FDisableIfDebuggerAttached := False;
+ FStackList := True;
+ FAutoScrollBars := True;
+ FCatchMainThread := False;
+ FTraceEAbort := False;
+ FTraceAllExceptions := False;
+ FIgnoredExceptions := TStringList.Create;
+ FAllThreads := True;
+ FAllRegisteredThreads := False;
+ FMainExceptionThreads := False;
+ FExceptionThread := False;
+ FMainThread := False;
+end;
+
+destructor TJclExcDlgParams.Destroy;
+begin
+ FIgnoredExceptions.Free;
+ inherited Destroy;
+end;
+
+function TJclExcDlgParams.GetIgnoredException: string;
+begin
+ Result := FIgnoredExceptions.Strings[FIgnoredExceptionsIndex];
+end;
+
+function TJclExcDlgParams.GetIgnoredExceptionsCount: Integer;
+begin
+ Result := FIgnoredExceptions.Count;
+end;
+
+function TJclExcDlgParams.GetReportAllThreads: Boolean;
+begin
+ Result := FAllThreads or FAllRegisteredThreads;
+end;
+
+function TJclExcDlgParams.GetReportExceptionThread: Boolean;
+begin
+ Result := FExceptionThread or FMainExceptionThreads;
+end;
+
+function TJclExcDlgParams.GetReportMainThread: Boolean;
+begin
+ Result := FMainThread or FMainExceptionThreads or FAllThreads or FAllRegisteredThreads;
+end;
+
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
+end.
Modified: trunk/jcl/devtools/jpp/JclTemplates.pas
===================================================================
--- trunk/jcl/devtools/jpp/JclTemplates.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/devtools/jpp/JclTemplates.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -65,7 +65,7 @@
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
- LogPath: 'JCL\experts\repository';
+ LogPath: 'JCL\devtools\jpp';
Extra: '';
Data: nil
);
Modified: trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr 2010-07-29 14:58:43 UTC (rev 3269)
@@ -35,7 +35,7 @@
Classes,
JclIDEUtils,
JclTemplates in '..\..\..\devtools\jpp\JclTemplates.pas',
- JclOtaExcDlgParams in 'JclOtaExcDlgParams.pas',
+ JclExcDlgTemplates in '..\..\..\devtools\jpp\JclExcDlgTemplates.pas',
JppState in '..\..\..\devtools\jpp\JppState.pas',
JppLexer in '..\..\..\devtools\jpp\JppLexer.pas',
JppParser in '..\..\..\devtools\jpp\JppParser.pas';
@@ -71,10 +71,10 @@
end;
var
- Params: TJclOtaExcDlgParams;
+ Params: TJclExcDlgParams;
begin
try
- Params := TJclOtaExcDlgParams.Create;
+ Params := TJclExcDlgParams.Create;
try
Params.ActivePersonality := bpDelphi32;
Params.FormName := 'ExceptionDialog';
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgFileFrame.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgFileFrame.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgFileFrame.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -38,7 +38,7 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclIDEUtils, JclOtaWizardFrame, JclOtaExcDlgParams, JclOtaConsts, JclOtaUtils;
+ JclIDEUtils, JclOtaWizardFrame, JclExcDlgTemplates, JclOtaConsts, JclOtaUtils;
type
TJclOtaExcDlgFilePage = class(TJclWizardFrame)
@@ -55,7 +55,7 @@
procedure ButtonFileBrowseClick(Sender: TObject);
procedure ComboBoxLanguageClick(Sender: TObject);
private
- FParams: TJclOtaExcDlgParams;
+ FParams: TJclExcDlgParams;
procedure AdjustFileExtension;
function GetSelectedLanguage: TJclBorPersonality;
protected
@@ -63,12 +63,12 @@
property SelectedLanguage: TJclBorPersonality read GetSelectedLanguage;
public
constructor Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams); reintroduce;
+ AParams: TJclExcDlgParams); reintroduce;
procedure PageActivated(Direction: TJclWizardDirection); override;
procedure PageDesactivated(Direction: TJclWizardDirection); override;
- property Params: TJclOtaExcDlgParams read FParams write FParams;
+ property Params: TJclExcDlgParams read FParams write FParams;
end;
{$IFDEF UNITVERSIONING}
@@ -156,7 +156,7 @@
end;
constructor TJclOtaExcDlgFilePage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
+ AParams: TJclExcDlgParams);
begin
FParams := AParams;
inherited Create(AOwner);
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgFormFrame.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgFormFrame.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgFormFrame.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -38,7 +38,7 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclOtaExcDlgParams, JclOtaWizardFrame;
+ JclExcDlgTemplates, JclOtaWizardFrame;
type
TJclOtaExcDlgFormPage = class(TJclWizardFrame)
@@ -52,17 +52,17 @@
CheckBoxAutoScrollBars: TCheckBox;
procedure CheckBoxMailClick(Sender: TObject);
private
- FParams: TJclOtaExcDlgParams;
+ FParams: TJclExcDlgParams;
procedure UpdateMailEdits;
protected
function GetSupportsNext: Boolean; override;
public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
+ constructor Create(AOwner: TComponent; AParams: TJclExcDlgParams); reintroduce;
procedure PageActivated(Direction: TJclWizardDirection); override;
procedure PageDesactivated(Direction: TJclWizardDirection); override;
- property Params: TJclOtaExcDlgParams read FParams write FParams;
+ property Params: TJclExcDlgParams read FParams write FParams;
end;
{$IFDEF UNITVERSIONING}
@@ -92,7 +92,7 @@
end;
constructor TJclOtaExcDlgFormPage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
+ AParams: TJclExcDlgParams);
begin
FParams := AParams;
inherited Create(AOwner);
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgIgnoreFrame.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgIgnoreFrame.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgIgnoreFrame.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -38,7 +38,7 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclOtaExcDlgParams, JclOtaWizardFrame;
+ JclExcDlgTemplates, JclOtaWizardFrame;
type
TJclOtaExcDlgIgnorePage = class(TJclWizardFrame)
@@ -48,15 +48,15 @@
MemoIgnoredExceptions: TMemo;
procedure CheckBoxTraceAllExceptionsClick(Sender: TObject);
private
- FParams: TJclOtaExcDlgParams;
+ FParams: TJclExcDlgParams;
procedure UpdateControls;
public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
+ constructor Create(AOwner: TComponent; AParams: TJclExcDlgParams); reintroduce;
procedure PageActivated(Direction: TJclWizardDirection); override;
procedure PageDesactivated(Direction: TJclWizardDirection); override;
- property Params: TJclOtaExcDlgParams read FParams write FParams;
+ property Params: TJclExcDlgParams read FParams write FParams;
end;
{$IFDEF UNITVERSIONING}
@@ -87,7 +87,7 @@
end;
constructor TJclOtaExcDlgIgnorePage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
+ AParams: TJclExcDlgParams);
begin
FParams := AParams;
inherited Create(AOwner);
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgLogFrame.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgLogFrame.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgLogFrame.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -38,7 +38,7 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclOtaExcDlgParams, JclOtaWizardFrame;
+ JclExcDlgTemplates, JclOtaWizardFrame;
type
TJclOtaExcDlgLogPage = class(TJclWizardFrame)
@@ -51,17 +51,17 @@
CheckBoxSaveDialog: TCheckBox;
procedure CheckBoxLogFileClick(Sender: TObject);
private
- FParams: TJclOtaExcDlgParams;
+ FParams: TJclExcDlgParams;
procedure UpdateLogControls;
protected
function GetSupportsNext: Boolean; override;
public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
+ constructor Create(AOwner: TComponent; AParams: TJclExcDlgParams); reintroduce;
procedure PageActivated(Direction: TJclWizardDirection); override;
procedure PageDesactivated(Direction: TJclWizardDirection); override;
- property Params: TJclOtaExcDlgParams read FParams write FParams;
+ property Params: TJclExcDlgParams read FParams write FParams;
end;
{$IFDEF UNITVERSIONING}
@@ -91,7 +91,7 @@
end;
constructor TJclOtaExcDlgLogPage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
+ AParams: TJclExcDlgParams);
begin
FParams := AParams;
inherited Create(AOwner);
Deleted: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -1,263 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgRepository.pas. }
-{ }
-{ The Initial Developer of the Original Code is Florent Ouchet }
-{ <outchy att users dott sourceforge dott net> }
-{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
-{ }
-{ Contributors: }
-{ }
-{**************************************************************************************************}
-{ }
-{ Last modified: $Date:: $ }
-{ Revision: $Rev:: $ }
-{ Author: $Author:: $ }
-{ }
-{**************************************************************************************************}
-
-unit JclOtaExcDlgParams;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Classes, Forms,
- {$IFDEF UNITVERSIONING}
- JclUnitVersioning,
- {$ENDIF UNITVERSIONING}
- JclIDEUtils,
- JclTemplates;
-
-type
- TJclOtaExcDlgParams = class(TJclTemplateParams)
- private
- FHookDll: Boolean;
- FFileName: string;
- FCodeDetails: Boolean;
- FModuleName: Boolean;
- FModuleOffset: Boolean;
- FDelayedTrace: Boolean;
- FFormName: string;
- FLogFile: Boolean;
- FLogFileName: string;
- FAutoSaveWorkingDirectory: Boolean;
- FAutoSaveApplicationDirectory: Boolean;
- FAutoSaveDesktopDirectory: Boolean;
- FLogSaveDialog: Boolean;
- FAddressOffset: Boolean;
- FVirtualAddress: Boolean;
- FActivePersonality: TJclBorPersonality;
- FLanguage: TJclBorPersonality;
- FLanguages: TJclBorPersonalities;
- FRawData: Boolean;
- FSendEMail: Boolean;
- FEMailAddress: string;
- FFormAncestor: string;
- FModalDialog: Boolean;
- FSizeableDialog: Boolean;
- FEMailSubject: string;
- FDesigner: TJclBorDesigner;
- FModuleList: Boolean;
- FUnitVersioning: Boolean;
- FOSInfo: Boolean;
- FActiveControls: Boolean;
- FDisableIfDebuggerAttached: Boolean;
- FStackList: Boolean;
- FAutoScrollBars: Boolean;
- FCatchMainThread: Boolean;
- FAllThreads: Boolean;
- FAllRegisteredThreads: Boolean;
- FMainExceptionThreads: Boolean;
- FExceptionThread: Boolean;
- FMainThread: Boolean;
- FTraceEAbort: Boolean;
- FIgnoredExceptions: TStrings;
- FIgnoredExceptionsIndex: Integer;
- FTraceAllExceptions: Boolean;
- function GetIgnoredExceptionsCount: Integer;
- function GetReportAllThreads: Boolean;
- function GetReportExceptionThread: Boolean;
- function GetReportMainThread: Boolean;
- function GetIgnoredException: string;
- public
- constructor Create; reintroduce;
- destructor Destroy; override;
- published
- // file options
- property Language: TJclBorPersonality read FLanguage write FLanguage;
- property Languages: TJclBorPersonalities read FLanguages write FLanguages;
- property ActivePersonality: TJclBorPersonality read FActivePersonality
- write FActivePersonality;
- property FileName: string read FFileName write FFileName;
- property FormName: string read FFormName write FFormName;
- property FormAncestor: string read FFormAncestor write FFormAncestor;
- property Designer: TJclBorDesigner read FDesigner write FDesigner;
- // form options
- property ModalDialog: Boolean read FModalDialog write FModalDialog;
- property SendEMail: Boolean read FSendEMail write FSendEMail;
- property EMailAddress: string read FEMailAddress write FEMailAddress;
- property EMailSubject: string read FEMailSubject write FEMailSubject;
- property SizeableDialog: Boolean read FSizeableDialog write FSizeableDialog;
- property AutoScrollBars: Boolean read FAutoScrollBars write FAutoScrollBars;
- // system options
- property DelayedTrace: Boolean read FDelayedTrace write FDelayedTrace;
- property HookDll: Boolean read FHookDll write FHookDll;
- property OSInfo: Boolean read FOSInfo write FOSInfo;
- property ModuleList: Boolean read FModuleList write FModuleList;
- property UnitVersioning: Boolean read FUnitVersioning write FUnitVersioning;
- property ActiveControls: Boolean read FActiveControls write FActiveControls;
- property CatchMainThread: Boolean read FCatchMainThread write FCatchMainThread;
- property DisableIfDebuggerAttached: Boolean read FDisableIfDebuggerAttached write FDisableIfDebuggerAttached;
- // log options
- property LogFile: Boolean read FLogFile write FLogFile;
- property LogFileName: string read FLogFileName write FLogFileName;
- property AutoSaveWorkingDirectory: Boolean read FAutoSaveWorkingDirectory write FAutoSaveWorkingDirectory;
- property AutoSaveApplicationDirectory: Boolean read FAutoSaveApplicationDirectory write FAutoSaveApplicationDirectory;
- property AutoSaveDesktopDirectory: Boolean read FAutoSaveDesktopDirectory write FAutoSaveDesktopDirectory;
- property LogSaveDialog: Boolean read FLogSaveDialog write FLogSaveDialog;
- // ignored exceptions
- property TraceAllExceptions: Boolean read FTraceAllExceptions
- write FTraceAllExceptions;
- property TraceEAbort: Boolean read FTraceEAbort write FTraceEAbort;
- property IgnoredException: string read GetIgnoredException;
- property IgnoredExceptions: TStrings read FIgnoredExceptions write FIgnoredExceptions;
- property IgnoredExceptionsIndex: Integer read FIgnoredExceptionsIndex write FIgnoredExceptionsIndex;
- property IgnoredExceptionsCount: Integer read GetIgnoredExceptionsCount;
- // trace options
- property StackList: Boolean read FStackList write FStackList;
- property RawData: Boolean read FRawData write FRawData;
- property ModuleName: Boolean read FModuleName write FModuleName;
- property ModuleOffset: Boolean read FModuleOffset write FModuleOffset;
- // thread options (mutually exclusives)
- property AllThreads: Boolean read FAllThreads write FAllThreads;
- property AllRegisterThreads: Boolean read FAllRegisteredThreads write FAllRegisteredThreads;
- property MainExceptionThreads: Boolean read FMainExceptionThreads write FMainExceptionThreads;
- property ExceptionThread: Boolean read FExceptionThread write FExceptionThread;
- property MainThread: Boolean read FMainThread write FMainThread;
- // composite properties
- property ReportMainThread: Boolean read GetReportMainThread;
- property ReportAllThreads: Boolean read GetReportAllThreads;
- property ReportExceptionThread: Boolean read GetReportExceptionThread;
- //property AddressOffset: Boolean read FAddressOffset write FAddressOffset;
- property CodeDetails: Boolean read FCodeDetails write FCodeDetails;
- property VirtualAddress: Boolean read FVirtualAddress write FVirtualAddress;
- end;
-
-{$IFDEF UNITVERSIONING}
-const
- UnitVersioning: TUnitVersionInfo = (
- RCSfile: '$URL$';
- Revision: '$Revision$';
- Date: '$Date$';
- LogPath: 'JCL\experts\repository\ExceptionDialog';
- Extra: '';
- Data: nil
- );
-{$ENDIF UNITVERSIONING}
-
-implementation
-
-{$R JclOtaExcDlgIcons.res}
-
-//=== { TJclOtaExcDlgParams } ================================================
-
-constructor TJclOtaExcDlgParams.Create;
-begin
- inherited Create;
-
- FHookDll := True;
- FLanguage := bpUnknown;
- FLanguages := [bpUnknown];
- FFileName := '';
- FCodeDetails := True;
- FModuleName := True;
- FModuleOffset := False;
- FDelayedTrace := True;
- FFormName := 'ExceptionDialog';
- FFormAncestor := TForm.ClassName;
- FLogFile := False;
- FLogFileName := 'ExtractFileName(Application.ExeName) + ''-exception-'' + FormatDateTime(''yyyy-mm-dd'', Date) + ''.log''';
- FAutoSaveWorkingDirectory := False;
- FAutoSaveApplicationDirectory := False;
- FAutoSaveDesktopDirectory := False;
- FLogSaveDialog := False;
- FAddressOffset := True;
- FVirtualAddress := False;
- FActivePersonality := bpUnknown;
- FRawData := False;
- FSendEMail := False;
- FEMailAddress := '';
- FEMailSubject := '';
- FModalDialog := True;
- FSizeableDialog := False;
- FDesigner := bdVCL;
- FModuleList := True;
- FUnitVersioning := True;
- FOSInfo := True;
- FActiveControls := True;
- FDisableIfDebuggerAttached := False;
- FStackList := True;
- FAutoScrollBars := True;
- FCatchMainThread := False;
- FTraceEAbort := False;
- FTraceAllExceptions := False;
- FIgnoredExceptions := TStringList.Create;
- FAllThreads := True;
- FAllRegisteredThreads := False;
- FMainExceptionThreads := False;
- FExceptionThread := False;
- FMainThread := False;
-end;
-
-destructor TJclOtaExcDlgParams.Destroy;
-begin
- FIgnoredExceptions.Free;
- inherited Destroy;
-end;
-
-function TJclOtaExcDlgParams.GetIgnoredException: string;
-begin
- Result := FIgnoredExceptions.Strings[FIgnoredExceptionsIndex];
-end;
-
-function TJclOtaExcDlgParams.GetIgnoredExceptionsCount: Integer;
-begin
- Result := FIgnoredExceptions.Count;
-end;
-
-function TJclOtaExcDlgParams.GetReportAllThreads: Boolean;
-begin
- Result := FAllThreads or FAllRegisteredThreads;
-end;
-
-function TJclOtaExcDlgParams.GetReportExceptionThread: Boolean;
-begin
- Result := FExceptionThread or FMainExceptionThreads;
-end;
-
-function TJclOtaExcDlgParams.GetReportMainThread: Boolean;
-begin
- Result := FMainThread or FMainExceptionThreads or FAllThreads or FAllRegisteredThreads;
-end;
-
-{$IFDEF UNITVERSIONING}
-initialization
- RegisterUnitVersion(HInstance, UnitVersioning);
-
-finalization
- UnregisterUnitVersion(HInstance);
-{$ENDIF UNITVERSIONING}
-
-end.
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -52,12 +52,12 @@
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
JclIDEUtils,
- JclOtaUtils, JclOtaRepositoryUtils, JclOtaExcDlgParams;
+ JclOtaUtils, JclOtaRepositoryUtils, JclExcDlgTemplates;
type
TJclExcDlgExpert = class(TJclOtaRepositoryExpert)
public
- procedure CreateExceptionDialog(const Params: TJclOtaExcDlgParams);
+ procedure CreateExceptionDialog(const Params: TJclExcDlgParams);
end;
TJclExcDlgDelphiExpert = class(TJclExcDlgExpert)
@@ -96,10 +96,12 @@
JclOtaResources, JclOtaConsts,
JclTemplates, JclOtaRepositoryReg, JclOtaExcDlgWizard;
+{$R JclOtaExcDlgIcons.res}
+
//=== { TJclExcDlgExpert } ===================================================
procedure TJclExcDlgExpert.CreateExceptionDialog(
- const Params: TJclOtaExcDlgParams);
+ const Params: TJclExcDlgParams);
function LoadTemplate(const FileName: string): string;
var
AFileStream: TFileStream;
@@ -197,9 +199,9 @@
procedure TJclExcDlgDelphiExpert.DoExecute(const Personality: TJclBorPersonality);
var
- AParams: TJclOtaExcDlgParams;
+ AParams: TJclExcDlgParams;
begin
- AParams := TJclOtaExcDlgParams.Create;
+ AParams := TJclExcDlgParams.Create;
try
AParams.Languages := [bpDelphi32];
AParams.Language := bpDelphi32;
@@ -229,9 +231,9 @@
procedure TJclExcDlgCBuilderExpert.DoExecute(
const Personality: TJclBorPersonality);
var
- AParams: TJclOtaExcDlgParams;
+ AParams: TJclExcDlgParams;
begin
- AParams := TJclOtaExcDlgParams.Create;
+ AParams := TJclExcDlgParams.Create;
try
AParams.Languages := [bpDelphi32];
AParams.Language := bpDelphi32;
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgSystemFrame.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgSystemFrame.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgSystemFrame.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -38,7 +38,7 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclOtaExcDlgParams, JclOtaWizardFrame;
+ JclExcDlgTemplates, JclOtaWizardFrame;
type
TJclOtaExcDlgSystemPage = class(TJclWizardFrame)
@@ -52,14 +52,14 @@
CheckBoxDisableIfDebuggerAttached: TCheckBox;
procedure CheckBoxModuleListClick(Sender: TObject);
private
- FParams: TJclOtaExcDlgParams;
+ FParams: TJclExcDlgParams;
public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
+ constructor Create(AOwner: TComponent; AParams: TJclExcDlgParams); reintroduce;
procedure PageActivated(Direction: TJclWizardDirection); override;
procedure PageDesactivated(Direction: TJclWizardDirection); override;
- property Params: TJclOtaExcDlgParams read FParams write FParams;
+ property Params: TJclExcDlgParams read FParams write FParams;
end;
{$IFDEF UNITVERSIONING}
@@ -89,7 +89,7 @@
end;
constructor TJclOtaExcDlgSystemPage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
+ AParams: TJclExcDlgParams);
begin
FParams := AParams;
inherited Create(AOwner);
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgThreadFrame.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgThreadFrame.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgThreadFrame.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -38,7 +38,7 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclOtaExcDlgParams, JclOtaWizardFrame;
+ JclExcDlgTemplates, JclOtaWizardFrame;
type
TJclOtaExcDlgThreadPage = class(TJclWizardFrame)
@@ -53,18 +53,18 @@
procedure RadioButtonClick(Sender: TObject);
procedure CheckBoxStackListClick(Sender: TObject);
private
- FParams: TJclOtaExcDlgParams;
+ FParams: TJclExcDlgParams;
FTestThread: TJclDebugThread;
procedure UpdatePreview;
procedure UpdateCheckBoxes;
public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
+ constructor Create(AOwner: TComponent; AParams: TJclExcDlgParams); reintroduce;
destructor Destroy; override;
procedure PageActivated(Direction: TJclWizardDirection); override;
procedure PageDesactivated(Direction: TJclWizardDirection); override;
- property Params: TJclOtaExcDlgParams read FParams write FParams;
+ property Params: TJclExcDlgParams read FParams write FParams;
end;
// in interface to be exported and have basic debug informations based on exports
@@ -132,7 +132,7 @@
end;
constructor TJclOtaExcDlgThreadPage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
+ AParams: TJclExcDlgParams);
begin
FParams := AParams;
inherited Create(AOwner);
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTraceFrame.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTraceFrame.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgTraceFrame.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -38,7 +38,7 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclOtaExcDlgParams, JclOtaWizardFrame;
+ JclExcDlgTemplates, JclOtaWizardFrame;
type
TJclOtaExcDlgTracePage = class(TJclWizardFrame)
@@ -53,16 +53,16 @@
procedure CheckBoxClick(Sender: TObject);
procedure CheckBoxStackListClick(Sender: TObject);
private
- FParams: TJclOtaExcDlgParams;
+ FParams: TJclExcDlgParams;
procedure UpdatePreview;
procedure UpdateCheckBoxes;
public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
+ constructor Create(AOwner: TComponent; AParams: TJclExcDlgParams); reintroduce;
procedure PageActivated(Direction: TJclWizardDirection); override;
procedure PageDesactivated(Direction: TJclWizardDirection); override;
- property Params: TJclOtaExcDlgParams read FParams write FParams;
+ property Params: TJclExcDlgParams read FParams write FParams;
end;
{$IFDEF UNITVERSIONING}
@@ -97,7 +97,7 @@
end;
constructor TJclOtaExcDlgTracePage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
+ AParams: TJclExcDlgParams);
begin
FParams := AParams;
inherited Create(AOwner);
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgWizard.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgWizard.pas 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgWizard.pas 2010-07-29 14:58:43 UTC (rev 3269)
@@ -38,20 +38,20 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- JclIDEUtils, JclOtaExcDlgParams, JclOtaWizardForm;
+ JclIDEUtils, JclExcDlgTemplates, JclOtaWizardForm;
type
TJclOtaExcDlgForm = class(TJclWizardForm)
procedure FormCreate(Sender: TObject);
private
- FParams: TJclOtaExcDlgParams;
+ FParams: TJclExcDlgParams;
public
constructor Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams); reintroduce;
- property Params: TJclOtaExcDlgParams read FParams;
+ AParams: TJclExcDlgParams); reintroduce;
+ property Params: TJclExcDlgParams read FParams;
end;
-function ExcDlgWizard(var AParams: TJclOtaExcDlgParams): Boolean;
+function ExcDlgWizard(var AParams: TJclExcDlgParams): Boolean;
{$IFDEF UNITVERSIONING}
const
@@ -76,7 +76,7 @@
JclOtaExcDlgTraceFrame, JclOtaExcDlgThreadFrame,
JclOtaExcDlgIgnoreFrame;
-function ExcDlgWizard(var AParams: TJclOtaExcDlgParams): Boolean;
+function ExcDlgWizard(var AParams: TJclExcDlgParams): Boolean;
var
OwnsParams: Boolean;
AForm: TJclOtaExcDlgForm;
@@ -87,7 +87,7 @@
if not Assigned(AParams) then
begin
OwnsParams := True;
- AParams := TJclOtaExcDlgParams.Create;
+ AParams := TJclExcDlgParams.Create;
end;
try
AForm := TJclOtaExcDlgForm.Create(Application, AParams);
@@ -105,7 +105,7 @@
//=== { TJclOtaExcDlgForm.pas } ==============================================
constructor TJclOtaExcDlgForm.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
+ AParams: TJclExcDlgParams);
begin
FParams := AParams;
inherited Create(AOwner);
Modified: trunk/jcl/packages/c6/JclDeveloperTools.bpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-07-29 14:58:43 UTC (rev 3269)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:18:18 UTC
+ Last generated: 29-07-2010 14:50:27 UTC
*****************************************************************************
-->
<PROJECT>
@@ -18,6 +18,7 @@
..\..\lib\c6\JppLexer.obj
..\..\lib\c6\JppParser.obj
..\..\lib\c6\JclTemplates.obj
+ ..\..\lib\c6\JclExcDlgTemplates.obj
..\..\lib\c6\JclCompilerUtils.obj
..\..\lib\c6\JclDevToolsResources.obj
..\..\lib\c6\JclIDEUtils.obj
@@ -37,6 +38,7 @@
<SPARELIBS value=""/>
<PACKAGES value="
rtl.bpi
+ vcl.bpi
Jcl.bpi
JclContainers.bpi
"/>
@@ -76,12 +78,14 @@
<FILE FILENAME="JclDeveloperTools.res" FORMNAME="" UNITNAME="JclDeveloperTools.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclDeveloperTools.cpp" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="vcl.bpi" FORMNAME="" UNITNAME="vcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="Jcl.bpi" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclContainers.bpi" FORMNAME="" UNITNAME="JclContainers" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\devtools\jpp\JppState.pas" FORMNAME="" UNITNAME="JppState" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\devtools\jpp\JppLexer.pas" FORMNAME="" UNITNAME="JppLexer" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\devtools\jpp\JppParser.pas" FORMNAME="" UNITNAME="JppParser" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\devtools\jpp\JclTemplates.pas" FORMNAME="" UNITNAME="JclTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\devtools\jpp\JclExcDlgTemplates.pas" FORMNAME="" UNITNAME="JclExcDlgTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclCompilerUtils.pas" FORMNAME="" UNITNAME="JclCompilerUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclDevToolsResources.pas" FORMNAME="" UNITNAME="JclDevToolsResources" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclIDEUtils.pas" FORMNAME="" UNITNAME="JclIDEUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/c6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:18:19 UTC
+ Last generated: 29-07-2010 14:50:27 UTC
-----------------------------------------------------------------------------
}
@@ -43,6 +43,7 @@
requires
rtl,
+ vcl,
Jcl,
JclContainers
;
@@ -51,6 +52,7 @@
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/c6/JclRepositoryExpert.bpk
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpert.bpk 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/c6/JclRepositoryExpert.bpk 2010-07-29 14:58:43 UTC (rev 3269)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:18:18 UTC
+ Last generated: 29-07-2010 14:44:37 UTC
*****************************************************************************
-->
<PROJECT>
@@ -16,7 +16,6 @@
..\..\lib\c6\JclRepositoryExpert.obj
..\..\lib\c6\JclOtaRepositoryUtils.obj
..\..\lib\c6\JclOtaExcDlgRepository.obj
- ..\..\lib\c6\JclOtaExcDlgParams.obj
..\..\lib\c6\JclOtaExcDlgWizard.obj
..\..\lib\c6\JclOtaExcDlgFileFrame.obj
..\..\lib\c6\JclOtaExcDlgFormFrame.obj
@@ -98,7 +97,6 @@
<FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\JclOtaRepositoryUtils.pas" FORMNAME="" UNITNAME="JclOtaRepositoryUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" FORMNAME="" UNITNAME="JclOtaExcDlgRepository" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas" FORMNAME="" UNITNAME="JclOtaExcDlgParams" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas" FORMNAME="JclOtaExcDlgForm" UNITNAME="JclOtaExcDlgWizard" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas" FORMNAME="JclOtaExcDlgFilePage" UNITNAME="JclOtaExcDlgFileFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFormFrame.pas" FORMNAME="JclOtaExcDlgFormPage" UNITNAME="JclOtaExcDlgFormFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/c6/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/c6/JclRepositoryExpert.dpk 2010-07-29 14:58:43 UTC (rev 3269)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:18:19 UTC
+ Last generated: 29-07-2010 14:44:37 UTC
-----------------------------------------------------------------------------
}
@@ -53,7 +53,6 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
- JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' {JclOtaExcDlgFilePage: TFrame},
JclOtaExcDlgFormFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFormFrame.pas' {JclOtaExcDlgFormPage: TFrame},
Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf 2010-07-29 14:58:43 UTC (rev 3269)
@@ -1,6 +1,5 @@
USEUNIT("..\..\experts\repository\JclOtaRepositoryUtils.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas");
-USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFormFrame.pas");
Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr 2010-07-29 14:58:43 UTC (rev 3269)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 29-07-2010 14:18:18 UTC
+ Last generated: 29-07-2010 14:44:37 UTC
*****************************************************************************
-->
<PROJECT>
@@ -16,7 +16,6 @@
..\..\lib\c6\JclRepositoryExpertDLL.obj
..\..\lib\c6\JclOtaRepositoryUtils.obj
..\..\lib\c6\JclOtaExcDlgRepository.obj
- ..\..\lib\c6\JclOtaExcDlgParams.obj
..\..\lib\c6\JclOtaExcDlgWizard.obj
..\..\lib\c6\JclOtaExcDlgFileFrame.obj
..\..\lib\c6\JclOtaExcDlgFormFrame.obj
@@ -97,7 +96,6 @@
<FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\JclOtaRepositoryUtils.pas" FORMNAME="" UNITNAME="JclOtaRepositoryUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" FORMNAME="" UNITNAME="JclOtaExcDlgRepository" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas" FORMNAME="" UNITNAME="JclOtaExcDlgParams" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas" FORMNAME="JclOtaExcDlgForm" UNITNAME="JclOtaExcDlgWizard" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas" FORMNAME="JclOtaExcDlgFilePage" UNITNAME="JclOtaExcDlgFileFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFormFrame.pas" FORMNAME="JclOtaExcDlgFormPage" UNITNAME="JclOtaExcDlgFormFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj
===================================================================
--- trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj 2010-07-29 14:58:43 UTC (rev 3269)
@@ -122,7 +122,7 @@
<Directories Name="PackageDLLOutputDir"></Directories>
<Directories Name="PackageDCPOutputDir">..\..\lib\cs1</Directories>
<Directories Name="SearchPath">..\..\lib\cs1;..\..\source\include</Directories>
- <Directories Name="Packages">rtl;Jcl;JclContainers</Directories>
+ <Directories Name="Packages">rtl;vcl;Jcl;JclContainers</Directories>
<Directories Name="Conditionals">WIN32;CONDITIONALEXPRESSIONS;RELEASE</Directories>
<Directories Name="DebugSourceDirs"></Directories>
<Directories Name="UsePackages">True</Directories>
Modified: trunk/jcl/packages/cs1/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:18:20 UTC
+ Last generated: 29-07-2010 14:50:27 UTC
-----------------------------------------------------------------------------
}
@@ -41,6 +41,7 @@
requires
rtl,
+ vcl,
Jcl,
JclContainers
;
@@ -50,6 +51,7 @@
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d10/JclDeveloperTools.bdsproj
===================================================================
--- trunk/jcl/packages/d10/JclDeveloperTools.bdsproj 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/d10/JclDeveloperTools.bdsproj 2010-07-29 14:58:43 UTC (rev 3269)
@@ -124,7 +124,7 @@
<Directories Name="OutputDir"></Directories>
<Directories Name="PackageDLLOutputDir"></Directories>
<Directories Name="PackageDCPOutputDir">..\..\lib\d10</Directories>
- <Directories Name="Packages">rtl;Jcl;JclContainers</Directories>
+ <Directories Name="Packages">rtl;vcl;Jcl;JclContainers</Directories>
<Directories Name="Conditionals">BCB;WIN32;CONDITIONALEXPRESSIONS;VER180;RELEASE</Directories>
<Directories Name="DebugSourceDirs"></Directories>
<Directories Name="UsePackages">True</Directories>
Modified: trunk/jcl/packages/d10/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-07-29 14:58:43 UTC (rev 3269)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 29-07-2010 14:18:20 UTC
+ Last generated: 29-07-2010 14:50:27 UTC
-----------------------------------------------------------------------------
}
@@ -43,6 +43,7 @@
requires
rtl,
+ vcl,
Jcl,
JclContainers
;
@@ -52,6 +53,7 @@
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
+ JclExcDlgTemplates in '..\..\devtools\jpp\JclExcDlgTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d10/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d10/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
+++ trunk/jcl/packages/d10/JclRepositoryExpert.dpk 2010-07-29 14:58:43 UTC (rev 3269)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 29-07-2010 14:18:20 UTC
+ Last generated: 29-07-2010 14:44:37 UTC
-----------------------------------------------------------------------------
}
@@ -54,7 +54,6 @@
contains
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
- JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
JclOtaExcDlgWizard in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgWizard.pas' {JclOtaExcDlgForm},
JclOtaExcDlgFileFrame in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgFileFrame.pas' ...
[truncated message content] |
|
From: <ou...@us...> - 2010-07-29 14:32:48
|
Revision: 3268
http://jcl.svn.sourceforge.net/jcl/?rev=3268&view=rev
Author: outchy
Date: 2010-07-29 14:32:39 +0000 (Thu, 29 Jul 2010)
Log Message:
-----------
JclOtaTemplates is a runtime unit: moving it to the JPP directory and renaming it to JclTemplates.
Modified Paths:
--------------
trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas
trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas
trunk/jcl/experts/repository/JclOtaRepositoryReg.pas
trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas
trunk/jcl/packages/c6/JclDeveloperTools.bpk
trunk/jcl/packages/c6/JclDeveloperTools.dpk
trunk/jcl/packages/c6/JclRepositoryExpert.bpk
trunk/jcl/packages/c6/JclRepositoryExpert.dpk
trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf
trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr
trunk/jcl/packages/cs1/JclDeveloperTools.dpk
trunk/jcl/packages/d10/JclDeveloperTools.dpk
trunk/jcl/packages/d10/JclRepositoryExpert.dpk
trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d11/JclDeveloperTools.dpk
trunk/jcl/packages/d11/JclDeveloperTools.dproj
trunk/jcl/packages/d11/JclRepositoryExpert.dpk
trunk/jcl/packages/d11/JclRepositoryExpert.dproj
trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d12/JclDeveloperTools.dpk
trunk/jcl/packages/d12/JclDeveloperTools.dproj
trunk/jcl/packages/d12/JclRepositoryExpert.dpk
trunk/jcl/packages/d12/JclRepositoryExpert.dproj
trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d14/JclDeveloperTools.dpk
trunk/jcl/packages/d14/JclDeveloperTools.dproj
trunk/jcl/packages/d14/JclRepositoryExpert.dpk
trunk/jcl/packages/d14/JclRepositoryExpert.dproj
trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d6/JclDeveloperTools.dpk
trunk/jcl/packages/d6/JclRepositoryExpert.dpk
trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d7/JclDeveloperTools.dpk
trunk/jcl/packages/d7/JclRepositoryExpert.dpk
trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d8/JclDeveloperTools.dpk
trunk/jcl/packages/d9/JclDeveloperTools.dpk
trunk/jcl/packages/d9/JclRepositoryExpert.dpk
trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/fpc/JclDeveloperTools.lpk
trunk/jcl/packages/fpc/JclDeveloperTools.pas
trunk/jcl/packages/xml/JclDeveloperTools-R.xml
trunk/jcl/packages/xml/JclRepositoryExpert-D.xml
trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml
Added Paths:
-----------
trunk/jcl/devtools/jpp/JclTemplates.pas
Removed Paths:
-------------
trunk/jcl/experts/repository/JclOtaTemplates.pas
Copied: trunk/jcl/devtools/jpp/JclTemplates.pas (from rev 3267, trunk/jcl/experts/repository/JclOtaTemplates.pas)
===================================================================
--- trunk/jcl/devtools/jpp/JclTemplates.pas (rev 0)
+++ trunk/jcl/devtools/jpp/JclTemplates.pas 2010-07-29 14:32:39 UTC (rev 3268)
@@ -0,0 +1,137 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the }
+{ License at http://www.mozilla.org/MPL/ }
+{ }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights }
+{ and limitations under the License. }
+{ }
+{ The Original Code is JclOtaTemplates.pas. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclTemplates;
+
+interface
+
+{$I jcl.inc}
+
+uses
+ Classes,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JppState;
+
+type
+ TJclTemplateParams = class(TPppState)
+ public
+ constructor Create;
+ end;
+
+const
+ ModulePattern = '%MODULENAME%';
+ FormPattern = '%FORMNAME%';
+ AncestorPattern = '%ANCESTORNAME%';
+
+function GetFinalFormContent(const Content, FormIdent,
+ AncestorIdent: string): string;
+function GetFinalHeaderContent(const Content, ModuleIdent, FormIdent,
+ AncestorIdent: string): string;
+function GetFinalSourceContent(const Content, ModuleIdent, FormIdent,
+ AncestorIdent: string): string;
+
+function ApplyTemplate(const Template: string; const Params: TJclTemplateParams): string;
+
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository';
+ Extra: '';
+ Data: nil
+ );
+{$ENDIF UNITVERSIONING}
+
+implementation
+
+uses
+ SysUtils,
+ TypInfo,
+ JclStrings, JclSysUtils,
+ JppParser;
+
+//=== { TJclTemplateParams } =================================================
+
+constructor TJclTemplateParams.Create;
+begin
+ inherited Create;
+ Options := Options + [poProcessDefines, poProcessMacros, poProcessValues];
+end;
+
+function GetFinalFormContent(const Content, FormIdent,
+ AncestorIdent: string): string;
+begin
+ Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
+end;
+
+function GetFinalHeaderContent(const Content, ModuleIdent, FormIdent,
+ AncestorIdent: string): string;
+begin
+ Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, ModulePattern, ModuleIdent, [rfReplaceAll, rfIgnoreCase]);
+end;
+
+function GetFinalSourceContent(const Content, ModuleIdent, FormIdent, AncestorIdent: string): string;
+begin
+ Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
+ Result := StringReplace(Result, ModulePattern, ModuleIdent, [rfReplaceAll, rfIgnoreCase]);
+end;
+
+function ApplyTemplate(const Template: string; const Params: TJclTemplateParams): string;
+var
+ JppParser: TJppParser;
+begin
+ Params.PushState;
+ try
+ JppParser := TJppParser.Create(Template, Params);
+ try
+ Result := JppParser.Parse;
+ finally
+ JppParser.Free;
+ end;
+ finally
+ Params.PopState;
+ end;
+end;
+
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
+end.
Modified: trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/experts/repository/ExceptionDialog/CreateStdDialogs.dpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -34,7 +34,7 @@
SysUtils,
Classes,
JclIDEUtils,
- JclOtaTemplates in '..\JclOtaTemplates.pas',
+ JclTemplates in '..\..\..\devtools\jpp\JclTemplates.pas',
JclOtaExcDlgParams in 'JclOtaExcDlgParams.pas',
JppState in '..\..\..\devtools\jpp\JppState.pas',
JppLexer in '..\..\..\devtools\jpp\JppLexer.pas',
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgParams.pas 2010-07-29 14:32:39 UTC (rev 3268)
@@ -38,10 +38,10 @@
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
JclIDEUtils,
- JclOtaTemplates;
+ JclTemplates;
type
- TJclOtaExcDlgParams = class(TJclOtaTemplateParams)
+ TJclOtaExcDlgParams = class(TJclTemplateParams)
private
FHookDll: Boolean;
FFileName: string;
Modified: trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas
===================================================================
--- trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/experts/repository/ExceptionDialog/JclOtaExcDlgRepository.pas 2010-07-29 14:32:39 UTC (rev 3268)
@@ -94,7 +94,7 @@
Windows,
JclStrings, JclFileUtils, JclRegistry,
JclOtaResources, JclOtaConsts,
- JclOtaTemplates, JclOtaRepositoryReg, JclOtaExcDlgWizard;
+ JclTemplates, JclOtaRepositoryReg, JclOtaExcDlgWizard;
//=== { TJclExcDlgExpert } ===================================================
Modified: trunk/jcl/experts/repository/JclOtaRepositoryReg.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaRepositoryReg.pas 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/experts/repository/JclOtaRepositoryReg.pas 2010-07-29 14:32:39 UTC (rev 3268)
@@ -71,7 +71,7 @@
uses
Windows,
JclStrings, JclFileUtils, JclRegistry,
- JclOtaResources, JclOtaConsts, JclOtaTemplates, JclOtaExcDlgWizard;
+ JclOtaResources, JclOtaConsts, JclTemplates, JclOtaExcDlgWizard;
type
TExpertRecord = record
Modified: trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas 2010-07-29 14:32:39 UTC (rev 3268)
@@ -188,7 +188,7 @@
uses
Classes, ActiveX,
- JclDateTime, JclFileUtils, JclOtaResources, JclOtaTemplates;
+ JclDateTime, JclFileUtils, JclOtaResources, JclTemplates;
//=== { TJclOTARepositoryExpertBase } ========================================
Deleted: trunk/jcl/experts/repository/JclOtaTemplates.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaTemplates.pas 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/experts/repository/JclOtaTemplates.pas 2010-07-29 14:32:39 UTC (rev 3268)
@@ -1,140 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaTemplates.pas. }
-{ }
-{ The Initial Developer of the Original Code is Florent Ouchet }
-{ <outchy att users dott sourceforge dott net> }
-{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
-{ }
-{ Contributors: }
-{ }
-{**************************************************************************************************}
-{ }
-{ Last modified: $Date:: $ }
-{ Revision: $Rev:: $ }
-{ Author: $Author:: $ }
-{ }
-{**************************************************************************************************}
-
-unit JclOtaTemplates;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Classes,
- {$IFDEF UNITVERSIONING}
- JclUnitVersioning,
- {$ENDIF UNITVERSIONING}
- JclIDEUtils,
- JppState;
-
-type
- TJclOtaTemplateParams = class(TPppState)
- public
- constructor Create;
- end;
-
-const
- ModulePattern = '%MODULENAME%';
- FormPattern = '%FORMNAME%';
- AncestorPattern = '%ANCESTORNAME%';
-
-function GetFinalFormContent(const Content, FormIdent,
- AncestorIdent: string): string;
-function GetFinalHeaderContent(const Content, ModuleIdent, FormIdent,
- AncestorIdent: string): string;
-function GetFinalSourceContent(const Content, ModuleIdent, FormIdent,
- AncestorIdent: string): string;
-
-function ApplyTemplate(const Template: string;
- const Params: TJclOtaTemplateParams): string;
-
-{$IFDEF UNITVERSIONING}
-const
- UnitVersioning: TUnitVersionInfo = (
- RCSfile: '$URL$';
- Revision: '$Revision$';
- Date: '$Date$';
- LogPath: 'JCL\experts\repository';
- Extra: '';
- Data: nil
- );
-{$ENDIF UNITVERSIONING}
-
-implementation
-
-uses
- SysUtils,
- TypInfo,
- JclStrings, JclSysUtils,
- JppParser;
-
-//=== { TJclOtaTemplateParams } ==============================================
-
-constructor TJclOtaTemplateParams.Create;
-begin
- inherited Create;
- Options := Options + [poProcessDefines, poProcessMacros, poProcessValues];
-end;
-
-function GetFinalFormContent(const Content, FormIdent,
- AncestorIdent: string): string;
-begin
- Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
-end;
-
-function GetFinalHeaderContent(const Content, ModuleIdent, FormIdent,
- AncestorIdent: string): string;
-begin
- Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, ModulePattern, ModuleIdent, [rfReplaceAll, rfIgnoreCase]);
-end;
-
-function GetFinalSourceContent(const Content, ModuleIdent, FormIdent, AncestorIdent: string): string;
-begin
- Result := StringReplace(Content, FormPattern, FormIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, AncestorPattern, AncestorIdent, [rfReplaceAll, rfIgnoreCase]);
- Result := StringReplace(Result, ModulePattern, ModuleIdent, [rfReplaceAll, rfIgnoreCase]);
-end;
-
-function ApplyTemplate(const Template: string;
- const Params: TJclOtaTemplateParams): string;
-var
- JppParser: TJppParser;
-begin
- Params.PushState;
- try
- JppParser := TJppParser.Create(Template, Params);
- try
- Result := JppParser.Parse;
- finally
- JppParser.Free;
- end;
- finally
- Params.PopState;
- end;
-end;
-
-{$IFDEF UNITVERSIONING}
-initialization
- RegisterUnitVersion(HInstance, UnitVersioning);
-
-finalization
- UnregisterUnitVersion(HInstance);
-{$ENDIF UNITVERSIONING}
-
-end.
Modified: trunk/jcl/packages/c6/JclDeveloperTools.bpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:22 UTC
+ Last generated: 29-07-2010 14:18:18 UTC
*****************************************************************************
-->
<PROJECT>
@@ -17,6 +17,7 @@
..\..\lib\c6\JppState.obj
..\..\lib\c6\JppLexer.obj
..\..\lib\c6\JppParser.obj
+ ..\..\lib\c6\JclTemplates.obj
..\..\lib\c6\JclCompilerUtils.obj
..\..\lib\c6\JclDevToolsResources.obj
..\..\lib\c6\JclIDEUtils.obj
@@ -80,6 +81,7 @@
<FILE FILENAME="..\..\devtools\jpp\JppState.pas" FORMNAME="" UNITNAME="JppState" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\devtools\jpp\JppLexer.pas" FORMNAME="" UNITNAME="JppLexer" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\devtools\jpp\JppParser.pas" FORMNAME="" UNITNAME="JppParser" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\devtools\jpp\JclTemplates.pas" FORMNAME="" UNITNAME="JclTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclCompilerUtils.pas" FORMNAME="" UNITNAME="JclCompilerUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclDevToolsResources.pas" FORMNAME="" UNITNAME="JclDevToolsResources" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclIDEUtils.pas" FORMNAME="" UNITNAME="JclIDEUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/c6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:23 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -50,6 +50,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/c6/JclRepositoryExpert.bpk
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpert.bpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/c6/JclRepositoryExpert.bpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:22 UTC
+ Last generated: 29-07-2010 14:18:18 UTC
*****************************************************************************
-->
<PROJECT>
@@ -14,7 +14,6 @@
<PROJECT value="JclRepositoryExpertC60.bpl"/>
<OBJFILES value="
..\..\lib\c6\JclRepositoryExpert.obj
- ..\..\lib\c6\JclOtaTemplates.obj
..\..\lib\c6\JclOtaRepositoryUtils.obj
..\..\lib\c6\JclOtaExcDlgRepository.obj
..\..\lib\c6\JclOtaExcDlgParams.obj
@@ -66,7 +65,7 @@
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="JclRepositoryExpert.cpp"/>
<INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\..\experts\repository;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <LIBPATH value="..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\experts\repository;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
@@ -97,7 +96,6 @@
<FILE FILENAME="JclContainers.bpi" FORMNAME="" UNITNAME="JclContainers" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\experts\repository\JclOtaTemplates.pas" FORMNAME="" UNITNAME="JclOtaTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\JclOtaRepositoryUtils.pas" FORMNAME="" UNITNAME="JclOtaRepositoryUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" FORMNAME="" UNITNAME="JclOtaExcDlgRepository" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas" FORMNAME="" UNITNAME="JclOtaExcDlgParams" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/c6/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpert.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/c6/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:23 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -51,7 +51,6 @@
JclDeveloperTools
;
contains
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf 2010-07-29 14:32:39 UTC (rev 3268)
@@ -1,4 +1,3 @@
-USEUNIT("..\..\experts\repository\JclOtaTemplates.pas");
USEUNIT("..\..\experts\repository\JclOtaRepositoryUtils.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas");
USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas");
Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:22 UTC
+ Last generated: 29-07-2010 14:18:18 UTC
*****************************************************************************
-->
<PROJECT>
@@ -14,7 +14,6 @@
<PROJECT value="JclRepositoryExpertDLLC60.dll"/>
<OBJFILES value="
..\..\lib\c6\JclRepositoryExpertDLL.obj
- ..\..\lib\c6\JclOtaTemplates.obj
..\..\lib\c6\JclOtaRepositoryUtils.obj
..\..\lib\c6\JclOtaExcDlgRepository.obj
..\..\lib\c6\JclOtaExcDlgParams.obj
@@ -66,7 +65,7 @@
<SYSDEFINES value="NO_STRICT;_RTLDLL;USEPACKAGES"/>
<MAINSOURCE value="JclRepositoryExpertDLL.cpp"/>
<INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\..\experts\repository;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <LIBPATH value="..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\experts\repository;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
@@ -96,7 +95,6 @@
<FILE FILENAME="JclContainers.bpi" FORMNAME="" UNITNAME="JclContainers" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\experts\repository\JclOtaTemplates.pas" FORMNAME="" UNITNAME="JclOtaTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\JclOtaRepositoryUtils.pas" FORMNAME="" UNITNAME="JclOtaRepositoryUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" FORMNAME="" UNITNAME="JclOtaExcDlgRepository" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas" FORMNAME="" UNITNAME="JclOtaExcDlgParams" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/cs1/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:26 UTC
+ Last generated: 29-07-2010 14:18:20 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d10/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 29-07-2010 14:18:20 UTC
-----------------------------------------------------------------------------
}
@@ -51,6 +51,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d10/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d10/JclRepositoryExpert.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d10/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 29-07-2010 14:18:20 UTC
-----------------------------------------------------------------------------
}
@@ -52,7 +52,6 @@
;
contains
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 29-07-2010 14:18:20 UTC
-----------------------------------------------------------------------------
}
@@ -42,7 +42,6 @@
uses
ToolsAPI,
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d11/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d11/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d11/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 29-07-2010 14:18:21 UTC
-----------------------------------------------------------------------------
}
@@ -52,6 +52,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d11/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d11/JclDeveloperTools.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d11/JclDeveloperTools.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -91,6 +91,7 @@
<DCCReference Include="..\..\devtools\jpp\JppState.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppParser.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\JclTemplates.pas"/>
<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpert.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d11/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 29-07-2010 14:18:21 UTC
-----------------------------------------------------------------------------
}
@@ -53,7 +53,6 @@
;
contains
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpert.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d11/JclRepositoryExpert.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -92,7 +92,6 @@
<DCCReference Include="JclContainers.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
- <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas"/>
Modified: trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:28 UTC
+ Last generated: 29-07-2010 14:18:22 UTC
-----------------------------------------------------------------------------
}
@@ -43,7 +43,6 @@
uses
ToolsAPI,
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -92,7 +92,6 @@
<DCCReference Include="JclContainers.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
- <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas"/>
Modified: trunk/jcl/packages/d12/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d12/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d12/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:28 UTC
+ Last generated: 29-07-2010 14:18:22 UTC
-----------------------------------------------------------------------------
}
@@ -51,6 +51,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d12/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d12/JclDeveloperTools.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d12/JclDeveloperTools.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -66,6 +66,7 @@
<DCCReference Include="..\..\devtools\jpp\JppState.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppParser.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\JclTemplates.pas"/>
<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
Modified: trunk/jcl/packages/d12/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d12/JclRepositoryExpert.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d12/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:28 UTC
+ Last generated: 29-07-2010 14:18:22 UTC
-----------------------------------------------------------------------------
}
@@ -52,7 +52,6 @@
;
contains
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d12/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d12/JclRepositoryExpert.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d12/JclRepositoryExpert.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -67,7 +67,6 @@
<DCCReference Include="JclContainers.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
- <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas"/>
Modified: trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:28 UTC
+ Last generated: 29-07-2010 14:18:22 UTC
-----------------------------------------------------------------------------
}
@@ -42,7 +42,6 @@
uses
ToolsAPI,
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -67,7 +67,6 @@
<DCCReference Include="JclContainers.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
- <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas"/>
Modified: trunk/jcl/packages/d14/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d14/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d14/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:29 UTC
+ Last generated: 29-07-2010 14:18:22 UTC
-----------------------------------------------------------------------------
}
@@ -51,6 +51,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d14/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d14/JclDeveloperTools.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d14/JclDeveloperTools.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -68,6 +68,7 @@
<DCCReference Include="..\..\devtools\jpp\JppState.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/>
<DCCReference Include="..\..\devtools\jpp\JppParser.pas"/>
+ <DCCReference Include="..\..\devtools\jpp\JclTemplates.pas"/>
<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
Modified: trunk/jcl/packages/d14/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d14/JclRepositoryExpert.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d14/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:29 UTC
+ Last generated: 29-07-2010 14:18:22 UTC
-----------------------------------------------------------------------------
}
@@ -52,7 +52,6 @@
;
contains
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d14/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d14/JclRepositoryExpert.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d14/JclRepositoryExpert.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -69,7 +69,6 @@
<DCCReference Include="JclContainers.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
- <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas"/>
Modified: trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:29 UTC
+ Last generated: 29-07-2010 14:18:22 UTC
-----------------------------------------------------------------------------
}
@@ -42,7 +42,6 @@
uses
ToolsAPI,
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj 2010-07-29 14:32:39 UTC (rev 3268)
@@ -69,7 +69,6 @@
<DCCReference Include="JclContainers.dcp"/>
<DCCReference Include="JclBaseExpert.dcp"/>
<DCCReference Include="JclDeveloperTools.dcp"/>
- <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/>
<DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/>
<DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas"/>
Modified: trunk/jcl/packages/d6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d6/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d6/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -50,6 +50,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d6/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d6/JclRepositoryExpert.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d6/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -51,7 +51,6 @@
;
contains
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -41,7 +41,6 @@
uses
ToolsAPI,
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d7/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d7/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d7/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -50,6 +50,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d7/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d7/JclRepositoryExpert.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d7/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -51,7 +51,6 @@
;
contains
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:24 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -41,7 +41,6 @@
uses
ToolsAPI,
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d8/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:26 UTC
+ Last generated: 29-07-2010 14:18:19 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d9/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d9/JclDeveloperTools.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d9/JclDeveloperTools.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
- Last generated: 07-05-2010 18:24:26 UTC
+ Last generated: 29-07-2010 14:18:20 UTC
-----------------------------------------------------------------------------
}
@@ -50,6 +50,7 @@
JppState in '..\..\devtools\jpp\JppState.pas' ,
JppLexer in '..\..\devtools\jpp\JppLexer.pas' ,
JppParser in '..\..\devtools\jpp\JppParser.pas' ,
+ JclTemplates in '..\..\devtools\jpp\JclTemplates.pas' ,
JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
Modified: trunk/jcl/packages/d9/JclRepositoryExpert.dpk
===================================================================
--- trunk/jcl/packages/d9/JclRepositoryExpert.dpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d9/JclRepositoryExpert.dpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 29-07-2010 14:18:20 UTC
-----------------------------------------------------------------------------
}
@@ -51,7 +51,6 @@
;
contains
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr 2010-07-29 14:32:39 UTC (rev 3268)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml)
- Last generated: 07-05-2010 18:24:27 UTC
+ Last generated: 29-07-2010 14:18:20 UTC
-----------------------------------------------------------------------------
}
@@ -41,7 +41,6 @@
uses
ToolsAPI,
- JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' ,
JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' ,
JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' ,
JclOtaExcDlgParams in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgParams.pas' ,
Modified: trunk/jcl/packages/fpc/JclDeveloperTools.lpk
===================================================================
--- trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-07-27 14:34:16 UTC (rev 3267)
+++ trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-07-29 14:32:39 UTC (rev 3268)
@@ -39,7 +39,7 @@
<Description Value="JEDI Code Library Developer Tools package"/>
<License Value="Copyright (C) 1999, 2009 Project JEDI"/>
<Version Major="2" Minor="2" Release="0" Build="3537"/>
- <Files Count="9">
+ <Files Count="10">
<Item1>
<Filename Value="..\..\devtools\jpp\JppState.pas"/>...
[truncated message content] |
49 messages has been excluded from this view by a project administrator.
