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

Designer, ChangeClassDialog: formatting, cleanup, add a try - finally block.

Browse Source 
git-svn-id: trunk@44808 -
This commit is contained in:
juha 2014-04-26 11:55:11 +00:00
parent 340635fea2
commit 72678bdaef
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
designer/changeclassdialog.pas
View File

@ -94,16 +94,12 @@ var
ChangeClassDlg: TChangeClassDlg; ChangeClassDlg: TChangeClassDlg;
begin begin
Result:=mrCancel; Result:=mrCancel;
//MessageDlg('Not implemented yet','Not implemented yet',mtInformation,[mbOk],0);
//exit;
ChangeClassDlg:=TChangeClassDlg.Create(nil); ChangeClassDlg:=TChangeClassDlg.Create(nil);
try try
ChangeClassDlg.ThePersistent:=APersistent; ChangeClassDlg.ThePersistent:=APersistent;
ChangeClassDlg.FillNewClassComboBox; ChangeClassDlg.FillNewClassComboBox;
if ChangeClassDlg.ShowModal=mrOk then begin if ChangeClassDlg.ShowModal=mrOk then begin
Result:=ChangePersistentClass(ADesigner,APersistent, Result:=ChangePersistentClass(ADesigner,APersistent,ChangeClassDlg.NewClass);
ChangeClassDlg.NewClass);
end; end;
finally finally
ChangeClassDlg.Free; ChangeClassDlg.Free;
@ -138,8 +134,7 @@ var
and (TControl(APersistent).Parent<>nil) then begin and (TControl(APersistent).Parent<>nil) then begin
if OldParents=nil then if OldParents=nil then
OldParents:=TStringList.Create; OldParents:=TStringList.Create;
OldParents.Values[TControl(APersistent).Name]:= OldParents.Values[TControl(APersistent).Name]:=TControl(APersistent).Parent.Name;
TControl(APersistent).Parent.Name;
end; end;
// stream selection // stream selection
@ -412,8 +407,7 @@ begin
AddClass(AClass); AddClass(AClass);
end; end;
function TChangeClassDlg.CompareClasses(Tree: TAvgLvlTree; Class1, function TChangeClassDlg.CompareClasses(Tree: TAvgLvlTree; Class1,Class2: TClass): integer;
Class2: TClass): integer;
// sort: // sort:
// transforming ThePersistent to descending classes is easy // transforming ThePersistent to descending classes is easy
// transforming ThePersistent to ascending classes is medium // transforming ThePersistent to ascending classes is medium
@ -485,19 +479,21 @@ begin
IDEComponentPalette.IterateRegisteredClasses(@AddComponentClass); IDEComponentPalette.IterateRegisteredClasses(@AddComponentClass);
// add list of classnames // add list of classnames
List:=TStringList.Create; List:=TStringList.Create;
ANode:=FClasses.FindLowest; try
while ANode<>nil do begin ANode:=FClasses.FindLowest;
List.Add(TClass(ANode.Data).ClassName); while ANode<>nil do begin
ANode:=FClasses.FindSuccessor(ANode); List.Add(TClass(ANode.Data).ClassName);
ANode:=FClasses.FindSuccessor(ANode);
end;
// assign to combobox
NewClassComboBox.Items.Assign(List);
if (NewClassComboBox.Items.IndexOf(NewClassComboBox.Text)<0)
and (NewClassComboBox.Items.Count>0) then
NewClassComboBox.Text:=NewClassComboBox.Items[0];
UpdateNewInfo;
finally
List.Free;
end; end;
// assign to combobox
NewClassComboBox.Items.Assign(List);
if (NewClassComboBox.Items.IndexOf(NewClassComboBox.Text)<0)
and (NewClassComboBox.Items.Count>0) then
NewClassComboBox.Text:=NewClassComboBox.Items[0];
UpdateNewInfo;
// clean up
List.Free;
end; end;
end. end.