IDE: replaced some cycle with circular dependency

git-svn-id: trunk@34590 -
This commit is contained in:
mattias 2012-01-04 23:53:33 +00:00
parent 16b7e1da2a
commit fc55260fbc
5 changed files with 16 additions and 17 deletions

View File

@ -318,7 +318,7 @@ begin
ReferenceControl,ReferenceSide,CheckPosition))
then begin
if MessageDlg(lisCCOWarningCaption,
lisThisWillCreateACycle, mtWarning, [mbIgnore, mbCancel], 0)<>
lisThisWillCreateACircularDependency, mtWarning, [mbIgnore, mbCancel], 0)<>
mrIgnore
then begin
Refresh(false);
@ -538,7 +538,7 @@ begin
ReferenceControl,ReferenceSide,CheckPosition))
then begin
if MessageDlg(lisCCOWarningCaption,
lisThisWillCreateACycle, mtWarning, [mbIgnore, mbCancel], 0)<>
lisThisWillCreateACircularDependency, mtWarning, [mbIgnore, mbCancel], 0)<>
mrIgnore
then begin
Refresh(false);
@ -649,7 +649,7 @@ begin
ReferenceControl,ReferenceSide,CheckPosition))
then begin
if MessageDlg(lisCCOWarningCaption,
lisThisWillCreateACycle, mtWarning, [mbIgnore, mbCancel], 0)<>
lisThisWillCreateACircularDependency, mtWarning, [mbIgnore, mbCancel], 0)<>
mrIgnore
then begin
Refresh(false);

View File

@ -1978,8 +1978,8 @@ var
// check cycles
if TheFormEditor.ClassDependsOnComponent(NewComponentClass, LookupRoot) then
begin
IDEMessageDialog(lisInvalidCycle,
Format(lisIsAThisCycleDependencyIsNotAllowed, [dbgsName(LookupRoot),
IDEMessageDialog(lisA2PInvalidCircularDependency,
Format(lisIsAThisCircularDependencyIsNotAllowed, [dbgsName(LookupRoot),
dbgsName(NewComponentClass), #13]),
mtError,[mbOk],'');
exit;

View File

@ -3644,16 +3644,16 @@ resourcestring
+'Project Inspector.';
lisPkgMangARequiredPackagesWasNotFound = 'A required packages was not '
+'found. See package graph.';
lisPkgMangCycleInPackageDependencies = 'Cycle in package dependencies';
lisPkgMangCircularDependencies = 'Circular dependencies found';
lisPkgMangThePackageIsCompiledAutomaticallyAndItsOutputDirec = 'The package '
+'%s is compiled automatically and its output directory is "%s", which is '
+'in the default unit search path of the compiler. The package uses other '
+'packages which also uses the default unit search of the compiler. This '
+'creates a cycle.%sYou can fix this issue%sby removing the path from '
+'creates an endless loop.%sYou can fix this issue%sby removing the path from '
+'your compiler config (e.g. fpc.cfg)%sor by disabling the auto update of '
+'this package%sor by removing dependencies.';
lisPkgMangThereIsACycleInTheRequiredPackages = 'There is a cycle in the '
+'required packages. See package graph.';
lisPkgMangThereIsACircularDependency = 'There is a circular dependency in the '
+'packages. See package graph.';
lisPkgMangThereAreTwoUnitsWithTheSameName1From2From = 'There are two units '
+'with the same name:%s%s1. %s%s%s from %s%s2. %s%s%s from %s%s%s';
lisPkgMangThereIsAUnitWithTheSameNameAsAPackage1From2 = 'There is a unit '
@ -3923,7 +3923,7 @@ resourcestring
lisA2PInvalidClassName = 'Invalid Class Name';
lisA2PTheClassNameIsNotAValidPascalIdentifier = 'The class name %s%s%s is '
+'not a valid pascal identifier.';
lisA2PInvalidCycle = 'Invalid Cycle';
lisA2PInvalidCircularDependency = 'Invalid Circular Dependency';
lisA2PTheClassNameAndAncestorTypeAreTheSame = 'The class name %s%s%s and '
+'ancestor type %s%s%s are the same.';
lisA2PAmbiguousAncestorType = 'Ambiguous Ancestor Type';
@ -4486,7 +4486,7 @@ resourcestring
lisLeftGroupBoxCaption = 'Left anchoring';
lisBottomGroupBoxCaption = 'Bottom anchoring';
lisUnableToSetAnchorSideControl = 'Unable to set AnchorSide Control';
lisThisWillCreateACycle = 'This will create a cycle.';
lisThisWillCreateACircularDependency = 'This will create a circular dependency.';
lisAnchorEditorNoControlSelected = 'Anchor Editor - no control selected';
lisAnchorsOfSelectedControls = 'Anchors of selected controls';
lisDebugOptionsFrmAdditionalSearchPath = 'Additional search path';
@ -4798,8 +4798,7 @@ resourcestring
lisPWOpenRecentProject = 'Open Recent Project';
lisPWViewExampleProjects = 'View Example Projects';
lisPWConvertProject = 'Convert Delphi Project';
lisInvalidCycle = 'Invalid cycle';
lisIsAThisCycleDependencyIsNotAllowed = '%s is a %s.%sThis cycle '
lisIsAThisCircularDependencyIsNotAllowed = '%s is a %s.%sThis circular '
+'dependency is not allowed.';
lisTheComponentCanNotBeDeletedBecauseItIsNotOwnedBy = 'The component %s can '
+'not be deleted, because it is not owned by %s.';

View File

@ -867,7 +867,7 @@ begin
// check classname<>ancestortype
if AnsiCompareText(Params.NewClassName,Params.AncestorType)=0 then begin
IDEMessageDialog(lisA2PInvalidCycle,
IDEMessageDialog(lisA2PInvalidCircularDependency,
Format(lisA2PTheClassNameAndAncestorTypeAreTheSame, ['"',
Params.NewClassName, '"', '"', Params.AncestorType, '"']),
mtError,[mbCancel]);

View File

@ -1251,8 +1251,8 @@ begin
PathList:=PackageGraph.FindCycleDependencyPath(APackage,FirstDependency);
if PathList<>nil then begin
DoShowPackageGraphPathList(PathList);
Result:=IDEMessageDialogAb(lisPkgMangCycleInPackageDependencies,
lisPkgMangThereIsACycleInTheRequiredPackages,
Result:=IDEMessageDialogAb(lisPkgMangCircularDependencies,
lisPkgMangThereIsACircularDependency,
mtError,Btns,ShowAbort);
if not ShowAbort then
Result := mrCancel; // User confirmed error, implicitly cancel the action
@ -1264,7 +1264,7 @@ begin
if PathList<>nil then begin
ConflictPkg:=TObject(PathList[PathList.Count-1]) as TLazPackage;
DoShowPackageGraphPathList(PathList);
Result:=IDEMessageDialogAb(lisPkgMangCycleInPackageDependencies,
Result:=IDEMessageDialogAb(lisPkgMangCircularDependencies,
Format(lisPkgMangThePackageIsCompiledAutomaticallyAndItsOutputDirec, [
ConflictPkg.Name, ConflictPkg.GetOutputDirectory, #13#13, #13, #13,
#13]),