search protocol changed to pass down a searchSpec instead
authorClaus Gittinger <cg@exept.de>
Tue, 23 Oct 2012 14:59:56 +0200
changeset 4464 bbdc850e9d93
parent 4463 8bfe40af7940
child 4465 6152a06b3328
search protocol changed to pass down a searchSpec instead of individual arguments. Makes it easier to add more search options in the future. Unfinished: need to remember last searchSpec instead of pattern/match/ignCase/variable
EditTextView.st
--- a/EditTextView.st	Tue Oct 23 14:59:09 2012 +0200
+++ b/EditTextView.st	Tue Oct 23 14:59:56 2012 +0200
@@ -6912,17 +6912,8 @@
 searchBwd:pattern ignoreCase:ign ifAbsent:aBlock
     "do a backward search"
 
-    |pos startLine startCol|
-
     cursorLine isNil ifTrue:[^ self].
-
-    pos := self startPositionForSearchBackward.
-    startLine := pos y.
-    startCol := pos x.
-
-    self searchBwd:pattern ignoreCase:ign startingAtLine:startLine col:startCol ifAbsent:aBlock
-
-    "Modified: 9.10.1997 / 13:02:13 / cg"
+    super searchBwd:pattern ignoreCase:ign ifAbsent:aBlock
 !
 
 searchBwd:pattern ignoreCase:ign startingAtLine:startLine col:startCol ifAbsent:aBlock
@@ -6969,42 +6960,6 @@
     "Modified: 9.10.1997 / 12:56:30 / cg"
 !
 
-searchFwd:pattern ifAbsent:aBlock
-    "do a forward search"
-
-    |pos startLine startCol|
-
-    pos := self startPositionForSearchForward.
-    startLine := pos y.
-    startCol := pos x.
-
-    self
-	searchFwd:pattern
-	startingAtLine:startLine col:startCol
-	ifAbsent:aBlock
-
-    "Modified: 9.10.1997 / 12:58:59 / cg"
-!
-
-searchFwd:pattern ignoreCase:ign ifAbsent:aBlock
-    "do a forward search"
-
-    |pos startLine startCol|
-
-    pos := self startPositionForSearchForward.
-    startLine := pos y.
-    startCol := pos x.
-
-    self
-	searchFwd:pattern
-	ignoreCase:ign
-	startingAtLine:startLine col:startCol
-	ifAbsent:aBlock
-
-    "Modified: 9.10.1997 / 12:58:59 / cg"
-    "Created: 9.10.1997 / 13:04:10 / cg"
-!
-
 searchFwd:pattern ignoreCase:ign match: match startingAtLine:startLine col:startCol ifAbsent:aBlock
     "do a forward search"
 
@@ -8066,9 +8021,9 @@
 !EditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.533 2012-10-02 14:38:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.534 2012-10-23 12:59:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.533 2012-10-02 14:38:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.534 2012-10-23 12:59:56 cg Exp $'
 ! !