From c37254b8ff65332fb781dfb1abd32ba4e925595e Mon Sep 17 00:00:00 2001 From: mattias Date: Wed, 14 Dec 2011 10:03:56 +0000 Subject: [PATCH] IDE: designer: allow dotted unit names, bug #20892 git-svn-id: trunk@34175 - --- designer/jitforms.pp | 11 +++++------ ide/main.pp | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/designer/jitforms.pp b/designer/jitforms.pp index 7a056c7a91..3667f4cbb2 100644 --- a/designer/jitforms.pp +++ b/designer/jitforms.pp @@ -42,10 +42,9 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, SysUtils, AvgLvlTree, TypInfo, LCLProc, LResources, Forms, Controls, - LCLMemManager, LCLIntf, Dialogs, - PropEditUtils, PropEdits, IDEProcs, - BasePkgManager; + Classes, SysUtils, AvgLvlTree, BasicCodeTools, TypInfo, LCLProc, LResources, + Forms, Controls, LCLMemManager, LCLIntf, Dialogs, PropEditUtils, PropEdits, + IDEProcs, BasePkgManager; type //---------------------------------------------------------------------------- @@ -1259,7 +1258,7 @@ begin if IndexOf(JITComponent)<0 then raise Exception.Create('TJITComponentList.RenameComponentUnitname JITComponent.ClassName='+ JITComponent.ClassName); - if (NewUnitName='') or (not IsValidIdent(NewUnitName)) then + if (NewUnitName='') or (not IsDottedIdentifier(NewUnitName)) then raise Exception.Create('TJITComponentList.RenameComponentUnitname invalid name: "'+NewUnitName+'"'); DoRenameUnitNameOfClass(JITComponent.ClassType,NewUnitName); end; @@ -1423,7 +1422,7 @@ begin raise Exception.Create('CreateNewClass NewClassName is not a valid identifier'); if NewUnitName='' then raise Exception.Create('CreateNewClass NewUnitName empty'); - if not IsValidIdent(NewUnitName) then + if not IsDottedIdentifier(NewUnitName) then raise Exception.Create('CreateNewClass NewUnitName is not a valid identifier'); Result:=nil; diff --git a/ide/main.pp b/ide/main.pp index 5fbd803747..806fae456f 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -8179,7 +8179,7 @@ begin // check program name NewProgramName:=ExtractFileNameOnly(AFilename); - if (NewProgramName='') or (not IsValidIdent(NewProgramName)) then begin + if (NewProgramName='') or (not IsDottedIdentifier(NewProgramName)) then begin Result:=MessageDlg(lisInvalidProjectFilename, Format(lisisAnInvalidProjectNamePleaseChooseAnotherEGProject, ['"', SaveDialog.Filename, '"', #13]),