paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-06 11:26:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDEIntf: added AddDependencyToOwners

Browse Source 
git-svn-id: trunk@33835 -
This commit is contained in:
mattias 2011-11-28 16:16:14 +00:00
parent 16bfa87121
commit 1fb32e5be1
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/ide/codyidentifiersdlg.pas
View File

@ -833,6 +833,7 @@ var
// returns false to abort // returns false to abort
var var
Pkg: TIDEPackage; Pkg: TIDEPackage;
DepOwner: TObject;
begin begin
Result:=true; Result:=true;
Pkg:=PackageEditingInterface.FindPackageWithName(NewGroupName); Pkg:=PackageEditingInterface.FindPackageWithName(NewGroupName);
@ -852,6 +853,11 @@ var
exit(false); exit(false);
end; end;
end; end;
if PackageEditingInterface.IsOwnerDependingOnPkg(CurOwner,NewGroupName,DepOwner)
then begin
// already depending on package name
exit(true);
end;
// ToDo add dependency // ToDo add dependency
end; end;

2
ideintf/packageintf.pas
View File

@ -218,6 +218,8 @@ type
function IsOwnerDependingOnPkg(AnOwner: TObject; const PkgName: string; function IsOwnerDependingOnPkg(AnOwner: TObject; const PkgName: string;
out DependencyOwner: TObject): boolean; virtual; abstract; out DependencyOwner: TObject): boolean; virtual; abstract;
function AddDependencyToOwners(OwnerList: TFPList; APackage: TIDEPackage;
OnlyTestIfPossible: boolean = false): TModalResult; virtual; abstract;
function AddUnitDependenciesForComponentClasses(const UnitFilename: string; function AddUnitDependenciesForComponentClasses(const UnitFilename: string;
ComponentClassnames: TStrings; ComponentClassnames: TStrings;
Quiet: boolean = false): TModalResult; virtual; abstract; Quiet: boolean = false): TModalResult; virtual; abstract;

2
packager/basepkgmanager.pas
View File

@ -74,8 +74,6 @@ type
IsPartOfProject: boolean): TModalResult; virtual; abstract; IsPartOfProject: boolean): TModalResult; virtual; abstract;
function FindIncludeFileInProjectDependencies(Project1: TProject; function FindIncludeFileInProjectDependencies(Project1: TProject;
const Filename: string): string; virtual; abstract; const Filename: string): string; virtual; abstract;
function AddDependencyToOwners(OwnerList: TFPList; APackage: TLazPackage;
OnlyTestIfPossible: boolean = false): TModalResult; virtual; abstract;
function SearchFile(const AFilename: string; function SearchFile(const AFilename: string;
SearchFlags: TSearchIDEFileFlags; SearchFlags: TSearchIDEFileFlags;
InObject: TObject): TPkgFile; virtual; abstract; InObject: TObject): TPkgFile; virtual; abstract;

8
packager/pkgmanager.pas
View File

@ -217,7 +217,7 @@ type
function GetPackageOfCurrentSourceEditor(out APackage: TLazPackage): TPkgFile; function GetPackageOfCurrentSourceEditor(out APackage: TLazPackage): TPkgFile;
function IsOwnerDependingOnPkg(AnOwner: TObject; const PkgName: string; function IsOwnerDependingOnPkg(AnOwner: TObject; const PkgName: string;
out DependencyOwner: TObject): boolean; override; out DependencyOwner: TObject): boolean; override;
function AddDependencyToOwners(OwnerList: TFPList; APackage: TLazPackage; function AddDependencyToOwners(OwnerList: TFPList; APackage: TIDEPackage;
OnlyTestIfPossible: boolean = false): TModalResult; override; OnlyTestIfPossible: boolean = false): TModalResult; override;
function DoOpenPkgFile(PkgFile: TPkgFile): TModalResult; function DoOpenPkgFile(PkgFile: TPkgFile): TModalResult;
function FindVirtualUnitSource(PkgFile: TPkgFile): string; function FindVirtualUnitSource(PkgFile: TPkgFile): string;
@ -3221,14 +3221,16 @@ begin
end; end;
function TPkgManager.AddDependencyToOwners(OwnerList: TFPList; function TPkgManager.AddDependencyToOwners(OwnerList: TFPList;
APackage: TLazPackage; OnlyTestIfPossible: boolean): TModalResult; APackage: TIDEPackage; OnlyTestIfPossible: boolean): TModalResult;
var var
i: Integer; i: Integer;
Item: TObject; Item: TObject;
NewDependency: TPkgDependency; NewDependency: TPkgDependency;
ADependency: TPkgDependency; ADependency: TPkgDependency;
r: TModalResult; r: TModalResult;
Pkg: TLazPackage;
begin begin
Pkg:=APackage as TLazPackage;
if not OnlyTestIfPossible then begin if not OnlyTestIfPossible then begin
Result:=AddDependencyToOwners(OwnerList,APackage,true); Result:=AddDependencyToOwners(OwnerList,APackage,true);
if Result<>mrOk then exit; if Result<>mrOk then exit;
@ -3239,7 +3241,7 @@ begin
Item:=TObject(OwnerList[i]); Item:=TObject(OwnerList[i]);
if Item=APackage then continue; if Item=APackage then continue;
if Item is TProject then begin if Item is TProject then begin
Result:=AddProjectDependency(TProject(Item),APackage,OnlyTestIfPossible); Result:=AddProjectDependency(TProject(Item),Pkg,OnlyTestIfPossible);
if Result<>mrOk then exit; if Result<>mrOk then exit;
end else if Item is TLazPackage then begin end else if Item is TLazPackage then begin
NewDependency:=TPkgDependency.Create; NewDependency:=TPkgDependency.Create;