Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
isEmptyOrNil / notEmptyOrNil refactoring
authorClaus Gittinger <cg@exept.de>
Tue, 17 Jan 2006 13:18:46 +0100
changeset 6482 00207f456339
parent 6481 fd4f39c392fb
child 6483 b40237b315f1
isEmptyOrNil / notEmptyOrNil refactoring
AbstractFileBrowser.st file | annotate | diff | comparison | revisions
BrowserView.st file | annotate | diff | comparison | revisions
ChangesBrowser.st file | annotate | diff | comparison | revisions
FileApplicationNoteBook.st file | annotate | diff | comparison | revisions
FileBrowser.st file | annotate | diff | comparison | revisions
FileDialog.st file | annotate | diff | comparison | revisions
FindFileApplication.st file | annotate | diff | comparison | revisions 
--- a/AbstractFileBrowser.st	Mon Jan 16 18:23:28 2006 +0100
+++ b/AbstractFileBrowser.st	Tue Jan 17 13:18:46 2006 +0100
@@ -2489,7 +2489,7 @@
     |cmd suffix cmdHist historySize|
 
     cmdHist := self class commandHistory.
-    (aCommandString notNil and:[aCommandString notEmpty]) ifTrue:[
+    (aCommandString notEmptyOrNil) ifTrue:[
         cmdHist notNil ifTrue:[
             cmdHist addFirst:aCommandString.
             historySize := self class commandHistorySize.
@@ -3802,7 +3802,7 @@
     |buffer destination files directories copiedFiles thisIsAFileMoveOperation|
 
     files := self clipboard files.
-    (files isNil or:[files isEmpty]) ifTrue:[ ^ self ].
+    files isEmptyOrNil ifTrue:[ ^ self ].
 
     thisIsAFileMoveOperation := self clipboard method == #cut.
 
@@ -6935,5 +6935,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.312 2006-01-13 09:01:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.313 2006-01-17 12:17:44 cg Exp $'
 ! !
--- a/BrowserView.st	Mon Jan 16 18:23:28 2006 +0100
+++ b/BrowserView.st	Tue Jan 17 13:18:46 2006 +0100
@@ -13127,7 +13127,7 @@
 
                 cat := self askForMethodCategory.
             ].
-            (cat notNil and:[cat notEmpty]) ifTrue:[
+            (cat notEmptyOrNil) ifTrue:[
                 AbortOperationRequest catch:[
                     lockUpdates := true.
 
@@ -14626,7 +14626,7 @@
 !BrowserView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.787 2005-10-11 11:46:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.788 2006-01-17 12:17:36 cg Exp $'
 ! !
 
 BrowserView initialize!
--- a/ChangesBrowser.st	Mon Jan 16 18:23:28 2006 +0100
+++ b/ChangesBrowser.st	Tue Jan 17 13:18:46 2006 +0100
@@ -2832,7 +2832,7 @@
                                 methodPos := inStream position1Based.
 
                                 text := inStream nextChunk.
-                                done := text isNil or:[text isEmpty].
+                                done := text isEmptyOrNil.
 
                                 done ifFalse:[
                                     first ifFalse:[
@@ -5688,5 +5688,5 @@
 !ChangesBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.337 2005-12-21 16:35:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.338 2006-01-17 12:18:46 cg Exp $'
 ! !
--- a/FileApplicationNoteBook.st	Mon Jan 16 18:23:28 2006 +0100
+++ b/FileApplicationNoteBook.st	Tue Jan 17 13:18:46 2006 +0100
@@ -1743,7 +1743,7 @@
 
     sel := self selectionHolder value.
     list := self archiveFileList.
-    (sel notNil and:[sel notEmpty]) ifTrue:[
+    (sel notEmptyOrNil) ifTrue:[
         stream := WriteStream on:''.
         sel do:[: key |
             stream nextPutAll:(key fileName asString).
@@ -1875,10 +1875,10 @@
 !
 
 hasSelectionInList
-
     | sel |
+
     sel := self selectionHolder value.
-    ^ (sel notNil and:[sel notEmpty])
+    ^ sel notEmptyOrNil
 !
 
 selectionHolder
@@ -2190,7 +2190,7 @@
     extractWithDirectoryPart := true.
     extractAllFilesInSelectedDirectories := false.
     sel := self selectionHolder value.
-    (sel isNil or:[sel isEmpty]) ifTrue:[
+    (sel isEmptyOrNil) ifTrue:[
         sel := self archiveFileList value.
     ].
     sel := sel do:[:item|
@@ -4602,7 +4602,7 @@
     master := self masterApplication.
     master notNil ifTrue:[
         modifiedApplications := master getSameFilesModifiedFor:self.
-        (modifiedApplications isNil or:[modifiedApplications isEmpty]) ifTrue:[^ true ].
+        (modifiedApplications isEmptyOrNil) ifTrue:[^ true ].
         filename := aFilename asString.
         stream := WriteStream on:''.
         stream nextPutAll:filename.
@@ -5538,5 +5538,5 @@
 !FileApplicationNoteBook class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.195 2006-01-16 17:23:28 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.196 2006-01-17 12:17:01 cg Exp $'
 ! !
--- a/FileBrowser.st	Mon Jan 16 18:23:28 2006 +0100
+++ b/FileBrowser.st	Tue Jan 17 13:18:46 2006 +0100
@@ -200,7 +200,7 @@
 addToCommandHistory:aCommandString for:aFilename
     |cmd suffix|
 
-    (aCommandString notNil and:[aCommandString notEmpty]) ifTrue:[
+    (aCommandString notEmptyOrNil) ifTrue:[
         CommandHistory notNil ifTrue:[
             CommandHistory addFirst:aCommandString.
             CommandHistory size > CommandHistorySize ifTrue:[
@@ -3513,7 +3513,7 @@
 
     ok ifTrue:[
         name1 := name1 value.
-        (name1 isNil or:[name1 isEmpty]) ifTrue:[
+        (name1 isEmptyOrNil) ifTrue:[
 "/            text1 := subView contents.
             text1 := subView list asStringCollection withTabs.
             text1 := text1 collect:[:l | l isNil ifTrue:[' '] ifFalse:[l]].
@@ -4237,7 +4237,7 @@
                 
                 "/            subView insertStringAtCursor:cmd.
                 "/            subView insertCharAtCursor:(Character cr).
-                (cmd notNil and:[ cmd notEmpty ]) ifTrue:[ 
+                (cmd notEmptyOrNil) ifTrue:[ 
                     self class addToCommandHistory:cmd for:nil.
                     self doExecuteCommand:cmd replace:false.
                     commandView contents:nil.
@@ -7520,5 +7520,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.607 2006-01-09 08:56:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.608 2006-01-17 12:16:53 cg Exp $'
 ! !
--- a/FileDialog.st	Mon Jan 16 18:23:28 2006 +0100
+++ b/FileDialog.st	Tue Jan 17 13:18:46 2006 +0100
@@ -341,7 +341,7 @@
         multipleSelect:false.
 
     enteredFileNameString := instance result.
-    (enteredFileNameString isNil or:[enteredFileNameString isEmpty]) ifTrue:[
+    (enteredFileNameString isEmptyOrNil) ifTrue:[
         ^ failBlock value
     ].
     enteredFileName := enteredFileNameString asFilename.
@@ -606,7 +606,7 @@
     defaultDir notNil ifTrue:[instance directory:defaultDir].
     instance multipleSelect:multipleSelect ? false.
     instance startFilename:defaultFile.
-    instance pattern:((pattern isNil or:[pattern isEmpty]) ifTrue:['*'] ifFalse:[pattern]).
+    instance pattern:((pattern isEmptyOrNil) ifTrue:['*'] ifFalse:[pattern]).
     instance initialText:titleString.
     instance okLabelHolder value:okText.
     instance cancelLabelHolder value:abortText.
@@ -1642,5 +1642,5 @@
 !FileDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.85 2006-01-09 08:51:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.86 2006-01-17 12:18:26 cg Exp $'
 ! !
--- a/FindFileApplication.st	Mon Jan 16 18:23:28 2006 +0100
+++ b/FindFileApplication.st	Tue Jan 17 13:18:46 2006 +0100
@@ -607,7 +607,7 @@
 
     sel := self selectionHolder value.
     list := self shownList.
-    (sel notNil and:[sel notEmpty]) ifTrue:[
+    (sel notEmptyOrNil) ifTrue:[
         stream := WriteStream on:''.
         sel do:[: key |
             stream nextPutAll:(list at:key).
@@ -786,7 +786,7 @@
     |sel|
 
     sel := self selectionHolder value.
-    (sel notNil and:[sel notEmpty]) ifTrue:[
+    (sel notEmptyOrNil) ifTrue:[
         FileBrowserV2 openOn:(self shownList at:sel first) asFilename
     ].
 !
@@ -796,7 +796,7 @@
 
     sel := self selectionHolder value.
     list := self shownList.
-    (sel notNil and:[sel notEmpty]) ifTrue:[
+    (sel notEmptyOrNil) ifTrue:[
         sel reverseDo:[: key |
             list removeAtIndex:key
         ]
@@ -807,7 +807,7 @@
     |sel entry application|
 
     sel := self selectionHolder value.
-    (sel notNil and:[sel notEmpty]) ifTrue:[
+    (sel notEmptyOrNil) ifTrue:[
         entry := self shownList at:sel first.
         entry asFilename exists ifFalse:[ ^ self].
         application := targetApplication ? self masterApplication.
@@ -1679,8 +1679,9 @@
 
 hasSelectionInResultList
     | sel |
+
     sel := self selectionHolder value.
-    ^  (sel notNil and:[sel notEmpty])
+    ^ sel notEmptyOrNil
 ! !
 
 !FindFileApplication methodsFor:'startup & release'!
@@ -1724,5 +1725,5 @@
 !FindFileApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.73 2005-12-21 12:43:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FindFileApplication.st,v 1.74 2006-01-17 12:16:39 cg Exp $'
 ! !
hg/stx-libtool