From 5e5874044f1d3c51939b8663bb95ee07437e1bb6 Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Tue, 28 May 2024 12:44:48 +0200 Subject: [PATCH] Use isNotNil instead of notNil Fix #1825 --- Iceberg-TipUI/IceCheckoutStrategy.extension.st | 10 +++++----- Iceberg-TipUI/IceTipDiffPanel.class.st | 2 +- .../IceTipResetBranchToThisCommitCommand.class.st | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Iceberg-TipUI/IceCheckoutStrategy.extension.st b/Iceberg-TipUI/IceCheckoutStrategy.extension.st index ac78658726..c42a4f8a50 100644 --- a/Iceberg-TipUI/IceCheckoutStrategy.extension.st +++ b/Iceberg-TipUI/IceCheckoutStrategy.extension.st @@ -1,12 +1,12 @@ Extension { #name : 'IceCheckoutStrategy' } { #category : '*Iceberg-TipUI' } -IceCheckoutStrategy >> description [ - - ^ self class description +IceCheckoutStrategy class >> description [ + ^ self subclassResponsibility ] { #category : '*Iceberg-TipUI' } -IceCheckoutStrategy class >> description [ - ^ self subclassResponsibility +IceCheckoutStrategy >> description [ + + ^ self class description ] diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st index e74a4311b5..83ca780762 100644 --- a/Iceberg-TipUI/IceTipDiffPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffPanel.class.st @@ -97,7 +97,7 @@ IceTipDiffPanel >> diffEntryRemoved: announcement [ no parent, but it's fine to just leave it there empty--though perhaps we should close the browser instead in that case?" [ - parent parent notNil and: [ + parent parent isNotNil and: [ parent isEmpty and: [ parent value isNoModification or: [ parent value definition isExtensionDefinition ] ] ] ] whileTrue: [ diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index fe1a9bd727..fbc0babe22 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -18,7 +18,7 @@ IceTipResetBranchToThisCommitCommand class >> defaultDescription [ { #category : 'testing' } IceTipResetBranchToThisCommitCommand >> canBeExecuted [ - ^ self selectedBranch notNil + ^ self selectedBranch isNotNil ] { #category : 'executing' } @@ -57,7 +57,7 @@ IceTipResetBranchToThisCommitCommand >> selectedBranch [ | selected | selected := self context model. - ^ (selected notNil and: [ selected isBranch ]) ifTrue: [ selected ] + ^ (selected isNotNil and: [ selected isBranch ]) ifTrue: [ selected ] ] { #category : 'accessing' }