changed: #doFindFileNamed:directories:ignoreCaseInName:excludeFilesNamed:ignoreCaseInExcludedName:containingString:ignoreCaseInContents:notContainingString:ignoreCaseInNotContents:sameContentsAsFile:sameContentsAs:in:
authorClaus Gittinger <cg@exept.de>
Thu, 12 Jan 2012 02:55:27 +0100
changeset 11106 86ac37a9a382
parent 11105 7983da617733
child 11107 17342ca15467
changed: #doFindFileNamed:directories:ignoreCaseInName:excludeFilesNamed:ignoreCaseInExcludedName:containingString:ignoreCaseInContents:notContainingString:ignoreCaseInNotContents:sameContentsAsFile:sameContentsAs:in:
FindFileApplication.st
--- a/FindFileApplication.st	Thu Jan 12 02:53:26 2012 +0100
+++ b/FindFileApplication.st	Thu Jan 12 02:55:27 2012 +0100
@@ -991,15 +991,6 @@
     ^ ignoreCaseInNotContents.
 !
 
-matchedFilesList
-
-    matchedFilesList isNil ifTrue:[
-        matchedFilesList := List new.
-        matchedFilesList addDependent:self.
-    ].
-    ^ matchedFilesList.
-!
-
 namePatternHolder
 
     namePatternHolder isNil ifTrue:[
@@ -1195,7 +1186,7 @@
     notContainingString:notContentsStringArg ignoreCaseInNotContents:ignCaseInNotContents 
     sameContentsAsFile:filenameToCompareContentsOrNil sameContentsAs:bytesToCompareContentsOrNil in:aDirectory
 
-    |dir lines contentsToCompare resultList matchedFilesList inStream
+    |dir lines contentsToCompare resultList inStream
      doesFileMatch contentsString notContentsString check checkNot 
      grepCommand nameMatch nameExcludedMatch realNameMatch fileSizesToSearchFor filesToSearchFor fileMD5sToSearchFor 
      setOfFilesToSearchFor remember cache fn dirSearchedRelative|
@@ -1254,7 +1245,6 @@
 "/    ].
 
     resultList := self resultList.
-    matchedFilesList := self matchedFilesList.
 
     filenameToCompareContentsOrNil notNil ifTrue:[
         doesFileMatch := 
@@ -1312,7 +1302,7 @@
                             ].
                             contentsMatches ifTrue:[
                                 matchedFile := filesToSearchFor at:idxInList.
-                                matchedFilesList add:matchedFile.
+                                self matchedFilesList add:matchedFile.
                             ].
                         ].
 "/                        contentsToCompare isNil ifTrue:[
@@ -1691,9 +1681,9 @@
 !FindFileApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.97 2012-01-12 01:12:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.98 2012-01-12 01:55:27 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.97 2012-01-12 01:12:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.98 2012-01-12 01:55:27 cg Exp $'
 ! !