From 72678bdaef23495aff8d24e13434b7b72b45aa2c Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Sat, 26 Apr 2014 11:55:11 +0000
Subject: [PATCH] Designer, ChangeClassDialog: formatting, cleanup, add a try -
 finally block.

git-svn-id: trunk@44808 -
---
 designer/changeclassdialog.pas | 38 +++++++++++++++-------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/designer/changeclassdialog.pas b/designer/changeclassdialog.pas
index 7066ee25fe..0d2e05e2fd 100644
--- a/designer/changeclassdialog.pas
+++ b/designer/changeclassdialog.pas
@@ -94,16 +94,12 @@ var
   ChangeClassDlg: TChangeClassDlg;
 begin
   Result:=mrCancel;
-  //MessageDlg('Not implemented yet','Not implemented yet',mtInformation,[mbOk],0);
-  //exit;
-  
   ChangeClassDlg:=TChangeClassDlg.Create(nil);
   try
     ChangeClassDlg.ThePersistent:=APersistent;
     ChangeClassDlg.FillNewClassComboBox;
     if ChangeClassDlg.ShowModal=mrOk then begin
-      Result:=ChangePersistentClass(ADesigner,APersistent,
-                                    ChangeClassDlg.NewClass);
+      Result:=ChangePersistentClass(ADesigner,APersistent,ChangeClassDlg.NewClass);
     end;
   finally
     ChangeClassDlg.Free;
@@ -138,8 +134,7 @@ var
     and (TControl(APersistent).Parent<>nil) then begin
       if OldParents=nil then
         OldParents:=TStringList.Create;
-      OldParents.Values[TControl(APersistent).Name]:=
-                                              TControl(APersistent).Parent.Name;
+      OldParents.Values[TControl(APersistent).Name]:=TControl(APersistent).Parent.Name;
     end;
 
     // stream selection
@@ -412,8 +407,7 @@ begin
   AddClass(AClass);
 end;
 
-function TChangeClassDlg.CompareClasses(Tree: TAvgLvlTree; Class1,
-  Class2: TClass): integer;
+function TChangeClassDlg.CompareClasses(Tree: TAvgLvlTree; Class1,Class2: TClass): integer;
 // sort:
 //   transforming ThePersistent to descending classes is easy
 //   transforming ThePersistent to ascending classes is medium
@@ -485,19 +479,21 @@ begin
     IDEComponentPalette.IterateRegisteredClasses(@AddComponentClass);
   // add list of classnames
   List:=TStringList.Create;
-  ANode:=FClasses.FindLowest;
-  while ANode<>nil do begin
-    List.Add(TClass(ANode.Data).ClassName);
-    ANode:=FClasses.FindSuccessor(ANode);
+  try
+    ANode:=FClasses.FindLowest;
+    while ANode<>nil do begin
+      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;
-  // 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.