Skip to content

Commit

Permalink
Merge pull request #1752 from astares/1751-Use-isNotEmpty-instead-of-…
Browse files Browse the repository at this point in the history
…notEmpty-in-Iceberg

Use #isNotEmpty instead of #notEmpty in Iceberg
  • Loading branch information
jecisc authored Nov 21, 2023
2 parents 97582ee + 6b01b44 commit 2e64076
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Iceberg-Libgit/IceRepositoryCreator.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ IceRepositoryCreator class >> defaultSubdirectory [
IceRepositoryCreator class >> isGitRoot: aReference [
self flag: #pharoTodo. "This does not understand submodules"
^ aReference isDirectory
and: [ (aReference directoriesMatching: '.git') notEmpty
and: [ (aReference directoriesMatching: '.git') isNotEmpty
and: [ (aReference / '.git' / 'config') exists ] ]
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ IceGitHubNewBranchFromIssuePanel >> useRemote: aRemoteModel [
IceGitHubNewBranchFromIssuePanel >> validate [

self
assert: ((issueNumberText text asString notEmpty) and: [ issueNumberText text isAllDigits ])
assert: ((issueNumberText text asString isNotEmpty) and: [ issueNumberText text isAllDigits ])
description: 'Please enter a valid issue number'.
self
assert: fetched
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ IceTipAddRemoteDialogPresenter >> urlText [
IceTipAddRemoteDialogPresenter >> validate [

self
assert: self remoteName notEmpty
assert: self remoteName isNotEmpty
description: 'You need to specify a remote name.'.
self
assert: self remoteUrl notEmpty
assert: self remoteUrl isNotEmpty
description: 'You need to specify a remote url.'

]
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceTipMergeSelectingPanel.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ IceTipMergeSelectingPanel >> changeListColumn [
onActivation: [ :iceNode |
checkedIceNodes add: iceNode.
iceNode value selectLeft.
iceNode notEmpty ifTrue: [
iceNode isNotEmpty ifTrue: [
iceNode allChildrenDo: [ :child | checkedIceNodes add: child ].
self basicRefresh ] ];
onDeactivation: [ :iceNode |
checkedIceNodes remove: iceNode.
iceNode value selectRight.
iceNode notEmpty ifTrue: [
iceNode isNotEmpty ifTrue: [
iceNode allChildrenDo: [ :child |
checkedIceNodes remove: child ifAbsent: [ ] ].
self basicRefresh ].
Expand Down
10 changes: 5 additions & 5 deletions Iceberg-TipUI/IceTipRepositoryModel.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ IceTipRepositoryModel >> descriptionDecorator [

{ #category : 'testing' }
IceTipRepositoryModel >> hasRemotes [
^ self entity remotes notEmpty
^ self entity remotes isNotEmpty
]

{ #category : 'testing' }
Expand Down Expand Up @@ -187,7 +187,7 @@ IceTipRepositoryModel >> isLibGitAvailable [

{ #category : 'private - testing' }
IceTipRepositoryModel >> isLoaded [
^ self entity loadedPackages notEmpty
^ self entity loadedPackages isNotEmpty
]

{ #category : 'testing' }
Expand Down Expand Up @@ -441,7 +441,7 @@ IceTipRepositoryModel >> status [
ifTrue: [ ^ entity workingCopy workingCopyState description ].
entity workingCopy isDetached
ifTrue: [ ^ 'Detached Working Copy' ].
(entity head isDetached and: [ entity head tags notEmpty ])
(entity head isDetached and: [ entity head tags isNotEmpty ])
ifTrue: [ ^ 'Detached HEAD' ].
entity head isDetached
ifTrue: [ ^ 'Detached HEAD' ].
Expand Down Expand Up @@ -477,7 +477,7 @@ IceTipRepositoryModel >> statusDecorator [
ifTrue: [ ^ IceTipStatusDecorator error ].
entity workingCopy isDetached
ifTrue: [ ^ IceTipStatusDecorator error ].
(entity head isDetached and: [ entity head tags notEmpty ])
(entity head isDetached and: [ entity head tags isNotEmpty ])
ifTrue: [ ^ IceTipStatusDecorator warning ].
entity head isDetached
ifTrue: [ ^ IceTipStatusDecorator error ].
Expand All @@ -501,7 +501,7 @@ IceTipRepositoryModel >> statusString [
ifTrue: [ ^ entity workingCopy workingCopyState description ].
entity workingCopy isDetached
ifTrue: [ ^ 'Detached Working Copy' ].
(entity head isDetached and: [ entity head tags notEmpty ])
(entity head isDetached and: [ entity head tags isNotEmpty ])
ifTrue: [ ^ 'Detached HEAD' ].
entity head isDetached
ifTrue: [ ^ 'Detached HEAD' ].
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ IceTipSelectAllPackagesCommand >> canBeExecuted [
| pkgList |

pkgList := self packagesList.
^ pkgList items notEmpty and: [ pkgList items size ~= pkgList selectedItems size ]
^ pkgList items isNotEmpty and: [ pkgList items size ~= pkgList selectedItems size ]
]

{ #category : 'executing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ IceTipUnselectAllPackagesCommand >> canBeExecuted [
| pkgList |

pkgList := self context packagesList.
^ pkgList items notEmpty
^ pkgList items isNotEmpty
]

{ #category : 'executing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg/IceRepository.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ IceRepository >> hasIncomingCommitsFrom: aRemote [

{ #category : 'testing' }
IceRepository >> hasLoadedPackages [
^ self loadedPackages notEmpty
^ self loadedPackages isNotEmpty
]

{ #category : 'API - branches' }
Expand Down
6 changes: 3 additions & 3 deletions Iceberg/IceSshCredentials.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ IceSshCredentials >> isDefault [

{ #category : 'testing' }
IceSshCredentials >> isPresent [
^ self username notEmpty
and: [ self publicKey notEmpty
and: [ self privateKey notEmpty ] ]
^ self username isNotEmpty
and: [ self publicKey isNotEmpty
and: [ self privateKey isNotEmpty ] ]
]

{ #category : 'accessing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg/IceTokenCredentials.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ IceTokenCredentials >> hostDescription [

{ #category : 'accessing' }
IceTokenCredentials >> isPresent [
^ self token notEmpty
^ self token isNotEmpty
]

{ #category : 'accessing' }
Expand Down

0 comments on commit 2e64076

Please sign in to comment.