From 26f5d5ce889aeff997739af7bc9aef25b7c072db Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Fri, 11 Jan 2008 16:10:14 +0000
Subject: [PATCH] - Get rid of lame helper notinlist(), use
 TStringList.IndexOf() instead. - Get rid of TCreateTableForm.ButtonsChange(),
 merge code into TCreateTableForm.EditFieldnameChange()

---
 source/createtable.pas | 32 +++++++-------------------------
 source/helpers.pas     | 24 ------------------------
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/source/createtable.pas b/source/createtable.pas
index d1ad702c..45095fb1 100644
--- a/source/createtable.pas
+++ b/source/createtable.pas
@@ -72,7 +72,6 @@ type
     procedure FormShow(Sender: TObject);
     procedure refreshfields(Sender: TObject);
     procedure ButtonChangeClick(Sender: TObject);
-    procedure ButtonsChange(Sender: TObject);
     procedure ComboBoxTypeChange(Sender: TObject);
     procedure EditLengthSetChange(Sender: TObject);
     procedure EditDefaultChange(Sender: TObject);
@@ -476,20 +475,21 @@ end;
 
 procedure TCreateTableForm.EditFieldnameChange(Sender: TObject);
 var
-  colExists : Boolean;
+  colExists, colSelected : Boolean;
 begin
   // Field Name EditChange
-  colExists := notinlist(EditFieldName.Text, ListboxColumns.Items);
-  buttonAdd.Enabled := colExists;
-  buttonChange.Enabled := colExists;
-  ButtonAdd.Default := colExists;
+  colExists := ListboxColumns.Items.IndexOf(EditFieldName.Text) > -1;
+  colSelected := index > -1;
+  buttonAdd.Enabled := not colExists;
+  buttonChange.Enabled := (not colExists) and colSelected;
+  buttonDelete.Enabled := colSelected;
+  ButtonAdd.Default := not colExists;
   try
     ensureValidIdentifier(EditFieldName.Text);
   except
     buttonAdd.Enabled := false;
     buttonChange.Enabled := false;
   end;
-  ButtonsChange(self);
 end;
 
 procedure TCreateTableForm.ListboxColumnsClick(Sender: TObject);
@@ -501,24 +501,6 @@ begin
   refreshfields(self);
 end;
 
-
-procedure TCreateTableForm.ButtonsChange(Sender: TObject);
-begin
-  // look for name and change buttons
-  if index = -1 then
-  begin
-    buttonDelete.Enabled := false;
-    buttonChange.Enabled := false;
-  end else
-  begin
-    buttonDelete.Enabled := true;
-    if notinlist(EditFieldName.Text, ListboxColumns.Items) then
-      buttonChange.Enabled := true
-    else
-      buttonChange.Enabled := false;
-  end;
-end;
-
 procedure TCreateTableForm.FormShow(Sender: TObject);
 var
   i         : Integer;
diff --git a/source/helpers.pas b/source/helpers.pas
index f020be2d..f9d911ae 100644
--- a/source/helpers.pas
+++ b/source/helpers.pas
@@ -37,7 +37,6 @@ type
   type TParseSQLProcessCommand = procedure(command: String; parameter: String) of object;
   function parsesql(sql: String; delimiter: String; processcommand: TParseSQLProcessCommand = nil) : TStringList;
   function sstr(str: String; len: Integer) : String;
-  function notinlist(str: String; strlist: TStrings): Boolean;
   function encrypt(str: String): String;
   function decrypt(str: String): String;
   function htmlentities(str: String): String;
@@ -655,29 +654,6 @@ end;
 
 
 
-{***
-  Check existance of a string in a TStrings
-
-  @param string Searched text
-  @param TStrings List of Strings
-  @return boolean
-}
-function notinlist(str: String; strlist: TStrings): Boolean;
-var i: Integer;
-begin
-  result := true;
-  for i:=0 to strlist.Count-1 do
-  begin
-    if str = strlist[i] then
-    begin
-      result := false;
-      break;
-    end;
-  end;
-end;
-
-
-
 {***
   Password-encryption, used to store session-passwords in registry