--- a/Tools__StringSearchTool.st	Mon Oct 12 15:00:26 2009 +0200
+++ b/Tools__StringSearchTool.st	Mon Oct 12 15:00:35 2009 +0200
@@ -15,10 +15,9 @@
 
 ApplicationModel subclass:#StringSearchTool
 	instanceVariableNames:'searchTextHolder searchTextView searchBarImageInfoLabelHolder
-		searchBarInfoLabelHolder searchTextModifiedHolder
-		ignoreCaseHolder closeBlock searchNextBlock searchPreviousBlock
-		restartHolder'
-	classVariableNames:'LastIgnoreCase LastRestart'
+		searchBarInfoLabelHolder searchTextModifiedHolder matchCaseHolder
+		closeBlock searchNextBlock searchPreviousBlock restartHolder'
+	classVariableNames:'LastMatchCase LastRestart'
 	poolDictionaries:''
 	category:'Interface-Tools'
 !
@@ -73,14 +72,14 @@
 
 !StringSearchTool class methodsFor:'accessing'!
 
-lastIgnoreCase
+lastMatchCase
 
-    ^ LastIgnoreCase ? true
+    ^ LastMatchCase ? false
 !
 
-lastIgnoreCase: aBoolean
+lastMatchCase: aBoolean
 
-    LastIgnoreCase := aBoolean
+    LastMatchCase := aBoolean
 !
 
 lastRestart
@@ -365,7 +364,7 @@
                     label: 'Case'
                     name: 'DoNotIgnoreCaseCheckBox'
                     layout: (LayoutFrame 360 0 1 0 553 0 23 0)
-                    model: doNotIgnoreCaseHolder
+                    model: matchCaseHolder
                     translateLabel: true
                   )
                  (LabelSpec
@@ -404,6 +403,11 @@
     closeBlock := something.
 !
 
+ignoreCase
+
+    ^ self matchCaseHolder value not
+!
+
 initialSearchString: aString  
 
     self searchTextHolder value: aString.
@@ -436,23 +440,16 @@
 
 !StringSearchTool methodsFor:'aspects'!
 
-doNotIgnoreCaseHolder
-    ^ BlockValue forLogicalNot:self ignoreCaseHolder
-!
-
-ignoreCaseHolder
+matchCaseHolder
 
-    ignoreCaseHolder isNil ifTrue:[
-        ignoreCaseHolder := self class lastIgnoreCase asValue.
+    matchCaseHolder isNil ifTrue:[
+        matchCaseHolder := self class lastMatchCase asValue.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       ignoreCaseHolder addDependent:self.
-        ignoreCaseHolder onChangeSend:#ignoreCaseHolderChanged to:self.
+"/       matchCaseHolder addDependent:self.
+        matchCaseHolder onChangeSend:#matchCaseHolderChanged to:self.
 
     ].
-    ^ ignoreCaseHolder.
-
-    "Created: / 16-06-2007 / 06:45:04 / Administrador"
-    "Modified: / 16-06-2007 / 19:32:15 / Administrador"
+    ^ matchCaseHolder.
 !
 
 restartHolder
@@ -508,11 +505,11 @@
 
 !StringSearchTool methodsFor:'change & update'!
 
-ignoreCaseHolderChanged
+matchCaseHolderChanged
 
     self searchNextTextIncludingCurrentSelection: true.
     self setFocusToSearchTextView.
-    self class lastIgnoreCase: self ignoreCaseHolder value. 
+    self class lastMatchCase: self matchCaseHolder value. 
 !
 
 processEvent:anEvent
@@ -639,7 +636,7 @@
 
 searchNextTextReachEnd
     |message|
-    message := 'End of list reached'.
+    message := 'End of text reached'.
     self searchTextRestarted: message.
     Smalltalk beep.
 
@@ -653,7 +650,7 @@
 searchPreviousTextReachBeginning
     |message|
 
-    message := 'Beginning of list reached'.
+    message := 'Beginning of text reached'.
     self searchTextRestarted: message.
     Smalltalk beep.
 
@@ -724,7 +721,7 @@
 
     searchText := searchTextView contents.
     searchText isEmptyOrNil ifTrue:[^self].
-    ignoreCase := self ignoreCaseHolder value.
+    ignoreCase := self ignoreCase.
     searchNextBlock isNil ifTrue:[^ self].
     searchNextBlock value: self value: searchText value: ignoreCase value: #beginning
 
@@ -739,7 +736,7 @@
     self searchTextStarted.
     searchText := searchTextView contents.
     searchText isEmptyOrNil ifTrue:[^self].
-    ignoreCase := self ignoreCaseHolder value.
+    ignoreCase := self ignoreCase.
     searchNextBlock isNil ifTrue:[^ self].
     startPlace := includeCurrentSelection ifTrue:[#current] ifFalse:[#includingCurrent].
     searchNextBlock value: self value: searchText value: ignoreCase value: startPlace 
@@ -758,7 +755,7 @@
     searchText := searchTextView contents.      
 "/    self setFocusToSearchTextView.
     searchText isEmptyOrNil ifTrue:[^self].
-    ignoreCase := self ignoreCaseHolder value.
+    ignoreCase := self ignoreCase.
     searchPreviousBlock isNil ifTrue:[^ self].
     searchPreviousBlock value: self value: searchText value: ignoreCase value: #current.
 
@@ -779,7 +776,7 @@
 
     searchText := searchTextView contents.
     searchText isEmptyOrNil ifTrue:[^self].
-    ignoreCase := self ignoreCaseHolder value.
+    ignoreCase := self ignoreCase.
     searchPreviousBlock isNil ifTrue:[^ self].
     searchPreviousBlock value: self value: searchText value: ignoreCase value: #end
 
@@ -791,9 +788,9 @@
 !StringSearchTool class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__StringSearchTool.st,v 1.15 2009-10-09 17:47:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__StringSearchTool.st,v 1.16 2009-10-12 13:00:35 fm Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__StringSearchTool.st,v 1.15 2009-10-09 17:47:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__StringSearchTool.st,v 1.16 2009-10-12 13:00:35 fm Exp $'
 ! !