Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup: notNil -> isNotNil and notEmpy -> isNotEmpty in Iceberg-* packages. (second PR) #1778

Merged
merged 1 commit into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Iceberg-Libgit/IceGitCommit.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ IceGitCommit >> hasMultipleAncestors [
| ancestors |
"using ancestorsIds because ancestors will instantiate parents and is slower"
ancestors := self ancestorIds.
^ ancestors notNil
^ ancestors isNotNil
and: [ ancestors size > 1 ]
]

Expand Down
4 changes: 2 additions & 2 deletions Iceberg-Libgit/IceRepositoryCreator.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ IceRepositoryCreator >> initialize [

{ #category : 'private - testing' }
IceRepositoryCreator >> isCloning [
^ self remoteToUse notNil
^ self remoteToUse isNotNil
]

{ #category : 'accessing' }
Expand Down Expand Up @@ -277,7 +277,7 @@ IceRepositoryCreator >> validateAlreadyPresentAndNotGit [
"Validate if I will add a local repository (url isNil and location isNotNil)...
testing the local directory actually exists"
(self remoteToUse isNil
and: [ self location notNil
and: [ self location isNotNil
and: [ self location exists
and: [ (self class isGitRoot: self location) not ] ] ])
ifTrue: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ IceGitLocalRepositoryType >> mcRepository [
extractedLocation := tuple first asFileReference asAbsolute.
repository := IceRepository registry
detect: [ :each |
each location notNil
each location isNotNil
and: [ each location resolve asAbsolute = extractedLocation ] ]
ifNone: [
(IceRepositoryCreator new
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-Plugin-GitHub/IceGitHubAPI.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ IceGitHubAPI >> newRequestTo: aString [

^ ZnClient new
in: [ :this |
(self credentials notNil and: [ isAnonymous not]) ifTrue: [
(self credentials isNotNil and: [ isAnonymous not]) ifTrue: [
self credentials applyToRequest: this ] ];
headerAt: 'Accept' put: self acceptMediaType;
url: 'https://api.github.com/', (aString first = $/
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IceGitHubTreeCommand >> actsOnTag: aRemoteModel [
{ #category : 'testing' }
IceGitHubTreeCommand >> canBeExecuted [

^ self item notNil and: [(self item canActivateCommand: self) and: [super canBeExecuted]]
^ self item isNotNil and: [(self item canActivateCommand: self) and: [super canBeExecuted]]
]

{ #category : 'accessing' }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ IceTipMetacelloInstallBaselineCommand >> basicInstallBaseline: icePackage groups
{ #category : 'testing' }
IceTipMetacelloInstallBaselineCommand >> canBeExecuted [

^ self packageModel notNil and: [ self package isMetacelloBaseline ]
^ self packageModel isNotNil and: [ self package isMetacelloBaseline ]
]

{ #category : 'private' }
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-TipUI/IceTipCommand.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ IceTipCommand >> badge [
{ #category : 'testing' }
IceTipCommand >> hasRepository [

^ self repositoryModel notNil
^ self repositoryModel isNotNil
]

{ #category : 'testing' }
IceTipCommand >> hasSelectedItem [

^ self context selectedItem notNil
^ self context selectedItem isNotNil
]

{ #category : 'testing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipGitRepositoryPanel.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ IceTipGitRepositoryPanel >> validate [
assert: (IceGitRemote isValidUrl: remoteString)
description: 'The url is incorrect.'.
self
assert: self projectLocation location notNil
assert: self projectLocation location isNotNil
description:
'Project location must be defined (if it does not exists, it will be created).'
]
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ IceTipLocalRepositoryPanel >> titleForWindow [
IceTipLocalRepositoryPanel >> validate [

self
assert: self location notNil
assert: self location isNotNil
description: 'Project location must exist!'.
self
assert: self location exists
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipMergePatchMorph.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ IceTipMergePatchMorph >> selectionHasActualClass [

^self selectedChangeWrapper
ifNil: [false]
ifNotNil: [:w | w item value contextClass notNil]
ifNotNil: [:w | w item value contextClass isNotNil]
]

{ #category : 'testing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipNewRepositoryPanel.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,6 @@ IceTipNewRepositoryPanel >> validate [
assert: self projectNameInputText text isNotEmpty
description: 'You must enter a project name (it will be used also as part of the path).'.
self
assert: self projectLocation location notNil
assert: self projectLocation location isNotNil
description: 'Project location must be defined (if it does not exists, it will be created).'
]
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipPackageCommand.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ IceTipPackageCommand class >> isAbstract [
{ #category : 'testing' }
IceTipPackageCommand >> hasPackageModel [

^ self packageModel notNil
^ self packageModel isNotNil
]

{ #category : 'testing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ IceTipRepositoryGroupPanel >> filteredItemsFor: pattern [
{ #category : 'testing' }
IceTipRepositoryGroupPanel >> hasSelectedItem [

^ repositoryList selectedItem notNil
^ repositoryList selectedItem isNotNil
]

{ #category : 'initialization' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg-TipUI/IceTipTreeGroup.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ IceTipTreeGroup >> isGroup [
IceTipTreeGroup >> isSameAs: aNode [
^ aNode species = self species
and: [ self name = aNode name
and: [ aNode name notNil ] ]
and: [ aNode name isNotNil ] ]
]

{ #category : 'accessing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg/IceCommit.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ IceCommit >> diffToWorkingCopyForPackages: aCollection [
IceCommit >> hasMultipleAncestors [
| ancestors |
ancestors := self ancestors.
^ ancestors notNil
^ ancestors isNotNil
and: [ ancestors size > 1 ]
]

Expand Down
2 changes: 1 addition & 1 deletion Iceberg/IceMethodDefinition.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ IceMethodDefinition >> install [

{ #category : 'morphic - compatibility' }
IceMethodDefinition >> isLoadable [
^ self contextClass notNil
^ self contextClass isNotNil
]

{ #category : 'testing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg/IceNode.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ IceNode >> hasChanges [
{ #category : 'testing' }
IceNode >> hasParent [

^ self parent notNil
^ self parent isNotNil
]

{ #category : 'comparing' }
Expand Down
2 changes: 1 addition & 1 deletion Iceberg/IceOperationMerge.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ IceOperationMerge >> isLoadable [
{ #category : 'testing' }
IceOperationMerge >> isResolved [

^ chosen notNil
^ chosen isNotNil
]

{ #category : 'resolution' }
Expand Down
4 changes: 2 additions & 2 deletions Iceberg/IceProxyMCVersionInfo.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ IceProxyMCVersionInfo class >> lastCommitFound: aCommit [
"This is just a cleanup mechanism... in general iceberg will be scanning
a full repository and each proxy will be pointing to same commit so no
point in keep it waiting"
(LastCommitFound notNil and: [ oldCommit isNil ]) ifTrue: [
(LastCommitFound isNotNil and: [ oldCommit isNil ]) ifTrue: [
[ (Delay forSeconds: 60) wait.
LastCommitFound := nil ] fork ]
]
Expand Down Expand Up @@ -93,7 +93,7 @@ IceProxyMCVersionInfo >> doesNotUnderstand: aMessage [
IceProxyMCVersionInfo >> findVersionInfo [
| repo remote commit |

(self class lastCommitFound notNil
(self class lastCommitFound isNotNil
and: [ self class lastCommitFound id = commitId ])
ifTrue: [
commit := self class lastCommitFound.
Expand Down
2 changes: 1 addition & 1 deletion Iceberg/LGitCommit.extension.st
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ LGitCommit >> changesFileNamed: fileName [
^ (myVersion
ifNil: [ parentVersions includes: nil ]
ifNotNil: [ parentVersions anySatisfy: [ :version |
version notNil and: [ version objectId = myVersion objectId ]]]) not
version isNotNil and: [ version objectId = myVersion objectId ]]]) not

]
1 change: 0 additions & 1 deletion Iceberg/MCMethodDefinition.extension.st
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Extension { #name : 'MCMethodDefinition' }


{ #category : '*Iceberg-Changes' }
MCMethodDefinition >> method [
^ self actualClass >> self selector
Expand Down
Loading