From 03e0e821f9b96559fbcb22c277d6a66a6db25b46 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Mon, 22 May 2023 14:57:35 +0200 Subject: [PATCH 01/83] use Pharo12 to test --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 94221c1ee5..1592af0894 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,14 +19,14 @@ jobs: # Default value means that a failure in one OS cancels all fail-fast: false matrix: - smalltalk: [ Pharo64-11 ] + smalltalk: [ Pharo64-12 ] os: [ ubuntu-latest, macos-latest ] ston: [ .smalltalk.ston ] # Test Windows with some exclusions. # At least a part of the problem is reported here: # https://github.com/pharo-vcs/iceberg/issues/1394 include: - - smalltalk: Pharo64-11 + - smalltalk: Pharo64-12 os: windows-latest ston: .smalltalk.windows.ston runs-on: ${{ matrix.os }} From 739ecaa31b648c249b023e75720fba1d7b73934a Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Tue, 6 Jun 2023 12:21:07 +0200 Subject: [PATCH 02/83] #theirVersionOn: has no senders but does send non-existing selectors. Clearly dead code --- Iceberg/MCAddition.extension.st | 6 ------ Iceberg/MCModification.extension.st | 6 ------ Iceberg/MCPatchOperation.extension.st | 6 ------ Iceberg/MCRemoval.extension.st | 6 ------ 4 files changed, 24 deletions(-) diff --git a/Iceberg/MCAddition.extension.st b/Iceberg/MCAddition.extension.st index b491900e58..2b1bdf77a8 100644 --- a/Iceberg/MCAddition.extension.st +++ b/Iceberg/MCAddition.extension.st @@ -5,9 +5,3 @@ MCAddition >> myVersionOn: aDiff [ ^ aDiff versionFromDefinition: definition ] - -{ #category : #'*Iceberg-Changes' } -MCAddition >> theirVersionOn: aDiff [ - - ^ nil -] diff --git a/Iceberg/MCModification.extension.st b/Iceberg/MCModification.extension.st index 245105b778..989f5661e9 100644 --- a/Iceberg/MCModification.extension.st +++ b/Iceberg/MCModification.extension.st @@ -13,9 +13,3 @@ MCModification >> myVersionOn: aDiff [ ^ aDiff versionFromDefinition: modification ] - -{ #category : #'*Iceberg-Changes' } -MCModification >> theirVersionOn: aDiff [ - - ^ aDiff versionFromDefinition: obsoletion -] diff --git a/Iceberg/MCPatchOperation.extension.st b/Iceberg/MCPatchOperation.extension.st index a3944f1dcd..c08e078887 100644 --- a/Iceberg/MCPatchOperation.extension.st +++ b/Iceberg/MCPatchOperation.extension.st @@ -11,9 +11,3 @@ MCPatchOperation >> myVersionOn: aDiff [ self subclassResponsibility ] - -{ #category : #'*Iceberg-Changes' } -MCPatchOperation >> theirVersionOn: aDiff [ - - self subclassResponsibility -] diff --git a/Iceberg/MCRemoval.extension.st b/Iceberg/MCRemoval.extension.st index f3f0a6a648..679e934eaa 100644 --- a/Iceberg/MCRemoval.extension.st +++ b/Iceberg/MCRemoval.extension.st @@ -5,9 +5,3 @@ MCRemoval >> myVersionOn: aDiff [ ^ nil ] - -{ #category : #'*Iceberg-Changes' } -MCRemoval >> theirVersionOn: aDiff [ - - ^ aDiff versionFromDefinition: definition -] From ee155f3636de44a5031402b52727e1ea6ee92212 Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Tue, 6 Jun 2023 12:37:39 +0200 Subject: [PATCH 03/83] remove methods that are the same in the superclass --- Iceberg-Libgit/IceGitNetworkRemote.class.st | 5 ----- Iceberg-Plugin-Pharo/IcePharoPlugin.class.st | 5 ----- .../IceTipHiedraAltHistoryBrowser.class.st | 15 --------------- Iceberg-TipUI/IceTipMergePatchMorph.class.st | 9 --------- Iceberg-TipUI/IceTipTreeGroup.class.st | 5 ----- .../IceAttachedSingleVersionWorkingCopy.class.st | 12 ------------ Iceberg/IceBasicProject.class.st | 16 ---------------- Iceberg/IceBranch.class.st | 12 ------------ Iceberg/IceClassDefinition.class.st | 8 -------- Iceberg/IceCodeDefinition.class.st | 8 +------- Iceberg/IceCommit.class.st | 12 ------------ Iceberg/IceMethodContainerDefinition.class.st | 6 ------ Iceberg/IceModification.class.st | 14 +------------- Iceberg/IceNoCommit.class.st | 12 ------------ Iceberg/IceNoModification.class.st | 5 ----- .../IceRepositoryRegistryAnnouncement.class.st | 12 +----------- Iceberg/IceTag.class.st | 10 ---------- Iceberg/IceUnbornBranch.class.st | 6 ------ 18 files changed, 3 insertions(+), 169 deletions(-) diff --git a/Iceberg-Libgit/IceGitNetworkRemote.class.st b/Iceberg-Libgit/IceGitNetworkRemote.class.st index 32b68742e1..38735c7e88 100644 --- a/Iceberg-Libgit/IceGitNetworkRemote.class.st +++ b/Iceberg-Libgit/IceGitNetworkRemote.class.st @@ -31,11 +31,6 @@ IceGitNetworkRemote class >> isAbstract [ ^ self == IceGitNetworkRemote ] -{ #category : #private } -IceGitNetworkRemote >> basicUrl: aString [ - url := aString -] - { #category : #accessing } IceGitNetworkRemote >> detailedInfo [ ^ { diff --git a/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st b/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st index 5d8f3cc2eb..7db229a57a 100644 --- a/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st +++ b/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st @@ -193,11 +193,6 @@ IcePharoPlugin >> fetchIfNeeded: aRepository [ ifFound: [ :each | each fetch ] ] ] -{ #category : #events } -IcePharoPlugin >> repositoryWasCreated: aRepository [ - -] - { #category : #events } IcePharoPlugin >> repositoryWillBeCreated: aRepository [ SystemVersion current major < 7 ifTrue: [ ^ self ]. diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st index b4d9ea012a..ff97777079 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st @@ -131,15 +131,6 @@ IceTipHiedraAltHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } -IceTipHiedraAltHistoryBrowser >> refreshCommitList [ - | commitModels | - - commitModels := self model commitModels. - commitList items: commitModels. - commitInfoTabs selectedModel: (commitModels ifNotEmpty: #first ifEmpty: [ nil ]) -] - { #category : #accessing } IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -162,12 +153,6 @@ IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } -IceTipHiedraAltHistoryBrowser >> selectedCommit [ - - ^ commitList selection selectedItem -] - { #category : #accessing } IceTipHiedraAltHistoryBrowser >> selectedItem [ diff --git a/Iceberg-TipUI/IceTipMergePatchMorph.class.st b/Iceberg-TipUI/IceTipMergePatchMorph.class.st index 3ea21b8ca8..534efa39a0 100644 --- a/Iceberg-TipUI/IceTipMergePatchMorph.class.st +++ b/Iceberg-TipUI/IceTipMergePatchMorph.class.st @@ -58,15 +58,6 @@ IceTipMergePatchMorph >> keepAllCurrentVersion [ self updateSource ] -{ #category : #actions } -IceTipMergePatchMorph >> keepCurrentVersion [ - "Mark the conflict as local." - - self selectedChangeWrapper chooseLocal. - self changed: #changes. - self updateSource -] - { #category : #testing } IceTipMergePatchMorph >> markAllAsConflict [ "Mark all conflicts as unresolved." diff --git a/Iceberg-TipUI/IceTipTreeGroup.class.st b/Iceberg-TipUI/IceTipTreeGroup.class.st index 95ff659c5b..bf0b91e110 100644 --- a/Iceberg-TipUI/IceTipTreeGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeGroup.class.st @@ -67,11 +67,6 @@ IceTipTreeGroup >> ensurePath: aPath [ ifEmpty: [ next ] ] -{ #category : #accessing } -IceTipTreeGroup >> icon [ - ^ icon -] - { #category : #testing } IceTipTreeGroup >> isGroup [ ^ true diff --git a/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st b/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st index 5ed1926684..eb8c6e8fc4 100644 --- a/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st +++ b/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st @@ -61,18 +61,6 @@ IceAttachedSingleVersionWorkingCopy >> mergeStateWith: aMergeableState [ ^ aMergeableState mergeWithSingleVersionWorkingCopyState: self ] -{ #category : #accessing } -IceAttachedSingleVersionWorkingCopy >> referenceCommit [ - - ^ repository workingCopy referenceCommit -] - -{ #category : #accessing } -IceAttachedSingleVersionWorkingCopy >> referenceCommits [ - - ^ { self referenceCommit } -] - { #category : #accessing } IceAttachedSingleVersionWorkingCopy >> singleCommit [ diff --git a/Iceberg/IceBasicProject.class.st b/Iceberg/IceBasicProject.class.st index 93e6de9473..16ec8ef94a 100644 --- a/Iceberg/IceBasicProject.class.st +++ b/Iceberg/IceBasicProject.class.st @@ -184,11 +184,6 @@ IceBasicProject >> removeTag: aString [ self tags: (self tags copyWithout: aString) ] -{ #category : #accessing } -IceBasicProject >> repository [ - ^ commitish repository -] - { #category : #accessing } IceBasicProject >> repositoryProperties [ ^ self repository properties @@ -206,17 +201,6 @@ IceBasicProject >> sourceDirectory: aString [ properties at: 'srcDirectory' put: aString ] -{ #category : #accessing } -IceBasicProject >> sourceDirectoryPath [ - - "API compatible both with Pharo6 and Pharo7. - This could be replaced by the Pharo7 API - - RelativePath with: self subdirectory - " - ^ (RelativePath withAll: (RelativePath canonicalizeElements: ($/ split: self sourceDirectory))) -] - { #category : #accessing } IceBasicProject >> tags [ diff --git a/Iceberg/IceBranch.class.st b/Iceberg/IceBranch.class.st index f5e88b1607..9182293543 100644 --- a/Iceberg/IceBranch.class.st +++ b/Iceberg/IceBranch.class.st @@ -33,12 +33,6 @@ IceBranch >> changesFromCommit: anIceCommit [ ^ self commit changesFromCommit: anIceCommit ] -{ #category : #'API - history' } -IceBranch >> commitsDo: aBlockClosure [ - - self newCommitWalk commitsDo: aBlockClosure -] - { #category : #'API - branches' } IceBranch >> delete [ @@ -142,12 +136,6 @@ IceBranch >> snapshotFor: anIceSavedPackage [ ^ self commit snapshotFor: anIceSavedPackage ] -{ #category : #validation } -IceBranch >> validateIsBranch [ - - "Nothing. I'm a branch" -] - { #category : #'private - changes' } IceBranch >> versionFor: anIcePackage [ diff --git a/Iceberg/IceClassDefinition.class.st b/Iceberg/IceClassDefinition.class.st index 2f812a4aec..1936f03a9d 100644 --- a/Iceberg/IceClassDefinition.class.st +++ b/Iceberg/IceClassDefinition.class.st @@ -64,14 +64,6 @@ IceClassDefinition >> asMCDefinitionWithoutMetaSide [ ] -{ #category : #accessing } -IceClassDefinition >> contents [ - mcDefinition ifNil: [ ^ '' ]. - ^ self isMeta - ifFalse: [ mcDefinition fullDefinitionString ] - ifTrue: [ mcDefinition classDefinitionString ] -] - { #category : #testing } IceClassDefinition >> isClassDefinition [ diff --git a/Iceberg/IceCodeDefinition.class.st b/Iceberg/IceCodeDefinition.class.st index cf3dfce171..59382d9958 100644 --- a/Iceberg/IceCodeDefinition.class.st +++ b/Iceberg/IceCodeDefinition.class.st @@ -6,7 +6,7 @@ See my sub/superclasses for more information. Class { #name : #IceCodeDefinition, #superclass : #IceDefinition, - #category : 'Iceberg-Changes' + #category : #'Iceberg-Changes' } { #category : #'instance creation' } @@ -38,12 +38,6 @@ IceCodeDefinition >> addToPatcher: aMCPatcher [ self subclassResponsibility ] -{ #category : #accessing } -IceCodeDefinition >> contents [ - - ^ self subclassResponsibility -] - { #category : #comparing } IceCodeDefinition >> hash [ diff --git a/Iceberg/IceCommit.class.st b/Iceberg/IceCommit.class.st index 58051ba8bd..242ceaebf1 100644 --- a/Iceberg/IceCommit.class.st +++ b/Iceberg/IceCommit.class.st @@ -255,12 +255,6 @@ IceCommit >> newCommitWalk [ ^ repository newCommitWalk fromCommit: self ] -{ #category : #'API - packages' } -IceCommit >> packageNames [ - - ^ self subclassResponsibility -] - { #category : #'API - packages' } IceCommit >> packages [ @@ -283,12 +277,6 @@ IceCommit >> printOn: aStream [ nextPutAll: ')' ] -{ #category : #'API - project' } -IceCommit >> project [ - - self subclassResponsibility -] - { #category : #printing } IceCommit >> shortId [ diff --git a/Iceberg/IceMethodContainerDefinition.class.st b/Iceberg/IceMethodContainerDefinition.class.st index 5b22a6fc7d..149ebd03be 100644 --- a/Iceberg/IceMethodContainerDefinition.class.st +++ b/Iceberg/IceMethodContainerDefinition.class.st @@ -73,12 +73,6 @@ IceMethodContainerDefinition >> name [ ^ name , (isMeta ifTrue: [ ' class' ] ifFalse: [ '' ]) ] -{ #category : #accessing } -IceMethodContainerDefinition >> name: aString [ - - name := aString -] - { #category : #patching } IceMethodContainerDefinition >> removeFrom: aPatcher [ diff --git a/Iceberg/IceModification.class.st b/Iceberg/IceModification.class.st index 53c00918f8..03a243218d 100644 --- a/Iceberg/IceModification.class.st +++ b/Iceberg/IceModification.class.st @@ -7,7 +7,7 @@ Class { #instVars : [ 'oldNode' ], - #category : 'Iceberg-Changes' + #category : #'Iceberg-Changes' } { #category : #'instance creation' } @@ -32,12 +32,6 @@ IceModification >> accept: aVisitor [ ^ aVisitor visitModification: self ] -{ #category : #accessing } -IceModification >> description [ - - ^ definition name -] - { #category : #operations } IceModification >> inverse [ @@ -50,12 +44,6 @@ IceModification >> isModification [ ^ true ] -{ #category : #accessing } -IceModification >> key [ - - ^ definition key -] - { #category : #accessing } IceModification >> leftContents [ diff --git a/Iceberg/IceNoCommit.class.st b/Iceberg/IceNoCommit.class.st index f9450cd4c8..6ce23bb0b0 100644 --- a/Iceberg/IceNoCommit.class.st +++ b/Iceberg/IceNoCommit.class.st @@ -133,18 +133,6 @@ IceNoCommit >> project [ ^ repository newUnbornProject ] -{ #category : #accessing } -IceNoCommit >> repository [ - - ^ repository -] - -{ #category : #accessing } -IceNoCommit >> repository: aRepository [ - - repository := aRepository -] - { #category : #'private - monticello' } IceNoCommit >> snapshotFor: anIceSavedPackage [ diff --git a/Iceberg/IceNoModification.class.st b/Iceberg/IceNoModification.class.st index eef4a0a78d..7934ddddbd 100644 --- a/Iceberg/IceNoModification.class.st +++ b/Iceberg/IceNoModification.class.st @@ -25,11 +25,6 @@ IceNoModification >> inverse [ ^ self ] -{ #category : #testing } -IceNoModification >> isConflict [ - ^ false -] - { #category : #testing } IceNoModification >> isNoModification [ diff --git a/Iceberg/IceRepositoryRegistryAnnouncement.class.st b/Iceberg/IceRepositoryRegistryAnnouncement.class.st index 33d6e0e54a..34acc6c215 100644 --- a/Iceberg/IceRepositoryRegistryAnnouncement.class.st +++ b/Iceberg/IceRepositoryRegistryAnnouncement.class.st @@ -4,20 +4,10 @@ I'm a generic announcement to notify when the repository registry has changed. Class { #name : #IceRepositoryRegistryAnnouncement, #superclass : #IceRepositoryAnnouncement, - #category : 'Iceberg-Announcements' + #category : #'Iceberg-Announcements' } { #category : #'instance creation' } IceRepositoryRegistryAnnouncement class >> repository: aRepository [ ^ self new repository: aRepository; yourself ] - -{ #category : #accessing } -IceRepositoryRegistryAnnouncement >> repository [ - ^ repository -] - -{ #category : #accessing } -IceRepositoryRegistryAnnouncement >> repository: anObject [ - repository := anObject -] diff --git a/Iceberg/IceTag.class.st b/Iceberg/IceTag.class.st index c9739a98c8..86d8c3d0d7 100644 --- a/Iceberg/IceTag.class.st +++ b/Iceberg/IceTag.class.st @@ -74,16 +74,6 @@ IceTag >> printOn: aStream [ print: self name ] -{ #category : #accessing } -IceTag >> repository [ - ^ repository -] - -{ #category : #accessing } -IceTag >> repository: anObject [ - repository := anObject -] - { #category : #querying } IceTag >> versionFor: package [ ^ self commit versionFor: package diff --git a/Iceberg/IceUnbornBranch.class.st b/Iceberg/IceUnbornBranch.class.st index bd1c4a6d8e..b28c830511 100644 --- a/Iceberg/IceUnbornBranch.class.st +++ b/Iceberg/IceUnbornBranch.class.st @@ -138,12 +138,6 @@ IceUnbornBranch >> packageNames [ ^ #() ] -{ #category : #'API - packages' } -IceUnbornBranch >> packages [ - - ^ #() -] - { #category : #'API - remotes' } IceUnbornBranch >> pull [ From b48312665890b9627d14dac77c064b075f5edd6b Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Tue, 6 Jun 2023 12:41:30 +0200 Subject: [PATCH 04/83] method not called, it itself sends a non-existing selector --- Iceberg/MCDefinition.extension.st | 6 ------ Iceberg/MCOrganizationDefinition.extension.st | 6 ------ 2 files changed, 12 deletions(-) diff --git a/Iceberg/MCDefinition.extension.st b/Iceberg/MCDefinition.extension.st index ab8ccc53a4..7b92581d8a 100644 --- a/Iceberg/MCDefinition.extension.st +++ b/Iceberg/MCDefinition.extension.st @@ -5,12 +5,6 @@ MCDefinition >> addAnalysisToPackageChangeSet: aPackageChangeSet change: aChange aPackageChangeSet addChange: aChange ] -{ #category : #'*Iceberg-Changes' } -MCDefinition >> addToPackageDiff: anIcePackageDiff leftSnapshot: anObject rightSnapshot: anObject1 [ - - self subclassResponsibility -] - { #category : #'*Iceberg-Changes' } MCDefinition >> buildOn: anIceDiffBuilder [ diff --git a/Iceberg/MCOrganizationDefinition.extension.st b/Iceberg/MCOrganizationDefinition.extension.st index e8f743cfa4..9627db29c2 100644 --- a/Iceberg/MCOrganizationDefinition.extension.st +++ b/Iceberg/MCOrganizationDefinition.extension.st @@ -5,12 +5,6 @@ MCOrganizationDefinition >> addAnalysisToPackageChangeSet: aPackageChangeSet cha aPackageChangeSet addOrganisationChange: aChange ] -{ #category : #'*Iceberg-Changes' } -MCOrganizationDefinition >> addToPackageDiff: anIcePackageDiff leftSnapshot: leftSnapshot rightSnapshot: rightSnapshot [ - - ^ anIcePackageDiff ensureOrganization: categories -] - { #category : #'*Iceberg-Core' } MCOrganizationDefinition >> iceClass [ ^ nil From 121370630f486c79067b33a6086ef548051cdccf Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Wed, 7 Jun 2023 09:27:54 +0200 Subject: [PATCH 05/83] openWithSpec -> open fixes #1700 --- Iceberg-TipUI/IceTipRepositoriesBrowser.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 7eb4a029e1..33499a239b 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -2,7 +2,7 @@ I'm a tool to show all repositories registered on this image. I define basic actions and an entry point to manage each repository individually. -IceTipRepositoriesBrowser new openWithSpec. +IceTipRepositoriesBrowser new open. " Class { #name : #IceTipRepositoriesBrowser, From 4ebcbeb4f2681884e9d4424c0c30cf156a70c24f Mon Sep 17 00:00:00 2001 From: Masashi Umezawa Date: Wed, 7 Jun 2023 21:37:20 +0900 Subject: [PATCH 06/83] Fixed IceGitIndex>>commitWithMessage:andParents: not to send unnecessary #utf8Encoded message --- Iceberg-Libgit/IceGitIndex.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Iceberg-Libgit/IceGitIndex.class.st b/Iceberg-Libgit/IceGitIndex.class.st index 37c3062d1e..b29dfd8dec 100644 --- a/Iceberg-Libgit/IceGitIndex.class.st +++ b/Iceberg-Libgit/IceGitIndex.class.st @@ -42,7 +42,7 @@ IceGitIndex >> commitWithMessage: message andParents: parentCommits [ index free. commitId := (LGitCommitBuilder of: self repositoryHandle) tree: (LGitTree of: self repositoryHandle fromId: indexTreeId); - message: message withUnixLineEndings utf8Encoded asString "FFI is expecting an string"; + message: message withUnixLineEndings "FFI is expecting an string"; parents: (self repositoryHandle isUnborn ifTrue: [ #() ] From 7a59b2cda4567f1563930c7c62731fbec513f9d8 Mon Sep 17 00:00:00 2001 From: Masashi Umezawa Date: Wed, 7 Jun 2023 21:57:33 +0900 Subject: [PATCH 07/83] Added IceGitCommitMessageTest>>testCommitWideString --- Iceberg-Tests/IceGitCommitMessageTest.class.st | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Iceberg-Tests/IceGitCommitMessageTest.class.st b/Iceberg-Tests/IceGitCommitMessageTest.class.st index d0f214eba7..a8a39dd12b 100644 --- a/Iceberg-Tests/IceGitCommitMessageTest.class.st +++ b/Iceberg-Tests/IceGitCommitMessageTest.class.st @@ -24,6 +24,15 @@ IceGitCommitMessageTest >> testCommitNullString [ ] +{ #category : #tests } +IceGitCommitMessageTest >> testCommitWideString [ + | msg | + msg := ZnUTF8Encoder new decodeBytes: (ByteArray readHexFrom: 'e38182e38184e38186'). "Japanese vowels a,i, and u - 'あいう'" + self repository commitWithMessage: msg. + self assert: self repository head commit comment equals: msg. + +] + { #category : #tests } IceGitCommitMessageTest >> testCommitWithEndingPesosSign [ "We used to have a problem that in some messages (depending of padding) the $ was added at the end" From 969ef1f28ac83e376c94abd6f24f621004de944b Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Mon, 12 Jun 2023 09:39:23 +0200 Subject: [PATCH 08/83] #mergeStateWith: has no senders, but sends selectors that do not exist (like #mergeWithInMergeWorkingCopyState:) --- Iceberg/IceAttachedSingleVersionWorkingCopy.class.st | 6 ------ Iceberg/IceEmptyWorkingCopy.class.st | 8 +------- Iceberg/IceInMergeWorkingCopy.class.st | 8 +------- Iceberg/IceWorkingCopyState.class.st | 6 ------ 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st b/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st index eb8c6e8fc4..0c9f1cc626 100644 --- a/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st +++ b/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st @@ -55,12 +55,6 @@ IceAttachedSingleVersionWorkingCopy >> mergeCommit: mergeCommit [ execute. ] -{ #category : #merging } -IceAttachedSingleVersionWorkingCopy >> mergeStateWith: aMergeableState [ - - ^ aMergeableState mergeWithSingleVersionWorkingCopyState: self -] - { #category : #accessing } IceAttachedSingleVersionWorkingCopy >> singleCommit [ diff --git a/Iceberg/IceEmptyWorkingCopy.class.st b/Iceberg/IceEmptyWorkingCopy.class.st index 49ee9fb2c8..50e8c2e960 100644 --- a/Iceberg/IceEmptyWorkingCopy.class.st +++ b/Iceberg/IceEmptyWorkingCopy.class.st @@ -4,7 +4,7 @@ I am an empty working copy, with no loaded packages. Class { #name : #IceEmptyWorkingCopy, #superclass : #IceWorkingCopyState, - #category : 'Iceberg-WorkingCopy' + #category : #'Iceberg-WorkingCopy' } { #category : #display } @@ -19,12 +19,6 @@ IceEmptyWorkingCopy >> isDetached [ ^ false ] -{ #category : #merging } -IceEmptyWorkingCopy >> mergeStateWith: aMergeableState [ - - ^ aMergeableState mergeWithEmptyWorkingCopyState: self -] - { #category : #accessing } IceEmptyWorkingCopy >> referenceCommit [ diff --git a/Iceberg/IceInMergeWorkingCopy.class.st b/Iceberg/IceInMergeWorkingCopy.class.st index 453f62f4e2..72ce08b86d 100644 --- a/Iceberg/IceInMergeWorkingCopy.class.st +++ b/Iceberg/IceInMergeWorkingCopy.class.st @@ -4,7 +4,7 @@ I am a working copy whose packages are all in merge status in the same commits. Class { #name : #IceInMergeWorkingCopy, #superclass : #IceWorkingCopyState, - #category : 'Iceberg-WorkingCopy' + #category : #'Iceberg-WorkingCopy' } { #category : #display } @@ -25,12 +25,6 @@ IceInMergeWorkingCopy >> isInMerge [ ^ true ] -{ #category : #merging } -IceInMergeWorkingCopy >> mergeStateWith: aMergeableState [ - - ^ aMergeableState mergeWithInMergeWorkingCopyState: self -] - { #category : #accessing } IceInMergeWorkingCopy >> referenceCommits [ diff --git a/Iceberg/IceWorkingCopyState.class.st b/Iceberg/IceWorkingCopyState.class.st index 8526387117..21ddef1be1 100644 --- a/Iceberg/IceWorkingCopyState.class.st +++ b/Iceberg/IceWorkingCopyState.class.st @@ -66,12 +66,6 @@ IceWorkingCopyState >> mergeCommit: aCommit [ self subclassResponsibility ] -{ #category : #merging } -IceWorkingCopyState >> mergeStateWith: aMergeableState [ - - self subclassResponsibility -] - { #category : #accessing } IceWorkingCopyState >> referenceCommit [ From 4940d2f44f14b5cb0fa855c86b36f2b070dc910f Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 15 Jun 2023 13:07:09 +0200 Subject: [PATCH 09/83] Small cleaning in Monticello API To get the working copy of a RPackage it is easier to call #mcWorkingCopy than to do what is actually done in the code. (#mcPackage will first get the working copy, so using the MC package to find the working copy end up doing 2 lookup of the working copy) --- Iceberg/Iceberg.class.st | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Iceberg/Iceberg.class.st b/Iceberg/Iceberg.class.st index 5b49bd6516..8d4d8587cd 100644 --- a/Iceberg/Iceberg.class.st +++ b/Iceberg/Iceberg.class.st @@ -123,21 +123,18 @@ Iceberg class >> remoteTypeSelector: anObject [ ] { #category : #accessing } -Iceberg class >> repositoryForPackage: anRPackage [ +Iceberg class >> repositoryForPackage: anRPackage [ + | existingRepositories possibleRepositoryTypes | - - existingRepositories := (MCWorkingCopy forPackage: anRPackage mcPackage) repositoryGroup repositories. - possibleRepositoryTypes := IceRepository allSubclasses, - { IceMetacelloRepositoryAdapter. - MCGitHubRepository }. - + existingRepositories := anRPackage mcWorkingCopy repositoryGroup repositories. + possibleRepositoryTypes := IceRepository allSubclasses , { IceMetacelloRepositoryAdapter . MCGitHubRepository }. + possibleRepositoryTypes do: [ :class | - existingRepositories + existingRepositories detect: [ :repo | repo isKindOf: class ] - ifFound: [ : repo | ^ repo getOrCreateIcebergRepository ] ]. + ifFound: [ :repo | ^ repo getOrCreateIcebergRepository ] ]. - self error: ('Could not find a git repository for {1}' format: {anRPackage name}) - + self error: ('Could not find a git repository for {1}' format: { anRPackage name }) ] { #category : #settings } From 04817ee24938820d592d50d16fc98ee3689fbc29 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Mon, 10 Jul 2023 10:16:47 +0200 Subject: [PATCH 10/83] Adapt to recent RPackage changes Adapt Iceberg to recent RPackage changes + improve some temporaries names --- Iceberg-TipUI/IcePackageDefinition.extension.st | 4 ++-- Iceberg/IceRepository.class.st | 2 +- Iceberg/IceSystemEventListener.class.st | 12 ++++++------ Iceberg/IceWorkingCopy.class.st | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Iceberg-TipUI/IcePackageDefinition.extension.st b/Iceberg-TipUI/IcePackageDefinition.extension.st index f235877541..ad42153eba 100644 --- a/Iceberg-TipUI/IcePackageDefinition.extension.st +++ b/Iceberg-TipUI/IcePackageDefinition.extension.st @@ -9,8 +9,8 @@ IcePackageDefinition >> browse [ { #category : #'*Iceberg-TipUI' } IcePackageDefinition >> canBeBrowsed [ - - ^ RPackage organizer includesPackageNamed: name + + ^ self packageOrganizer hasPackage: name ] { #category : #'*Iceberg-TipUI' } diff --git a/Iceberg/IceRepository.class.st b/Iceberg/IceRepository.class.st index c6dc174dcf..bf17c2a58a 100644 --- a/Iceberg/IceRepository.class.st +++ b/Iceberg/IceRepository.class.st @@ -170,7 +170,7 @@ IceRepository class >> registerRepository: aRepository [ { #category : #registry } IceRepository class >> registeredRepositoryIncludingPackage: aPackage [ ^ self registry - detect: [ :each | each includesPackageNamed: aPackage name ] + detect: [ :repoitory | repoitory includesPackageNamed: aPackage name ] ifNone: [ nil ] ] diff --git a/Iceberg/IceSystemEventListener.class.st b/Iceberg/IceSystemEventListener.class.st index 20f402801c..ed1f4e01fc 100644 --- a/Iceberg/IceSystemEventListener.class.st +++ b/Iceberg/IceSystemEventListener.class.st @@ -54,18 +54,18 @@ IceSystemEventListener class >> handleVersionLoaded: ann [ "now we can verify its status" RPackageSet withoutCacheDo: [ IceRepository registry - do: [ :each | - (each includesPackageNamed: package name) + do: [ :repository | + (repository includesPackageNamed: package name) ifTrue: [ | icePackage isDirty | - icePackage := each packageNamed: package name. + icePackage := repository packageNamed: package name. self flag: #pharoTodo. "Ugly hack. Should enhance for next version" - isDirty := each workingCopy referenceCommit isUnknownCommit + isDirty := repository workingCopy referenceCommit isUnknownCommit ifTrue: [ true ] ifFalse: [ | diff | - diff := each workingCopy referenceCommit diffToWorkingCopyForPackage: icePackage. + diff := repository workingCopy referenceCommit diffToWorkingCopyForPackage: icePackage. diff includesPackageNamed: package name ]. icePackage beDirty: isDirty. - Iceberg announcer announce: (IceRepositoryModified for: each) ] ]] + Iceberg announcer announce: (IceRepositoryModified for: repository) ] ]] ] { #category : #'class initialization' } diff --git a/Iceberg/IceWorkingCopy.class.st b/Iceberg/IceWorkingCopy.class.st index f4a5c52fea..b1e6efe465 100644 --- a/Iceberg/IceWorkingCopy.class.st +++ b/Iceberg/IceWorkingCopy.class.st @@ -324,8 +324,8 @@ IceWorkingCopy >> forceCalculateDirtyPackages [ targetVersion: self referenceCommit; buildFull. - self loadedPackages do: [ :each | - each beDirty: (diff includesPackageNamed: each name) ]. + self loadedPackages do: [ :package | + package beDirty: (diff includesPackageNamed: package name) ]. ] { #category : #'API - commits' } @@ -406,9 +406,9 @@ IceWorkingCopy >> isInMerge [ ] { #category : #'API - packages' } -IceWorkingCopy >> isLoadedPackageNamed: aString [ - - ^ RPackageOrganizer default includesPackageNamed: aString +IceWorkingCopy >> isLoadedPackageNamed: aString [ + + ^ self packageOrganizer hasPackage: aString ] { #category : #'API - changes' } @@ -495,8 +495,8 @@ IceWorkingCopy >> markAllPackagesAsClean [ { #category : #'API - packages' } IceWorkingCopy >> markAsCleanPackagesNotInDiff: aDiff [ - self markAsCleanPackagesThat: [ :each | - (aDiff includesPackageNamed: each name) not ] + self markAsCleanPackagesThat: [ :package | + (aDiff includesPackageNamed: package name) not ] ] { #category : #'API - packages' } From d709f5b874c79befc21170180ec637a1ceeecfc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Sun, 16 Jul 2023 21:01:33 +0200 Subject: [PATCH 11/83] First handling simple inform: and also those that were self application inform: and simply invoke Object>>inform: --- .../IceShouldHandleLibgitErrors.class.st | 4 ++-- .../IceGitHubNewPullRequestAction.class.st | 8 +++++--- .../IceGitHubOpenOnGithubAction.class.st | 15 +++++++++------ .../IceGitHubRemoveBranchesAction.class.st | 4 +++- ...tHubViewPullRequestOnGithubAction.class.st | 14 +++++++++----- .../IceTipFiletreeToTonelDialog.class.st | 2 +- .../IceTipInteractiveErrorVisitor.class.st | 19 ++++++++++++++++--- Iceberg-TipUI/IceTipSaveImageAction.class.st | 2 +- 8 files changed, 46 insertions(+), 22 deletions(-) diff --git a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st index e4974ec3de..431bcaa6b9 100644 --- a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st +++ b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st @@ -8,7 +8,7 @@ Otherwise, libgit errors may be thrown to the user and produce ugly effects. E.g Class { #name : #IceShouldHandleLibgitErrors, #superclass : #ReAbstractRule, - #category : 'Iceberg-ArchitecturalRules' + #category : #'Iceberg-ArchitecturalRules' } { #category : #'testing-interest' } @@ -55,7 +55,7 @@ IceShouldHandleLibgitErrors >> libgitRepositoryHandleAccessorsForClass: aClass [ ^ aClass allMethods select: - [ :m | m pragmas anySatisfy: [ :p | p keyword = IceLibgitRepository libgitRepositoryHandleAccessorPragmaSelector ] ] + [ :m | m pragmas anySatisfy: [ :p | p selector = IceLibgitRepository libgitRepositoryHandleAccessorPragmaSelector ] ] ] { #category : #accessing } diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st index eeb1fc2f02..76458583ea 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st @@ -63,7 +63,9 @@ IceGitHubNewPullRequestAction >> validateMakePullRequestOn: aRepository [ ifNotEmpty: [ :commits | '{1} not published' format: { commits size } ]. status ifEmpty: [ ^ true ]. - ^ UIManager default - confirm: (('{1} has ongoing modifications ({2}). -Do you want to continue anyway?') format: { aRepository name. status asCommaString }) + ^ SpApplication defaultApplication newConfirm + title: ('{1} has ongoing modifications.' format: { aRepository name.}); + label: ('{2} +Do you want to continue anyway?' format: { status asCommaString }); + openModal ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st index 3ba8079718..e7cb99e58f 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st @@ -41,16 +41,19 @@ IceGitHubOpenOnGithubAction >> basicExecute [ at: #WebBrowser ifPresent: [ :webBrowser | webBrowser openOn: url ] ifAbsent: [ - UIManager default - inform: ('Cannot open "{1}" because the project WebBrowser is not present by default in Pharo 6.' format: { url }) ] + SpApplication defaultApplication + title: ('Cannot open "{1}"' format: { url }); + label: 'Because the project WebBrowser is not present by default in Pharo 6.'; + openModal ] ] on: IceGitHubError do: [ - UIManager default inform: ('Invalid Github repository. No project named "{1}" found for the owner "{2}"' - format: { - self projectName. - self organisation}) ] + SpApplication defaultApplication + title: 'Invalid Github repository.'; + label: ('No project named "{1}" found for the owner "{2}"' + format: { self projectName . self organisation}); + openModal ] ] { #category : #accessing } diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st index f080d269e1..e6ccef85f5 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st @@ -62,7 +62,9 @@ IceGitHubRemoveBranchesAction >> removeBranch: json [ deleteBranch: self remote owner project: self remote projectBasename name: branchName. - UIManager default inform: ('Branch {1} removed.' format: { branchName }) + SpApplication defaultApplication + title: ('Branch {1} removed.' format: { branchName }); + openModal ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st index 8d01350d72..6073e339ba 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st @@ -27,15 +27,19 @@ IceGitHubViewPullRequestOnGithubAction >> basicExecute [ at: #WebBrowser ifPresent: [ :webBrowser | webBrowser openOn: url ] ifAbsent: [ - UIManager default inform: ('Cannot open "{1}" because the project WebBrowser is not present by default in Pharo 6.' format: { url }) ] + SpApplication defaultApplication newInform + title: ('Cannot open "{1}"' format: { url }); + label: 'Because the project WebBrowser is not present by default in Pharo 6.'; + openModal ] ] on: IceGitHubError do: [ - UIManager default inform: ('Invalid Github repository. No project named "{1}" found for the owner "{2}"' - format: { - self projectName. - self organisation}) ] + SpApplication defaultApplication newInform + title: 'Invalid Github repository.'; + label: ('No project named "{1}" found for the owner "{2}"' + format: { self projectName . self organisation}); + openModal ] ] { #category : #accessing } diff --git a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialog.class.st b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialog.class.st index 28b57bdbdc..508388eaa0 100644 --- a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialog.class.st +++ b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialog.class.st @@ -18,7 +18,7 @@ Class { { #category : #actions } IceTipFiletreeToTonelDialog >> accept [ - (IceTipStandardAction new) + IceTipStandardAction new repository: self repository; message: ('Migrating {1} sources to tonel' format: { self repository name }); onSuccessRepositoryModified; diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index 1e73a9784a..cc0856679d 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -44,6 +44,12 @@ IceTipInteractiveErrorVisitor >> context: anObject [ context := anObject ] +{ #category : #visiting } +IceTipInteractiveErrorVisitor >> defaultApplication [ + + ^ SpApplication defaultApplication +] + { #category : #accessing } IceTipInteractiveErrorVisitor >> repository [ ^ repository @@ -156,12 +162,19 @@ Add one before continue.' { #category : #visiting } IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ - UIManager default inform: 'There is nothing to commit.' + + self defaultApplication newInform + title: 'There is nothing to commit.'; + openModal ] { #category : #visiting } -IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ - UIManager default inform: ('Remote "{1}" already exists.' format: { anError remoteName }) +IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ + + self defaultApplication newInform + title: + ('Remote "{1}" already exists.' format: { anError remoteName }); + openModal ] { #category : #visiting } diff --git a/Iceberg-TipUI/IceTipSaveImageAction.class.st b/Iceberg-TipUI/IceTipSaveImageAction.class.st index 45af00dfc7..a60893f771 100644 --- a/Iceberg-TipUI/IceTipSaveImageAction.class.st +++ b/Iceberg-TipUI/IceTipSaveImageAction.class.st @@ -13,5 +13,5 @@ Class { IceTipSaveImageAction >> execute [ Smalltalk saveSession. - self inform: 'Image automatically saved' + SpApplication defaultApplication newInform title: 'Image automatically saved'; openModal ] From 141ae4244507428fc9d75d8ef39487200e1e7f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Sun, 16 Jul 2023 21:15:31 +0200 Subject: [PATCH 12/83] Fixed alert: title: all tests are green but not sure that they are coverting. --- .../IceGitHubAction.class.st | 9 +-- .../IceGitHubCreatePullRequestModel.class.st | 7 ++- .../IceTipInteractiveErrorVisitor.class.st | 57 ++++++++++++------- 3 files changed, 45 insertions(+), 28 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st index cd0de4b605..64281a5176 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st @@ -9,7 +9,7 @@ Class { 'remote', 'retries' ], - #category : 'Iceberg-Plugin-GitHub-Commands' + #category : #'Iceberg-Plugin-GitHub-Commands' } { #category : #testing } @@ -68,7 +68,8 @@ IceGitHubAction >> reportError: error [ message := error messageBody. message = 'Invalid field: head' ifTrue: [ message := 'Branch does not exist on github. Please commit and push your changes.' ]. - UIManager default - alert: message - title: 'Error creating pull request: ', error messageText + SpApplication defaultApplication newInform + label: message; + title: 'Error creating pull request: ', error messageText; + openModal ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st index 0228daea34..5407bc4e0e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st @@ -60,9 +60,10 @@ IceGitHubCreatePullRequestModel >> accept [ | title | title := self titlePanel text trim. title ifEmpty: [ - UIManager default - alert: 'You need to specify a title for the pull request.' - title: 'Error'. + SpApplication defaultApplication newInform + label: 'You need to specify a title for the pull request.'; + title: 'Error'; + openModal. ^ self ]. acceptBlock ifNotNil: [ diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index cc0856679d..1068785bc8 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -62,30 +62,40 @@ IceTipInteractiveErrorVisitor >> repository: anObject [ { #category : #visiting } IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ - UIManager default - alert: anError messageText - title: 'Iceberg authentication Error' + self defaultApplication + label: anError messageText; + title: 'Iceberg authentication Error'; + openModal ] { #category : #visiting } IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ - UIManager default - alert: anError messageText - title: 'Iceberg conflicts while checking out' + + self defaultApplication + label: anError messageText; + title: 'Iceberg conflicts while checking out'; + openModal ] { #category : #visiting } -IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ - UIManager default - alert: ('The clone location {1} already exists' format: { anError location }) - title: 'Clone action failed' +IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ + + self defaultApplication + label: + ('The clone location {1} already exists' format: + { anError location }); + title: 'Clone action failed'; + openModal ] { #category : #visiting } IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ - UIManager default - alert: ('The clone remote {1} could not been found' format: { anError remoteUrl }) - title: 'Clone action failed' + + self defaultApplication + label: ('The clone remote {1} could not been found' format: + { anError remoteUrl }); + title: 'Clone action failed'; + openModal ] { #category : #visiting } @@ -117,11 +127,14 @@ IceTipInteractiveErrorVisitor >> visitGenericError: anError [ { #category : #visiting } IceTipInteractiveErrorVisitor >> visitMergeAborted: anError [ - UIManager default - alert: (anError messageText ifNil: ['Automatic (fast-forward) merge is not possible. + + self defaultApplication + label: (anError messageText ifNil: [ + 'Automatic (fast-forward) merge is not possible. Please perform the merge manually, then proceed with your previous operation. -WARNING: If you have external files, you may need to verify the conflicts there.']) - title: 'Automatic merge failed' +WARNING: If you have external files, you may need to verify the conflicts there.' ]); + title: 'Automatic merge failed'; + openModal ] { #category : #visiting } @@ -154,10 +167,12 @@ IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ { #category : #visiting } IceTipInteractiveErrorVisitor >> visitNoRemote: anError [ - UIManager default - alert: 'There are no remotes defined for this repository. -Add one before continue.' - title: 'Remote action failed' + + self defaultApplication + label: 'There are no remotes defined for this repository. +Add one before continue.'; + title: 'Remote action failed'; + openModal ] { #category : #visiting } From 30a9c8b81ee39ac2b249ad19f7ace3e8eaf5b769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Sun, 16 Jul 2023 21:43:04 +0200 Subject: [PATCH 13/83] Fix UIManager default defer: --- .../IceGitHubNewBranchFromIssuePanel.class.st | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st index 4d8bda9ccb..e057608849 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st @@ -29,6 +29,12 @@ IceGitHubNewBranchFromIssuePanel >> branchName [ issueText text trim }. ] +{ #category : #private } +IceGitHubNewBranchFromIssuePanel >> defaultApplication [ + + ^ SpApplication defaultApplication +] + { #category : #layout } IceGitHubNewBranchFromIssuePanel >> defaultLayout [ @@ -187,22 +193,24 @@ IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [ aString trimmed isEmpty ifTrue: [ ^ self ]. aString isAllDigits ifFalse: [ ^ self ]. number := aString asNumber. - (issue isNil or: [ (issue at: 'number') ~= number ]) ifFalse: [ ^ self ]. + (issue isNil or: [ (issue at: 'number') ~= number ]) ifFalse: [ + ^ self ]. remote := self selectRemoteModel remote. - - self wait: 500 milliSeconds thenDo: [ + + self wait: 500 milliSeconds thenDo: [ [ - issue := IceGitHubAPI new - beAnonymous; - getIssue: remote owner - project: remote projectName - number: number. - UIManager default defer: [ - self updateText: (self sanitizeTitle: (issue at: 'title')) ] ] - on: IceGitHubError do: [ :e | - e messageText = 'Not Found' ifFalse: [ e pass ]. - UIManager default defer: [ - self updateText: self unknownTitle ] ] ] + issue := IceGitHubAPI new + beAnonymous; + getIssue: remote owner + project: remote projectName + number: number. + self defaultApplication defer: [ + self updateText: (self sanitizeTitle: (issue at: 'title')) ] ] + on: IceGitHubError + do: [ :e | + e messageText = 'Not Found' ifFalse: [ e pass ]. + self defaultApplication defer: [ + self updateText: self unknownTitle ] ] ] ] { #category : #private } From b52b679d2d5ab72b162677a2707283afe032c1de Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Mon, 24 Jul 2023 12:37:10 +0200 Subject: [PATCH 14/83] Fix protocols of methods in extension of their own package Some methods are extension methods whose extension package is the same as the package of their class. So they are not really extension methods. I updated their protocol to be a better protocol. --- .../IceRepository.extension.st | 6 ++++++ Iceberg/IcePackage.class.st | 2 +- Iceberg/IcePackage.extension.st | 7 ------- Iceberg/IceRepository.class.st | 7 +------ Iceberg/IceRepository.extension.st | 15 --------------- 5 files changed, 8 insertions(+), 29 deletions(-) create mode 100644 Iceberg-Metacello-Integration/IceRepository.extension.st delete mode 100644 Iceberg/IcePackage.extension.st delete mode 100644 Iceberg/IceRepository.extension.st diff --git a/Iceberg-Metacello-Integration/IceRepository.extension.st b/Iceberg-Metacello-Integration/IceRepository.extension.st new file mode 100644 index 0000000000..fcb43e92a5 --- /dev/null +++ b/Iceberg-Metacello-Integration/IceRepository.extension.st @@ -0,0 +1,6 @@ +Extension { #name : #IceRepository } + +{ #category : #'*Iceberg-Metacello-Integration' } +IceRepository >> metacelloAdapter: version [ + ^ IceMetacelloRepositoryAdapter for: self withVersion: version +] diff --git a/Iceberg/IcePackage.class.st b/Iceberg/IcePackage.class.st index 649bda55d7..733db10c87 100644 --- a/Iceberg/IcePackage.class.st +++ b/Iceberg/IcePackage.class.st @@ -62,7 +62,7 @@ IcePackage >> currentCommits [ ^ repository workingCopy referenceCommits ] -{ #category : #'*Iceberg-Adapters' } +{ #category : #accessing } IcePackage >> directoryName [ ^ self repository directoryNameForPackage: self diff --git a/Iceberg/IcePackage.extension.st b/Iceberg/IcePackage.extension.st deleted file mode 100644 index 792400ef0f..0000000000 --- a/Iceberg/IcePackage.extension.st +++ /dev/null @@ -1,7 +0,0 @@ -Extension { #name : #IcePackage } - -{ #category : #'*Iceberg-Adapters' } -IcePackage >> directoryName [ - - ^ self repository directoryNameForPackage: self -] diff --git a/Iceberg/IceRepository.class.st b/Iceberg/IceRepository.class.st index bf17c2a58a..96245a9174 100644 --- a/Iceberg/IceRepository.class.st +++ b/Iceberg/IceRepository.class.st @@ -482,7 +482,7 @@ IceRepository >> forget [ Iceberg announcer announce: (IceRepositoryForgotten repository: self) ] -{ #category : #'*Iceberg-Changes' } +{ #category : #accessing } IceRepository >> fullWorkingCopyDiff [ ^ IceDiff new source: self workingCopy; @@ -658,11 +658,6 @@ IceRepository >> lookupCommit: commitId ifAbsent: aBlock [ self subclassResponsibility ] -{ #category : #'*Iceberg-Adapters' } -IceRepository >> metacelloAdapter: version [ - ^ IceMetacelloRepositoryAdapter for: self withVersion: version -] - { #category : #'API - packages' } IceRepository >> modifiedPackages [ "Lists all modified packages currently loaded in the image" diff --git a/Iceberg/IceRepository.extension.st b/Iceberg/IceRepository.extension.st deleted file mode 100644 index caf8adbfe0..0000000000 --- a/Iceberg/IceRepository.extension.st +++ /dev/null @@ -1,15 +0,0 @@ -Extension { #name : #IceRepository } - -{ #category : #'*Iceberg-Changes' } -IceRepository >> fullWorkingCopyDiff [ - ^ IceDiff new - source: self workingCopy; - target: self head; - buildFull; - yourself -] - -{ #category : #'*Iceberg-Adapters' } -IceRepository >> metacelloAdapter: version [ - ^ IceMetacelloRepositoryAdapter for: self withVersion: version -] From 37d02b62e6b8bd76aca947947601a0f73c797d15 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 27 Jul 2023 12:05:55 +0200 Subject: [PATCH 15/83] Do not use `RPackage organizer` This method emulates a dynamic global variable and is plan for deprecation. This PR provides an alternative way to access the organizer that does not contains the hacks of `RPackage organizer`. --- Iceberg-TipUI/IcePackageDefinition.extension.st | 2 +- Iceberg/IceCritiquesVisitor.class.st | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Iceberg-TipUI/IcePackageDefinition.extension.st b/Iceberg-TipUI/IcePackageDefinition.extension.st index ad42153eba..4839af1d7a 100644 --- a/Iceberg-TipUI/IcePackageDefinition.extension.st +++ b/Iceberg-TipUI/IcePackageDefinition.extension.st @@ -4,7 +4,7 @@ Extension { #name : #IcePackageDefinition } IcePackageDefinition >> browse [ "Open a browser on the package, if it exists." - (RPackage organizer packageNamed: name ifAbsent: [ ^ self ]) browse + (self packageOrganizer packageNamed: name ifAbsent: [ ^ self ]) browse ] { #category : #'*Iceberg-TipUI' } diff --git a/Iceberg/IceCritiquesVisitor.class.st b/Iceberg/IceCritiquesVisitor.class.st index 8bf3cafc81..feb69d1763 100644 --- a/Iceberg/IceCritiquesVisitor.class.st +++ b/Iceberg/IceCritiquesVisitor.class.st @@ -85,11 +85,10 @@ IceCritiquesVisitor >> visitNoModification: anIceNoModification [ ] { #category : #visiting } -IceCritiquesVisitor >> visitPackage: anIcePackageDefinition [ - +IceCritiquesVisitor >> visitPackage: anIcePackageDefinition [ + | aPackage | - - aPackage := RPackage organizer packageNamed: anIcePackageDefinition name ifAbsent: [ ^ self ]. + aPackage := self packageOrganizer packageNamed: anIcePackageDefinition name ifAbsent: [ ^ self ]. critiques addAll: aPackage critiques ] From f200db416f3ee73601f08f46f7020cd344acbd24 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 28 Jul 2023 12:45:57 +0200 Subject: [PATCH 16/83] Prevent the browsing of a removed element Fixes https://github.com/pharo-project/pharo/issues/14300 As a bonus I fixed some protocols --- Iceberg-TipUI/IceTipAddRemoteCommand.class.st | 2 +- Iceberg-TipUI/IceTipBrowseCommand.class.st | 6 +++--- Iceberg-TipUI/IceTipInspectCommand.class.st | 2 +- Iceberg-TipUI/IceTipRemotesTreeCommand.class.st | 2 +- Iceberg-TipUI/IceTipTreeCollapseCommand.class.st | 2 +- Iceberg-TipUI/IceTipTreeExpandCommand.class.st | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st index 0947b80f0e..ef13f1601b 100644 --- a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st @@ -19,7 +19,7 @@ IceTipAddRemoteCommand class >> defaultName [ ^ 'Add remote' ] -{ #category : #executing } +{ #category : #testing } IceTipAddRemoteCommand >> canBeExecuted [ "Any repository can have more remotes." diff --git a/Iceberg-TipUI/IceTipBrowseCommand.class.st b/Iceberg-TipUI/IceTipBrowseCommand.class.st index d157e05f83..4f1a7e77d5 100644 --- a/Iceberg-TipUI/IceTipBrowseCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseCommand.class.st @@ -19,11 +19,11 @@ IceTipBrowseCommand class >> defaultName [ ^ 'Browse...' ] -{ #category : #executing } +{ #category : #testing } IceTipBrowseCommand >> canBeExecuted [ + "In the case of a method removal it is not possible to browse the selected element." - ^ self hasSelectedItem - + ^ self hasSelectedItem and: [ self item value definition canBeBrowsed ] ] { #category : #executing } diff --git a/Iceberg-TipUI/IceTipInspectCommand.class.st b/Iceberg-TipUI/IceTipInspectCommand.class.st index 15c645273a..d50a4ee13d 100644 --- a/Iceberg-TipUI/IceTipInspectCommand.class.st +++ b/Iceberg-TipUI/IceTipInspectCommand.class.st @@ -19,7 +19,7 @@ IceTipInspectCommand class >> defaultName [ ^ 'Inspect...' ] -{ #category : #executing } +{ #category : #testing } IceTipInspectCommand >> canBeExecuted [ ^ self context hasSelectedItem diff --git a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st index f3b82c3572..8007441af0 100644 --- a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st +++ b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st @@ -31,7 +31,7 @@ IceTipRemotesTreeCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #executing } +{ #category : #testing } IceTipRemotesTreeCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item canActivateCommand: self ] diff --git a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st index 2af0da0c83..abe4c6c3f2 100644 --- a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st @@ -20,7 +20,7 @@ IceTipTreeCollapseCommand class >> defaultName [ ^ 'Collapse' ] -{ #category : #executing } +{ #category : #testing } IceTipTreeCollapseCommand >> canBeExecuted [ ^ self hasSelectedItem diff --git a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st index 3126ca0dd2..b3e6aab770 100644 --- a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st @@ -19,7 +19,7 @@ IceTipTreeExpandCommand class >> defaultName [ ^ 'Expand' ] -{ #category : #executing } +{ #category : #testing } IceTipTreeExpandCommand >> canBeExecuted [ ^ self hasSelectedItem From 7268995d07177e42428b053d5fa71ae33f0b7481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Sun, 3 Sep 2023 17:41:54 +0200 Subject: [PATCH 17/83] Improve Merge (after ESUG git lecture there is a need). --- Iceberg-TipUI/IceTipMergeCommand.class.st | 2 +- Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Iceberg-TipUI/IceTipMergeCommand.class.st b/Iceberg-TipUI/IceTipMergeCommand.class.st index 8cb78e52d4..7ffaf4ae1e 100644 --- a/Iceberg-TipUI/IceTipMergeCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeCommand.class.st @@ -16,7 +16,7 @@ IceTipMergeCommand class >> defaultDescription [ { #category : #'accessing - defaults' } IceTipMergeCommand class >> defaultName [ - ^ 'Merge' + ^ 'Merge to current' ] { #category : #testing } diff --git a/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st b/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st index 82ce7b3494..b270d72690 100644 --- a/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st +++ b/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st @@ -48,5 +48,5 @@ IceTipRepositoryBrowserTest >> testHasMergeButtonOnTheLeft [ self assert: (presenter toolbar leftItems - anySatisfy: [ :aButton | aButton label = 'Merge' ]) + anySatisfy: [ :aButton | 'Merge*' match: aButton label ]) ] From 1778263bbcfd975c02c591be2d54b54c3a88a637 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Mon, 4 Sep 2023 12:16:46 +0200 Subject: [PATCH 18/83] Unify snapshot method with Monticello Iceberg implemented its own MCPackage>>snapshot method to modify the one of Monticello. The method of Monticello was updated to use the same change as Iceberg but also it was updated to reduce the number of categories (package-tag) manipulations. I want to check here if we could use this new version for Iceberg too as a step toward getting rid of the categories in Pharo --- Iceberg/IceWorkingCopy.class.st | 2 +- Iceberg/MCPackage.extension.st | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 Iceberg/MCPackage.extension.st diff --git a/Iceberg/IceWorkingCopy.class.st b/Iceberg/IceWorkingCopy.class.st index b1e6efe465..be188eb427 100644 --- a/Iceberg/IceWorkingCopy.class.st +++ b/Iceberg/IceWorkingCopy.class.st @@ -729,7 +729,7 @@ IceWorkingCopy >> snapshotFor: package [ IceWorkingCopy >> snapshotForPackage: aPackage [ ^ aPackage isLoaded - ifTrue: [ (MCPackage named: aPackage name) basicSnapshot ] + ifTrue: [ (MCPackage named: aPackage name) snapshot ] ifFalse: [ self referenceCommit snapshotForPackage: aPackage ] ] diff --git a/Iceberg/MCPackage.extension.st b/Iceberg/MCPackage.extension.st deleted file mode 100644 index 4f6709bb27..0000000000 --- a/Iceberg/MCPackage.extension.st +++ /dev/null @@ -1,20 +0,0 @@ -Extension { #name : #MCPackage } - -{ #category : #'*Iceberg' } -MCPackage >> basicSnapshot [ - | rPackageSet definitions categories | - rPackageSet := self packageSet. - definitions := OrderedCollection new. - categories := rPackageSet categoryNames asArray. - categories isEmpty - ifFalse: [ definitions add: (MCOrganizationDefinition categories: categories) ]. - - rPackageSet methods - do: [:ea | definitions add: ea asMCMethodDefinition]. - - rPackageSet definedClasses - do: [:ea | definitions addAll: ea classDefinitions]. - - ^ MCSnapshot fromDefinitions: definitions - -] From 249ac337d53550ea75ec23e2bce7e35e29e9dc14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Mon, 4 Sep 2023 19:12:18 +0200 Subject: [PATCH 19/83] - confirm:label: done --- .../IceGitHubTipPullRequestBrowser.class.st | 4 ++-- Iceberg-Tests/IceParameterizedTestCase.class.st | 9 ++++++--- Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st | 10 ++++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st index bd01a9c54d..6b69f7f713 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st @@ -217,8 +217,8 @@ IceGitHubTipPullRequestBrowser >> mergeButton [ { #category : #actions } IceGitHubTipPullRequestBrowser >> mergePullRequestIntoImage [ - (UIManager default confirm: - ('I will create a new local branch named {1}. Should I continue?' + (self confirm: + ('I will create a new local branch named {1}. Should I continue?' format: { self pullRequest branchName })) ifFalse: [ ^ self ]. IceGitHubAPI ensureCredentials. diff --git a/Iceberg-Tests/IceParameterizedTestCase.class.st b/Iceberg-Tests/IceParameterizedTestCase.class.st index ac693316a4..e2bc3be42a 100644 --- a/Iceberg-Tests/IceParameterizedTestCase.class.st +++ b/Iceberg-Tests/IceParameterizedTestCase.class.st @@ -135,12 +135,15 @@ IceParameterizedTestCase >> printOn: aStream [ { #category : #running } IceParameterizedTestCase >> setUp [ + super setUp. - oldShareRepositoriesBetweenImages := IceLibgitRepository shareRepositoriesBetweenImages. + oldShareRepositoriesBetweenImages := IceLibgitRepository + shareRepositoriesBetweenImages. IceLibgitRepository shareRepositoriesBetweenImages: false. provider := IceCredentialsProvider providerType. - IceCredentialsProvider providerType: IceNonInteractiveCredentialsProvider. - self parameters do: #activate. + IceCredentialsProvider providerType: + IceNonInteractiveCredentialsProvider. + self parameters do: [ :each | each activate ] ] { #category : #running } diff --git a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st index bebf124f75..738ba20fd4 100644 --- a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st @@ -56,8 +56,10 @@ IceTipFetchAllProjectCommand >> iconName [ { #category : #executing } IceTipFetchAllProjectCommand >> isConfirmed [ - ^ UIManager default - confirm: - 'This operation can take some times depending on the size and number of your repositories. Are you sure you want to fetch all repositories?' - label: 'Proceed?' + ^ self application newConfirm + title: 'Proceed?'; + label: + 'This operation can take some times depending on the size and number of your repositories. Are you sure you want to fetch all repositories?'; + openModal + ] From 2cc94d472bdef838863ae70a7e8378122ad63a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Mon, 4 Sep 2023 19:30:55 +0200 Subject: [PATCH 20/83] Addressing confirm:label:trueChoice:falseChoice:c..... --- .../IceTipInteractiveErrorVisitor.class.st | 101 +++++++++--------- .../IceMetacelloRepositoryAdapter.class.st | 19 ++-- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index 1068785bc8..5bfe5e25f7 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -100,18 +100,16 @@ IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ { #category : #visiting } IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ + | proceed | - - proceed := UIManager default - confirm: aWarning messageText - label: 'Warning!' - trueChoice: 'Continue' - falseChoice: 'Cancel' - cancelChoice: nil - default: false. - - proceed ifNil: [ ^ self ]. - proceed ifTrue: [ aWarning resume ] + proceed := context application newConfirm + label: aWarning messageText; + title: 'Warning!'; + acceptLabel: 'Continue'; + cancelLabel: 'Cancel'; + openModal. + proceed ifFalse: [ ^ self ]. + aWarning resume ] { #category : #visiting } @@ -151,18 +149,17 @@ IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ { #category : #visiting } IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ + | proceed | - - proceed := UIManager default - confirm: aWarning messageText - label: 'Warning!' - trueChoice: 'Commit' - falseChoice: 'Cancel' - cancelChoice: nil - default: false. - - proceed ifNil: [ ^ self ]. - proceed ifTrue: [ aWarning resume ] + proceed := context application newConfirm + label: aWarning messageText; + title: 'Warning!'; + acceptLabel: 'Commit'; + cancelLabel: 'Cancel'; + openModal. + + proceed ifFalse: [ ^ self ]. + aWarning resume ] { #category : #visiting } @@ -194,32 +191,32 @@ IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ { #category : #visiting } IceTipInteractiveErrorVisitor >> visitRemoteDesynchronizedError: anError [ + | continue command | - - continue := UIManager default - confirm: ('Your repository is out of sync with remote {1}. -You need to pull remote changes before continue and push your changes.' format: { anError remote }) - label: 'Remote repository out of sync!' - trueChoice: 'Pull' - falseChoice: 'Cancel' - cancelChoice: nil - default: false. - (continue isNil or: [continue not]) - ifTrue: [ ^ self ]. + continue := context application newConfirm + label: + ('Your repository is out of sync with remote {1}. +You need to pull remote changes before continue and push your changes.' + format: { anError remote }); + title: 'Remote repository out of sync!'; + acceptLabel: 'Pull'; + cancelLabel: 'Cancel'; + openModal. + (continue isNil or: [ continue not ]) ifTrue: [ ^ self ]. command := IcePullRemoteCommand new - repository: self repository; - remote: anError remote; - yourself. + repository: self repository; + remote: anError remote; + yourself. [ command executeWithContext: context ] - on: IceMergeAborted, IceShouldCommitBeforePull - do: [ :e | - self flag: #pharoTodo. "Refactor this" - (e isKindOf: IceShouldCommitBeforePull) - ifTrue: [ e resume ] - ifFalse: [ e acceptError: self ] ]. - + on: IceMergeAborted , IceShouldCommitBeforePull + do: [ :e | + self flag: #pharoTodo. "Refactor this" + (e isKindOf: IceShouldCommitBeforePull) + ifTrue: [ e resume ] + ifFalse: [ e acceptError: self ] ]. + command isSuccess ifFalse: [ ^ self ]. anError isResumable ifTrue: [ ^ anError resume ]. anError retry @@ -227,17 +224,17 @@ You need to pull remote changes before continue and push your changes.' format: { #category : #visiting } IceTipInteractiveErrorVisitor >> visitShouldCommitBeforePullError: anError [ + | continue | - continue := UIManager default - confirm: - 'Your repository has uncommited changes. Merging incoming commits will change + continue := context application newConfirm + label: + 'Your repository has uncommited changes. Merging incoming commits will change your current working copy and your current state will not be recoverable. -We recommend that you commit first and then pull incoming changes again.' - label: 'You might loose your current changes!' - trueChoice: 'Proceed anyway' - falseChoice: 'Cancel' - cancelChoice: nil - default: false. +We recommend that you commit first and then pull incoming changes again.'; + title: 'You might loose your current changes!'; + acceptLabel: 'Proceed anyway'; + cancelLabel: 'Cancel'; + openModal. continue ifFalse: [ ^ self ]. anError resume ] diff --git a/Iceberg/IceMetacelloRepositoryAdapter.class.st b/Iceberg/IceMetacelloRepositoryAdapter.class.st index 519e2bf060..0d48f7aa09 100644 --- a/Iceberg/IceMetacelloRepositoryAdapter.class.st +++ b/Iceberg/IceMetacelloRepositoryAdapter.class.st @@ -120,15 +120,18 @@ IceMetacelloRepositoryAdapter >> isValid [ { #category : #MonticelloGUI } IceMetacelloRepositoryAdapter >> morphicOpen: workingCopy [ + | shouldOpenIceberg | - shouldOpenIceberg := UIManager default - confirm: ('{1} belongs to {2} and cannot be browsed here. -Do you want to open the Iceberg Browser instead?' format: { workingCopy packageName. self repository name }) - label: 'Browsing an iceberg repository' - trueChoice: 'Open' - falseChoice: 'Cancel' - cancelChoice: nil - default: true. + shouldOpenIceberg := + SpApplication defaultApplication newConfirm + title: 'Browsing an iceberg repository'; + label: ('{1} belongs to {2} and cannot be browsed here. +Do you want to open the Iceberg Browser instead?' format: { + workingCopy packageName. + self repository name }); + acceptLabel: 'Open'; + cancelLabel: 'Cancel'; + openModal. shouldOpenIceberg ifFalse: [ ^ self ]. IceTipRepositoriesBrowser new open ] From fa2592b02ea98d0cf009a14f4f1c8f3303ae85c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Mon, 4 Sep 2023 20:40:09 +0200 Subject: [PATCH 21/83] addressing inform:actionOnClick: --- .../IceGitHubAction.class.st | 16 +++++--- .../IceGitHubNewBranchFromIssuePanel.class.st | 4 +- .../IceGitHubNewPullRequestAction.class.st | 27 ++++++------- .../IceGitHubOpenOnGithubAction.class.st | 37 ++++++++++-------- .../IceGitHubRemoveBranchesAction.class.st | 15 ++++--- ...tHubViewPullRequestOnGithubAction.class.st | 39 ++++++++++--------- 6 files changed, 75 insertions(+), 63 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st index 64281a5176..3aaad09ba9 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st @@ -23,6 +23,12 @@ IceGitHubAction >> credentials [ ^ credentials ifNil: [ credentials := self obtainCredentials ] ] +{ #category : #private } +IceGitHubAction >> defaultApplication [ + + ^ SpApplication defaultApplication +] + { #category : #executing } IceGitHubAction >> execute [ self withErrorHandlingDo: [ @@ -63,13 +69,13 @@ IceGitHubAction >> remote: anObject [ { #category : #private } IceGitHubAction >> reportError: error [ - + | message | message := error messageBody. - message = 'Invalid field: head' - ifTrue: [ message := 'Branch does not exist on github. Please commit and push your changes.' ]. - SpApplication defaultApplication newInform + message = 'Invalid field: head' ifTrue: [ + message := 'Branch does not exist on github. Please commit and push your changes.' ]. + self defaultApplication newInform label: message; - title: 'Error creating pull request: ', error messageText; + title: 'Error creating pull request: ' , error messageText; openModal ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st index e057608849..5e1ddfeea4 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st @@ -204,12 +204,12 @@ IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [ getIssue: remote owner project: remote projectName number: number. - self defaultApplication defer: [ + self defer: [ self updateText: (self sanitizeTitle: (issue at: 'title')) ] ] on: IceGitHubError do: [ :e | e messageText = 'Not Found' ifFalse: [ e pass ]. - self defaultApplication defer: [ + self defer: [ self updateText: self unknownTitle ] ] ] ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st index 76458583ea..2a73c8c00a 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st @@ -44,9 +44,10 @@ IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ pullRequestDatas := pullRequest send. url := pullRequestDatas at: 'html_url'. - UIManager default - inform: 'Pull request created. Click to view on Github.' - actionOnClick: [ WebBrowser openOn: url ] + self defaultApplication newInform + title: 'Pull request created. Click to view on Github.'; + onAccept: [ WebBrowser openOn: url ]; + openModal. ] on: IceGitHubError do: [ :e | self reportError: e ] @@ -54,18 +55,18 @@ IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ { #category : #private } IceGitHubNewPullRequestAction >> validateMakePullRequestOn: aRepository [ + | status | - status := OrderedCollection new: 2. - aRepository isModified - ifTrue: [ status add: 'Uncommited changes' ]. - (aRepository outgoingCommitsTo: remote) - ifNotEmpty: [ :commits | '{1} not published' format: { commits size } ]. + aRepository isModified ifTrue: [ status add: 'Uncommited changes' ]. + (aRepository outgoingCommitsTo: remote) ifNotEmpty: [ :commits | + '{1} not published' format: { commits size } ]. status ifEmpty: [ ^ true ]. - - ^ SpApplication defaultApplication newConfirm - title: ('{1} has ongoing modifications.' format: { aRepository name.}); - label: ('{2} + + ^ self defaultApplication newConfirm + title: + ('{1} has ongoing modifications.' format: { aRepository name }); + label: ('{2} Do you want to continue anyway?' format: { status asCommaString }); - openModal + openModal ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st index e7cb99e58f..46eff77942 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st @@ -32,27 +32,30 @@ IceGitHubOpenOnGithubAction class >> organisation: aString projectName: anotherS { #category : #executing } IceGitHubOpenOnGithubAction >> basicExecute [ - [ - + + [ | url | - url := (self github getRepository: self organisation project: self projectName) at: 'html_url'. - - self class environment - at: #WebBrowser - ifPresent: [ :webBrowser | webBrowser openOn: url ] - ifAbsent: [ - SpApplication defaultApplication + url := (self github + getRepository: self organisation + project: self projectName) at: 'html_url'. + + self class environment + at: #WebBrowser + ifPresent: [ :webBrowser | webBrowser openOn: url ] + ifAbsent: [ + self defaultApplication title: ('Cannot open "{1}"' format: { url }); - label: 'Because the project WebBrowser is not present by default in Pharo 6.'; - openModal ] - - ] + label: + 'Because the project WebBrowser is not present by default in Pharo 6.'; + openModal ] ] on: IceGitHubError - do: [ - SpApplication defaultApplication + do: [ + self defaultApplication title: 'Invalid Github repository.'; - label: ('No project named "{1}" found for the owner "{2}"' - format: { self projectName . self organisation}); + label: + ('No project named "{1}" found for the owner "{2}"' format: { + self projectName. + self organisation }); openModal ] ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st index e6ccef85f5..9ba9896429 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st @@ -54,18 +54,17 @@ IceGitHubRemoveBranchesAction >> remoteBranches [ { #category : #actions } IceGitHubRemoveBranchesAction >> removeBranch: json [ + | branchName | - branchName := json at: 'name'. - IceGitHubAPI new + IceGitHubAPI new credentials: self credentials; - deleteBranch: self remote owner - project: self remote projectBasename - name: branchName. - SpApplication defaultApplication + deleteBranch: self remote owner + project: self remote projectBasename + name: branchName. + self defaultApplication title: ('Branch {1} removed.' format: { branchName }); - openModal - + openModal ] { #category : #actions } diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st index 6073e339ba..b3e2fa4f79 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st @@ -18,27 +18,30 @@ IceGitHubViewPullRequestOnGithubAction class >> organisation: aString projectNam { #category : #executing } IceGitHubViewPullRequestOnGithubAction >> basicExecute [ - [ - + + [ | url | - url := (self github getRepository: self organisation project: self projectName) at: 'html_url'. - - self class environment - at: #WebBrowser - ifPresent: [ :webBrowser | webBrowser openOn: url ] - ifAbsent: [ - SpApplication defaultApplication newInform - title: ('Cannot open "{1}"' format: { url }); - label: 'Because the project WebBrowser is not present by default in Pharo 6.'; - openModal ] - - ] + url := (self github + getRepository: self organisation + project: self projectName) at: 'html_url'. + + self class environment + at: #WebBrowser + ifPresent: [ :webBrowser | webBrowser openOn: url ] + ifAbsent: [ + self defaultApplication newInform + title: ('Cannot open "{1}"' format: { url }); + label: + 'Because the project WebBrowser is not present by default in Pharo 6.'; + openModal ] ] on: IceGitHubError - do: [ - SpApplication defaultApplication newInform + do: [ + SpApplication defaultApplication newInform title: 'Invalid Github repository.'; - label: ('No project named "{1}" found for the owner "{2}"' - format: { self projectName . self organisation}); + label: + ('No project named "{1}" found for the owner "{2}"' format: { + self projectName. + self organisation }); openModal ] ] From 8dcfe0847df756d015bf4ffa16d6a7d278c06ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Mon, 4 Sep 2023 21:03:50 +0200 Subject: [PATCH 22/83] QuestionWithoutCancel + request migrated :) --- ...acelloInstallBaselineGroupCommand.class.st | 21 ++++++++++--------- .../IceTipEditProjectDialog.class.st | 19 +++++++---------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st index 1b027e3d19..3a02c189ba 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st @@ -17,15 +17,16 @@ IceTipMetacelloInstallBaselineGroupCommand class >> defaultName [ IceTipMetacelloInstallBaselineGroupCommand >> execute [ | result | - result := UIManager default - request: 'Groups to install (a comma separated string)' - initialAnswer: '' - title: 'Enter groups to install'. - result ifNil: [ ^ self ]. - - self + result := self application newRequest + title: 'Enter groups to install'; + label: 'Groups to install (a comma separated string)'; + text: 'All'; openModal. + result ifNil: [ ^ self ]. + + self installBaseline: self package - groups: ((result substrings: ',') - collect: #trimmed - as: Array) + groups: + ((result substrings: ',') + collect: [ :each | each trimmed ] + as: Array) ] diff --git a/Iceberg-TipUI/IceTipEditProjectDialog.class.st b/Iceberg-TipUI/IceTipEditProjectDialog.class.st index 9b80d21e12..ba770f8344 100644 --- a/Iceberg-TipUI/IceTipEditProjectDialog.class.st +++ b/Iceberg-TipUI/IceTipEditProjectDialog.class.st @@ -332,21 +332,18 @@ IceTipEditProjectDialog >> onAccept: aBlockClosure [ IceTipEditProjectDialog >> removeDirectory [ | toRemove newSelection | - newSelection := selectedDirectoryPath parent. toRemove := selectedDirectoryPath asResolvedBy: self model fileSystem. - toRemove exists - ifTrue: [ - (UIManager default - questionWithoutCancel: ('Are you sure to delete ''{1}''?' format: {toRemove basename}) - title: 'Remove directory') - ifFalse: [ ^ self]. - toRemove ensureDelete ]. - - sourceDirectoryTree roots: { self model fileSystem }. - self expandAndSelect: newSelection. + toRemove exists ifTrue: [ + (self application newConfirm + title: 'Remove directory'; + label: ('Are you sure to delete ''{1}''?' format: { toRemove basename }); + openModal) ifFalse: [ ^ self ]. + toRemove ensureDelete ]. + sourceDirectoryTree roots: { self model fileSystem }. + self expandAndSelect: newSelection ] { #category : #accessing } From e0fe99825fb16ddec92bfd711d09965dca628388 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Tue, 5 Sep 2023 11:38:43 +0200 Subject: [PATCH 23/83] react to library not present in a nicer way --- Iceberg-Libgit/IceLibgitRepository.class.st | 5 +++++ .../IceTipRepositoriesBrowser.class.st | 19 ++++++++++++++++++- Iceberg-TipUI/IceTipRepositoryModel.class.st | 17 +++++++++++++---- Iceberg-TipUI/IceTipStyleContributor.class.st | 19 +++++++++++-------- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/Iceberg-Libgit/IceLibgitRepository.class.st b/Iceberg-Libgit/IceLibgitRepository.class.st index 141d9024f0..fe29a55322 100644 --- a/Iceberg-Libgit/IceLibgitRepository.class.st +++ b/Iceberg-Libgit/IceLibgitRepository.class.st @@ -768,6 +768,11 @@ IceLibgitRepository >> remoteTrackedBranches [ { #category : #'API - remotes' } IceLibgitRepository >> remotes [ + LGitLibrary uniqueInstance isAvailable + ifFalse: [ + 'No libgit2 available, skipping.' crTrace. + ^ #() ]. + self handleLibgitError: [ | gitRemotes | self isValid ifFalse: [ ^ #() ]. gitRemotes := self repositoryHandle allRemotes. diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 7eb4a029e1..2483dd4c58 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -9,7 +9,8 @@ Class { #superclass : #IceTipBrowser, #instVars : [ 'currentGroupPanel', - 'repositoryNotebook' + 'repositoryNotebook', + 'notifyPanel' ], #category : #'Iceberg-TipUI-View-Repository' } @@ -103,6 +104,14 @@ IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ yourself ] +{ #category : #initialization } +IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ + + notifyPanel layout add: (notifyPanel newLabel + label: 'There is no libgit2 available in your system! Please verify everything is fine before continue.'; + yourself) +] + { #category : #initialization } IceTipRepositoriesBrowser >> connectPresenters [ @@ -127,6 +136,7 @@ IceTipRepositoriesBrowser >> defaultKeyboardFocus [ IceTipRepositoriesBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom + add: notifyPanel expand: false; add: repositoryNotebook; yourself ] @@ -155,6 +165,10 @@ IceTipRepositoriesBrowser >> initialExtentForWindow [ { #category : #initialization } IceTipRepositoriesBrowser >> initializePresenters [ + notifyPanel := self newPresenter. + notifyPanel layout: SpBoxLayout newVertical. + notifyPanel addStyle: 'libgit2NotAvailable'. + repositoryNotebook := self newNotebook ] @@ -259,6 +273,9 @@ IceTipRepositoriesBrowser >> titleForWindow [ { #category : #initialization } IceTipRepositoriesBrowser >> updatePresenter [ + LGitLibrary uniqueInstance isAvailable + ifFalse: [ self addLibGitNotAvailableWarning ]. + self model repositoryGroups do: [ :group | repositoryNotebook addPageTitle: group label diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st index a7eb6937d0..5d75754d1b 100644 --- a/Iceberg-TipUI/IceTipRepositoryModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryModel.class.st @@ -57,9 +57,11 @@ IceTipRepositoryModel >> branchModelFor: aBranch [ { #category : #accessing } IceTipRepositoryModel >> branchName [ - self entity isMissing ifTrue: [ ^ self class unknownBranchLabel ]. - ^ self entity head description. + (self isLibGitAvailable not or: [ self entity isMissing ]) + ifTrue: [ ^ self class unknownBranchLabel ]. + + ^ self entity head description ] { #category : #accessing } @@ -110,7 +112,7 @@ IceTipRepositoryModel >> description [ | text | text := self displayString. - self entity isModified + (self isLibGitAvailable and: [ self entity isModified ]) ifTrue: [ text := '*', text ]. ^ text ] @@ -118,7 +120,7 @@ IceTipRepositoryModel >> description [ { #category : #accessing } IceTipRepositoryModel >> descriptionDecorator [ - self entity isModified + (self isLibGitAvailable and: [ self entity isModified ]) ifTrue: [ ^ IceTipDescriptionDecorator modified ]. ^ super descriptionDecorator ] @@ -175,6 +177,12 @@ IceTipRepositoryModel >> isDetached [ or: [ self entity head isDetached ] ] +{ #category : #'private - testing' } +IceTipRepositoryModel >> isLibGitAvailable [ + + ^ LGitLibrary uniqueInstance isAvailable +] + { #category : #'private - testing' } IceTipRepositoryModel >> isLoaded [ ^ self entity loadedPackages notEmpty @@ -425,6 +433,7 @@ IceTipRepositoryModel >> status [ | status incoming outgoing | self verifyDirectoryStructureIfMissing: [ :message | ^ message asString ]. + self isLibGitAvailable ifFalse: [ ^ 'Unknown (No libgit2)' ]. entity workingCopy workingCopyState isUnknownCommitState ifTrue: [ ^ entity workingCopy workingCopyState description ]. diff --git a/Iceberg-TipUI/IceTipStyleContributor.class.st b/Iceberg-TipUI/IceTipStyleContributor.class.st index 44cbcc047b..57fadcd53a 100644 --- a/Iceberg-TipUI/IceTipStyleContributor.class.st +++ b/Iceberg-TipUI/IceTipStyleContributor.class.st @@ -13,13 +13,16 @@ Class { IceTipStyleContributor >> styleSheetContribution [ ^ SpStyle newApplication - addClass: 'textInputField' with: [ :textClass | - textClass addClass: 'iceTipReadonly' with: [ :iceTipReadonly | - iceTipReadonly addPropertyDrawWith: [ :draw | draw color: Color transparent ] ]] ; - addClass: 'text' with: [ :textClass | - textClass addClass: 'iceTipReadonly' with: [ :iceTipReadonly | - iceTipReadonly addPropertyDrawWith: [ :draw | draw color: Color transparent ]. - textClass addClass: 'iceTipText4Lines' with: [ :iceTipText4Lines | - iceTipText4Lines addPropertyGeometryWith: [ :geo | geo height: 80 ] ] ] ]; + addClass: 'libgit2NotAvailable' with: [ :aClass | aClass + addPropertyDrawWith: [ :draw | draw backgroundColor: Color orange ]; + addPropertyFontWith: [ :font | font color: Color white ] ]; + addClass: 'textInputField' with: [ :textClass | textClass + addClass: 'iceTipReadonly' with: [ :iceTipReadonly | iceTipReadonly + addPropertyDrawWith: [ :draw | draw color: Color transparent ] ] ]; + addClass: 'text' with: [ :textClass | textClass + addClass: 'iceTipReadonly' with: [ :iceTipReadonly | iceTipReadonly + addPropertyDrawWith: [ :draw | draw color: Color transparent ]; + addClass: 'iceTipText4Lines' with: [ :iceTipText4Lines | iceTipText4Lines + addPropertyGeometryWith: [ :geo | geo height: 80 ] ] ] ]; yourself ] From 034d567c38f61ebe4e6f6199a628f4d64183f2e0 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 6 Sep 2023 15:19:31 +0200 Subject: [PATCH 24/83] Remove usage of categories in MCOrganizationDefinition Base the organization definition on packages and tags instead of categories. #ensureMCClassOrganisationHasCorrectStructure: has been simplified because now the organization knows the package and we do not need to do magic to ensure we have the right one IcePackageDefinition has been updated to use the package name and tag names instead of categories. This change includes https://github.com/pharo-vcs/iceberg/pull/1728 --- .../IceConvertFormatAction.class.st | 61 ++++----------- Iceberg/IceMCDefinitionImporter.class.st | 8 +- Iceberg/IcePackageDefinition.class.st | 77 +++++++++++-------- 3 files changed, 66 insertions(+), 80 deletions(-) diff --git a/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st b/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st index 554caf39f1..b7f0770e95 100644 --- a/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st +++ b/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st @@ -34,21 +34,9 @@ IceConvertFormatAction >> codeDirectoryWithDelim [ { #category : #private } IceConvertFormatAction >> ensureMCClassOrganisationHasCorrectStructure: mcVersion [ - | organisation | - organisation := mcVersion snapshot definitions - detect: [ :each | each isOrganizationDefinition ]. - - (organisation categories size = 1) ifFalse: [ | baseCategory | - baseCategory := self - obtainCommonCategory: organisation categories first - from: organisation categories. - baseCategory ifEmpty: [ - self error: 'I didn''t find a base category, something is wrong with the package definition' ]. - baseCategory = organisation categories first ifFalse: [ - organisation categories: (organisation categories copyWithFirst: baseCategory) ] ]. - - ^ mcVersion + (mcVersion snapshot definitions detect: [ :each | each isOrganizationDefinition ]) packageName ifNil: [ + self error: 'I have no package name in the organization definition' ] ] { #category : #private } @@ -57,16 +45,14 @@ IceConvertFormatAction >> ensureMCVersionWithClassOrganisation: mcVersion [ only for extensions, we need to ensure it has one, otherwise package creation will fail" - ^ mcVersion snapshot definitions - detect: [ :each | each isClassDefinition ] - ifFound: [ :each | mcVersion ] - ifNone: [ - MCVersion - package: mcVersion package - info: mcVersion info - snapshot: (MCSnapshot fromDefinitions: ( - { MCOrganizationDefinition categories: { mcVersion package name }}, - mcVersion snapshot definitions)) ] + ^ mcVersion snapshot definitions + detect: [ :each | each isClassDefinition ] + ifFound: [ :each | mcVersion ] + ifNone: [ + MCVersion + package: mcVersion package + info: mcVersion info + snapshot: (MCSnapshot fromDefinitions: { (MCOrganizationDefinition packageName: mcVersion package name) } , mcVersion snapshot definitions) ] ] { #category : #execution } @@ -103,22 +89,20 @@ IceConvertFormatAction >> mergeWithCurrentBranch: anObject [ { #category : #private } IceConvertFormatAction >> migratePackage: packageName commit: commit [ + | filetreePackage srcDir subDirWithDelim mcVersion | - srcDir := self codeDirectory. subDirWithDelim := self codeDirectoryWithDelim. - + mcVersion := (commit versionFor: packageName) mcVersion. mcVersion := self ensureMCVersionWithClassOrganisation: mcVersion. - mcVersion := self ensureMCClassOrganisationHasCorrectStructure: mcVersion. - self writerClass - forInternalStoreFileOut: mcVersion - on: repository. + self ensureMCClassOrganisationHasCorrectStructure: mcVersion. + self writerClass forInternalStoreFileOut: mcVersion on: repository. filetreePackage := commit writerClass directoryNameFor: packageName. (srcDir / filetreePackage) ensureDeleteAll. - self repository addFilesToIndex: { - subDirWithDelim, (IceLibgitTonelWriter directoryNameFor: packageName). - subDirWithDelim, (IceLibgitFiletreeWriter directoryNameFor: packageName) } + self repository addFilesToIndex: { + (subDirWithDelim , (IceLibgitTonelWriter directoryNameFor: packageName)). + (subDirWithDelim , (IceLibgitFiletreeWriter directoryNameFor: packageName)) } ] { #category : #private } @@ -152,17 +136,6 @@ IceConvertFormatAction >> migrateSources [ andParents: { commit }. ] -{ #category : #private } -IceConvertFormatAction >> obtainCommonCategory: aString from: aCollection [ - - ^ (aCollection allSatisfy: [ :each | each beginsWith: aString ]) - ifTrue: [ aString ] - ifFalse: [ - (aString includes: $-) - ifTrue: [ self obtainCommonCategory: (aString copyUpToLast: $-) from: aCollection ] - ifFalse: [ '' ] ] -] - { #category : #private } IceConvertFormatAction >> removeFiletreeRemnants [ "remove .filetree remaining" diff --git a/Iceberg/IceMCDefinitionImporter.class.st b/Iceberg/IceMCDefinitionImporter.class.st index d76421608b..1aea3ee983 100644 --- a/Iceberg/IceMCDefinitionImporter.class.st +++ b/Iceberg/IceMCDefinitionImporter.class.st @@ -123,9 +123,11 @@ IceMCDefinitionImporter >> visitMethodDefinition: aMCMethodDefinition [ ] { #category : #visiting } -IceMCDefinitionImporter >> visitOrganizationDefinition: aMCOrganizationDefinition [ - - packageNode value categories: aMCOrganizationDefinition categories +IceMCDefinitionImporter >> visitOrganizationDefinition: aMCOrganizationDefinition [ + + packageNode value + packageName: aMCOrganizationDefinition packageName; + tagNames: aMCOrganizationDefinition tagNames ] { #category : #visiting } diff --git a/Iceberg/IcePackageDefinition.class.st b/Iceberg/IcePackageDefinition.class.st index 771ac28641..a1392a0d5d 100644 --- a/Iceberg/IcePackageDefinition.class.st +++ b/Iceberg/IcePackageDefinition.class.st @@ -10,10 +10,11 @@ Class { #superclass : #IceDefinition, #instVars : [ 'package', - 'categories', - 'path' + 'path', + 'packageName', + 'tagNames' ], - #category : 'Iceberg-Changes' + #category : #'Iceberg-Changes' } { #category : #visiting } @@ -37,44 +38,30 @@ IcePackageDefinition >> addModification: anIceModification toPatcher: aMCPatcher { #category : #patching } IcePackageDefinition >> addToPatcher: aPatcher [ - - aPatcher addDefinition: (MCOrganizationDefinition categories: categories) -] - -{ #category : #accessing } -IcePackageDefinition >> asMCDefinition [ - - ^ MCOrganizationDefinition categories: categories -] -{ #category : #accessing } -IcePackageDefinition >> categories [ - ^ categories + aPatcher addDefinition: self asMCDefinition ] { #category : #accessing } -IcePackageDefinition >> categories: aCollection [ +IcePackageDefinition >> asMCDefinition [ - categories := aCollection + ^ MCOrganizationDefinition packageName: packageName tagNames: tagNames ] { #category : #accessing } IcePackageDefinition >> contents [ - - ^ String streamContents: [ :stream | - stream nextPutAll: 'Package tags: '. - categories do: [ :elem | - stream nextPutAll: String crlf; - nextPutAll: String tab; - nextPutAll: elem. - ]] -] -{ #category : #initialization } -IcePackageDefinition >> initialize [ - - super initialize. - categories := #() + ^ String streamContents: [ :stream | + stream + nextPutAll: 'Package: '; + nextPutAll: self packageName; + crlf; + nextPutAll: 'Tags: '. + self tagNames do: [ :tagName | + stream + nextPutAll: String crlf; + nextPutAll: String tab; + nextPutAll: tagName ] ] ] { #category : #testing } @@ -89,6 +76,18 @@ IcePackageDefinition >> package [ ^ package ] +{ #category : #accessing } +IcePackageDefinition >> packageName [ + + ^ packageName +] + +{ #category : #accessing } +IcePackageDefinition >> packageName: anObject [ + + packageName := anObject +] + { #category : #accessing } IcePackageDefinition >> path [ ^ path @@ -107,6 +106,18 @@ IcePackageDefinition >> removeFrom: aVisitor [ { #category : #patching } IcePackageDefinition >> removeFromPatcher: aPatcher [ - - aPatcher removeDefinition: (MCOrganizationDefinition categories: categories) + + aPatcher removeDefinition: self asMCDefinition +] + +{ #category : #accessing } +IcePackageDefinition >> tagNames [ + + ^ tagNames +] + +{ #category : #accessing } +IcePackageDefinition >> tagNames: anObject [ + + tagNames := anObject ] From 334248bf2bd9e1991a76af0728827793ad6dc077 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Wed, 6 Sep 2023 15:29:01 +0200 Subject: [PATCH 25/83] bindings update to 3.0.7 --- BaselineOfIceberg/BaselineOfIceberg.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st index f69d9bdebe..141e9776f5 100644 --- a/BaselineOfIceberg/BaselineOfIceberg.class.st +++ b/BaselineOfIceberg/BaselineOfIceberg.class.st @@ -76,7 +76,7 @@ BaselineOfIceberg >> libgit: spec [ baseline: 'LibGit' with: [ spec - repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.6'; + repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.7'; loads: 'default' ]. spec project: 'LibGit-Tests' From 6efb431a97f473a6d6803e58ce9c29cf86c2d511 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 6 Sep 2023 15:57:54 +0200 Subject: [PATCH 26/83] Fix tests --- .../RG2PackageDefinition.extension.st | 24 ++++++++++--------- Iceberg/IceMCPackageImporter.class.st | 17 +++++++------ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Iceberg-Tests/RG2PackageDefinition.extension.st b/Iceberg-Tests/RG2PackageDefinition.extension.st index 85dc06e54f..93d826948c 100644 --- a/Iceberg-Tests/RG2PackageDefinition.extension.st +++ b/Iceberg-Tests/RG2PackageDefinition.extension.st @@ -3,16 +3,18 @@ Extension { #name : #RG2PackageDefinition } { #category : #'*Iceberg-Tests' } RG2PackageDefinition >> asMCSnapshot [ - | definitions | - - definitions := ((((self definedBehaviors reject: #isMeta) sorted: [:a :b | a name < b name ]) collect: #asMCDefinition), (self extensionMethods collect: #asMCDefinition)) asOrderedCollection. - definitions addAll: ((self definedBehaviors select: [:each | each isTrait and: [each classSide hasTraitComposition]]) - collect: [:aTrait | aTrait classSide asMCDefinition]). - - definitions addAll: ((self definedBehaviors, (self definedBehaviors collect: #classSide)) flatCollect: [ :behavior | - (behavior localMethods reject: [:each | (each parent instanceSide package = each package) not]) - collect: [ :method | method asMCDefinition] ]). - definitions add: (MCOrganizationDefinition categories: {name}). + | definitions | + definitions := ((((self definedBehaviors reject: #isMeta) sorted: [ :a :b | a name < b name ]) collect: #asMCDefinition) + , (self extensionMethods collect: #asMCDefinition)) asOrderedCollection. + definitions addAll: (self definedBehaviors + select: [ :each | each isTrait and: [ each classSide hasTraitComposition ] ] + thenCollect: [ :aTrait | aTrait classSide asMCDefinition ]). - ^ MCSnapshot fromDefinitions: definitions. + definitions addAll: (self definedBehaviors , (self definedBehaviors collect: #classSide) flatCollect: [ :behavior | + behavior localMethods + select: [ :each | each parent instanceSide package = each package ] + thenCollect: [ :method | method asMCDefinition ] ]). + definitions add: (MCOrganizationDefinition packageName: name). + + ^ MCSnapshot fromDefinitions: definitions ] diff --git a/Iceberg/IceMCPackageImporter.class.st b/Iceberg/IceMCPackageImporter.class.st index 80e7617eb9..6440392218 100644 --- a/Iceberg/IceMCPackageImporter.class.st +++ b/Iceberg/IceMCPackageImporter.class.st @@ -13,22 +13,21 @@ Class { { #category : #importing } IceMCPackageImporter >> importOn: aNode [ - + | packageNode snapshot definition | "If the version does not include the package, we do not calculate a snapshot nor import it" - (version includesPackageNamed: self packageName) - ifFalse: [ ^ self ]. - + (version includesPackageNamed: self packageName) ifFalse: [ ^ self ]. + definition := IcePackageDefinition named: self packageName. packageNode := aNode addChild: definition. definition path: packageNode path. - + snapshot := self snapshot. - snapshot definitions do: [ :e | + snapshot definitions do: [ :e | e accept: (IceMCDefinitionImporter new - packageNode: packageNode; - snapshot: snapshot; - yourself) ]. + packageNode: packageNode; + snapshot: snapshot; + yourself) ]. ^ packageNode ] From d1dec4fe0ec6c5b63bf79df7813d9db14b9eed1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Fri, 8 Sep 2023 21:23:53 +0200 Subject: [PATCH 27/83] Renamed all the xModel into xPresenter same for xDialog into xDialogPresenter just to help understanding the code. --- .../IceFiletreeToTonelCommand.class.st | 2 +- ...ipFiletreeToTonelDialogPresenter.class.st} | 34 ++++----- .../IcePlaintextCredentials.extension.st | 6 +- .../IcePlaintextOtpCredentials.extension.st | 2 +- Iceberg-TipUI/IceSshCredentials.extension.st | 2 +- ...eTipAbstractCredentialsPresenter.class.st} | 52 +++++++------- ...actPlaintextCredentialsPresenter.class.st} | 20 +++--- ...pAbstractSSHCredentialsPresenter.class.st} | 16 ++--- ...TipAddNewPackagesDialogPresenter.class.st} | 36 +++++----- .../IceTipAddPackageCommand.class.st | 2 +- ...IceTipAddPackagesDialogPresenter.class.st} | 40 +++++------ ...eTipAddPlainTextCredentialCommand.class.st | 2 +- ...AddPlaintextCredentialsPresenter.class.st} | 18 ++--- Iceberg-TipUI/IceTipAddRemoteCommand.class.st | 2 +- ...> IceTipAddRemoteDialogPresenter.class.st} | 36 +++++----- .../IceTipAddRepositoryCommand.class.st | 2 +- ...IceTipAddSSHCredentialsPresenter.class.st} | 18 ++--- .../IceTipAddSshCredentialCommand.class.st | 2 +- .../IceTipAddTokenCredentialCommand.class.st | 2 +- ...eTipAddTokenCredentialsPresenter.class.st} | 24 +++---- ...ForPlaintextCredentialsPresenter.class.st} | 16 ++--- ...PlaintextOtpCredentialsPresenter.class.st} | 14 ++-- ...ithubForPlaintextCredentialsModel.class.st | 11 --- ...bForPlaintextCredentialsPresenter.class.st | 11 +++ ...IceTipAskSSHCredentialsPresenter.class.st} | 10 +-- .../IceTipCheckoutBranchDialog.class.st | 2 +- .../IceTipCheckoutPreviewBrowser.class.st | 2 +- ...ceTipCritiquesBeforeCommitBrowser.class.st | 2 +- ...lass.st => IceTipDialogPresenter.class.st} | 8 +-- ...ditPlaintextCredentialsPresenter.class.st} | 16 ++--- ...IceTipEditProjectDialogPresenter.class.st} | 70 +++++++++---------- .../IceTipEditRepositoryCommand.class.st | 2 +- ...ceTipEditSSHCredentialsPresenter.class.st} | 16 ++--- ...TipEditTokenCredentialsPresenter.class.st} | 12 ++-- ...st => IceTipErrorDialogPresenter.class.st} | 26 +++---- .../IceTipForgetRepositoryCommand.class.st | 2 +- ...tUsernameAndEmailDialogPresenter.class.st} | 34 ++++----- ...pHiedraAltComponentHistoryBrowser.class.st | 2 +- .../IceTipHiedraAltHistoryBrowser.class.st | 2 +- ...eTipHiedraAltHistoryRowPresenter.class.st} | 10 +-- ...TipInteractiveCredentialsProvider.class.st | 4 +- .../IceTipInteractiveErrorVisitor.class.st | 4 +- ...IceTipMergeBranchDialogPresenter.class.st} | 26 +++---- Iceberg-TipUI/IceTipMergeCommand.class.st | 2 +- ...t => IceTipOptionDialogPresenter.class.st} | 30 ++++---- ...egisterRepositoryDialogPresenter.class.st} | 22 +++--- ...eTipRemovePackageDialogPresenter.class.st} | 30 ++++---- ...pRemoveRepositoryDialogPresenter.class.st} | 30 ++++---- .../IceTipRepairCloneRepository.class.st | 2 +- Iceberg-TipUI/IceTipRepairCommand.class.st | 2 +- .../IceTipRepairEditRepository.class.st | 2 +- .../IceTipRepairMergeWithBranch.class.st | 2 +- Iceberg-TipUI/IceTipRepairProject.class.st | 2 +- ...pRepairRepositoryDialogPresenter.class.st} | 40 +++++------ .../IceTipSelectRemotePresenter.class.st | 2 +- ...eTipUnloadAndRemovePackageCommand.class.st | 2 +- .../IceTipWorkingCopyBrowser.class.st | 2 +- ...TipWorkingCopyStatusBarPresenter.class.st} | 14 ++-- .../IceTokenCredentials.extension.st | 2 +- .../LGitCredentialsPlaintext.extension.st | 2 +- Iceberg-TipUI/ManifestIcebergTipUI.class.st | 4 +- 61 files changed, 406 insertions(+), 406 deletions(-) rename Iceberg-Plugin-Migration/{IceTipFiletreeToTonelDialog.class.st => IceTipFiletreeToTonelDialogPresenter.class.st} (72%) rename Iceberg-TipUI/{IceTipAbstractCredentialsModel.class.st => IceTipAbstractCredentialsPresenter.class.st} (67%) rename Iceberg-TipUI/{IceTipAbstractPlaintextCredentialsModel.class.st => IceTipAbstractPlaintextCredentialsPresenter.class.st} (66%) rename Iceberg-TipUI/{IceTipAbstractSSHCredentialsModel.class.st => IceTipAbstractSSHCredentialsPresenter.class.st} (80%) rename Iceberg-TipUI/{IceTipAddNewPackagesDialog.class.st => IceTipAddNewPackagesDialogPresenter.class.st} (72%) rename Iceberg-TipUI/{IceTipAddPackagesDialog.class.st => IceTipAddPackagesDialogPresenter.class.st} (72%) rename Iceberg-TipUI/{IceTipAddPlaintextCredentialsModel.class.st => IceTipAddPlaintextCredentialsPresenter.class.st} (66%) rename Iceberg-TipUI/{IceTipAddRemoteDialog.class.st => IceTipAddRemoteDialogPresenter.class.st} (69%) rename Iceberg-TipUI/{IceTipAddSSHCredentialsModel.class.st => IceTipAddSSHCredentialsPresenter.class.st} (72%) rename Iceberg-TipUI/{IceTipAddTokenCredentialsModel.class.st => IceTipAddTokenCredentialsPresenter.class.st} (74%) rename Iceberg-TipUI/{IceTipAskForPlaintextCredentialsModel.class.st => IceTipAskForPlaintextCredentialsPresenter.class.st} (65%) rename Iceberg-TipUI/{IceTipAskForPlaintextOtpCredentialsModel.class.st => IceTipAskForPlaintextOtpCredentialsPresenter.class.st} (69%) delete mode 100644 Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsModel.class.st create mode 100644 Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st rename Iceberg-TipUI/{IceTipAskSSHCredentialsModel.class.st => IceTipAskSSHCredentialsPresenter.class.st} (54%) rename Iceberg-TipUI/{IceTipDialog.class.st => IceTipDialogPresenter.class.st} (79%) rename Iceberg-TipUI/{IceTipEditPlaintextCredentialsModel.class.st => IceTipEditPlaintextCredentialsPresenter.class.st} (60%) rename Iceberg-TipUI/{IceTipEditProjectDialog.class.st => IceTipEditProjectDialogPresenter.class.st} (81%) rename Iceberg-TipUI/{IceTipEditSSHCredentialsModel.class.st => IceTipEditSSHCredentialsPresenter.class.st} (70%) rename Iceberg-TipUI/{IceTipEditTokenCredentialsModel.class.st => IceTipEditTokenCredentialsPresenter.class.st} (59%) rename Iceberg-TipUI/{IceTipErrorDialog.class.st => IceTipErrorDialogPresenter.class.st} (70%) rename Iceberg-TipUI/{IceTipGitUsernameAndEmailDialog.class.st => IceTipGitUsernameAndEmailDialogPresenter.class.st} (68%) rename Iceberg-TipUI/{IceTipHiedraAltHistoryRow.class.st => IceTipHiedraAltHistoryRowPresenter.class.st} (82%) rename Iceberg-TipUI/{IceTipMergeBranchDialog.class.st => IceTipMergeBranchDialogPresenter.class.st} (68%) rename Iceberg-TipUI/{IceTipOptionDialog.class.st => IceTipOptionDialogPresenter.class.st} (72%) rename Iceberg-TipUI/{IceTipRegisterRepositoryDialog.class.st => IceTipRegisterRepositoryDialogPresenter.class.st} (67%) rename Iceberg-TipUI/{IceTipRemovePackageDialog.class.st => IceTipRemovePackageDialogPresenter.class.st} (67%) rename Iceberg-TipUI/{IceTipRemoveRepositoryDialog.class.st => IceTipRemoveRepositoryDialogPresenter.class.st} (64%) rename Iceberg-TipUI/{IceTipRepairRepositoryDialog.class.st => IceTipRepairRepositoryDialogPresenter.class.st} (68%) rename Iceberg-TipUI/{IceTipWorkingCopyStatusBar.class.st => IceTipWorkingCopyStatusBarPresenter.class.st} (75%) diff --git a/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st b/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st index ba48b13e2e..123ed18021 100644 --- a/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st +++ b/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st @@ -31,5 +31,5 @@ IceFiletreeToTonelCommand >> canBeExecuted [ { #category : #executing } IceFiletreeToTonelCommand >> execute [ - (IceTipFiletreeToTonelDialog on: self repository) openDialog + (IceTipFiletreeToTonelDialogPresenter on: self repository) openDialog ] diff --git a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialog.class.st b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st similarity index 72% rename from Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialog.class.st rename to Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st index 508388eaa0..c8f1549d88 100644 --- a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialog.class.st +++ b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st @@ -3,8 +3,8 @@ I'm a dialog validate and perform a migration of sources from filetree to tonel. " Class { - #name : #IceTipFiletreeToTonelDialog, - #superclass : #IceTipDialog, + #name : #IceTipFiletreeToTonelDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'iconPanel', 'confirmLabel', @@ -16,7 +16,7 @@ Class { } { #category : #actions } -IceTipFiletreeToTonelDialog >> accept [ +IceTipFiletreeToTonelDialogPresenter >> accept [ IceTipStandardAction new repository: self repository; @@ -28,25 +28,25 @@ IceTipFiletreeToTonelDialog >> accept [ ] { #category : #accessing } -IceTipFiletreeToTonelDialog >> branchBaseName [ +IceTipFiletreeToTonelDialogPresenter >> branchBaseName [ ^ 'migrate-sources-to-tonel' ] { #category : #accessing } -IceTipFiletreeToTonelDialog >> branchName [ +IceTipFiletreeToTonelDialogPresenter >> branchName [ ^ branchName ifNil: [ branchName := self obtainBranchName ] ] { #category : #'accessing - ui' } -IceTipFiletreeToTonelDialog >> confirmLabel [ +IceTipFiletreeToTonelDialogPresenter >> confirmLabel [ ^ confirmLabel ] { #category : #accessing } -IceTipFiletreeToTonelDialog >> confirmMessage [ +IceTipFiletreeToTonelDialogPresenter >> confirmMessage [ ^ 'Convert repository {1} sources from filetree format to tonel. This process will use a new branch named {2}. @@ -56,7 +56,7 @@ ARE YOU SURE?' ] { #category : #layout } -IceTipFiletreeToTonelDialog >> defaultLayout [ +IceTipFiletreeToTonelDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight borderWidth: 5; @@ -70,7 +70,7 @@ IceTipFiletreeToTonelDialog >> defaultLayout [ ] { #category : #actions } -IceTipFiletreeToTonelDialog >> doAccept [ +IceTipFiletreeToTonelDialogPresenter >> doAccept [ IceConvertFormatAction new repository: self repository; @@ -81,13 +81,13 @@ IceTipFiletreeToTonelDialog >> doAccept [ ] { #category : #'accessing - ui' } -IceTipFiletreeToTonelDialog >> iconPanel [ +IceTipFiletreeToTonelDialogPresenter >> iconPanel [ ^ iconPanel ] { #category : #initialization } -IceTipFiletreeToTonelDialog >> initialExtentForWindow [ +IceTipFiletreeToTonelDialogPresenter >> initialExtentForWindow [ ^ (500 @ (self class inputTextHeight * 5 + self class buttonHeight + 50)) @@ -95,7 +95,7 @@ IceTipFiletreeToTonelDialog >> initialExtentForWindow [ ] { #category : #initialization } -IceTipFiletreeToTonelDialog >> initializePresenters [ +IceTipFiletreeToTonelDialogPresenter >> initializePresenters [ super initializePresenters. iconPanel := self newImage @@ -114,13 +114,13 @@ IceTipFiletreeToTonelDialog >> initializePresenters [ ] { #category : #'accessing - ui' } -IceTipFiletreeToTonelDialog >> mergeWithMasterCheckbox [ +IceTipFiletreeToTonelDialogPresenter >> mergeWithMasterCheckbox [ ^ mergeWithMasterCheckbox ] { #category : #private } -IceTipFiletreeToTonelDialog >> obtainBranchName [ +IceTipFiletreeToTonelDialogPresenter >> obtainBranchName [ | baseName suffix count | count := 0. @@ -135,19 +135,19 @@ IceTipFiletreeToTonelDialog >> obtainBranchName [ ] { #category : #accessing } -IceTipFiletreeToTonelDialog >> repository [ +IceTipFiletreeToTonelDialogPresenter >> repository [ ^ repository ] { #category : #initialization } -IceTipFiletreeToTonelDialog >> setModelBeforeInitialization: anObject [ +IceTipFiletreeToTonelDialogPresenter >> setModelBeforeInitialization: anObject [ repository := anObject ] { #category : #initialization } -IceTipFiletreeToTonelDialog >> titleForWindow [ +IceTipFiletreeToTonelDialogPresenter >> titleForWindow [ ^ 'Convert sources to tonel' ] diff --git a/Iceberg-TipUI/IcePlaintextCredentials.extension.st b/Iceberg-TipUI/IcePlaintextCredentials.extension.st index 681630ab80..2280cbb78b 100644 --- a/Iceberg-TipUI/IcePlaintextCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextCredentials.extension.st @@ -2,18 +2,18 @@ Extension { #name : #IcePlaintextCredentials } { #category : #'*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClass [ - ^ IceTipAskForPlaintextCredentialsModel + ^ IceTipAskForPlaintextCredentialsPresenter ] { #category : #'*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClassOn: aString [ ^ (aString includesSubstring: 'github.com' caseSensitive: false) - ifTrue: [ IceTipAskGithubForPlaintextCredentialsModel ] + ifTrue: [ IceTipAskGithubForPlaintextCredentialsPresenter ] ifFalse: [ self askForModelClass ] ] { #category : #'*Iceberg-TipUI' } IcePlaintextCredentials >> editModelClass [ - ^ IceTipEditPlaintextCredentialsModel + ^ IceTipEditPlaintextCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st index 88d12d1e5e..c69cf7dd5e 100644 --- a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st @@ -2,5 +2,5 @@ Extension { #name : #IcePlaintextOtpCredentials } { #category : #'*Iceberg-TipUI' } IcePlaintextOtpCredentials >> askForModelClass [ - ^ IceTipAskForPlaintextOtpCredentialsModel + ^ IceTipAskForPlaintextOtpCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceSshCredentials.extension.st b/Iceberg-TipUI/IceSshCredentials.extension.st index 3f35a6dbcb..e3ad3fed5c 100644 --- a/Iceberg-TipUI/IceSshCredentials.extension.st +++ b/Iceberg-TipUI/IceSshCredentials.extension.st @@ -7,5 +7,5 @@ IceSshCredentials >> askForModelClass [ { #category : #'*Iceberg-TipUI' } IceSshCredentials >> editModelClass [ - ^ IceTipEditSSHCredentialsModel + ^ IceTipEditSSHCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTipAbstractCredentialsModel.class.st b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st similarity index 67% rename from Iceberg-TipUI/IceTipAbstractCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st index c01378af14..ec0f14565a 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st @@ -5,8 +5,8 @@ to ask / add / edit credentials. There are subclasses to each of the actions and the types of keys. " Class { - #name : #IceTipAbstractCredentialsModel, - #superclass : #IceTipDialog, + #name : #IceTipAbstractCredentialsPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'storeCheckbox', 'credentialStore', @@ -19,7 +19,7 @@ Class { } { #category : #actions } -IceTipAbstractCredentialsModel >> acceptAddAction [ +IceTipAbstractCredentialsPresenter >> acceptAddAction [ credentials := self newCredentials. @@ -32,7 +32,7 @@ IceTipAbstractCredentialsModel >> acceptAddAction [ ] { #category : #actions } -IceTipAbstractCredentialsModel >> acceptAskAction [ +IceTipAbstractCredentialsPresenter >> acceptAskAction [ credentials := self newCredentials. @@ -46,7 +46,7 @@ IceTipAbstractCredentialsModel >> acceptAskAction [ ] { #category : #actions } -IceTipAbstractCredentialsModel >> acceptEditAction [ +IceTipAbstractCredentialsPresenter >> acceptEditAction [ self refreshCredentialsFromPresenter. credentialStore storeCredential: self credentials. @@ -56,19 +56,19 @@ IceTipAbstractCredentialsModel >> acceptEditAction [ ] { #category : #accessing } -IceTipAbstractCredentialsModel >> askingHostname: aString [ +IceTipAbstractCredentialsPresenter >> askingHostname: aString [ askingHostname := aString ] { #category : #actions } -IceTipAbstractCredentialsModel >> cancelAction [ +IceTipAbstractCredentialsPresenter >> cancelAction [ "Action to execute on cancel." ] { #category : #actions } -IceTipAbstractCredentialsModel >> cancelAskAction [ +IceTipAbstractCredentialsPresenter >> cancelAskAction [ accepted := true. self closeWindow. @@ -76,43 +76,43 @@ IceTipAbstractCredentialsModel >> cancelAskAction [ ] { #category : #actions } -IceTipAbstractCredentialsModel >> closeAction [ +IceTipAbstractCredentialsPresenter >> closeAction [ accepted ifFalse: [ self cancelAction ] ] { #category : #accessing } -IceTipAbstractCredentialsModel >> credentialStore: aStore [ +IceTipAbstractCredentialsPresenter >> credentialStore: aStore [ credentialStore := aStore ] { #category : #accessing } -IceTipAbstractCredentialsModel >> credentials [ +IceTipAbstractCredentialsPresenter >> credentials [ ^ credentials ] { #category : #accessing } -IceTipAbstractCredentialsModel >> credentials: anIceCredentials [ +IceTipAbstractCredentialsPresenter >> credentials: anIceCredentials [ credentials := anIceCredentials. self refreshPresenterFromCredentials ] { #category : #accessing } -IceTipAbstractCredentialsModel >> hostnameFromInput [ +IceTipAbstractCredentialsPresenter >> hostnameFromInput [ "Answer the remoote hostname for the credentials." ^ self subclassResponsibility ] { #category : #initialization } -IceTipAbstractCredentialsModel >> initialize [ +IceTipAbstractCredentialsPresenter >> initialize [ super initialize. accepted := false ] { #category : #accessing } -IceTipAbstractCredentialsModel >> initializeDialogWindow: aDialogWindowPresenter [ +IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPresenter [ super initializeDialogWindow: aDialogWindowPresenter. self updateOkButton. @@ -122,7 +122,7 @@ IceTipAbstractCredentialsModel >> initializeDialogWindow: aDialogWindowPresenter ] { #category : #initialization } -IceTipAbstractCredentialsModel >> initializePresenters [ +IceTipAbstractCredentialsPresenter >> initializePresenters [ storeCheckbox := self newCheckBox label: 'Do you want this credentials to be stored for future use?'; @@ -132,27 +132,27 @@ IceTipAbstractCredentialsModel >> initializePresenters [ ] { #category : #testing } -IceTipAbstractCredentialsModel >> isOkEnabled [ +IceTipAbstractCredentialsPresenter >> isOkEnabled [ "Determite if the user should be enabled to press on the accept button." ^ self subclassResponsibility ] { #category : #accessing } -IceTipAbstractCredentialsModel >> newCredentials [ +IceTipAbstractCredentialsPresenter >> newCredentials [ "Answer a new instance of the credentials using the form inputs." ^ self subclassResponsibility ] { #category : #updating } -IceTipAbstractCredentialsModel >> okButton [ +IceTipAbstractCredentialsPresenter >> okButton [ ^ self window buttons first ] { #category : #'API - opening' } -IceTipAbstractCredentialsModel >> open [ +IceTipAbstractCredentialsPresenter >> open [ self openModal. @@ -160,36 +160,36 @@ IceTipAbstractCredentialsModel >> open [ ] { #category : #accessing } -IceTipAbstractCredentialsModel >> refreshCredentialsFromPresenter [ +IceTipAbstractCredentialsPresenter >> refreshCredentialsFromPresenter [ "Hook to update the credentials object from the presenter inputs." ] { #category : #accessing } -IceTipAbstractCredentialsModel >> refreshPresenterFromCredentials [ +IceTipAbstractCredentialsPresenter >> refreshPresenterFromCredentials [ "Hook to update the presenter input fields from the credentials object." ] { #category : #testing } -IceTipAbstractCredentialsModel >> shouldStoreCredentials [ +IceTipAbstractCredentialsPresenter >> shouldStoreCredentials [ ^ storeCheckbox state ] { #category : #accessing } -IceTipAbstractCredentialsModel >> storeCheckbox [ +IceTipAbstractCredentialsPresenter >> storeCheckbox [ ^ storeCheckbox ] { #category : #accessing } -IceTipAbstractCredentialsModel >> tool: aBrowser [ +IceTipAbstractCredentialsPresenter >> tool: aBrowser [ "Set the tool that triggered this dialog, and therefore might need a #refresh after the users accepts the dialog and it produces an effect on the system." tool := aBrowser ] { #category : #updating } -IceTipAbstractCredentialsModel >> updateOkButton [ +IceTipAbstractCredentialsPresenter >> updateOkButton [ self window ifNil: [ ^ self ]. self okButton enabled: self isOkEnabled diff --git a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsModel.class.st b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st similarity index 66% rename from Iceberg-TipUI/IceTipAbstractPlaintextCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st index 3bc8697c1f..24f88809b7 100644 --- a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st @@ -3,8 +3,8 @@ I implement the basic behavior of all the plaintext credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractPlaintextCredentialsModel, - #superclass : #IceTipAbstractCredentialsModel, + #name : #IceTipAbstractPlaintextCredentialsPresenter, + #superclass : #IceTipAbstractCredentialsPresenter, #instVars : [ 'usernameLabel', 'usernameInput', @@ -15,7 +15,7 @@ Class { } { #category : #initialization } -IceTipAbstractPlaintextCredentialsModel >> initializePresenters [ +IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. usernameLabel := self newLabel label: 'Username:'. @@ -33,13 +33,13 @@ IceTipAbstractPlaintextCredentialsModel >> initializePresenters [ ] { #category : #testing } -IceTipAbstractPlaintextCredentialsModel >> isOkEnabled [ +IceTipAbstractPlaintextCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self password isNotEmpty ] ] { #category : #accessing } -IceTipAbstractPlaintextCredentialsModel >> newCredentials [ +IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ ^ IcePlaintextCredentials new username: self username; @@ -48,31 +48,31 @@ IceTipAbstractPlaintextCredentialsModel >> newCredentials [ ] { #category : #accessing } -IceTipAbstractPlaintextCredentialsModel >> password [ +IceTipAbstractPlaintextCredentialsPresenter >> password [ ^ passwordInput text ] { #category : #'accessing - ui' } -IceTipAbstractPlaintextCredentialsModel >> passwordInput [ +IceTipAbstractPlaintextCredentialsPresenter >> passwordInput [ ^ passwordInput ] { #category : #private } -IceTipAbstractPlaintextCredentialsModel >> passwordLabel [ +IceTipAbstractPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Password:' ] { #category : #accessing } -IceTipAbstractPlaintextCredentialsModel >> username [ +IceTipAbstractPlaintextCredentialsPresenter >> username [ ^ usernameInput text ] { #category : #'accessing - ui' } -IceTipAbstractPlaintextCredentialsModel >> usernameInput [ +IceTipAbstractPlaintextCredentialsPresenter >> usernameInput [ ^ usernameInput ] diff --git a/Iceberg-TipUI/IceTipAbstractSSHCredentialsModel.class.st b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st similarity index 80% rename from Iceberg-TipUI/IceTipAbstractSSHCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st index 96f32c7406..d0f96fe3b3 100644 --- a/Iceberg-TipUI/IceTipAbstractSSHCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st @@ -3,8 +3,8 @@ I implement the basic behavior of all the ssh credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractSSHCredentialsModel, - #superclass : #IceTipAbstractCredentialsModel, + #name : #IceTipAbstractSSHCredentialsPresenter, + #superclass : #IceTipAbstractCredentialsPresenter, #instVars : [ 'usernameInput', 'usernameLabel', @@ -19,7 +19,7 @@ Class { } { #category : #initialization } -IceTipAbstractSSHCredentialsModel >> initializePresenters [ +IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. usernameLabel := self newLabel @@ -57,20 +57,20 @@ IceTipAbstractSSHCredentialsModel >> initializePresenters [ ] { #category : #testing } -IceTipAbstractSSHCredentialsModel >> isOkEnabled [ +IceTipAbstractSSHCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self publicKey isNotEmpty and: [ self privateKey isNotEmpty ] ] ] { #category : #accessing } -IceTipAbstractSSHCredentialsModel >> passphrase [ +IceTipAbstractSSHCredentialsPresenter >> passphrase [ ^ passphraseInput text ] { #category : #accessing } -IceTipAbstractSSHCredentialsModel >> privateKey [ +IceTipAbstractSSHCredentialsPresenter >> privateKey [ ^ privateKeyInput location ifNil: [ '' ] @@ -78,7 +78,7 @@ IceTipAbstractSSHCredentialsModel >> privateKey [ ] { #category : #accessing } -IceTipAbstractSSHCredentialsModel >> publicKey [ +IceTipAbstractSSHCredentialsPresenter >> publicKey [ ^ publicKeyInput location ifNil: [ '' ] @@ -86,7 +86,7 @@ IceTipAbstractSSHCredentialsModel >> publicKey [ ] { #category : #accessing } -IceTipAbstractSSHCredentialsModel >> username [ +IceTipAbstractSSHCredentialsPresenter >> username [ ^ usernameInput text ] diff --git a/Iceberg-TipUI/IceTipAddNewPackagesDialog.class.st b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st similarity index 72% rename from Iceberg-TipUI/IceTipAddNewPackagesDialog.class.st rename to Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st index a251c28ef4..5604783f88 100644 --- a/Iceberg-TipUI/IceTipAddNewPackagesDialog.class.st +++ b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st @@ -2,8 +2,8 @@ I am an small dialog to ask the user to select new packages to load. New packages are packages in the commit but not in the image. " Class { - #name : #IceTipAddNewPackagesDialog, - #superclass : #IceTipDialog, + #name : #IceTipAddNewPackagesDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'packagesList', 'selectedPackages', @@ -16,7 +16,7 @@ Class { } { #category : #commands } -IceTipAddNewPackagesDialog class >> buildCommandsGroupWith: presenterInstance forRoot: rootCommandGroup [ +IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterInstance forRoot: rootCommandGroup [ rootCommandGroup register: ((CmCommandGroup named: 'package list commands') asSpecGroup @@ -26,7 +26,7 @@ IceTipAddNewPackagesDialog class >> buildCommandsGroupWith: presenterInstance fo ] { #category : #actions } -IceTipAddNewPackagesDialog >> accept [ +IceTipAddNewPackagesDialogPresenter >> accept [ | selectedPackageNames | selectedPackageNames := selectedPackages collect: [ :e | e name ]. @@ -43,19 +43,19 @@ IceTipAddNewPackagesDialog >> accept [ ] { #category : #accessing } -IceTipAddNewPackagesDialog >> checkoutModel: anIceTipCheckoutModel [ +IceTipAddNewPackagesDialogPresenter >> checkoutModel: anIceTipCheckoutModel [ checkoutModel := anIceTipCheckoutModel ] { #category : #accessing } -IceTipAddNewPackagesDialog >> checkoutPreviewWindow: anIceTipCheckoutPreviewBrowser [ +IceTipAddNewPackagesDialogPresenter >> checkoutPreviewWindow: anIceTipCheckoutPreviewBrowser [ checkoutPreviewWindow := anIceTipCheckoutPreviewBrowser ] { #category : #layout } -IceTipAddNewPackagesDialog >> defaultLayout [ +IceTipAddNewPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom add: problemDescription expand: false; @@ -64,13 +64,13 @@ IceTipAddNewPackagesDialog >> defaultLayout [ ] { #category : #initialization } -IceTipAddNewPackagesDialog >> iconForWindow [ +IceTipAddNewPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] { #category : #initialization } -IceTipAddNewPackagesDialog >> initializePackagesList [ +IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ packagesList addColumn: (SpCompositeTableColumn new @@ -91,7 +91,7 @@ IceTipAddNewPackagesDialog >> initializePackagesList [ ] { #category : #initialization } -IceTipAddNewPackagesDialog >> initializePresenters [ +IceTipAddNewPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. packagesList := self newTable. @@ -109,49 +109,49 @@ Please select the packages if you wish to load them in the image'. ] { #category : #'accessing - ui' } -IceTipAddNewPackagesDialog >> packagesList [ +IceTipAddNewPackagesDialogPresenter >> packagesList [ ^ packagesList ] { #category : #accessing } -IceTipAddNewPackagesDialog >> selectedPackage [ +IceTipAddNewPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] { #category : #accessing } -IceTipAddNewPackagesDialog >> selectedPackages [ +IceTipAddNewPackagesDialogPresenter >> selectedPackages [ ^ selectedPackages ] { #category : #accessing } -IceTipAddNewPackagesDialog >> selectedPackages: anObject [ +IceTipAddNewPackagesDialogPresenter >> selectedPackages: anObject [ selectedPackages := anObject ] { #category : #'accessing - model' } -IceTipAddNewPackagesDialog >> setModelBeforeInitialization: somePackages [ +IceTipAddNewPackagesDialogPresenter >> setModelBeforeInitialization: somePackages [ packages := somePackages ] { #category : #initialization } -IceTipAddNewPackagesDialog >> titleForWindow [ +IceTipAddNewPackagesDialogPresenter >> titleForWindow [ ^ 'Select New Packages to Load'. ] { #category : #initialization } -IceTipAddNewPackagesDialog >> updatePresenter [ +IceTipAddNewPackagesDialogPresenter >> updatePresenter [ packagesList items: packages ] { #category : #validation } -IceTipAddNewPackagesDialog >> validate [ +IceTipAddNewPackagesDialogPresenter >> validate [ self assert: self selectedPackage isNotNil diff --git a/Iceberg-TipUI/IceTipAddPackageCommand.class.st b/Iceberg-TipUI/IceTipAddPackageCommand.class.st index 7e4ed56165..b426fd154f 100644 --- a/Iceberg-TipUI/IceTipAddPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPackageCommand.class.st @@ -22,7 +22,7 @@ IceTipAddPackageCommand class >> defaultName [ { #category : #executing } IceTipAddPackageCommand >> execute [ - (IceTipAddPackagesDialog + (IceTipAddPackagesDialogPresenter newApplication: context application model: self repositoryModel) asDialogWindow diff --git a/Iceberg-TipUI/IceTipAddPackagesDialog.class.st b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st similarity index 72% rename from Iceberg-TipUI/IceTipAddPackagesDialog.class.st rename to Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st index ceb52584b5..94800447f8 100644 --- a/Iceberg-TipUI/IceTipAddPackagesDialog.class.st +++ b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog to add packages to a repository. " Class { - #name : #IceTipAddPackagesDialog, - #superclass : #IceTipDialog, + #name : #IceTipAddPackagesDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'model', 'packagesList', @@ -14,7 +14,7 @@ Class { } { #category : #actions } -IceTipAddPackagesDialog >> accept [ +IceTipAddPackagesDialogPresenter >> accept [ "ensure window goes away (in case accept comes from a keybinding and not the ok button)" self closeWindow. @@ -26,7 +26,7 @@ IceTipAddPackagesDialog >> accept [ ] { #category : #accessing } -IceTipAddPackagesDialog >> allPackages [ +IceTipAddPackagesDialogPresenter >> allPackages [ ^ RPackageOrganizer default packages asOrderedCollection @@ -34,7 +34,7 @@ IceTipAddPackagesDialog >> allPackages [ ] { #category : #accessing } -IceTipAddPackagesDialog >> allPackagesNotRegistered [ +IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ | currentPackagesNames | currentPackagesNames := self model packages collect: #packageName. @@ -43,7 +43,7 @@ IceTipAddPackagesDialog >> allPackagesNotRegistered [ ] { #category : #layout } -IceTipAddPackagesDialog >> defaultLayout [ +IceTipAddPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom add: packagesList; @@ -52,13 +52,13 @@ IceTipAddPackagesDialog >> defaultLayout [ ] { #category : #initialization } -IceTipAddPackagesDialog >> iconForWindow [ +IceTipAddPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] { #category : #initialization } -IceTipAddPackagesDialog >> initializePackageNameText [ +IceTipAddPackagesDialogPresenter >> initializePackageNameText [ packageNameText placeholder: 'Enter a package name'; @@ -67,7 +67,7 @@ IceTipAddPackagesDialog >> initializePackageNameText [ ] { #category : #initialization } -IceTipAddPackagesDialog >> initializePackagesList [ +IceTipAddPackagesDialogPresenter >> initializePackagesList [ packagesList addColumn: (SpCompositeTableColumn new addColumn: (SpCheckBoxTableColumn new @@ -87,7 +87,7 @@ IceTipAddPackagesDialog >> initializePackagesList [ ] { #category : #initialization } -IceTipAddPackagesDialog >> initializePresenters [ +IceTipAddPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. packagesList := self newTable. @@ -98,32 +98,32 @@ IceTipAddPackagesDialog >> initializePresenters [ ] { #category : #accessing } -IceTipAddPackagesDialog >> model [ +IceTipAddPackagesDialogPresenter >> model [ ^ model ] { #category : #accessing } -IceTipAddPackagesDialog >> model: anObject [ +IceTipAddPackagesDialogPresenter >> model: anObject [ model := anObject. self refresh ] { #category : #'accessing - ui' } -IceTipAddPackagesDialog >> packageNameText [ +IceTipAddPackagesDialogPresenter >> packageNameText [ ^ packageNameText ] { #category : #'accessing - ui' } -IceTipAddPackagesDialog >> packagesList [ +IceTipAddPackagesDialogPresenter >> packagesList [ ^ packagesList ] { #category : #accessing } -IceTipAddPackagesDialog >> refresh [ +IceTipAddPackagesDialogPresenter >> refresh [ packagesList items: (packageNameText text ifEmpty: [ @@ -136,31 +136,31 @@ IceTipAddPackagesDialog >> refresh [ ] { #category : #accessing } -IceTipAddPackagesDialog >> selectedPackage [ +IceTipAddPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] { #category : #initialization } -IceTipAddPackagesDialog >> setModelBeforeInitialization: anObject [ +IceTipAddPackagesDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] { #category : #initialization } -IceTipAddPackagesDialog >> titleForWindow [ +IceTipAddPackagesDialogPresenter >> titleForWindow [ ^ 'Add packages' ] { #category : #initialization } -IceTipAddPackagesDialog >> updatePresenter [ +IceTipAddPackagesDialogPresenter >> updatePresenter [ self refresh ] { #category : #accessing } -IceTipAddPackagesDialog >> validate [ +IceTipAddPackagesDialogPresenter >> validate [ self assert: self selectedPackage isNotNil diff --git a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st index 7dec70a52a..ff725f569e 100644 --- a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st @@ -20,7 +20,7 @@ IceTipAddPlainTextCredentialCommand class >> defaultName [ { #category : #executing } IceTipAddPlainTextCredentialCommand >> execute [ - ((IceTipAddPlaintextCredentialsModel newApplication: context application) + ((IceTipAddPlaintextCredentialsPresenter newApplication: context application) credentialStore: self store; tool: self tool; asDialogWindow) diff --git a/Iceberg-TipUI/IceTipAddPlaintextCredentialsModel.class.st b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st similarity index 66% rename from Iceberg-TipUI/IceTipAddPlaintextCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st index 33a387d7cf..34e65aa27d 100644 --- a/Iceberg-TipUI/IceTipAddPlaintextCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st @@ -2,8 +2,8 @@ I implement the dialog to add plaintext credentials. " Class { - #name : #IceTipAddPlaintextCredentialsModel, - #superclass : #IceTipAbstractPlaintextCredentialsModel, + #name : #IceTipAddPlaintextCredentialsPresenter, + #superclass : #IceTipAbstractPlaintextCredentialsPresenter, #instVars : [ 'hostLabel', 'hostInput' @@ -12,13 +12,13 @@ Class { } { #category : #testing } -IceTipAddPlaintextCredentialsModel >> accept [ +IceTipAddPlaintextCredentialsPresenter >> accept [ self acceptAddAction ] { #category : #layout } -IceTipAddPlaintextCredentialsModel >> defaultLayout [ +IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new beColumnNotHomogeneous; @@ -31,20 +31,20 @@ IceTipAddPlaintextCredentialsModel >> defaultLayout [ ] { #category : #accessing } -IceTipAddPlaintextCredentialsModel >> hostnameFromInput [ +IceTipAddPlaintextCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] { #category : #initialization } -IceTipAddPlaintextCredentialsModel >> initialExtentForWindow [ +IceTipAddPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] { #category : #initialization } -IceTipAddPlaintextCredentialsModel >> initializePresenters [ +IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. hostLabel := self newLabel label: 'Host: '. @@ -55,13 +55,13 @@ IceTipAddPlaintextCredentialsModel >> initializePresenters [ ] { #category : #testing } -IceTipAddPlaintextCredentialsModel >> isOkEnabled [ +IceTipAddPlaintextCredentialsPresenter >> isOkEnabled [ ^ super isOkEnabled and: [ self hostnameFromInput isNotEmpty ] ] { #category : #initialization } -IceTipAddPlaintextCredentialsModel >> titleForWindow [ +IceTipAddPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Add new Plain Text Credential' ] diff --git a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st index ef13f1601b..9664e8295b 100644 --- a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st @@ -29,7 +29,7 @@ IceTipAddRemoteCommand >> canBeExecuted [ { #category : #executing } IceTipAddRemoteCommand >> execute [ - (IceTipAddRemoteDialog + (IceTipAddRemoteDialogPresenter newApplication: context application model: self repositoryModel) asDialogWindow diff --git a/Iceberg-TipUI/IceTipAddRemoteDialog.class.st b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st similarity index 69% rename from Iceberg-TipUI/IceTipAddRemoteDialog.class.st rename to Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st index b1a60e78fe..a7e1f9eb46 100644 --- a/Iceberg-TipUI/IceTipAddRemoteDialog.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog to add remotes to a repository. " Class { - #name : #IceTipAddRemoteDialog, - #superclass : #IceTipDialog, + #name : #IceTipAddRemoteDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'model', 'nameLabel', @@ -16,7 +16,7 @@ Class { } { #category : #actions } -IceTipAddRemoteDialog >> accept [ +IceTipAddRemoteDialogPresenter >> accept [ self validate. (self model @@ -28,7 +28,7 @@ IceTipAddRemoteDialog >> accept [ ] { #category : #layout } -IceTipAddRemoteDialog >> defaultLayout [ +IceTipAddRemoteDialogPresenter >> defaultLayout [ ^ SpGridLayout new borderWidth: 5; @@ -42,7 +42,7 @@ IceTipAddRemoteDialog >> defaultLayout [ ] { #category : #initialization } -IceTipAddRemoteDialog >> initialExtentForWindow [ +IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ ^ (500@( self class inputTextHeight * 2 @@ -52,7 +52,7 @@ IceTipAddRemoteDialog >> initialExtentForWindow [ ] { #category : #initialization } -IceTipAddRemoteDialog >> initializePresenters [ +IceTipAddRemoteDialogPresenter >> initializePresenters [ nameLabel := self newLabel label: 'Remote name'; @@ -71,73 +71,73 @@ IceTipAddRemoteDialog >> initializePresenters [ ] { #category : #accessing } -IceTipAddRemoteDialog >> model [ +IceTipAddRemoteDialogPresenter >> model [ ^ model ] { #category : #accessing } -IceTipAddRemoteDialog >> model: anObject [ +IceTipAddRemoteDialogPresenter >> model: anObject [ model := anObject ] { #category : #'accessing - ui' } -IceTipAddRemoteDialog >> nameLabel [ +IceTipAddRemoteDialogPresenter >> nameLabel [ ^ nameLabel ] { #category : #'accessing - ui' } -IceTipAddRemoteDialog >> nameText [ +IceTipAddRemoteDialogPresenter >> nameText [ ^ nameText ] { #category : #events } -IceTipAddRemoteDialog >> onAccept: aBlock [ +IceTipAddRemoteDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] { #category : #accessing } -IceTipAddRemoteDialog >> remoteName [ +IceTipAddRemoteDialogPresenter >> remoteName [ ^ self nameText text trimmed ] { #category : #accessing } -IceTipAddRemoteDialog >> remoteUrl [ +IceTipAddRemoteDialogPresenter >> remoteUrl [ ^ self urlText text trimmed ] { #category : #initialization } -IceTipAddRemoteDialog >> setModelBeforeInitialization: anObject [ +IceTipAddRemoteDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] { #category : #initialization } -IceTipAddRemoteDialog >> titleForWindow [ +IceTipAddRemoteDialogPresenter >> titleForWindow [ ^ 'Add remote' ] { #category : #'accessing - ui' } -IceTipAddRemoteDialog >> urlLabel [ +IceTipAddRemoteDialogPresenter >> urlLabel [ ^ urlLabel ] { #category : #'accessing - ui' } -IceTipAddRemoteDialog >> urlText [ +IceTipAddRemoteDialogPresenter >> urlText [ ^ urlText ] { #category : #actions } -IceTipAddRemoteDialog >> validate [ +IceTipAddRemoteDialogPresenter >> validate [ self assert: self remoteName notEmpty diff --git a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st index e9acf59eb7..0aa7d9688d 100644 --- a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st @@ -30,7 +30,7 @@ IceTipAddRepositoryCommand >> canBeExecuted [ { #category : #executing } IceTipAddRepositoryCommand >> execute [ - (IceTipRegisterRepositoryDialog newApplication: context application) + (IceTipRegisterRepositoryDialogPresenter newApplication: context application) asDialogWindow centeredRelativeTo: context window; open diff --git a/Iceberg-TipUI/IceTipAddSSHCredentialsModel.class.st b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st similarity index 72% rename from Iceberg-TipUI/IceTipAddSSHCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st index bd5fdf86cd..57f671869e 100644 --- a/Iceberg-TipUI/IceTipAddSSHCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st @@ -2,8 +2,8 @@ I implement the dialog to add SSH credentials. " Class { - #name : #IceTipAddSSHCredentialsModel, - #superclass : #IceTipAbstractSSHCredentialsModel, + #name : #IceTipAddSSHCredentialsPresenter, + #superclass : #IceTipAbstractSSHCredentialsPresenter, #instVars : [ 'hostLabel', 'hostInput' @@ -12,13 +12,13 @@ Class { } { #category : #actions } -IceTipAddSSHCredentialsModel >> accept [ +IceTipAddSSHCredentialsPresenter >> accept [ self acceptAddAction ] { #category : #layout } -IceTipAddSSHCredentialsModel >> defaultLayout [ +IceTipAddSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new beColumnNotHomogeneous; @@ -32,20 +32,20 @@ IceTipAddSSHCredentialsModel >> defaultLayout [ ] { #category : #accessing } -IceTipAddSSHCredentialsModel >> hostnameFromInput [ +IceTipAddSSHCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] { #category : #initialization } -IceTipAddSSHCredentialsModel >> initialExtentForWindow [ +IceTipAddSSHCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 7 + self class buttonHeight)) scaledByDisplayScaleFactor ] { #category : #initialization } -IceTipAddSSHCredentialsModel >> initializePresenters [ +IceTipAddSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. hostLabel := self newLabel @@ -58,7 +58,7 @@ IceTipAddSSHCredentialsModel >> initializePresenters [ ] { #category : #accessing } -IceTipAddSSHCredentialsModel >> newCredentials [ +IceTipAddSSHCredentialsPresenter >> newCredentials [ ^ IceSshCredentials new username: self username; @@ -69,7 +69,7 @@ IceTipAddSSHCredentialsModel >> newCredentials [ ] { #category : #initialization } -IceTipAddSSHCredentialsModel >> titleForWindow [ +IceTipAddSSHCredentialsPresenter >> titleForWindow [ ^ 'Add SSH credential' ] diff --git a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st index 60c551d9d2..db86f547fd 100644 --- a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st @@ -20,7 +20,7 @@ IceTipAddSshCredentialCommand class >> defaultName [ { #category : #execution } IceTipAddSshCredentialCommand >> execute [ - ((IceTipAddSSHCredentialsModel newApplication: context application) + ((IceTipAddSSHCredentialsPresenter newApplication: context application) credentialStore: self store; tool: self tool; asDialogWindow) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st index 7c7ea7b5c2..a1570d8283 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st @@ -18,7 +18,7 @@ IceTipAddTokenCredentialCommand class >> defaultName [ { #category : #executing } IceTipAddTokenCredentialCommand >> execute [ - ((IceTipAddTokenCredentialsModel newApplication: context application) + ((IceTipAddTokenCredentialsPresenter newApplication: context application) credentialStore: self store; tool: self tool; asDialogWindow) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialsModel.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st similarity index 74% rename from Iceberg-TipUI/IceTipAddTokenCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st index 54ac252287..e6b33e71f7 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st @@ -2,8 +2,8 @@ I am a dialog to add token credentials. " Class { - #name : #IceTipAddTokenCredentialsModel, - #superclass : #IceTipAbstractCredentialsModel, + #name : #IceTipAddTokenCredentialsPresenter, + #superclass : #IceTipAbstractCredentialsPresenter, #instVars : [ 'hostInput', 'tokenInput', @@ -16,13 +16,13 @@ Class { } { #category : #accessing } -IceTipAddTokenCredentialsModel >> accept [ +IceTipAddTokenCredentialsPresenter >> accept [ self acceptAddAction ] { #category : #layout } -IceTipAddTokenCredentialsModel >> defaultLayout [ +IceTipAddTokenCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new borderWidth: 5; @@ -37,19 +37,19 @@ IceTipAddTokenCredentialsModel >> defaultLayout [ ] { #category : #accessing } -IceTipAddTokenCredentialsModel >> hostnameFromInput [ +IceTipAddTokenCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] { #category : #initialization } -IceTipAddTokenCredentialsModel >> initialExtentForWindow [ +IceTipAddTokenCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] { #category : #initialization } -IceTipAddTokenCredentialsModel >> initializePresenters [ +IceTipAddTokenCredentialsPresenter >> initializePresenters [ super initializePresenters. usernameLabel := self newLabel @@ -81,7 +81,7 @@ IceTipAddTokenCredentialsModel >> initializePresenters [ ] { #category : #testing } -IceTipAddTokenCredentialsModel >> isOkEnabled [ +IceTipAddTokenCredentialsPresenter >> isOkEnabled [ ^ self usernameFromInput isNotEmpty and: [ self hostnameFromInput isNotEmpty and: [ @@ -89,7 +89,7 @@ IceTipAddTokenCredentialsModel >> isOkEnabled [ ] { #category : #accessing } -IceTipAddTokenCredentialsModel >> newCredentials [ +IceTipAddTokenCredentialsPresenter >> newCredentials [ ^ IceTokenCredentials new username: self usernameFromInput; @@ -99,19 +99,19 @@ IceTipAddTokenCredentialsModel >> newCredentials [ ] { #category : #initialization } -IceTipAddTokenCredentialsModel >> titleForWindow [ +IceTipAddTokenCredentialsPresenter >> titleForWindow [ ^ 'Add token credentials' ] { #category : #accessing } -IceTipAddTokenCredentialsModel >> tokenFromInput [ +IceTipAddTokenCredentialsPresenter >> tokenFromInput [ ^ tokenInput text ] { #category : #accessing } -IceTipAddTokenCredentialsModel >> usernameFromInput [ +IceTipAddTokenCredentialsPresenter >> usernameFromInput [ ^ usernameInput text ] diff --git a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsModel.class.st b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st similarity index 65% rename from Iceberg-TipUI/IceTipAskForPlaintextCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st index 5264e51bcd..365540a064 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st @@ -3,31 +3,31 @@ I implement the dialog to ask plaintext credentials. This dialog is used when the IceTipInteractiveCredentialsProvider needs to ask a plaintext credential. " Class { - #name : #IceTipAskForPlaintextCredentialsModel, - #superclass : #IceTipAbstractPlaintextCredentialsModel, + #name : #IceTipAskForPlaintextCredentialsPresenter, + #superclass : #IceTipAbstractPlaintextCredentialsPresenter, #category : #'Iceberg-TipUI-Credentials' } { #category : #actions } -IceTipAskForPlaintextCredentialsModel >> accept [ +IceTipAskForPlaintextCredentialsPresenter >> accept [ ^ self acceptAskAction ] { #category : #actions } -IceTipAskForPlaintextCredentialsModel >> cancel [ +IceTipAskForPlaintextCredentialsPresenter >> cancel [ self cancelAskAction ] { #category : #actions } -IceTipAskForPlaintextCredentialsModel >> cancelAction [ +IceTipAskForPlaintextCredentialsPresenter >> cancelAction [ self cancelAskAction ] { #category : #layout } -IceTipAskForPlaintextCredentialsModel >> defaultLayout [ +IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom borderWidth: 5; @@ -45,13 +45,13 @@ IceTipAskForPlaintextCredentialsModel >> defaultLayout [ ] { #category : #initialization } -IceTipAskForPlaintextCredentialsModel >> initialExtentForWindow [ +IceTipAskForPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (450 @ 180) scaledByDisplayScaleFactor ] { #category : #initialization } -IceTipAskForPlaintextCredentialsModel >> titleForWindow [ +IceTipAskForPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Please log in to ' , askingHostname ] diff --git a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsModel.class.st b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st similarity index 69% rename from Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st index 9fbd288ade..eaa0b052c5 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipAskForPlaintextOtpCredentialsModel, - #superclass : #IceTipAskForPlaintextCredentialsModel, + #name : #IceTipAskForPlaintextOtpCredentialsPresenter, + #superclass : #IceTipAskForPlaintextCredentialsPresenter, #instVars : [ 'tokenLabel', 'tokenInput' @@ -9,7 +9,7 @@ Class { } { #category : #layout } -IceTipAskForPlaintextOtpCredentialsModel >> defaultLayout [ +IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom borderWidth: 5; @@ -27,13 +27,13 @@ IceTipAskForPlaintextOtpCredentialsModel >> defaultLayout [ ] { #category : #initialization } -IceTipAskForPlaintextOtpCredentialsModel >> initialExtentForWindow [ +IceTipAskForPlaintextOtpCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 210) scaledByDisplayScaleFactor ] { #category : #initialization } -IceTipAskForPlaintextOtpCredentialsModel >> initializePresenters [ +IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ super initializePresenters. tokenLabel := self newLabel label: 'OTP Token: '. @@ -44,7 +44,7 @@ IceTipAskForPlaintextOtpCredentialsModel >> initializePresenters [ ] { #category : #accessing } -IceTipAskForPlaintextOtpCredentialsModel >> newCredentials [ +IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ ^ IcePlaintextOtpCredentials new username: self username; @@ -54,7 +54,7 @@ IceTipAskForPlaintextOtpCredentialsModel >> newCredentials [ ] { #category : #accessing } -IceTipAskForPlaintextOtpCredentialsModel >> token [ +IceTipAskForPlaintextOtpCredentialsPresenter >> token [ ^ tokenInput text ] diff --git a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsModel.class.st b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsModel.class.st deleted file mode 100644 index 541d3ff099..0000000000 --- a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsModel.class.st +++ /dev/null @@ -1,11 +0,0 @@ -Class { - #name : #IceTipAskGithubForPlaintextCredentialsModel, - #superclass : #IceTipAskForPlaintextCredentialsModel, - #category : #'Iceberg-TipUI-Credentials' -} - -{ #category : #private } -IceTipAskGithubForPlaintextCredentialsModel >> passwordLabel [ - - ^ 'Token:' -] diff --git a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st new file mode 100644 index 0000000000..a9c3aba0a3 --- /dev/null +++ b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st @@ -0,0 +1,11 @@ +Class { + #name : #IceTipAskGithubForPlaintextCredentialsPresenter, + #superclass : #IceTipAskForPlaintextCredentialsPresenter, + #category : #'Iceberg-TipUI-Credentials' +} + +{ #category : #private } +IceTipAskGithubForPlaintextCredentialsPresenter >> passwordLabel [ + + ^ 'Token:' +] diff --git a/Iceberg-TipUI/IceTipAskSSHCredentialsModel.class.st b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st similarity index 54% rename from Iceberg-TipUI/IceTipAskSSHCredentialsModel.class.st rename to Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st index 634b1e11ac..19347ecf1f 100644 --- a/Iceberg-TipUI/IceTipAskSSHCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st @@ -2,25 +2,25 @@ I am a dialog to ask for SSH credentials. " Class { - #name : #IceTipAskSSHCredentialsModel, - #superclass : #IceTipEditSSHCredentialsModel, + #name : #IceTipAskSSHCredentialsPresenter, + #superclass : #IceTipEditSSHCredentialsPresenter, #category : #'Iceberg-TipUI-Credentials' } { #category : #actions } -IceTipAskSSHCredentialsModel >> accept [ +IceTipAskSSHCredentialsPresenter >> accept [ ^ self acceptAskAction ] { #category : #actions } -IceTipAskSSHCredentialsModel >> cancelAction [ +IceTipAskSSHCredentialsPresenter >> cancelAction [ self cancelAskAction ] { #category : #accessing } -IceTipAskSSHCredentialsModel >> newCredentials [ +IceTipAskSSHCredentialsPresenter >> newCredentials [ self refreshCredentialsFromPresenter. ^ credentials diff --git a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st index b25c2bb231..8371ddd3c5 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st @@ -5,7 +5,7 @@ I'm a dialog to perform a checkout of a branch. " Class { #name : #IceTipCheckoutBranchDialog, - #superclass : #IceTipOptionDialog, + #superclass : #IceTipOptionDialogPresenter, #instVars : [ 'model', 'types' diff --git a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st index b610aab192..6757094f5f 100644 --- a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st @@ -110,7 +110,7 @@ IceTipCheckoutPreviewBrowser >> newActionButton [ { #category : #operations } IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ - ((IceTipAddNewPackagesDialog + ((IceTipAddNewPackagesDialogPresenter newApplication: self application model: self model newPackages) checkoutModel: self model; diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st index 66e430f2a2..f96e633058 100644 --- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st @@ -3,7 +3,7 @@ I am a dialog to be used before commit so we can check if the code to commit has " Class { #name : #IceTipCritiquesBeforeCommitBrowser, - #superclass : #IceTipDialog, + #superclass : #IceTipDialogPresenter, #instVars : [ 'commitModel', 'onAcceptAction', diff --git a/Iceberg-TipUI/IceTipDialog.class.st b/Iceberg-TipUI/IceTipDialogPresenter.class.st similarity index 79% rename from Iceberg-TipUI/IceTipDialog.class.st rename to Iceberg-TipUI/IceTipDialogPresenter.class.st index 5314322030..28f57f6119 100644 --- a/Iceberg-TipUI/IceTipDialog.class.st +++ b/Iceberg-TipUI/IceTipDialogPresenter.class.st @@ -3,25 +3,25 @@ I'm a general dialog. I implement a default accept method that needs to be overriden my children and some utility methods to easier build a dialog. " Class { - #name : #IceTipDialog, + #name : #IceTipDialogPresenter, #superclass : #IceTipPresenter, #category : #'Iceberg-TipUI-View' } { #category : #actions } -IceTipDialog >> accept [ +IceTipDialogPresenter >> accept [ "override this if you want a dialog" ] { #category : #actions } -IceTipDialog >> cancel [ +IceTipDialogPresenter >> cancel [ "override this if you want a dialog" self closeWindow ] { #category : #initialization } -IceTipDialog >> initializeDialogWindow: aWindow [ +IceTipDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. diff --git a/Iceberg-TipUI/IceTipEditPlaintextCredentialsModel.class.st b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st similarity index 60% rename from Iceberg-TipUI/IceTipEditPlaintextCredentialsModel.class.st rename to Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st index 86bfce1660..e05dfb7673 100644 --- a/Iceberg-TipUI/IceTipEditPlaintextCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st @@ -2,19 +2,19 @@ I implement the dialog to edit plaintext credentials. " Class { - #name : #IceTipEditPlaintextCredentialsModel, - #superclass : #IceTipAbstractPlaintextCredentialsModel, + #name : #IceTipEditPlaintextCredentialsPresenter, + #superclass : #IceTipAbstractPlaintextCredentialsPresenter, #category : #'Iceberg-TipUI-Credentials' } { #category : #actions } -IceTipEditPlaintextCredentialsModel >> accept [ +IceTipEditPlaintextCredentialsPresenter >> accept [ ^ self acceptEditAction ] { #category : #layout } -IceTipEditPlaintextCredentialsModel >> defaultLayout [ +IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new beColumnNotHomogeneous; @@ -26,13 +26,13 @@ IceTipEditPlaintextCredentialsModel >> defaultLayout [ ] { #category : #initialization } -IceTipEditPlaintextCredentialsModel >> initialExtentForWindow [ +IceTipEditPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 160) scaledByDisplayScaleFactor ] { #category : #actions } -IceTipEditPlaintextCredentialsModel >> refreshCredentialsFromPresenter [ +IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials username: self username; @@ -40,14 +40,14 @@ IceTipEditPlaintextCredentialsModel >> refreshCredentialsFromPresenter [ ] { #category : #accessing } -IceTipEditPlaintextCredentialsModel >> refreshPresenterFromCredentials [ +IceTipEditPlaintextCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. passwordInput text: credentials password ] { #category : #initialization } -IceTipEditPlaintextCredentialsModel >> titleForWindow [ +IceTipEditPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Edit credential for ' , credentials host ] diff --git a/Iceberg-TipUI/IceTipEditProjectDialog.class.st b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st similarity index 81% rename from Iceberg-TipUI/IceTipEditProjectDialog.class.st rename to Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st index ba770f8344..3694af7c87 100644 --- a/Iceberg-TipUI/IceTipEditProjectDialog.class.st +++ b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipEditProjectDialog, - #superclass : #IceTipDialog, + #name : #IceTipEditProjectDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'nameLabel', 'nameInput', @@ -22,7 +22,7 @@ Class { } { #category : #actions } -IceTipEditProjectDialog >> accept [ +IceTipEditProjectDialogPresenter >> accept [ IceTipStandardAction new repository: model repository; @@ -44,13 +44,13 @@ IceTipEditProjectDialog >> accept [ ] { #category : #accessing } -IceTipEditProjectDialog >> acceptCallback [ +IceTipEditProjectDialogPresenter >> acceptCallback [ ^ acceptCallback ] { #category : #actions } -IceTipEditProjectDialog >> addDirectory [ +IceTipEditProjectDialogPresenter >> addDirectory [ | newDirectoryName newDirectory previousSelection | @@ -71,7 +71,7 @@ IceTipEditProjectDialog >> addDirectory [ ] { #category : #initialization } -IceTipEditProjectDialog >> connectPresenters [ +IceTipEditProjectDialogPresenter >> connectPresenters [ super connectPresenters. @@ -88,13 +88,13 @@ IceTipEditProjectDialog >> connectPresenters [ ] { #category : #accessing } -IceTipEditProjectDialog >> defaultFormat [ +IceTipEditProjectDialogPresenter >> defaultFormat [ ^ defaultFormat ] { #category : #layout } -IceTipEditProjectDialog >> defaultLayout [ +IceTipEditProjectDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom borderWidth: 5; @@ -129,7 +129,7 @@ IceTipEditProjectDialog >> defaultLayout [ ] { #category : #utilities } -IceTipEditProjectDialog >> expandAndSelect: aRelativePath [ +IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ | path aPathForSpec currentNode | @@ -156,25 +156,25 @@ IceTipEditProjectDialog >> expandAndSelect: aRelativePath [ ] { #category : #'accessing - ui' } -IceTipEditProjectDialog >> formatLabel [ +IceTipEditProjectDialogPresenter >> formatLabel [ ^ formatLabel ] { #category : #'accessing - ui' } -IceTipEditProjectDialog >> formatList [ +IceTipEditProjectDialogPresenter >> formatList [ ^ formatList ] { #category : #accessing } -IceTipEditProjectDialog >> formats [ +IceTipEditProjectDialogPresenter >> formats [ ^ formats ] { #category : #'format-management' } -IceTipEditProjectDialog >> guessFormatFromDirectory: aFileReference [ +IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ "We take as guinea pig a sub-directory to guess what format it is on. In case the current directory has no children directories, we just select the default format" @@ -193,13 +193,13 @@ IceTipEditProjectDialog >> guessFormatFromDirectory: aFileReference [ ] { #category : #accessing } -IceTipEditProjectDialog >> hasToShowWarning [ +IceTipEditProjectDialogPresenter >> hasToShowWarning [ ^ model repository workingCopy packages isNotEmpty ] { #category : #initialization } -IceTipEditProjectDialog >> initialExtentForWindow [ +IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ^ self hasToShowWarning ifTrue: [ (475@525) scaledByDisplayScaleFactor ] @@ -214,7 +214,7 @@ IceTipEditProjectDialog >> initialExtentForWindow [ ] { #category : #initialization } -IceTipEditProjectDialog >> initialize [ +IceTipEditProjectDialogPresenter >> initialize [ selectedDirectoryPath := RelativePath new. formats := TIceRepositoryWriter users sorted: [ :a :b | a description < b description ]. @@ -224,7 +224,7 @@ IceTipEditProjectDialog >> initialize [ ] { #category : #initialization } -IceTipEditProjectDialog >> initializeDirectoryTree [ +IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ sourceDirectoryTree addColumn: (SpCompositeTableColumn new @@ -242,7 +242,7 @@ IceTipEditProjectDialog >> initializeDirectoryTree [ ] { #category : #initialization } -IceTipEditProjectDialog >> initializeMessagePanel [ +IceTipEditProjectDialogPresenter >> initializeMessagePanel [ | icon | @@ -255,7 +255,7 @@ IceTipEditProjectDialog >> initializeMessagePanel [ ] { #category : #initialization } -IceTipEditProjectDialog >> initializePresenters [ +IceTipEditProjectDialogPresenter >> initializePresenters [ nameLabel := self newLabel label: 'Project Name'; @@ -293,43 +293,43 @@ IceTipEditProjectDialog >> initializePresenters [ ] { #category : #accessing } -IceTipEditProjectDialog >> messageIcon [ +IceTipEditProjectDialogPresenter >> messageIcon [ ^ messageIcon ] { #category : #accessing } -IceTipEditProjectDialog >> messageText [ +IceTipEditProjectDialogPresenter >> messageText [ ^ messageText ] { #category : #accessing } -IceTipEditProjectDialog >> model [ +IceTipEditProjectDialogPresenter >> model [ ^ model ] { #category : #'accessing - ui' } -IceTipEditProjectDialog >> nameInput [ +IceTipEditProjectDialogPresenter >> nameInput [ ^ nameInput ] { #category : #'accessing - ui' } -IceTipEditProjectDialog >> nameLabel [ +IceTipEditProjectDialogPresenter >> nameLabel [ ^ nameLabel ] { #category : #events } -IceTipEditProjectDialog >> onAccept: aBlockClosure [ +IceTipEditProjectDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] { #category : #actions } -IceTipEditProjectDialog >> removeDirectory [ +IceTipEditProjectDialogPresenter >> removeDirectory [ | toRemove newSelection | newSelection := selectedDirectoryPath parent. @@ -347,31 +347,31 @@ IceTipEditProjectDialog >> removeDirectory [ ] { #category : #accessing } -IceTipEditProjectDialog >> selectedDirectoryPath [ +IceTipEditProjectDialogPresenter >> selectedDirectoryPath [ ^ selectedDirectoryPath ] { #category : #actions } -IceTipEditProjectDialog >> selectedFileFormat [ +IceTipEditProjectDialogPresenter >> selectedFileFormat [ ^ formatList selectedItem ] { #category : #events } -IceTipEditProjectDialog >> setModelBeforeInitialization: anObject [ +IceTipEditProjectDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] { #category : #'accessing - ui' } -IceTipEditProjectDialog >> sourceDirectoryLabel [ +IceTipEditProjectDialogPresenter >> sourceDirectoryLabel [ ^ sourceDirectoryLabel ] { #category : #accessing } -IceTipEditProjectDialog >> sourceDirectorySelectionChanged: selectedPaths [ +IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPaths [ | selection | @@ -387,25 +387,25 @@ IceTipEditProjectDialog >> sourceDirectorySelectionChanged: selectedPaths [ ] { #category : #'accessing - ui' } -IceTipEditProjectDialog >> sourceDirectoryTree [ +IceTipEditProjectDialogPresenter >> sourceDirectoryTree [ ^ sourceDirectoryTree ] { #category : #initialization } -IceTipEditProjectDialog >> titleForWindow [ +IceTipEditProjectDialogPresenter >> titleForWindow [ ^ 'Edit Project' ] { #category : #accessing } -IceTipEditProjectDialog >> username [ +IceTipEditProjectDialogPresenter >> username [ ^ self nameInput text trimBoth ] { #category : #accessing } -IceTipEditProjectDialog >> warningMessage [ +IceTipEditProjectDialogPresenter >> warningMessage [ ^ 'Be careful. You should choose the actual format of the current repository. Changing the format in here will not migrate your code to another format. diff --git a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st index 437ef82566..c0b67c816d 100644 --- a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st @@ -29,7 +29,7 @@ IceTipEditRepositoryCommand >> canBeExecuted [ IceTipEditRepositoryCommand >> execute [ self flag: #TODO. "Demeter's law" - ((IceTipEditProjectDialog + ((IceTipEditProjectDialogPresenter newApplication: context application model: self repositoryModel entity project) asDialogWindow) diff --git a/Iceberg-TipUI/IceTipEditSSHCredentialsModel.class.st b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st similarity index 70% rename from Iceberg-TipUI/IceTipEditSSHCredentialsModel.class.st rename to Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st index 9a00b84c50..b7d805fe72 100644 --- a/Iceberg-TipUI/IceTipEditSSHCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st @@ -2,19 +2,19 @@ I implement the dialog to edit SSH credentials. " Class { - #name : #IceTipEditSSHCredentialsModel, - #superclass : #IceTipAbstractSSHCredentialsModel, + #name : #IceTipEditSSHCredentialsPresenter, + #superclass : #IceTipAbstractSSHCredentialsPresenter, #category : #'Iceberg-TipUI-Credentials' } { #category : #actions } -IceTipEditSSHCredentialsModel >> accept [ +IceTipEditSSHCredentialsPresenter >> accept [ ^ self acceptEditAction ] { #category : #layout } -IceTipEditSSHCredentialsModel >> defaultLayout [ +IceTipEditSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new beColumnNotHomogeneous; @@ -28,13 +28,13 @@ IceTipEditSSHCredentialsModel >> defaultLayout [ ] { #category : #initialization } -IceTipEditSSHCredentialsModel >> initialExtentForWindow [ +IceTipEditSSHCredentialsPresenter >> initialExtentForWindow [ ^ (500@230) scaledByDisplayScaleFactor ] { #category : #actions } -IceTipEditSSHCredentialsModel >> refreshCredentialsFromPresenter [ +IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials username: self username; @@ -44,7 +44,7 @@ IceTipEditSSHCredentialsModel >> refreshCredentialsFromPresenter [ ] { #category : #accessing } -IceTipEditSSHCredentialsModel >> refreshPresenterFromCredentials [ +IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. passphraseInput text: credentials keyPassphrase. @@ -53,7 +53,7 @@ IceTipEditSSHCredentialsModel >> refreshPresenterFromCredentials [ ] { #category : #initialization } -IceTipEditSSHCredentialsModel >> titleForWindow [ +IceTipEditSSHCredentialsPresenter >> titleForWindow [ ^ 'Edit SSH keys for ' , self credentials hostDescription ] diff --git a/Iceberg-TipUI/IceTipEditTokenCredentialsModel.class.st b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st similarity index 59% rename from Iceberg-TipUI/IceTipEditTokenCredentialsModel.class.st rename to Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st index b1621f1c54..3d3b8c23a9 100644 --- a/Iceberg-TipUI/IceTipEditTokenCredentialsModel.class.st +++ b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st @@ -2,19 +2,19 @@ I am a dialog to edit token credentials. " Class { - #name : #IceTipEditTokenCredentialsModel, - #superclass : #IceTipAddTokenCredentialsModel, + #name : #IceTipEditTokenCredentialsPresenter, + #superclass : #IceTipAddTokenCredentialsPresenter, #category : #'Iceberg-TipUI-Credentials' } { #category : #accessing } -IceTipEditTokenCredentialsModel >> accept [ +IceTipEditTokenCredentialsPresenter >> accept [ ^ self acceptEditAction ] { #category : #accessing } -IceTipEditTokenCredentialsModel >> refreshCredentialsFromPresenter [ +IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials username: self usernameFromInput; @@ -24,7 +24,7 @@ IceTipEditTokenCredentialsModel >> refreshCredentialsFromPresenter [ ] { #category : #accessing } -IceTipEditTokenCredentialsModel >> refreshPresenterFromCredentials [ +IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. tokenInput text: credentials token. @@ -33,7 +33,7 @@ IceTipEditTokenCredentialsModel >> refreshPresenterFromCredentials [ ] { #category : #initialization } -IceTipEditTokenCredentialsModel >> titleForWindow [ +IceTipEditTokenCredentialsPresenter >> titleForWindow [ ^ 'Edit token credentials' ] diff --git a/Iceberg-TipUI/IceTipErrorDialog.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st similarity index 70% rename from Iceberg-TipUI/IceTipErrorDialog.class.st rename to Iceberg-TipUI/IceTipErrorDialogPresenter.class.st index 4a7c0492b9..dc2d41d517 100644 --- a/Iceberg-TipUI/IceTipErrorDialog.class.st +++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st @@ -7,8 +7,8 @@ My model is an exception that I'll freeze for further debugging. (IceTipErrorDialog on: anError) openDialogWithSpec " Class { - #name : #IceTipErrorDialog, - #superclass : #IceTipDialog, + #name : #IceTipErrorDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'exception', 'errorLabel', @@ -18,14 +18,14 @@ Class { } { #category : #initialization } -IceTipErrorDialog >> accept [ +IceTipErrorDialogPresenter >> accept [ self closeWindow. exception debug. ] { #category : #layout } -IceTipErrorDialog >> defaultLayout [ +IceTipErrorDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight borderWidth: 5; @@ -36,31 +36,31 @@ IceTipErrorDialog >> defaultLayout [ ] { #category : #'accessing - ui' } -IceTipErrorDialog >> errorLabel [ +IceTipErrorDialogPresenter >> errorLabel [ ^ errorLabel ] { #category : #accessing } -IceTipErrorDialog >> exception [ +IceTipErrorDialogPresenter >> exception [ ^ exception ] { #category : #accessing } -IceTipErrorDialog >> exception: anException [ +IceTipErrorDialogPresenter >> exception: anException [ exception := anException freeze ] { #category : #'accessing - ui' } -IceTipErrorDialog >> iconPanel [ +IceTipErrorDialogPresenter >> iconPanel [ ^ iconPanel ] { #category : #initialization } -IceTipErrorDialog >> initialExtentForWindow [ +IceTipErrorDialogPresenter >> initialExtentForWindow [ ^ (500@( self class inputTextHeight * 2 @@ -70,7 +70,7 @@ IceTipErrorDialog >> initialExtentForWindow [ ] { #category : #initialization } -IceTipErrorDialog >> initializeDialogWindow: aWindow [ +IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ aWindow addButton: 'Debug' @@ -81,7 +81,7 @@ IceTipErrorDialog >> initializeDialogWindow: aWindow [ ] { #category : #initialization } -IceTipErrorDialog >> initializePresenters [ +IceTipErrorDialogPresenter >> initializePresenters [ iconPanel := self newImage. iconPanel image: (self iconNamed: #error). @@ -92,13 +92,13 @@ IceTipErrorDialog >> initializePresenters [ ] { #category : #initialization } -IceTipErrorDialog >> setModelBeforeInitialization: aDomainObject [ +IceTipErrorDialogPresenter >> setModelBeforeInitialization: aDomainObject [ self exception: aDomainObject ] { #category : #initialization } -IceTipErrorDialog >> titleForWindow [ +IceTipErrorDialogPresenter >> titleForWindow [ ^ 'Error' ] diff --git a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st index 383213ca5f..bf9876ab0d 100644 --- a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st @@ -23,7 +23,7 @@ IceTipForgetRepositoryCommand class >> defaultName [ { #category : #executing } IceTipForgetRepositoryCommand >> execute [ - (IceTipRemoveRepositoryDialog + (IceTipRemoveRepositoryDialogPresenter newApplication: context application model: self repositoryModel) asModalWindow diff --git a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialog.class.st b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st similarity index 68% rename from Iceberg-TipUI/IceTipGitUsernameAndEmailDialog.class.st rename to Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st index 985bf3176c..7103019d4a 100644 --- a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialog.class.st +++ b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog for asking ""user.name"" and ""user.email"" . " Class { - #name : #IceTipGitUsernameAndEmailDialog, - #superclass : #IceTipDialog, + #name : #IceTipGitUsernameAndEmailDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'nameLabel', 'nameInput', @@ -17,7 +17,7 @@ Class { } { #category : #actions } -IceTipGitUsernameAndEmailDialog >> accept [ +IceTipGitUsernameAndEmailDialogPresenter >> accept [ self username isEmptyOrNil ifTrue: [ ^ self window alert: 'user.name is required.' ]. self email isEmptyOrNil ifTrue: [ ^ self window alert: 'user.email is required.' ]. @@ -33,7 +33,7 @@ IceTipGitUsernameAndEmailDialog >> accept [ ] { #category : #layout } -IceTipGitUsernameAndEmailDialog >> defaultLayout [ +IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom borderWidth: 5; @@ -51,36 +51,36 @@ IceTipGitUsernameAndEmailDialog >> defaultLayout [ ] { #category : #accessing } -IceTipGitUsernameAndEmailDialog >> email [ +IceTipGitUsernameAndEmailDialogPresenter >> email [ ^ self emailInput text trimBoth ] { #category : #'accessing - ui' } -IceTipGitUsernameAndEmailDialog >> emailInput [ +IceTipGitUsernameAndEmailDialogPresenter >> emailInput [ ^ emailInput ] { #category : #'accessing - ui' } -IceTipGitUsernameAndEmailDialog >> emailLabel [ +IceTipGitUsernameAndEmailDialogPresenter >> emailLabel [ ^ emailLabel ] { #category : #'accessing - ui' } -IceTipGitUsernameAndEmailDialog >> globalCheckbox [ +IceTipGitUsernameAndEmailDialogPresenter >> globalCheckbox [ ^ globalCheckbox ] { #category : #initialization } -IceTipGitUsernameAndEmailDialog >> initialExtentForWindow [ +IceTipGitUsernameAndEmailDialogPresenter >> initialExtentForWindow [ ^ (400@200) scaledByDisplayScaleFactor ] { #category : #initialization } -IceTipGitUsernameAndEmailDialog >> initializePresenters [ +IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ nameLabel := self newLabel label: 'user.name'; @@ -103,43 +103,43 @@ IceTipGitUsernameAndEmailDialog >> initializePresenters [ ] { #category : #testing } -IceTipGitUsernameAndEmailDialog >> isGlobal [ +IceTipGitUsernameAndEmailDialogPresenter >> isGlobal [ ^ self globalCheckbox state ] { #category : #'accessing - ui' } -IceTipGitUsernameAndEmailDialog >> nameInput [ +IceTipGitUsernameAndEmailDialogPresenter >> nameInput [ ^ nameInput ] { #category : #'accessing - ui' } -IceTipGitUsernameAndEmailDialog >> nameLabel [ +IceTipGitUsernameAndEmailDialogPresenter >> nameLabel [ ^ nameLabel ] { #category : #events } -IceTipGitUsernameAndEmailDialog >> onAccept: aBlockClosure [ +IceTipGitUsernameAndEmailDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] { #category : #events } -IceTipGitUsernameAndEmailDialog >> setModelBeforeInitialization: anObject [ +IceTipGitUsernameAndEmailDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] { #category : #initialization } -IceTipGitUsernameAndEmailDialog >> titleForWindow [ +IceTipGitUsernameAndEmailDialogPresenter >> titleForWindow [ ^ 'Please provide Git missing properties' ] { #category : #accessing } -IceTipGitUsernameAndEmailDialog >> username [ +IceTipGitUsernameAndEmailDialogPresenter >> username [ ^ self nameInput text trimBoth ] diff --git a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st index 8743f46e3e..e78130b7b5 100644 --- a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st @@ -83,7 +83,7 @@ IceTipHiedraAltComponentHistoryBrowser >> initializeWindow: aWindowPresenter [ IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ ^ self - instantiate: IceTipHiedraAltHistoryRow + instantiate: IceTipHiedraAltHistoryRowPresenter on: { (hiedraColumnController formAtRow: index). item } ] diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st index ff97777079..28565664db 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st @@ -114,7 +114,7 @@ IceTipHiedraAltHistoryBrowser >> initializeWindow: aWindowPresenter [ IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ ^ self - instantiate: IceTipHiedraAltHistoryRow + instantiate: IceTipHiedraAltHistoryRowPresenter on: { (hiedraColumnController formAtRow: index). item } ] diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryRow.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st similarity index 82% rename from Iceberg-TipUI/IceTipHiedraAltHistoryRow.class.st rename to Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st index d584038124..b4d9f6b312 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryRow.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st @@ -1,5 +1,5 @@ Class { - #name : #IceTipHiedraAltHistoryRow, + #name : #IceTipHiedraAltHistoryRowPresenter, #superclass : #SpPresenter, #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', @@ -7,7 +7,7 @@ Class { } { #category : #initialization } -IceTipHiedraAltHistoryRow >> addTagsTo: aLayout [ +IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ | tagNames tagLayout | tagNames := self item tagNames. @@ -31,13 +31,13 @@ IceTipHiedraAltHistoryRow >> addTagsTo: aLayout [ ] { #category : #accessing } -IceTipHiedraAltHistoryRow >> form [ +IceTipHiedraAltHistoryRowPresenter >> form [ ^ self model first ] { #category : #initialization } -IceTipHiedraAltHistoryRow >> initializePresenters [ +IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ self layout: (SpBoxLayout newLeftToRight spacing: 5; @@ -52,7 +52,7 @@ IceTipHiedraAltHistoryRow >> initializePresenters [ ] { #category : #accessing } -IceTipHiedraAltHistoryRow >> item [ +IceTipHiedraAltHistoryRowPresenter >> item [ ^ self model second ] diff --git a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st index 8770913cd0..e74a3465c0 100644 --- a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st +++ b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st @@ -48,10 +48,10 @@ IceTipInteractiveCredentialsProvider >> obtainSshCredentials: credentialsToRetur | returnedCred | - returnedCred := IceTipAskSSHCredentialsModel new + returnedCred := IceTipAskSSHCredentialsPresenter new credentials: self sshCredentials; credentialStore: self credentialStore; open. - + credentialsToReturn readFrom: returnedCred ] diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index 5bfe5e25f7..b345444f61 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -115,7 +115,7 @@ IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ { #category : #visiting } IceTipInteractiveErrorVisitor >> visitGenericError: anError [ - (IceTipErrorDialog + (IceTipErrorDialogPresenter newApplication: context application model: anError) asModalWindow @@ -138,7 +138,7 @@ WARNING: If you have external files, you may need to verify the conflicts there. { #category : #visiting } IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ - ((IceTipGitUsernameAndEmailDialog + ((IceTipGitUsernameAndEmailDialogPresenter newApplication: context application model: self repository) onAccept: [ anError resume ]; diff --git a/Iceberg-TipUI/IceTipMergeBranchDialog.class.st b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st similarity index 68% rename from Iceberg-TipUI/IceTipMergeBranchDialog.class.st rename to Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st index 687c7de711..fbd509f795 100644 --- a/Iceberg-TipUI/IceTipMergeBranchDialog.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st @@ -4,8 +4,8 @@ I'm a dialog to perform a merge of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipMergeBranchDialog, - #superclass : #IceTipOptionDialog, + #name : #IceTipMergeBranchDialogPresenter, + #superclass : #IceTipOptionDialogPresenter, #instVars : [ 'model', 'types' @@ -14,25 +14,25 @@ Class { } { #category : #'instance creation' } -IceTipMergeBranchDialog class >> onRepository: aRepository [ +IceTipMergeBranchDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] { #category : #accessing } -IceTipMergeBranchDialog >> allTypes [ +IceTipMergeBranchDialogPresenter >> allTypes [ ^ types ifNil: [ types := self createMergeBranchTypes ] ] { #category : #accessing } -IceTipMergeBranchDialog >> beSwitchAndMerge [ +IceTipMergeBranchDialogPresenter >> beSwitchAndMerge [ self allTypes do: #beSwitchAndMerge ] { #category : #'private - factory' } -IceTipMergeBranchDialog >> createMergeBranchTypes [ +IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ | allTypes | "Collect types local+remotes" @@ -55,44 +55,44 @@ IceTipMergeBranchDialog >> createMergeBranchTypes [ ] { #category : #actions } -IceTipMergeBranchDialog >> doAccept [ +IceTipMergeBranchDialogPresenter >> doAccept [ self selectedType doAccept ] { #category : #initialization } -IceTipMergeBranchDialog >> initialExtentForWindow [ +IceTipMergeBranchDialogPresenter >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] { #category : #accessing } -IceTipMergeBranchDialog >> model [ +IceTipMergeBranchDialogPresenter >> model [ ^ model ] { #category : #accessing } -IceTipMergeBranchDialog >> model: anObject [ +IceTipMergeBranchDialogPresenter >> model: anObject [ model := anObject. self allTypes do: [ :each | each model: anObject ] ] { #category : #'accessing - model' } -IceTipMergeBranchDialog >> setModelBeforeInitialization: anObject [ +IceTipMergeBranchDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] { #category : #initialization } -IceTipMergeBranchDialog >> titleForWindow [ +IceTipMergeBranchDialogPresenter >> titleForWindow [ ^ 'Select branch to merge into ' , (self model branchName contractTo: 45) ] { #category : #activation } -IceTipMergeBranchDialog >> updateWindowTitle [ +IceTipMergeBranchDialogPresenter >> updateWindowTitle [ self window title: self titleForWindow ] diff --git a/Iceberg-TipUI/IceTipMergeCommand.class.st b/Iceberg-TipUI/IceTipMergeCommand.class.st index 7ffaf4ae1e..11c5c49cdd 100644 --- a/Iceberg-TipUI/IceTipMergeCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeCommand.class.st @@ -28,7 +28,7 @@ IceTipMergeCommand >> canBeExecuted [ { #category : #executing } IceTipMergeCommand >> execute [ - (IceTipMergeBranchDialog + (IceTipMergeBranchDialogPresenter newApplication: context application model: self repositoryModel) asDialogWindow diff --git a/Iceberg-TipUI/IceTipOptionDialog.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st similarity index 72% rename from Iceberg-TipUI/IceTipOptionDialog.class.st rename to Iceberg-TipUI/IceTipOptionDialogPresenter.class.st index 6beefb2742..2f6133367c 100644 --- a/Iceberg-TipUI/IceTipOptionDialog.class.st +++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st @@ -7,7 +7,7 @@ I'm kind of a ""tabbed"" dialog, but my options are ""mac style"": lateral and n This is useful to keep a variable number of options. " Class { - #name : #IceTipOptionDialog, + #name : #IceTipOptionDialogPresenter, #superclass : #IceTipPresenter, #instVars : [ 'typeList', @@ -18,7 +18,7 @@ Class { } { #category : #actions } -IceTipOptionDialog >> accept [ +IceTipOptionDialogPresenter >> accept [ [ self doAccept. @@ -29,19 +29,19 @@ IceTipOptionDialog >> accept [ ] { #category : #accessing } -IceTipOptionDialog >> allTypes [ +IceTipOptionDialogPresenter >> allTypes [ ^ self subclassResponsibility ] { #category : #accessing } -IceTipOptionDialog >> contextSelection [ +IceTipOptionDialogPresenter >> contextSelection [ ^ type ] { #category : #layout } -IceTipOptionDialog >> defaultLayout [ +IceTipOptionDialogPresenter >> defaultLayout [ ^ SpPanedLayout newLeftToRight positionOfSlider: 30 percent; @@ -51,19 +51,19 @@ IceTipOptionDialog >> defaultLayout [ ] { #category : #actions } -IceTipOptionDialog >> doAccept [ +IceTipOptionDialogPresenter >> doAccept [ self subclassResponsibility ] { #category : #initialization } -IceTipOptionDialog >> initialExtentForWindow [ +IceTipOptionDialogPresenter >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] { #category : #initialization } -IceTipOptionDialog >> initializeDialogWindow: aWindowPresenter [ +IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter addButton: 'Ok' do: [ :presenter | self accept ]; @@ -73,14 +73,14 @@ IceTipOptionDialog >> initializeDialogWindow: aWindowPresenter [ ] { #category : #initialization } -IceTipOptionDialog >> initializePresenters [ +IceTipOptionDialogPresenter >> initializePresenters [ contentLayout := SpBoxLayout newTopToBottom. self initializeTypeList ] { #category : #initialization } -IceTipOptionDialog >> initializeTypeList [ +IceTipOptionDialogPresenter >> initializeTypeList [ (typeList := self newList) items: self allTypes; @@ -91,7 +91,7 @@ IceTipOptionDialog >> initializeTypeList [ ] { #category : #private } -IceTipOptionDialog >> replacePanelWith: aType [ +IceTipOptionDialogPresenter >> replacePanelWith: aType [ contentLayout removeAll; @@ -99,13 +99,13 @@ IceTipOptionDialog >> replacePanelWith: aType [ ] { #category : #accessing } -IceTipOptionDialog >> selectedType [ +IceTipOptionDialogPresenter >> selectedType [ ^ type ] { #category : #private } -IceTipOptionDialog >> selectionChanged: aType [ +IceTipOptionDialogPresenter >> selectionChanged: aType [ type := aType. aType ifNotNil: [ @@ -114,13 +114,13 @@ IceTipOptionDialog >> selectionChanged: aType [ ] { #category : #'accessing - ui' } -IceTipOptionDialog >> typeList [ +IceTipOptionDialogPresenter >> typeList [ ^ typeList ] { #category : #private } -IceTipOptionDialog >> updateWindowTitle [ +IceTipOptionDialogPresenter >> updateWindowTitle [ self window title: type titleForWindow ] diff --git a/Iceberg-TipUI/IceTipRegisterRepositoryDialog.class.st b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st similarity index 67% rename from Iceberg-TipUI/IceTipRegisterRepositoryDialog.class.st rename to Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st index dd4649c2e0..b93531803d 100644 --- a/Iceberg-TipUI/IceTipRegisterRepositoryDialog.class.st +++ b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st @@ -7,8 +7,8 @@ self new openDialogWithSpec " Class { - #name : #IceTipRegisterRepositoryDialog, - #superclass : #IceTipOptionDialog, + #name : #IceTipRegisterRepositoryDialogPresenter, + #superclass : #IceTipOptionDialogPresenter, #instVars : [ 'types', 'repository', @@ -18,13 +18,13 @@ Class { } { #category : #accessing } -IceTipRegisterRepositoryDialog >> allTypes [ +IceTipRegisterRepositoryDialogPresenter >> allTypes [ ^ types ifNil: [ types := IceTipRepositoryTypePanel allTypes ] ] { #category : #accessing } -IceTipRegisterRepositoryDialog >> beForCloneOfRepository: aRepository [ +IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ self withoutNewRepository. self withoutLocalRepository. @@ -32,7 +32,7 @@ IceTipRegisterRepositoryDialog >> beForCloneOfRepository: aRepository [ ] { #category : #actions } -IceTipRegisterRepositoryDialog >> doAccept [ +IceTipRegisterRepositoryDialogPresenter >> doAccept [ | newRepository | self selectedType validate. @@ -43,7 +43,7 @@ IceTipRegisterRepositoryDialog >> doAccept [ ] { #category : #actions } -IceTipRegisterRepositoryDialog >> doEdit: aRepository [ +IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ repository location: aRepository location; @@ -51,32 +51,32 @@ IceTipRegisterRepositoryDialog >> doEdit: aRepository [ ] { #category : #testing } -IceTipRegisterRepositoryDialog >> isEditing [ +IceTipRegisterRepositoryDialogPresenter >> isEditing [ ^ repository isNotNil ] { #category : #events } -IceTipRegisterRepositoryDialog >> onAccept: aBlock [ +IceTipRegisterRepositoryDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] { #category : #initialization } -IceTipRegisterRepositoryDialog >> titleForWindow [ +IceTipRegisterRepositoryDialogPresenter >> titleForWindow [ ^ 'Register project' ] { #category : #accessing } -IceTipRegisterRepositoryDialog >> withoutLocalRepository [ +IceTipRegisterRepositoryDialogPresenter >> withoutLocalRepository [ types := self allTypes reject: #isLocalRepository. typeList items: types ] { #category : #accessing } -IceTipRegisterRepositoryDialog >> withoutNewRepository [ +IceTipRegisterRepositoryDialogPresenter >> withoutNewRepository [ types := self allTypes reject: #isNewRepository. typeList items: types diff --git a/Iceberg-TipUI/IceTipRemovePackageDialog.class.st b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st similarity index 67% rename from Iceberg-TipUI/IceTipRemovePackageDialog.class.st rename to Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st index 4d76999b9c..c1872aeb06 100644 --- a/Iceberg-TipUI/IceTipRemovePackageDialog.class.st +++ b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRemovePackageDialog, - #superclass : #IceTipDialog, + #name : #IceTipRemovePackageDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'model', 'iconPanel', @@ -12,7 +12,7 @@ Class { } { #category : #actions } -IceTipRemovePackageDialog >> accept [ +IceTipRemovePackageDialogPresenter >> accept [ self removeFromRepositoryCheckbox state ifTrue: [ self model remove ]. @@ -21,19 +21,19 @@ IceTipRemovePackageDialog >> accept [ ] { #category : #'accessing - ui' } -IceTipRemovePackageDialog >> confirmLabel [ +IceTipRemovePackageDialogPresenter >> confirmLabel [ ^ confirmLabel ] { #category : #accessing } -IceTipRemovePackageDialog >> confirmMessage [ +IceTipRemovePackageDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove package {1}?' ] { #category : #layout } -IceTipRemovePackageDialog >> defaultLayout [ +IceTipRemovePackageDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight borderWidth: 5; @@ -49,13 +49,13 @@ IceTipRemovePackageDialog >> defaultLayout [ ] { #category : #'accessing - ui' } -IceTipRemovePackageDialog >> iconPanel [ +IceTipRemovePackageDialogPresenter >> iconPanel [ ^ iconPanel ] { #category : #initialization } -IceTipRemovePackageDialog >> initialExtentForWindow [ +IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ ^ (500 @ (self class inputTextHeight * 2 + self class buttonHeight + 75)) @@ -63,7 +63,7 @@ IceTipRemovePackageDialog >> initialExtentForWindow [ ] { #category : #initialization } -IceTipRemovePackageDialog >> initializePresenters [ +IceTipRemovePackageDialogPresenter >> initializePresenters [ iconPanel := self newImage image: (self iconNamed: #question); @@ -82,37 +82,37 @@ IceTipRemovePackageDialog >> initializePresenters [ ] { #category : #accessing } -IceTipRemovePackageDialog >> model [ +IceTipRemovePackageDialogPresenter >> model [ ^ model ] { #category : #accessing } -IceTipRemovePackageDialog >> model: anObject [ +IceTipRemovePackageDialogPresenter >> model: anObject [ model := anObject ] { #category : #'accessing - ui' } -IceTipRemovePackageDialog >> removeFromRepositoryCheckbox [ +IceTipRemovePackageDialogPresenter >> removeFromRepositoryCheckbox [ ^ removeFromRepositoryCheckbox ] { #category : #initialization } -IceTipRemovePackageDialog >> setModelBeforeInitialization: anObject [ +IceTipRemovePackageDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] { #category : #initialization } -IceTipRemovePackageDialog >> titleForWindow [ +IceTipRemovePackageDialogPresenter >> titleForWindow [ ^ 'Remove Package' ] { #category : #accessing } -IceTipRemovePackageDialog >> unloadFromImageCheckbox [ +IceTipRemovePackageDialogPresenter >> unloadFromImageCheckbox [ ^ unloadFromImageCheckbox ] diff --git a/Iceberg-TipUI/IceTipRemoveRepositoryDialog.class.st b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st similarity index 64% rename from Iceberg-TipUI/IceTipRemoveRepositoryDialog.class.st rename to Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st index e5e31cebf9..448a16e9ed 100644 --- a/Iceberg-TipUI/IceTipRemoveRepositoryDialog.class.st +++ b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRemoveRepositoryDialog, - #superclass : #IceTipDialog, + #name : #IceTipRemoveRepositoryDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'model', 'iconPanel', @@ -11,7 +11,7 @@ Class { } { #category : #actions } -IceTipRemoveRepositoryDialog >> accept [ +IceTipRemoveRepositoryDialogPresenter >> accept [ (self removeFileSystemCheckbox state ifTrue: [ self model newDeleteAction ] @@ -20,18 +20,18 @@ IceTipRemoveRepositoryDialog >> accept [ ] { #category : #'accessing - ui' } -IceTipRemoveRepositoryDialog >> confirmLabel [ +IceTipRemoveRepositoryDialogPresenter >> confirmLabel [ ^ confirmLabel ] { #category : #accessing } -IceTipRemoveRepositoryDialog >> confirmMessage [ +IceTipRemoveRepositoryDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove your repository {1} from your image?' ] { #category : #layout } -IceTipRemoveRepositoryDialog >> defaultLayout [ +IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight borderWidth: 5; @@ -45,13 +45,13 @@ IceTipRemoveRepositoryDialog >> defaultLayout [ ] { #category : #'accessing - ui' } -IceTipRemoveRepositoryDialog >> iconPanel [ +IceTipRemoveRepositoryDialogPresenter >> iconPanel [ ^ iconPanel ] { #category : #initialization } -IceTipRemoveRepositoryDialog >> initialExtentForWindow [ +IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ ^ (500@( self class inputTextHeight * 2 @@ -61,7 +61,7 @@ IceTipRemoveRepositoryDialog >> initialExtentForWindow [ ] { #category : #initialization } -IceTipRemoveRepositoryDialog >> initializePresenters [ +IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ iconPanel := self newImage image: (self iconNamed: #question); @@ -75,36 +75,36 @@ IceTipRemoveRepositoryDialog >> initializePresenters [ ] { #category : #accessing } -IceTipRemoveRepositoryDialog >> model [ +IceTipRemoveRepositoryDialogPresenter >> model [ ^ model ] { #category : #accessing } -IceTipRemoveRepositoryDialog >> model: anObject [ +IceTipRemoveRepositoryDialogPresenter >> model: anObject [ model := anObject ] { #category : #'accessing - ui' } -IceTipRemoveRepositoryDialog >> removeFileSystemCheckbox [ +IceTipRemoveRepositoryDialogPresenter >> removeFileSystemCheckbox [ ^ removeFileSystemCheckbox ] { #category : #accessing } -IceTipRemoveRepositoryDialog >> removeMessage [ +IceTipRemoveRepositoryDialogPresenter >> removeMessage [ ^ 'Also remove repository from file system' ] { #category : #initialization } -IceTipRemoveRepositoryDialog >> setModelBeforeInitialization: anObject [ +IceTipRemoveRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] { #category : #initialization } -IceTipRemoveRepositoryDialog >> titleForWindow [ +IceTipRemoveRepositoryDialogPresenter >> titleForWindow [ ^ 'Remove repository' ] diff --git a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st index 7fd4f8245e..2bbf694e4d 100644 --- a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st @@ -48,7 +48,7 @@ IceTipRepairCloneRepository class >> title [ { #category : #executing } IceTipRepairCloneRepository >> basicExecute [ - ((IceTipRegisterRepositoryDialog newApplication: context application) + ((IceTipRegisterRepositoryDialogPresenter newApplication: context application) beForCloneOfRepository: self repositoryModel entity; onAccept: [ Iceberg announcer announce: (IceRepositoryModified for: self repositoryModel entity) ]; diff --git a/Iceberg-TipUI/IceTipRepairCommand.class.st b/Iceberg-TipUI/IceTipRepairCommand.class.st index c41656223d..ad3f612190 100644 --- a/Iceberg-TipUI/IceTipRepairCommand.class.st +++ b/Iceberg-TipUI/IceTipRepairCommand.class.st @@ -34,7 +34,7 @@ IceTipRepairCommand >> canBeExecuted [ { #category : #executing } IceTipRepairCommand >> execute [ - ((IceTipRepairRepositoryDialog + ((IceTipRepairRepositoryDialogPresenter newApplication: context application model: self repositoryModel) asDialogWindow) diff --git a/Iceberg-TipUI/IceTipRepairEditRepository.class.st b/Iceberg-TipUI/IceTipRepairEditRepository.class.st index 9eee81b1e2..8850faf7bf 100644 --- a/Iceberg-TipUI/IceTipRepairEditRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairEditRepository.class.st @@ -44,7 +44,7 @@ IceTipRepairEditRepository class >> title [ { #category : #executing } IceTipRepairEditRepository >> basicExecute [ - (IceTipEditProjectDialog + (IceTipEditProjectDialogPresenter newApplication: context application model: self repositoryModel entity project) openDialog diff --git a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st index ee1dcc91a4..3ee897f53c 100644 --- a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st @@ -53,7 +53,7 @@ IceTipRepairMergeWithBranch class >> title [ IceTipRepairMergeWithBranch >> basicExecute [ self fetchAllRemotes. - ((IceTipMergeBranchDialog + ((IceTipMergeBranchDialogPresenter newApplication: context application model: self repositoryModel) beSwitchAndMerge; diff --git a/Iceberg-TipUI/IceTipRepairProject.class.st b/Iceberg-TipUI/IceTipRepairProject.class.st index 7568aa2beb..ce164f63e0 100644 --- a/Iceberg-TipUI/IceTipRepairProject.class.st +++ b/Iceberg-TipUI/IceTipRepairProject.class.st @@ -45,7 +45,7 @@ IceTipRepairProject class >> title [ { #category : #executing } IceTipRepairProject >> basicExecute [ - ((IceTipEditProjectDialog + ((IceTipEditProjectDialogPresenter newApplication: context application model: (IceBasicProject onRepository: self repositoryModel entity)) asDialogWindow) diff --git a/Iceberg-TipUI/IceTipRepairRepositoryDialog.class.st b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st similarity index 68% rename from Iceberg-TipUI/IceTipRepairRepositoryDialog.class.st rename to Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st index e9378eba92..9284c8ae2d 100644 --- a/Iceberg-TipUI/IceTipRepairRepositoryDialog.class.st +++ b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRepairRepositoryDialog, - #superclass : #IceTipDialog, + #name : #IceTipRepairRepositoryDialogPresenter, + #superclass : #IceTipDialogPresenter, #instVars : [ 'optionsList', 'detailPanel', @@ -12,13 +12,13 @@ Class { } { #category : #'instance creation' } -IceTipRepairRepositoryDialog class >> onRepository: aRepository [ +IceTipRepairRepositoryDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] { #category : #actions } -IceTipRepairRepositoryDialog >> accept [ +IceTipRepairRepositoryDialogPresenter >> accept [ self closeWindow. selectedOption @@ -27,13 +27,13 @@ IceTipRepairRepositoryDialog >> accept [ ] { #category : #'api - focus' } -IceTipRepairRepositoryDialog >> defaultKeyboardFocus [ +IceTipRepairRepositoryDialogPresenter >> defaultKeyboardFocus [ ^ optionsList ] { #category : #layout } -IceTipRepairRepositoryDialog >> defaultLayout [ +IceTipRepairRepositoryDialogPresenter >> defaultLayout [ self flag: #TODO. "Replace the fixed height with a correct style" ^ SpBoxLayout newTopToBottom @@ -45,19 +45,19 @@ IceTipRepairRepositoryDialog >> defaultLayout [ ] { #category : #'accessing - ui' } -IceTipRepairRepositoryDialog >> detailPanel [ +IceTipRepairRepositoryDialogPresenter >> detailPanel [ ^ detailPanel ] { #category : #initialization } -IceTipRepairRepositoryDialog >> initialExtentForWindow [ +IceTipRepairRepositoryDialogPresenter >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] { #category : #initialization } -IceTipRepairRepositoryDialog >> initializeDialogWindow: aWindow [ +IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -71,7 +71,7 @@ IceTipRepairRepositoryDialog >> initializeDialogWindow: aWindow [ ] { #category : #initialization } -IceTipRepairRepositoryDialog >> initializeOptionsList [ +IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ optionsList hideColumnHeaders; @@ -90,7 +90,7 @@ IceTipRepairRepositoryDialog >> initializeOptionsList [ ] { #category : #initialization } -IceTipRepairRepositoryDialog >> initializePresenters [ +IceTipRepairRepositoryDialogPresenter >> initializePresenters [ reasonPanel := self newText beNotEditable; @@ -109,31 +109,31 @@ IceTipRepairRepositoryDialog >> initializePresenters [ ] { #category : #private } -IceTipRepairRepositoryDialog >> initializeReasonPanel [ +IceTipRepairRepositoryDialogPresenter >> initializeReasonPanel [ reasonPanel text: self model longStatus ] { #category : #accessing } -IceTipRepairRepositoryDialog >> model [ +IceTipRepairRepositoryDialogPresenter >> model [ ^ model ] { #category : #'accessing - ui' } -IceTipRepairRepositoryDialog >> optionsList [ +IceTipRepairRepositoryDialogPresenter >> optionsList [ ^ optionsList ] { #category : #'accessing - ui' } -IceTipRepairRepositoryDialog >> reasonPanel [ +IceTipRepairRepositoryDialogPresenter >> reasonPanel [ ^ reasonPanel ] { #category : #private } -IceTipRepairRepositoryDialog >> refreshDetailPanel [ +IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ selectedOption ifNotNil: [ detailPanel @@ -142,14 +142,14 @@ IceTipRepairRepositoryDialog >> refreshDetailPanel [ ] { #category : #initialization } -IceTipRepairRepositoryDialog >> refreshDialogButtons [ +IceTipRepairRepositoryDialogPresenter >> refreshDialogButtons [ self window ifNotNil: [ :aWindow | aWindow buttons first enabled: (selectedOption isNotNil) ] ] { #category : #private } -IceTipRepairRepositoryDialog >> selectionChanged: selectedItem [ +IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ selectedOption := selectedItem. self refreshDetailPanel. @@ -158,13 +158,13 @@ IceTipRepairRepositoryDialog >> selectionChanged: selectedItem [ ] { #category : #initialization } -IceTipRepairRepositoryDialog >> setModelBeforeInitialization: anObject [ +IceTipRepairRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] { #category : #initialization } -IceTipRepairRepositoryDialog >> titleForWindow [ +IceTipRepairRepositoryDialogPresenter >> titleForWindow [ ^ 'Repair repository' ] diff --git a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st index ff490310c5..51ece93142 100644 --- a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st +++ b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st @@ -18,7 +18,7 @@ IceTipSelectRemotePresenter >> addButton [ { #category : #actions } IceTipSelectRemotePresenter >> addRemote [ - ((IceTipAddRemoteDialog + ((IceTipAddRemoteDialogPresenter newApplication: self application model: self model repositoryModel) onAccept: [ :newRemoteName | diff --git a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st index 444dea377b..799a7e886a 100644 --- a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st @@ -33,7 +33,7 @@ IceTipUnloadAndRemovePackageCommand >> canBeExecuted [ { #category : #executing } IceTipUnloadAndRemovePackageCommand >> execute [ - (IceTipRemovePackageDialog + (IceTipRemovePackageDialogPresenter newApplication: context application model: self packageModel) asModalWindow diff --git a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st index 6b62cdc8ee..ebf9dd35c6 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st @@ -153,7 +153,7 @@ IceTipWorkingCopyBrowser >> initializePresenters [ filterInput := self newTextInput. packagesTable := self newTable. self initializePackagesTable. - statusBar := self instantiate: IceTipWorkingCopyStatusBar + statusBar := self instantiate: IceTipWorkingCopyStatusBarPresenter ] { #category : #initialization } diff --git a/Iceberg-TipUI/IceTipWorkingCopyStatusBar.class.st b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st similarity index 75% rename from Iceberg-TipUI/IceTipWorkingCopyStatusBar.class.st rename to Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st index 909a72bc4a..03e34062ab 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyStatusBar.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st @@ -2,7 +2,7 @@ I'm the status bar for a IceTipWorkingCopyBrowser. " Class { - #name : #IceTipWorkingCopyStatusBar, + #name : #IceTipWorkingCopyStatusBarPresenter, #superclass : #SpPresenter, #instVars : [ 'branchLabel', @@ -13,7 +13,7 @@ Class { } { #category : #layout } -IceTipWorkingCopyStatusBar class >> defaultLayout [ +IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ ^ SpBoxLayout newLeftToRight add: #branchLabel expand: false; @@ -26,20 +26,20 @@ IceTipWorkingCopyStatusBar class >> defaultLayout [ ] { #category : #testing } -IceTipWorkingCopyStatusBar >> canTakeKeyboardFocus [ +IceTipWorkingCopyStatusBarPresenter >> canTakeKeyboardFocus [ ^ false ] { #category : #initialization } -IceTipWorkingCopyStatusBar >> initializePresenters [ +IceTipWorkingCopyStatusBarPresenter >> initializePresenters [ branchLabel := self newLabel. statusLabel := self newLabel ] { #category : #accessing } -IceTipWorkingCopyStatusBar >> model: aModel [ +IceTipWorkingCopyStatusBarPresenter >> model: aModel [ "Fill labels from a IceTipWorkingCopyModel." aModel shortCommitId @@ -53,7 +53,7 @@ IceTipWorkingCopyStatusBar >> model: aModel [ ] { #category : #accessing } -IceTipWorkingCopyStatusBar >> refreshWithCommitId: aModel [ +IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ branchLabel label: ('{1} at ' format: { aModel branchName }). commitLink := self newLink. @@ -65,7 +65,7 @@ IceTipWorkingCopyStatusBar >> refreshWithCommitId: aModel [ ] { #category : #accessing } -IceTipWorkingCopyStatusBar >> refreshWithoutCommitId: aModel [ +IceTipWorkingCopyStatusBarPresenter >> refreshWithoutCommitId: aModel [ branchLabel label: aModel branchName. commitLink := self newNullPresenter. diff --git a/Iceberg-TipUI/IceTokenCredentials.extension.st b/Iceberg-TipUI/IceTokenCredentials.extension.st index 5abd6da41c..5b476eeb69 100644 --- a/Iceberg-TipUI/IceTokenCredentials.extension.st +++ b/Iceberg-TipUI/IceTokenCredentials.extension.st @@ -7,5 +7,5 @@ IceTokenCredentials >> askForModelClass [ { #category : #'*Iceberg-TipUI' } IceTokenCredentials >> editModelClass [ - ^ IceTipEditTokenCredentialsModel + ^ IceTipEditTokenCredentialsPresenter ] diff --git a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st index d622764b38..6806b57051 100644 --- a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st +++ b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st @@ -3,5 +3,5 @@ Extension { #name : #LGitCredentialsPlaintext } { #category : #'*Iceberg-TipUI' } LGitCredentialsPlaintext >> askForModelClassOn: aString [ - ^ IceTipAskForPlaintextCredentialsModel + ^ IceTipAskForPlaintextCredentialsPresenter ] diff --git a/Iceberg-TipUI/ManifestIcebergTipUI.class.st b/Iceberg-TipUI/ManifestIcebergTipUI.class.st index 31ffa11115..a47a98479d 100644 --- a/Iceberg-TipUI/ManifestIcebergTipUI.class.st +++ b/Iceberg-TipUI/ManifestIcebergTipUI.class.st @@ -9,7 +9,7 @@ Class { { #category : #'code-critics' } ManifestIcebergTipUI class >> ruleAnySatisfyRuleV1FalsePositive [ - ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialog #guessFormatFromDirectory: #false)) #'2021-01-05T16:19:22.932793-03:00') ) + ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #guessFormatFromDirectory: #false)) #'2021-01-05T16:19:22.932793-03:00') ) ] { #category : #'code-critics' } @@ -19,5 +19,5 @@ ManifestIcebergTipUI class >> ruleNotEliminationRuleV1FalsePositive [ { #category : #'code-critics' } ManifestIcebergTipUI class >> ruleReGuardClauseRuleV1FalsePositive [ - ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialog #initializeMessagePanel #false)) #'2021-01-05T16:19:22.928248-03:00') ) + ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #initializeMessagePanel #false)) #'2021-01-05T16:19:22.928248-03:00') ) ] From 10379883299abad6a97f7b2dfff36fb9c5010555 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 14 Sep 2023 14:25:36 +0200 Subject: [PATCH 28/83] Update tonel dependency to Pharo12 branch During the development of Pharo 12 we will bring some changes to tonel such as an improved way to deal with packages and tags and maybe a way to set the deprecated aliases of a class. This change make Iceberg depend on the branch Pharo12 of the tonel repository. This branch has one change ahead of the master branch that is the introduction of TonelWriterV3. This new writer will export the package and the tag of classes on top of the category. It also update the reader to be able to read this new format and try to be as backward compatible as possible. --- BaselineOfIceberg/BaselineOfIceberg.class.st | 27 ++++++++++---------- BaselineOfIceberg/package.st | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st index f69d9bdebe..d19e7757d9 100644 --- a/BaselineOfIceberg/BaselineOfIceberg.class.st +++ b/BaselineOfIceberg/BaselineOfIceberg.class.st @@ -2,12 +2,13 @@ Baseline for https://github.com/pharo-vcs/iceberg project " Class { - #name : #BaselineOfIceberg, - #superclass : #BaselineOf, - #category : #BaselineOfIceberg + #name : 'BaselineOfIceberg', + #superclass : 'BaselineOf', + #category : 'BaselineOfIceberg', + #package : 'BaselineOfIceberg' } -{ #category : #baseline } +{ #category : 'baseline' } BaselineOfIceberg >> baseline: spec [ @@ -63,14 +64,14 @@ BaselineOfIceberg >> baseline: spec [ ] -{ #category : #accessing } +{ #category : 'accessing' } BaselineOfIceberg >> customProjectAttributes [ Smalltalk os isMacOS ifTrue: [ ^ #(#MacOS) ]. Smalltalk os isUnix ifTrue: [ ^ #(#Unix) ]. Smalltalk os isWindows ifTrue: [ ^ #(#Windows) ] ] -{ #category : #baseline } +{ #category : 'baseline' } BaselineOfIceberg >> libgit: spec [ spec baseline: 'LibGit' @@ -84,14 +85,14 @@ BaselineOfIceberg >> libgit: spec [ with: [ spec loads: #('tests') ] ] -{ #category : #script } +{ #category : 'script' } BaselineOfIceberg >> postLoad [ self resetKMRepository. (Smalltalk at: #Iceberg) bootstrap ] -{ #category : #script } +{ #category : 'script' } BaselineOfIceberg >> postLoadWithDirective: aDirective projectSpec: aSpec [ | repository | self resetKMRepository. @@ -108,7 +109,7 @@ BaselineOfIceberg >> postLoadWithDirective: aDirective projectSpec: aSpec [ packageList: aSpec packageNames ] -{ #category : #accessing } +{ #category : 'accessing' } BaselineOfIceberg >> projectClass [ ^ super projectClass "this is breaking the bootstrap. Reverting it for now." @@ -117,23 +118,23 @@ BaselineOfIceberg >> projectClass [ do: [ super projectClass ]" ] -{ #category : #script } +{ #category : 'script' } BaselineOfIceberg >> resetKMRepository [ Smalltalk at: #KMRepository ifPresent: [ :class | class reset ] ] -{ #category : #baseline } +{ #category : 'baseline' } BaselineOfIceberg >> ring2: spec [ spec baseline: 'Ring2' with: [ spec repository: 'github://guillep/Ring2:v2.0.0/src' ] ] -{ #category : #baseline } +{ #category : 'baseline' } BaselineOfIceberg >> tonel: spec [ spec baseline: 'Tonel' - with: [ spec repository: 'github://pharo-vcs/tonel:v1.0.19' ] + with: [ spec repository: 'github://pharo-vcs/tonel:Pharo12' ] ] diff --git a/BaselineOfIceberg/package.st b/BaselineOfIceberg/package.st index 14d75ed14c..83d7134234 100644 --- a/BaselineOfIceberg/package.st +++ b/BaselineOfIceberg/package.st @@ -1 +1 @@ -Package { #name : #BaselineOfIceberg } +Package { #name : 'BaselineOfIceberg' } From 5dd0fe63daa33e8a2cf6ca4ffa30eca47a679adc Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 15 Sep 2023 00:20:04 +0200 Subject: [PATCH 29/83] Fix undeclared --- Iceberg-UI-Tests/IceRegistryTest.class.st | 13 ++-- ...kForPlaintextCredentialsModelTest.class.st | 38 ++++----- ...ceTipCollectionRepositoryProvider.class.st | 13 ++-- .../IceTipCommitBrowserTest.class.st | 32 ++++---- ...TipCommitBrowserTestWithRemoteSet.class.st | 16 ++-- ...CommitBrowserTestWithoutRemoteSet.class.st | 12 +-- .../IceTipCreateTagPanelTest.class.st | 19 ++--- .../IceTipEditProjectDialogTest.class.st | 9 ++- ...ialogWithPackageInWorkingCopyTest.class.st | 7 +- ...ogWithoutPackageInWorkingCopyTest.class.st | 7 +- .../IceTipHistoryBrowserTest.class.st | 20 ++--- .../IceTipMockSaveImageAction.class.st | 14 ++-- .../IceTipPresenterMetaTests.class.st | 29 +++---- .../IceTipRepositoriesBrowserTest.class.st | 78 ++++++++++--------- .../IceTipRepositoryBrowserTest.class.st | 20 ++--- ...ipRepositoryBrowserWithRemoteTest.class.st | 20 ++--- ...epositoryBrowserWithoutRemoteTest.class.st | 20 ++--- ...IceTipUnknownCommitRepositoryTest.class.st | 11 +-- ...kingCopyBrowserOnDetachedRepoTest.class.st | 12 +-- ...rkingCopyBrowserOnUpdatedRepoTest.class.st | 12 +-- .../IceTipWorkingCopyBrowserTest.class.st | 22 +++--- ...pWorkingCopyBrowserWithRemoteTest.class.st | 30 +++---- Iceberg-UI-Tests/package.st | 2 +- 23 files changed, 246 insertions(+), 210 deletions(-) diff --git a/Iceberg-UI-Tests/IceRegistryTest.class.st b/Iceberg-UI-Tests/IceRegistryTest.class.st index 14e4dc27b0..326c985bd3 100644 --- a/Iceberg-UI-Tests/IceRegistryTest.class.st +++ b/Iceberg-UI-Tests/IceRegistryTest.class.st @@ -1,25 +1,26 @@ Class { - #name : #IceRegistryTest, - #superclass : #TestCase, + #name : 'IceRegistryTest', + #superclass : 'TestCase', #instVars : [ 'currentRegistry' ], - #category : #'Iceberg-UI-Tests' + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } -{ #category : #running } +{ #category : 'running' } IceRegistryTest >> setUp [ super setUp. currentRegistry := IceRepository registry. ] -{ #category : #running } +{ #category : 'running' } IceRegistryTest >> tearDown [ currentRegistry collect: [ :repo | repo ] into: IceRepository registry. super tearDown ] -{ #category : #tests } +{ #category : 'tests' } IceRegistryTest >> testRegistryResetDoesNotThrowErrorUponOpenningWindow [ | window | IceRepository reset. diff --git a/Iceberg-UI-Tests/IceTipAskForPlaintextCredentialsModelTest.class.st b/Iceberg-UI-Tests/IceTipAskForPlaintextCredentialsModelTest.class.st index 238d24ab15..af8e477509 100644 --- a/Iceberg-UI-Tests/IceTipAskForPlaintextCredentialsModelTest.class.st +++ b/Iceberg-UI-Tests/IceTipAskForPlaintextCredentialsModelTest.class.st @@ -1,34 +1,36 @@ Class { - #name : #IceTipAskForPlaintextCredentialsModelTest, - #superclass : #TestCase, + #name : 'IceTipAskForPlaintextCredentialsModelTest', + #superclass : 'TestCase', #instVars : [ 'store', 'dialog' ], - #category : #'Iceberg-UI-Tests' + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } -{ #category : #tests } +{ #category : 'tests' } IceTipAskForPlaintextCredentialsModelTest >> openNonModal: aDialog [ aDialog asDialogWindow open ] -{ #category : #running } +{ #category : 'running' } IceTipAskForPlaintextCredentialsModelTest >> setUp [ + super setUp. store := IceCredentialStore new. - dialog := IceTipAskForPlaintextCredentialsModel new - credentialStore: store; - yourself + dialog := IceTipAskForPlaintextCredentialsPresenter new + credentialStore: store; + yourself ] -{ #category : #running } +{ #category : 'running' } IceTipAskForPlaintextCredentialsModelTest >> tearDown [ dialog ifNotNil: [ [dialog window close] on: LGitNoCredentialsProvided do: [ ] ]. ] -{ #category : #tests } +{ #category : 'tests' } IceTipAskForPlaintextCredentialsModelTest >> testAcceptCreatesCredential [ | cred | @@ -46,7 +48,7 @@ IceTipAskForPlaintextCredentialsModelTest >> testAcceptCreatesCredential [ self assert: cred password equals: 'aaa'. ] -{ #category : #'tests - storing' } +{ #category : 'tests - storing' } IceTipAskForPlaintextCredentialsModelTest >> testAcceptDoNotStoresCredential [ | cred | @@ -65,7 +67,7 @@ IceTipAskForPlaintextCredentialsModelTest >> testAcceptDoNotStoresCredential [ self assert: cred password equals: ''. ] -{ #category : #tests } +{ #category : 'tests' } IceTipAskForPlaintextCredentialsModelTest >> testAcceptEnabledAndDisabled [ dialog askingHostname: 'github.com'. self openNonModal: dialog. @@ -83,14 +85,14 @@ IceTipAskForPlaintextCredentialsModelTest >> testAcceptEnabledAndDisabled [ self assert: dialog okButton isEnabled ] -{ #category : #tests } +{ #category : 'tests' } IceTipAskForPlaintextCredentialsModelTest >> testAcceptIsBlockedInTheBeginning [ dialog askingHostname: 'github.com'. self openNonModal: dialog. self deny: dialog okButton isEnabled ] -{ #category : #'tests - storing' } +{ #category : 'tests - storing' } IceTipAskForPlaintextCredentialsModelTest >> testAcceptStoresCredential [ | cred | @@ -109,7 +111,7 @@ IceTipAskForPlaintextCredentialsModelTest >> testAcceptStoresCredential [ self assert: cred password equals: 'aaa'. ] -{ #category : #'tests - storing' } +{ #category : 'tests - storing' } IceTipAskForPlaintextCredentialsModelTest >> testAcceptStoresCredentialReplacesOld [ | cred orig | @@ -132,7 +134,7 @@ IceTipAskForPlaintextCredentialsModelTest >> testAcceptStoresCredentialReplacesO self assert: cred password equals: 'aaa'. ] -{ #category : #'tests - cancel' } +{ #category : 'tests - cancel' } IceTipAskForPlaintextCredentialsModelTest >> testCancelThrowsException [ dialog askingHostname: 'github.com'. @@ -141,7 +143,7 @@ IceTipAskForPlaintextCredentialsModelTest >> testCancelThrowsException [ self should: [ dialog window triggerCancelAction ] raise: LGitNoCredentialsProvided ] -{ #category : #'tests - cancel' } +{ #category : 'tests - cancel' } IceTipAskForPlaintextCredentialsModelTest >> testCloseThrowsException [ dialog askingHostname: 'github.com'. @@ -150,7 +152,7 @@ IceTipAskForPlaintextCredentialsModelTest >> testCloseThrowsException [ self should: [ dialog window close ] raise: LGitNoCredentialsProvided ] -{ #category : #tests } +{ #category : 'tests' } IceTipAskForPlaintextCredentialsModelTest >> testTitle [ dialog askingHostname: 'github.com'. diff --git a/Iceberg-UI-Tests/IceTipCollectionRepositoryProvider.class.st b/Iceberg-UI-Tests/IceTipCollectionRepositoryProvider.class.st index cd126c4e5d..dbfe9ab0b2 100644 --- a/Iceberg-UI-Tests/IceTipCollectionRepositoryProvider.class.st +++ b/Iceberg-UI-Tests/IceTipCollectionRepositoryProvider.class.st @@ -1,24 +1,25 @@ Class { - #name : #IceTipCollectionRepositoryProvider, - #superclass : #Object, + #name : 'IceTipCollectionRepositoryProvider', + #superclass : 'Object', #instVars : [ 'collection' ], - #category : #'Iceberg-UI-Tests' + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCollectionRepositoryProvider >> addRepository: aRepository [ collection add: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCollectionRepositoryProvider >> collection: anObject [ collection := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCollectionRepositoryProvider >> repositories [ ^ collection diff --git a/Iceberg-UI-Tests/IceTipCommitBrowserTest.class.st b/Iceberg-UI-Tests/IceTipCommitBrowserTest.class.st index 66cfe4192a..843004e7b5 100644 --- a/Iceberg-UI-Tests/IceTipCommitBrowserTest.class.st +++ b/Iceberg-UI-Tests/IceTipCommitBrowserTest.class.st @@ -1,19 +1,21 @@ Class { - #name : #IceTipCommitBrowserTest, - #superclass : #IceAbstractTestCase, + #name : 'IceTipCommitBrowserTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'presenter', 'saveMock' ], - #category : #'Iceberg-UI-Tests-Browsers' + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #testing } +{ #category : 'testing' } IceTipCommitBrowserTest class >> isAbstract [ ^ self name = #IceTipCommitBrowserTest ] -{ #category : #running } +{ #category : 'running' } IceTipCommitBrowserTest >> setUp [ super setUp. @@ -35,13 +37,13 @@ IceTipCommitBrowserTest >> setUp [ presenter commentPanel commentText text: 'my super commit message' ] -{ #category : #running } +{ #category : 'running' } IceTipCommitBrowserTest >> tearDown [ presenter ifNotNil: [ presenter window close ]. super tearDown ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testAcceptShortcutInCommentBoxTriggersCommit [ | oldStatus | @@ -61,7 +63,7 @@ IceTipCommitBrowserTest >> testAcceptShortcutInCommentBoxTriggersCommit [ presenter commentPanel saveOnCommit: oldStatus ] ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testFixesField [ self assert: presenter commentPanel fixesField class @@ -78,7 +80,7 @@ IceTipCommitBrowserTest >> testFixesField [ Fixes #123456'. ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testHasCommentPanelWithSavingSettings [ | previousState | @@ -96,13 +98,13 @@ IceTipCommitBrowserTest >> testHasCommentPanelWithSavingSettings [ presenter commentPanel saveOnCommit: previousState ] ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testHasDiffPanel [ self assert: presenter diffPanel class equals: IceTipDiffSelectingPanel ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testIsAutomaticallySavingWhenChecked [ | previousState| @@ -116,7 +118,7 @@ IceTipCommitBrowserTest >> testIsAutomaticallySavingWhenChecked [ ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testIsCommitingCheckedItems [ | diffTree | @@ -141,7 +143,7 @@ IceTipCommitBrowserTest >> testIsCommitingCheckedItems [ isMethodDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testIsCommitingWithTheRightMessage [ presenter doCommit. self @@ -149,7 +151,7 @@ IceTipCommitBrowserTest >> testIsCommitingWithTheRightMessage [ equals: 'my super commit message' ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testIsNotAutomaticallySavingWhenNotChecked [ | previousState | previousState := presenter commentPanel isSaving. @@ -161,7 +163,7 @@ IceTipCommitBrowserTest >> testIsNotAutomaticallySavingWhenNotChecked [ presenter commentPanel saveOnCommit: previousState ] ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTest >> testIsNotCommitingUncheckedItems [ | diffTree | presenter diffPanel selectedItems diff --git a/Iceberg-UI-Tests/IceTipCommitBrowserTestWithRemoteSet.class.st b/Iceberg-UI-Tests/IceTipCommitBrowserTestWithRemoteSet.class.st index 901230fc9b..f15f3ac3b0 100644 --- a/Iceberg-UI-Tests/IceTipCommitBrowserTestWithRemoteSet.class.st +++ b/Iceberg-UI-Tests/IceTipCommitBrowserTestWithRemoteSet.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceTipCommitBrowserTestWithRemoteSet, - #superclass : #IceTipCommitBrowserTest, - #category : #'Iceberg-UI-Tests-Browsers' + #name : 'IceTipCommitBrowserTestWithRemoteSet', + #superclass : 'IceTipCommitBrowserTest', + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipCommitBrowserTestWithRemoteSet >> newFixture [ ^ IceClonedFromRemoteFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTestWithRemoteSet >> testNotPushingAutomatically [ | previousState | previousState := presenter commentPanel isPushing. @@ -19,7 +21,7 @@ IceTipCommitBrowserTestWithRemoteSet >> testNotPushingAutomatically [ presenter commentPanel pushCheckbox state: previousState ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTestWithRemoteSet >> testPushSettingCheckbox [ | previousState | @@ -34,7 +36,7 @@ IceTipCommitBrowserTestWithRemoteSet >> testPushSettingCheckbox [ presenter commentPanel pushCheckbox toggleState ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTestWithRemoteSet >> testPushingAutomatically [ | previousState diffTree | previousState := presenter commentPanel isPushing. diff --git a/Iceberg-UI-Tests/IceTipCommitBrowserTestWithoutRemoteSet.class.st b/Iceberg-UI-Tests/IceTipCommitBrowserTestWithoutRemoteSet.class.st index 0735a4aeb5..8ebbeed96f 100644 --- a/Iceberg-UI-Tests/IceTipCommitBrowserTestWithoutRemoteSet.class.st +++ b/Iceberg-UI-Tests/IceTipCommitBrowserTestWithoutRemoteSet.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceTipCommitBrowserTestWithoutRemoteSet, - #superclass : #IceTipCommitBrowserTest, - #category : #'Iceberg-UI-Tests-Browsers' + #name : 'IceTipCommitBrowserTestWithoutRemoteSet', + #superclass : 'IceTipCommitBrowserTest', + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipCommitBrowserTestWithoutRemoteSet >> newFixture [ ^ IceCleanWorkingCopyFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceTipCommitBrowserTestWithoutRemoteSet >> testPushSettingCheckbox [ self assert: presenter commentPanel isPushing equals: false ] diff --git a/Iceberg-UI-Tests/IceTipCreateTagPanelTest.class.st b/Iceberg-UI-Tests/IceTipCreateTagPanelTest.class.st index b81be8eda0..5d4b093abd 100644 --- a/Iceberg-UI-Tests/IceTipCreateTagPanelTest.class.st +++ b/Iceberg-UI-Tests/IceTipCreateTagPanelTest.class.st @@ -1,33 +1,34 @@ Class { - #name : #IceTipCreateTagPanelTest, - #superclass : #TestCase, + #name : 'IceTipCreateTagPanelTest', + #superclass : 'TestCase', #instVars : [ 'panel' ], - #category : 'Iceberg-UI-Tests' + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } -{ #category : #tests } +{ #category : 'tests' } IceTipCreateTagPanelTest >> testLatestTagPartsNoNumeric [ panel := IceTipCreateTagPanel basicNew. self assert: (panel latestTagPartsIn: #()) equals: #('v' 0 0 0). self assert: (panel latestTagPartsIn: #('non-numeric')) equals: #('v' 0 0 0) ] -{ #category : #tests } +{ #category : 'tests' } IceTipCreateTagPanelTest >> testLatestTagPartsNoNumeric2 [ panel := IceTipCreateTagPanel basicNew. self assert: (panel latestTagPartsIn: #('v1.2.x')) equals: #('v' 1 2 0). self assert: (panel latestTagPartsIn: #('v1.x')) equals: #('v' 1 0 0). ] -{ #category : #tests } +{ #category : 'tests' } IceTipCreateTagPanelTest >> testLatestTagPartsPadded [ panel := IceTipCreateTagPanel basicNew. self assert: (panel latestTagPartsIn: #('v2.1')) equals: #('v' 2 1 0) ] -{ #category : #tests } +{ #category : 'tests' } IceTipCreateTagPanelTest >> testLatestTagPartsWithExtra [ panel := IceTipCreateTagPanel basicNew. self @@ -35,7 +36,7 @@ IceTipCreateTagPanelTest >> testLatestTagPartsWithExtra [ equals: #('v' 1 0 3) ] -{ #category : #tests } +{ #category : 'tests' } IceTipCreateTagPanelTest >> testLatestTagPartsWithPrefix [ panel := IceTipCreateTagPanel basicNew. self @@ -43,7 +44,7 @@ IceTipCreateTagPanelTest >> testLatestTagPartsWithPrefix [ equals: #('v' 2 1 3) ] -{ #category : #tests } +{ #category : 'tests' } IceTipCreateTagPanelTest >> testLatestTagPartsWithoutPrefix [ panel := IceTipCreateTagPanel basicNew. self diff --git a/Iceberg-UI-Tests/IceTipEditProjectDialogTest.class.st b/Iceberg-UI-Tests/IceTipEditProjectDialogTest.class.st index a25b051098..a0b2a185d3 100644 --- a/Iceberg-UI-Tests/IceTipEditProjectDialogTest.class.st +++ b/Iceberg-UI-Tests/IceTipEditProjectDialogTest.class.st @@ -1,13 +1,14 @@ Class { - #name : #IceTipEditProjectDialogTest, - #superclass : #IceAbstractTestCase, + #name : 'IceTipEditProjectDialogTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'dialog' ], - #category : #'Iceberg-UI-Tests' + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } -{ #category : #testing } +{ #category : 'testing' } IceTipEditProjectDialogTest class >> isAbstract [ ^ self name = #IceTipEditProjectDialogTest ] diff --git a/Iceberg-UI-Tests/IceTipEditProjectDialogWithPackageInWorkingCopyTest.class.st b/Iceberg-UI-Tests/IceTipEditProjectDialogWithPackageInWorkingCopyTest.class.st index 3eb60d57a3..9d5cce5215 100644 --- a/Iceberg-UI-Tests/IceTipEditProjectDialogWithPackageInWorkingCopyTest.class.st +++ b/Iceberg-UI-Tests/IceTipEditProjectDialogWithPackageInWorkingCopyTest.class.st @@ -1,5 +1,6 @@ Class { - #name : #IceTipEditProjectDialogWithPackageInWorkingCopyTest, - #superclass : #IceTipEditProjectDialogTest, - #category : #'Iceberg-UI-Tests' + #name : 'IceTipEditProjectDialogWithPackageInWorkingCopyTest', + #superclass : 'IceTipEditProjectDialogTest', + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } diff --git a/Iceberg-UI-Tests/IceTipEditProjectDialogWithoutPackageInWorkingCopyTest.class.st b/Iceberg-UI-Tests/IceTipEditProjectDialogWithoutPackageInWorkingCopyTest.class.st index 86804d64ee..93f1d64853 100644 --- a/Iceberg-UI-Tests/IceTipEditProjectDialogWithoutPackageInWorkingCopyTest.class.st +++ b/Iceberg-UI-Tests/IceTipEditProjectDialogWithoutPackageInWorkingCopyTest.class.st @@ -1,5 +1,6 @@ Class { - #name : #IceTipEditProjectDialogWithoutPackageInWorkingCopyTest, - #superclass : #IceTipEditProjectDialogTest, - #category : #'Iceberg-UI-Tests' + #name : 'IceTipEditProjectDialogWithoutPackageInWorkingCopyTest', + #superclass : 'IceTipEditProjectDialogTest', + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } diff --git a/Iceberg-UI-Tests/IceTipHistoryBrowserTest.class.st b/Iceberg-UI-Tests/IceTipHistoryBrowserTest.class.st index d693ad3553..c0bdb54657 100644 --- a/Iceberg-UI-Tests/IceTipHistoryBrowserTest.class.st +++ b/Iceberg-UI-Tests/IceTipHistoryBrowserTest.class.st @@ -1,18 +1,20 @@ Class { - #name : #IceTipHistoryBrowserTest, - #superclass : #IceAbstractTestCase, + #name : 'IceTipHistoryBrowserTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'presenter' ], - #category : #'Iceberg-UI-Tests-Browsers' + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipHistoryBrowserTest >> newFixture [ ^ IceWithRemoteAndLocalCommitFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceTipHistoryBrowserTest >> setUp [ | model iceTipPullModel | @@ -25,13 +27,13 @@ IceTipHistoryBrowserTest >> setUp [ presenter open ] -{ #category : #running } +{ #category : 'running' } IceTipHistoryBrowserTest >> tearDown [ presenter ifNotNil: [ presenter window close ]. super tearDown ] -{ #category : #running } +{ #category : 'running' } IceTipHistoryBrowserTest >> testCommitListDisplayData [ | commit | commit := (presenter commitList items at: 1) realObject. @@ -49,12 +51,12 @@ IceTipHistoryBrowserTest >> testCommitListDisplayData [ equals: commit datetime asLocalStringYMDHM ] -{ #category : #running } +{ #category : 'running' } IceTipHistoryBrowserTest >> testCommitListHasTheCorrectColumns [ self assertCollection: (presenter commitList columns collect: #title ) hasSameElements: { 'Timestamp' . 'Commit' . 'Author' . 'Description'} ] -{ #category : #running } +{ #category : 'running' } IceTipHistoryBrowserTest >> testHasDiffPanel [ self assert: presenter commitInfoTabs class = IceTipCommitInfoPresenter diff --git a/Iceberg-UI-Tests/IceTipMockSaveImageAction.class.st b/Iceberg-UI-Tests/IceTipMockSaveImageAction.class.st index 627bb936bc..3a306fb092 100644 --- a/Iceberg-UI-Tests/IceTipMockSaveImageAction.class.st +++ b/Iceberg-UI-Tests/IceTipMockSaveImageAction.class.st @@ -1,26 +1,28 @@ Class { - #name : #IceTipMockSaveImageAction, - #superclass : #Object, + #name : 'IceTipMockSaveImageAction', + #superclass : 'Object', #instVars : [ 'timesExecuted' ], - #category : #'Iceberg-UI-Tests-Browsers' + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipMockSaveImageAction >> execute [ timesExecuted := timesExecuted + 1 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMockSaveImageAction >> initialize [ super initialize. timesExecuted := 0 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMockSaveImageAction >> timesExecuted [ ^timesExecuted ] diff --git a/Iceberg-UI-Tests/IceTipPresenterMetaTests.class.st b/Iceberg-UI-Tests/IceTipPresenterMetaTests.class.st index 90ed1f7dbb..b66dc10855 100644 --- a/Iceberg-UI-Tests/IceTipPresenterMetaTests.class.st +++ b/Iceberg-UI-Tests/IceTipPresenterMetaTests.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceTipPresenterMetaTests, - #superclass : #TestCase, - #category : #'Iceberg-UI-Tests' + #name : 'IceTipPresenterMetaTests', + #superclass : 'TestCase', + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } -{ #category : #running } +{ #category : 'running' } IceTipPresenterMetaTests >> allClassesInAnyIcebergPackage [ ^ Array streamContents: [ :str | @@ -12,7 +13,7 @@ IceTipPresenterMetaTests >> allClassesInAnyIcebergPackage [ (c package name beginsWith: 'Iceberg') ifTrue: [ str nextPut: c ] ] ] ] -{ #category : #running } +{ #category : 'running' } IceTipPresenterMetaTests >> allMethodsInPresenters [ ^ Array streamContents: [ :stream | @@ -22,7 +23,7 @@ IceTipPresenterMetaTests >> allMethodsInPresenters [ nextPutAll: each classSide methods ] ] ] -{ #category : #running } +{ #category : 'running' } IceTipPresenterMetaTests >> allMethodsInPresentersThatMatch: aRBPattern [ | searcher | @@ -37,7 +38,7 @@ IceTipPresenterMetaTests >> allMethodsInPresentersThatMatch: aRBPattern [ ] -{ #category : #running } +{ #category : 'running' } IceTipPresenterMetaTests >> assertSendSuperAllMethodsNamed: aSelector isMeta: isMeta [ | aCollection | @@ -56,7 +57,7 @@ IceTipPresenterMetaTests >> assertSendSuperAllMethodsNamed: aSelector isMeta: is " ] -{ #category : #running } +{ #category : 'running' } IceTipPresenterMetaTests >> methodsInPresentersWithName: aSelector isMeta: isMeta [ ^ Array streamContents: [ :stream | @@ -67,21 +68,21 @@ IceTipPresenterMetaTests >> methodsInPresentersWithName: aSelector isMeta: isMet ] -{ #category : #running } +{ #category : 'running' } IceTipPresenterMetaTests >> presenterClasses [ ^ self allClassesInAnyIcebergPackage select: [ :each | each inheritsFrom: SpPresenter ] ] -{ #category : #running } +{ #category : 'running' } IceTipPresenterMetaTests >> presenterClassesDefining: aSelector isMeta: isMeta [ ^ (self methodsInPresentersWithName: aSelector isMeta: isMeta) collect: [ :each | each origin ] ] -{ #category : #tests } +{ #category : 'tests' } IceTipPresenterMetaTests >> testDefaultSpecDoesntUsePragma [ "Do not use the pragma, that was necessary in Spec1 but not in Spec2." @@ -92,7 +93,7 @@ IceTipPresenterMetaTests >> testDefaultSpecDoesntUsePragma [ ] -{ #category : #tests } +{ #category : 'tests' } IceTipPresenterMetaTests >> testDoNotImplementDiscouragedSelectors [ "Either instance or class-side, the old #title is named #titleForWindow in inst-side." @@ -112,7 +113,7 @@ IceTipPresenterMetaTests >> testDoNotImplementDiscouragedSelectors [ ] -{ #category : #tests } +{ #category : 'tests' } IceTipPresenterMetaTests >> testDontAccessUnderlyingWidget [ "In general, we don't want uses of #whenBuiltDo: or #adapter or similar. They are not prohibited by Spec2, but they are often used to manipulate the @@ -130,7 +131,7 @@ IceTipPresenterMetaTests >> testDontAccessUnderlyingWidget [ " ] -{ #category : #tests } +{ #category : 'tests' } IceTipPresenterMetaTests >> testPreferCloseWindow [ "IceTipSpPresenter provides #closeWindow to avoid 'self window close' and 'self window delete'." diff --git a/Iceberg-UI-Tests/IceTipRepositoriesBrowserTest.class.st b/Iceberg-UI-Tests/IceTipRepositoriesBrowserTest.class.st index 599547aad5..6c9004ffab 100644 --- a/Iceberg-UI-Tests/IceTipRepositoriesBrowserTest.class.st +++ b/Iceberg-UI-Tests/IceTipRepositoriesBrowserTest.class.st @@ -1,27 +1,29 @@ Class { - #name : #IceTipRepositoriesBrowserTest, - #superclass : #IceAbstractTestCase, + #name : 'IceTipRepositoriesBrowserTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'presenter', 'alphabeticallyFirstRepository', 'repositoryProvider' ], - #category : #'Iceberg-UI-Tests-Browsers' + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipRepositoriesBrowserTest >> newFixture [ ^ IceSinglePackageFixture inGit ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoriesBrowserTest >> newRepositoryNamed: aName [ ^ fixture factory newRepositoryNamed: aName ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoriesBrowserTest >> setUp [ | alphabeticallyLastRepository | @@ -42,12 +44,12 @@ IceTipRepositoriesBrowserTest >> setUp [ presenter open ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoriesBrowserTest >> tearDown [ presenter ifNotNil: [ presenter window close ]. super tearDown ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testAddRepositoryInModelWithoutRefreshDoesNotRefreshList [ | previousList | @@ -58,7 +60,7 @@ IceTipRepositoriesBrowserTest >> testAddRepositoryInModelWithoutRefreshDoesNotRe self assert: presenter projectsPanelRepositoryList items equals: previousList. ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testAddRepositoryInModelWithoutRefreshDoesNotShowNewRepository [ | newRepository | @@ -68,7 +70,7 @@ IceTipRepositoriesBrowserTest >> testAddRepositoryInModelWithoutRefreshDoesNotSh self deny: (presenter projectsPanelIsShowingRepository: newRepository) ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testAddRepositoryThenRefreshShowsNewRepository [ | newRepository | @@ -79,7 +81,7 @@ IceTipRepositoriesBrowserTest >> testAddRepositoryThenRefreshShowsNewRepository self assert: (presenter projectsPanelIsShowingRepository: newRepository) ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditRepositoryBranchThenRefreshDoesRefreshList [ self @@ -88,7 +90,7 @@ IceTipRepositoriesBrowserTest >> testEditRepositoryBranchThenRefreshDoesRefreshL makesPropertyValueTo: 'toto' ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditRepositoryBranchWithoutRefreshDoesNotRefreshList [ self @@ -96,7 +98,7 @@ IceTipRepositoriesBrowserTest >> testEditRepositoryBranchWithoutRefreshDoesNotRe doing: [ :repository | repository createBranch: 'toto' ] ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditRepositoryNameThenRefreshDoesRefreshList [ | newName | @@ -107,7 +109,7 @@ IceTipRepositoriesBrowserTest >> testEditRepositoryNameThenRefreshDoesRefreshLis makesPropertyValueTo: newName ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditRepositoryNameWithoutRefreshDoesNotRefreshList [ self @@ -115,7 +117,7 @@ IceTipRepositoriesBrowserTest >> testEditRepositoryNameWithoutRefreshDoesNotRefr doing: [ :repository | repository name: 'newname' ] ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditRepositoryProperty: aProperty doing: aBlock makesPropertyValueTo: aValue [ | firstRepository repositoryModel oldValue newValue | @@ -133,7 +135,7 @@ IceTipRepositoriesBrowserTest >> testEditRepositoryProperty: aProperty doing: aB self assert: newValue equals: aValue. ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditRepositoryStatusThenRefreshDoesRefreshList [ self @@ -144,7 +146,7 @@ IceTipRepositoriesBrowserTest >> testEditRepositoryStatusThenRefreshDoesRefreshL makesPropertyValueTo: (IceTipRepositoryModel on: nil) localRepositoryMissing ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditRepositoryStatusWithoutRefreshDoesNotRefreshList [ self @@ -154,7 +156,7 @@ IceTipRepositoriesBrowserTest >> testEditRepositoryStatusWithoutRefreshDoesNotRe repository repositoryDirectory ensureDeleteAll ] ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditThenRefreshRepositoryProperty: aProperty doing: aBlock makesPropertyValueTo: aValue [ self @@ -165,7 +167,7 @@ IceTipRepositoriesBrowserTest >> testEditThenRefreshRepositoryProperty: aPropert makesPropertyValueTo: aValue ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testEditWithoutRefreshRepositoryProperty: aProperty doing: aBlock [ | repositoryModel | @@ -176,25 +178,25 @@ IceTipRepositoriesBrowserTest >> testEditWithoutRefreshRepositoryProperty: aProp makesPropertyValueTo: (repositoryModel perform: aProperty) ] -{ #category : #'tests - structural' } +{ #category : 'tests - structural' } IceTipRepositoriesBrowserTest >> testHasAddButtonOnTheRight [ self assert: (presenter toolbar rightItems anySatisfy: [:aButton | aButton label = 'Add']). ] -{ #category : #'tests - structural' } +{ #category : 'tests - structural' } IceTipRepositoriesBrowserTest >> testHasFetchAllButtonOnTheLeft [ self assert: (presenter toolbar leftItems anySatisfy: [:aButton | aButton label = 'Fetch all']). ] -{ #category : #'tests - structural' } +{ #category : 'tests - structural' } IceTipRepositoriesBrowserTest >> testHasSettingsButtonOnTheRight [ self assert: (presenter toolbar rightItems anySatisfy: [:aButton | aButton label = 'Settings']). ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testInitialListShowsElementsInOriginalOrder [ self @@ -208,7 +210,7 @@ IceTipRepositoriesBrowserTest >> testInitialListShowsElementsInOriginalOrder [ equals: presenter projectsPanelRepositoryList items third description. ] -{ #category : #'tests - context menu' } +{ #category : 'tests - context menu' } IceTipRepositoriesBrowserTest >> testListHasContextMenuHasPackagesOptionEnabled [ | menu | @@ -220,7 +222,7 @@ IceTipRepositoriesBrowserTest >> testListHasContextMenuHasPackagesOptionEnabled self assert: (menu defaultGroup menuItems at: 1) isEnabled ] -{ #category : #'tests - context menu' } +{ #category : 'tests - context menu' } IceTipRepositoriesBrowserTest >> testListHasContextMenuHasRepairRepositoryOptionDisabled [ | menu | @@ -231,7 +233,7 @@ IceTipRepositoriesBrowserTest >> testListHasContextMenuHasRepairRepositoryOption each name = IceTipRepairCommand defaultName ]) ] -{ #category : #'tests - context menu' } +{ #category : 'tests - context menu' } IceTipRepositoriesBrowserTest >> testListHasContextMenuOnSelection [ | menu | @@ -242,7 +244,7 @@ IceTipRepositoriesBrowserTest >> testListHasContextMenuOnSelection [ self assert: menu defaultGroup menuItems isNotEmpty ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testListShowsNotLoadedProject [ self assert: (presenter projectsPanelRepositoryList valueAtColumn: 1 row: 3) equals: '*anotherOne'. @@ -250,7 +252,7 @@ IceTipRepositoriesBrowserTest >> testListShowsNotLoadedProject [ self assert: (presenter projectsPanelRepositoryList valueAtColumn: 3 row: 3) equals: 'master'. ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testListShowsUpToDateProject [ self assert: (presenter projectsPanelRepositoryList valueAtColumn: 1 row: 1) equals: 'test-project'. @@ -258,28 +260,28 @@ IceTipRepositoriesBrowserTest >> testListShowsUpToDateProject [ self assert: (presenter projectsPanelRepositoryList valueAtColumn: 3 row: 1) equals: 'master'. ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingByBranchDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 3 ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingByNameDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 1. ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingByStatusDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 2 ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingDescendingByBranchDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" @@ -287,7 +289,7 @@ IceTipRepositoriesBrowserTest >> testSortingDescendingByBranchDoesNotFail [ presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 3. ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingDescendingByNameDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" @@ -295,7 +297,7 @@ IceTipRepositoriesBrowserTest >> testSortingDescendingByNameDoesNotFail [ presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 1. ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingDescendingByStatusDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" @@ -303,7 +305,7 @@ IceTipRepositoriesBrowserTest >> testSortingDescendingByStatusDoesNotFail [ presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 2. ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingOriginalByBranchDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" @@ -312,7 +314,7 @@ IceTipRepositoriesBrowserTest >> testSortingOriginalByBranchDoesNotFail [ presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 3. ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingOriginalByNameDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" @@ -321,7 +323,7 @@ IceTipRepositoriesBrowserTest >> testSortingOriginalByNameDoesNotFail [ presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 1. ] -{ #category : #'tests - table sorting' } +{ #category : 'tests - table sorting' } IceTipRepositoriesBrowserTest >> testSortingOriginalByStatusDoesNotFail [ "Smoke test because there is no way to access the real shown elements for now" @@ -330,7 +332,7 @@ IceTipRepositoriesBrowserTest >> testSortingOriginalByStatusDoesNotFail [ presenter projectsPanelRepositoryList clickOnColumnHeaderAt: 2. ] -{ #category : #'tests - table' } +{ #category : 'tests - table' } IceTipRepositoriesBrowserTest >> testTableHasTheCorrectColumns [ self assertCollection: (presenter projectsPanelRepositoryList columns collect: #title) hasSameElements: { 'Repositories'. 'Status'. 'Branch'} diff --git a/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st b/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st index b270d72690..a49b17e012 100644 --- a/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st +++ b/Iceberg-UI-Tests/IceTipRepositoryBrowserTest.class.st @@ -1,19 +1,21 @@ Class { - #name : #IceTipRepositoryBrowserTest, - #superclass : #IceAbstractTestCase, + #name : 'IceTipRepositoryBrowserTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'presenter' ], - #category : #'Iceberg-UI-Tests-Browsers' + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserTest class >> isAbstract [ ^ self name = #IceTipRepositoryBrowserTest ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserTest >> testHasAddRemoteButtonOnTheRight [ self assert: @@ -21,7 +23,7 @@ IceTipRepositoryBrowserTest >> testHasAddRemoteButtonOnTheRight [ anySatisfy: [ :aButton | aButton label = 'Add remote' ]) ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserTest >> testHasBranchButtonOnTheLeft [ self assert: @@ -29,7 +31,7 @@ IceTipRepositoryBrowserTest >> testHasBranchButtonOnTheLeft [ anySatisfy: [ :aButton | aButton label = 'Branch' ]) ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserTest >> testHasCorrectSideTreeBar [ self assertCollection: (presenter sidebarTree roots collect: #name) @@ -37,13 +39,13 @@ IceTipRepositoryBrowserTest >> testHasCorrectSideTreeBar [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserTest >> testHasHiedraHistoryBrowser [ presenter historyPanel class = IceTipHiedraAltHistoryBrowser ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserTest >> testHasMergeButtonOnTheLeft [ self assert: diff --git a/Iceberg-UI-Tests/IceTipRepositoryBrowserWithRemoteTest.class.st b/Iceberg-UI-Tests/IceTipRepositoryBrowserWithRemoteTest.class.st index a3f660e700..a5f28544c3 100644 --- a/Iceberg-UI-Tests/IceTipRepositoryBrowserWithRemoteTest.class.st +++ b/Iceberg-UI-Tests/IceTipRepositoryBrowserWithRemoteTest.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceTipRepositoryBrowserWithRemoteTest, - #superclass : #IceTipRepositoryBrowserTest, - #category : #'Iceberg-UI-Tests-Browsers' + #name : 'IceTipRepositoryBrowserWithRemoteTest', + #superclass : 'IceTipRepositoryBrowserTest', + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipRepositoryBrowserWithRemoteTest >> newFixture [ ^ IceWithRemoteFixture inGit ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithRemoteTest >> setUp [ super setUp. @@ -17,13 +19,13 @@ IceTipRepositoryBrowserWithRemoteTest >> setUp [ presenter open ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithRemoteTest >> tearDown [ presenter ifNotNil: [ "super tearDown" presenter window close ]. super tearDown. ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithRemoteTest >> testHasFetchButtonOnTheLeft [ self assert: @@ -31,7 +33,7 @@ IceTipRepositoryBrowserWithRemoteTest >> testHasFetchButtonOnTheLeft [ anySatisfy: [ :aButton | aButton label = 'Fetch' ]) ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithRemoteTest >> testHasPullButtonOnTheLeft [ self assert: @@ -39,7 +41,7 @@ IceTipRepositoryBrowserWithRemoteTest >> testHasPullButtonOnTheLeft [ anySatisfy: [ :aButton | aButton label = 'Pull' ]) ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithRemoteTest >> testHasPushButtonOnTheLeft [ self assert: diff --git a/Iceberg-UI-Tests/IceTipRepositoryBrowserWithoutRemoteTest.class.st b/Iceberg-UI-Tests/IceTipRepositoryBrowserWithoutRemoteTest.class.st index 4ec53391f5..abbbb5298f 100644 --- a/Iceberg-UI-Tests/IceTipRepositoryBrowserWithoutRemoteTest.class.st +++ b/Iceberg-UI-Tests/IceTipRepositoryBrowserWithoutRemoteTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRepositoryBrowserWithoutRemoteTest, - #superclass : #IceTipRepositoryBrowserTest, - #category : #'Iceberg-UI-Tests-Browsers' + #name : 'IceTipRepositoryBrowserWithoutRemoteTest', + #superclass : 'IceTipRepositoryBrowserTest', + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipRepositoryBrowserWithoutRemoteTest >> newFixture [ ^ IceSinglePackageFixture inGit ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithoutRemoteTest >> setUp [ super setUp. @@ -18,14 +20,14 @@ IceTipRepositoryBrowserWithoutRemoteTest >> setUp [ presenter open ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithoutRemoteTest >> tearDown [ presenter ifNotNil: [ presenter window close ] "super tearDown" ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithoutRemoteTest >> testHasNoFetchButtonOnTheLeft [ self deny: @@ -33,7 +35,7 @@ IceTipRepositoryBrowserWithoutRemoteTest >> testHasNoFetchButtonOnTheLeft [ anySatisfy: [ :aButton | aButton label = 'Fetch' ]) ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithoutRemoteTest >> testHasNoPullButtonOnTheLeft [ self deny: @@ -41,7 +43,7 @@ IceTipRepositoryBrowserWithoutRemoteTest >> testHasNoPullButtonOnTheLeft [ anySatisfy: [ :aButton | aButton label = 'Pull' ]) ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryBrowserWithoutRemoteTest >> testHasNoPushButtonOnTheLeft [ self deny: diff --git a/Iceberg-UI-Tests/IceTipUnknownCommitRepositoryTest.class.st b/Iceberg-UI-Tests/IceTipUnknownCommitRepositoryTest.class.st index 99de34360d..c3b03c8464 100644 --- a/Iceberg-UI-Tests/IceTipUnknownCommitRepositoryTest.class.st +++ b/Iceberg-UI-Tests/IceTipUnknownCommitRepositoryTest.class.st @@ -1,16 +1,17 @@ Class { - #name : #IceTipUnknownCommitRepositoryTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-UI-Tests' + #name : 'IceTipUnknownCommitRepositoryTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-UI-Tests', + #package : 'Iceberg-UI-Tests' } -{ #category : #running } +{ #category : 'running' } IceTipUnknownCommitRepositoryTest >> newFixture [ ^ IceWithRemoteAndUnknownCommitFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceTipUnknownCommitRepositoryTest >> testRepositoryStatusIsUnknown [ | model status | diff --git a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserOnDetachedRepoTest.class.st b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserOnDetachedRepoTest.class.st index b4fe5dae29..94b9257435 100644 --- a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserOnDetachedRepoTest.class.st +++ b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserOnDetachedRepoTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipWorkingCopyBrowserOnDetachedRepoTest, - #superclass : #IceTipWorkingCopyBrowserTest, - #category : #'Iceberg-UI-Tests-Browsers' + #name : 'IceTipWorkingCopyBrowserOnDetachedRepoTest', + #superclass : 'IceTipWorkingCopyBrowserTest', + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipWorkingCopyBrowserOnDetachedRepoTest >> newFixture [ ^ IceDetachedWorkingCopyFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceTipWorkingCopyBrowserOnDetachedRepoTest >> testStatusBarShowsStatusOfRepository [ self assert: diff --git a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserOnUpdatedRepoTest.class.st b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserOnUpdatedRepoTest.class.st index 749cb7686a..6d68582658 100644 --- a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserOnUpdatedRepoTest.class.st +++ b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserOnUpdatedRepoTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipWorkingCopyBrowserOnUpdatedRepoTest, - #superclass : #IceTipWorkingCopyBrowserTest, - #category : #'Iceberg-UI-Tests-Browsers' + #name : 'IceTipWorkingCopyBrowserOnUpdatedRepoTest', + #superclass : 'IceTipWorkingCopyBrowserTest', + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipWorkingCopyBrowserOnUpdatedRepoTest >> newFixture [ ^ IceSinglePackageFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceTipWorkingCopyBrowserOnUpdatedRepoTest >> testStatusBarShowsStatusOfRepository [ self assert: diff --git a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserTest.class.st b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserTest.class.st index 5217c2869b..d9efa0f383 100644 --- a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserTest.class.st +++ b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserTest.class.st @@ -1,26 +1,28 @@ Class { - #name : #IceTipWorkingCopyBrowserTest, - #superclass : #IceAbstractTestCase, + #name : 'IceTipWorkingCopyBrowserTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'presenter' ], - #category : #'Iceberg-UI-Tests-Browsers' + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyBrowserTest class >> isAbstract [ ^ self name = #IceTipWorkingCopyBrowserTest ] -{ #category : #tests } +{ #category : 'tests' } IceTipWorkingCopyBrowserTest >> contextMenuForIndex: index [ presenter packagesTable selectIndex: index. ^ presenter packagesTable contextMenu value. ] -{ #category : #running } +{ #category : 'running' } IceTipWorkingCopyBrowserTest >> setUp [ super setUp. @@ -29,7 +31,7 @@ IceTipWorkingCopyBrowserTest >> setUp [ presenter open ] -{ #category : #running } +{ #category : 'running' } IceTipWorkingCopyBrowserTest >> tearDown [ presenter ifNotNil: [ @@ -37,7 +39,7 @@ IceTipWorkingCopyBrowserTest >> tearDown [ super tearDown ] -{ #category : #tests } +{ #category : 'tests' } IceTipWorkingCopyBrowserTest >> testItemsHasContextMenu [ | menu | @@ -46,7 +48,7 @@ IceTipWorkingCopyBrowserTest >> testItemsHasContextMenu [ self assert: menu isNotNil. ] -{ #category : #tests } +{ #category : 'tests' } IceTipWorkingCopyBrowserTest >> testPackageHasBrowseRepositoryVersionOption [ | menu | @@ -55,7 +57,7 @@ IceTipWorkingCopyBrowserTest >> testPackageHasBrowseRepositoryVersionOption [ self assert: (menu defaultGroup menuItems anySatisfy: [ :e | e name = 'Browse this version in Monticello' ]) ] -{ #category : #tests } +{ #category : 'tests' } IceTipWorkingCopyBrowserTest >> testPackageIsShownInList [ self assert: (presenter packagesTable items anySatisfy: [ :each | each name = self packageName1 ]) diff --git a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserWithRemoteTest.class.st b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserWithRemoteTest.class.st index 281d3071c5..8d4320b1f7 100644 --- a/Iceberg-UI-Tests/IceTipWorkingCopyBrowserWithRemoteTest.class.st +++ b/Iceberg-UI-Tests/IceTipWorkingCopyBrowserWithRemoteTest.class.st @@ -1,19 +1,21 @@ Class { - #name : #IceTipWorkingCopyBrowserWithRemoteTest, - #superclass : #IceTipWorkingCopyBrowserTest, + #name : 'IceTipWorkingCopyBrowserWithRemoteTest', + #superclass : 'IceTipWorkingCopyBrowserTest', #instVars : [ 'remoteWorkingCopy' ], - #category : #'Iceberg-UI-Tests-Browsers' + #category : 'Iceberg-UI-Tests-Browsers', + #package : 'Iceberg-UI-Tests', + #tag : 'Browsers' } -{ #category : #running } +{ #category : 'running' } IceTipWorkingCopyBrowserWithRemoteTest >> newFixture [ ^ IceClonedFromRemoteFixture inGit ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> setUp [ super setUp. @@ -30,7 +32,7 @@ IceTipWorkingCopyBrowserWithRemoteTest >> setUp [ self remoteRepository push ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testAddPackageInModelThenAnnounceAddsPackageToList [ "Add package directly in the model without notifying the UI" @@ -43,7 +45,7 @@ IceTipWorkingCopyBrowserWithRemoteTest >> testAddPackageInModelThenAnnounceAddsP self assert: (presenter showsPackageNamed: self packageName2). ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testCommitThenAnnounceCommitedUpdatesPushBadge [ | pushButton | @@ -60,7 +62,7 @@ IceTipWorkingCopyBrowserWithRemoteTest >> testCommitThenAnnounceCommitedUpdatesP self assert: pushButton badge equals: '1' ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testCommitThenAnnounceUpdatesPushBadge [ | pushButton | @@ -77,7 +79,7 @@ IceTipWorkingCopyBrowserWithRemoteTest >> testCommitThenAnnounceUpdatesPushBadge self assert: pushButton badge equals: '1' ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testFetchButtonUpdatesPullBadge [ "If fetch brings commits in the upstream of the current branch, the badge of the pull button should be updated" @@ -90,7 +92,7 @@ IceTipWorkingCopyBrowserWithRemoteTest >> testFetchButtonUpdatesPullBadge [ self assert: pullButton badge equals: 1 ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testMakePackageDirtyInModelThenAnnounceMakesPackageDirtyInList [ "Add package directly in the model without notifying the UI" @@ -103,7 +105,7 @@ IceTipWorkingCopyBrowserWithRemoteTest >> testMakePackageDirtyInModelThenAnnounc self assert: (presenter packagesTable valueAtColumn: 2 row: 1) equals: ('*', self packageName1). ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testMakePackageNonDirtyInModelThenAnnounceMakesPackageDirtyInList [ "Add package directly in the model without notifying the UI" @@ -123,13 +125,13 @@ IceTipWorkingCopyBrowserWithRemoteTest >> testMakePackageNonDirtyInModelThenAnno self assert: (presenter packagesTable valueAtColumn: 2 row: 1) equals: self packageName1. ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testNonDirtyPackageIsNotDirtyInList [ self assert: (presenter packagesTable valueAtColumn: 2 row: 1) equals: self packageName1. ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testPullButtonHasNoBadgeBeforeFetching [ "If we don't fetch, the badge of the pull button should not be updated" @@ -138,7 +140,7 @@ IceTipWorkingCopyBrowserWithRemoteTest >> testPullButtonHasNoBadgeBeforeFetching self deny: pullButton hasBadge ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceTipWorkingCopyBrowserWithRemoteTest >> testPushButtonHasNoBadgeBeforeCommit [ | pushButton | diff --git a/Iceberg-UI-Tests/package.st b/Iceberg-UI-Tests/package.st index ae15db91d7..acc282bc2f 100644 --- a/Iceberg-UI-Tests/package.st +++ b/Iceberg-UI-Tests/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-UI-Tests' } +Package { #name : 'Iceberg-UI-Tests' } From 2f45ec9a7154bc9119b624dd95c43b792caad968 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 15 Sep 2023 22:02:49 +0200 Subject: [PATCH 30/83] Fix ring working copy --- Iceberg-Memory/IceChangeImporter.extension.st | 4 +- Iceberg-Memory/IceMemoryChange.class.st | 17 +-- Iceberg-Memory/IceMemoryCommit.class.st | 47 ++++---- Iceberg-Memory/IceMemoryCommitWalk.class.st | 19 +-- Iceberg-Memory/IceMemoryIndex.class.st | 27 +++-- Iceberg-Memory/IceMemoryLocalBranch.class.st | 23 ++-- Iceberg-Memory/IceMemoryNoCommit.class.st | 9 +- Iceberg-Memory/IceMemoryProject.class.st | 27 +++-- Iceberg-Memory/IceMemoryRemote.class.st | 33 +++--- Iceberg-Memory/IceMemoryRemoteBranch.class.st | 17 +-- Iceberg-Memory/IceMemoryRepository.class.st | 111 +++++++++--------- Iceberg-Memory/IceMemoryUnbornBranch.class.st | 13 +- Iceberg-Memory/IceRingWorkingCopy.class.st | 51 ++++---- .../IceRingWorkingCopyChangerVisitor.class.st | 74 ++++++------ Iceberg-Memory/package.st | 2 +- 15 files changed, 241 insertions(+), 233 deletions(-) diff --git a/Iceberg-Memory/IceChangeImporter.extension.st b/Iceberg-Memory/IceChangeImporter.extension.st index fbf7d19754..0e606730b7 100644 --- a/Iceberg-Memory/IceChangeImporter.extension.st +++ b/Iceberg-Memory/IceChangeImporter.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceChangeImporter } +Extension { #name : 'IceChangeImporter' } -{ #category : #'*Iceberg-Memory' } +{ #category : '*Iceberg-Memory' } IceChangeImporter >> visitMemoryChange: anIceMemoryChange [ | importer | diff --git a/Iceberg-Memory/IceMemoryChange.class.st b/Iceberg-Memory/IceMemoryChange.class.st index bcdd5cf676..c376a941fa 100644 --- a/Iceberg-Memory/IceMemoryChange.class.st +++ b/Iceberg-Memory/IceMemoryChange.class.st @@ -1,13 +1,14 @@ Class { - #name : #IceMemoryChange, - #superclass : #IceChange, + #name : 'IceMemoryChange', + #superclass : 'IceChange', #instVars : [ 'package' ], - #category : #'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMemoryChange class >> on: anIcePackage [ ^ self new @@ -15,23 +16,23 @@ IceMemoryChange class >> on: anIcePackage [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceMemoryChange >> accept: aVisitor [ aVisitor visitMemoryChange: self ] -{ #category : #displaying } +{ #category : 'displaying' } IceMemoryChange >> displayingProgressString [ ^ 'Comparing memory changes of ' , self package name ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryChange >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryChange >> package: anIcePackage [ package := anIcePackage diff --git a/Iceberg-Memory/IceMemoryCommit.class.st b/Iceberg-Memory/IceMemoryCommit.class.st index df0142f81a..6566600ed9 100644 --- a/Iceberg-Memory/IceMemoryCommit.class.st +++ b/Iceberg-Memory/IceMemoryCommit.class.st @@ -3,22 +3,23 @@ I'm a commit that works on memory. I'm used for testing. " Class { - #name : #IceMemoryCommit, - #superclass : #IceCommit, + #name : 'IceMemoryCommit', + #superclass : 'IceCommit', #instVars : [ 'mcCommit' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #comparing } +{ #category : 'comparing' } IceMemoryCommit >> = aCommit [ ^ (self mcCommit dependencies asArray sort: [ :a :b | a timeStamp > b timeStamp ]) = (aCommit mcCommit dependencies asArray sort: [ :a :b | a timeStamp > b timeStamp ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> ancestors [ ^ self mcCommit info ancestors collect: [ :parentMcCommitInfo | | iceCommit parentMcCommit | @@ -29,13 +30,13 @@ IceMemoryCommit >> ancestors [ iceCommit ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> author [ ^ mcCommit info author ] -{ #category : #'private-changes' } +{ #category : 'private-changes' } IceMemoryCommit >> changedPackagesToCommitInfo: aCommit [ | otherDependencies | @@ -47,20 +48,20 @@ IceMemoryCommit >> changedPackagesToCommitInfo: aCommit [ collect: [ :each | each package ] as: Array ] -{ #category : #'private-changes' } +{ #category : 'private-changes' } IceMemoryCommit >> changesFromCommit: anIceCommit [ ^ (anIceCommit changedPackagesToCommitInfo: self) collect: [ :package | IceMemoryChange on: package ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> comment [ ^ mcCommit info message ] -{ #category : #ancestry } +{ #category : 'ancestry' } IceMemoryCommit >> commonAncestorWithCommit: anIceMemoryCommit [ | ancestor ancestorInfo | @@ -74,13 +75,13 @@ IceMemoryCommit >> commonAncestorWithCommit: anIceMemoryCommit [ yourself ] -{ #category : #'private-monticello' } +{ #category : 'private-monticello' } IceMemoryCommit >> commonMCAncestorWith: anIceMemoryCommit [ ^ mcCommit info commonAncestorWith: anIceMemoryCommit mcCommit info ] -{ #category : #'API-tags' } +{ #category : 'API-tags' } IceMemoryCommit >> createTag: aString [ (self repository hasTagNamed: aString) ifTrue: [ @@ -91,13 +92,13 @@ IceMemoryCommit >> createTag: aString [ ^ IceTag named: aString inRepository: self repository. ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> datetime [ ^ self mcCommit info timeStamp ] -{ #category : #comparing } +{ #category : 'comparing' } IceMemoryCommit >> hash [ self mcCommit dependencies isEmpty ifTrue: [ ^ 0 hash ]. @@ -109,17 +110,17 @@ IceMemoryCommit >> hash [ fold: [ :a :b | a hash bitXor: b hash ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> id [ ^ self mcCommit info id asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> mcCommit [ ^ mcCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> mcCommit: aMCVersion [ self assert: (aMCVersion isKindOf: MCVersion). self assert: (aMCVersion dependencies allSatisfy: [ :each | @@ -127,25 +128,25 @@ IceMemoryCommit >> mcCommit: aMCVersion [ mcCommit := aMCVersion ] -{ #category : #merging } +{ #category : 'merging' } IceMemoryCommit >> mergeWith: anIceMemoryCommit [ ^ repository workingCopy mergeCommit: anIceMemoryCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> packageNames [ ^ (mcCommit dependencies collect: [ :each | each package name ]) asArray ] -{ #category : #'API-project' } +{ #category : 'API-project' } IceMemoryCommit >> project [ ^ IceMemoryProject onRepository: self repository commitish: self ] -{ #category : #'API-properties' } +{ #category : 'API-properties' } IceMemoryCommit >> properties [ ^ IceRepositoryProperties @@ -153,13 +154,13 @@ IceMemoryCommit >> properties [ commitish: self ] -{ #category : #TOMOVE } +{ #category : 'TOMOVE' } IceMemoryCommit >> snapshotFor: package [ ^ (self repository mcVersionFor: (self versionFor: package)) snapshot ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryCommit >> timeStamp [ ^ self mcCommit info timeStamp diff --git a/Iceberg-Memory/IceMemoryCommitWalk.class.st b/Iceberg-Memory/IceMemoryCommitWalk.class.st index 5617a5f69d..1eb2bb237a 100644 --- a/Iceberg-Memory/IceMemoryCommitWalk.class.st +++ b/Iceberg-Memory/IceMemoryCommitWalk.class.st @@ -1,43 +1,44 @@ Class { - #name : #IceMemoryCommitWalk, - #superclass : #IceAbstractCommitWalk, + #name : 'IceMemoryCommitWalk', + #superclass : 'IceAbstractCommitWalk', #instVars : [ 'startingPoint', 'queue' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #walking } +{ #category : 'walking' } IceMemoryCommitWalk >> commitsDo: aBlock [ self rawResultsDo: aBlock ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMemoryCommitWalk >> fromBranch: aBranch [ self fromCommit: aBranch commit ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMemoryCommitWalk >> fromCommit: anIceMemoryCommit [ queue add: anIceMemoryCommit ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMemoryCommitWalk >> fromTag: anIceTag [ self shouldBeImplemented. ] -{ #category : #initialization } +{ #category : 'initialization' } IceMemoryCommitWalk >> initialize [ super initialize. queue := OrderedCollection new ] -{ #category : #iterating } +{ #category : 'iterating' } IceMemoryCommitWalk >> rawResultsDo: aBlockClosure [ | current | diff --git a/Iceberg-Memory/IceMemoryIndex.class.st b/Iceberg-Memory/IceMemoryIndex.class.st index fe8d6f4031..334d7dee1f 100644 --- a/Iceberg-Memory/IceMemoryIndex.class.st +++ b/Iceberg-Memory/IceMemoryIndex.class.st @@ -1,13 +1,14 @@ Class { - #name : #IceMemoryIndex, - #superclass : #IceIndex, + #name : 'IceMemoryIndex', + #superclass : 'IceIndex', #instVars : [ 'modifiedVersions' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMemoryIndex class >> on: anIceMemoryRepository [ ^ self new @@ -15,13 +16,13 @@ IceMemoryIndex class >> on: anIceMemoryRepository [ yourself ] -{ #category : #adding } +{ #category : 'adding' } IceMemoryIndex >> addPackage: anIcePackageDefinition [ "Nothing, the package should be already added" ] -{ #category : #'API-commiting' } +{ #category : 'API-commiting' } IceMemoryIndex >> commitWithMessage: message andParents: parentCommits [ | newCommit versionInfos packageNames iceCommit head headCommit | @@ -60,39 +61,39 @@ IceMemoryIndex >> commitWithMessage: message andParents: parentCommits [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceMemoryIndex >> initialize [ super initialize. modifiedVersions := Set new ] -{ #category : #testing } +{ #category : 'testing' } IceMemoryIndex >> isEmpty [ ^ modifiedVersions isEmpty ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryIndex >> modifiedVersions [ ^ modifiedVersions ] -{ #category : #storing } +{ #category : 'storing' } IceMemoryIndex >> storeMCVersion: aMCVersion [ repository internalStoreVersion: aMCVersion. modifiedVersions add: aMCVersion. ] -{ #category : #storing } +{ #category : 'storing' } IceMemoryIndex >> storeVersion: aMCVersion [ self storeMCVersion: aMCVersion ] -{ #category : #updating } +{ #category : 'updating' } IceMemoryIndex >> updateDiskWorkingCopy: anIceDiff [ anIceDiff tree @@ -103,7 +104,7 @@ IceMemoryIndex >> updateDiskWorkingCopy: anIceDiff [ diff: anIceDiff) ] -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } IceMemoryIndex >> updateProject: anIceUnbornProject [ "Nothing for now" 1halt. diff --git a/Iceberg-Memory/IceMemoryLocalBranch.class.st b/Iceberg-Memory/IceMemoryLocalBranch.class.st index cf03020c2a..f128a634fe 100644 --- a/Iceberg-Memory/IceMemoryLocalBranch.class.st +++ b/Iceberg-Memory/IceMemoryLocalBranch.class.st @@ -1,32 +1,33 @@ Class { - #name : #IceMemoryLocalBranch, - #superclass : #IceLocalBranch, + #name : 'IceMemoryLocalBranch', + #superclass : 'IceLocalBranch', #instVars : [ 'commit', 'upstream' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryLocalBranch >> commit [ ^ commit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryLocalBranch >> commit: aCommit [ commit := aCommit ] -{ #category : #'API-remotes' } +{ #category : 'API-remotes' } IceMemoryLocalBranch >> hasUpstream [ ^ upstream notNil ] -{ #category : #merging } +{ #category : 'merging' } IceMemoryLocalBranch >> mergeWithBranch: anIceMemoryRemoteBranch [ "Ensure that all commits of the remote branch are in the local branch mc repository" @@ -38,25 +39,25 @@ IceMemoryLocalBranch >> mergeWithBranch: anIceMemoryRemoteBranch [ commit := self commit mergeWith: anIceMemoryRemoteBranch commit ] -{ #category : #'API-remotes' } +{ #category : 'API-remotes' } IceMemoryLocalBranch >> setUpstream: anIceMemoryRemoteBranch [ upstream := anIceMemoryRemoteBranch ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryLocalBranch >> trackedBranch [ ^ repository remoteTrackedBranches detect: [ :each | each name = name ] ] -{ #category : #tracking } +{ #category : 'tracking' } IceMemoryLocalBranch >> tracksRemoteBranch [ ^ repository remoteTrackedBranches anySatisfy: [ :branch | branch name = self name ] ] -{ #category : #'API-remotes' } +{ #category : 'API-remotes' } IceMemoryLocalBranch >> upstream [ ^ upstream ifNil: [ IceUpstreamNotConfigured signal ] diff --git a/Iceberg-Memory/IceMemoryNoCommit.class.st b/Iceberg-Memory/IceMemoryNoCommit.class.st index ae62275add..ea2800ee4a 100644 --- a/Iceberg-Memory/IceMemoryNoCommit.class.st +++ b/Iceberg-Memory/IceMemoryNoCommit.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMemoryNoCommit, - #superclass : #IceNoCommit, - #category : 'Iceberg-Memory' + #name : 'IceMemoryNoCommit', + #superclass : 'IceNoCommit', + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #'API-properties' } +{ #category : 'API-properties' } IceMemoryNoCommit >> properties [ ^ IceRepositoryProperties fromDictionary: Dictionary new diff --git a/Iceberg-Memory/IceMemoryProject.class.st b/Iceberg-Memory/IceMemoryProject.class.st index dcb8c47c28..18e46b6163 100644 --- a/Iceberg-Memory/IceMemoryProject.class.st +++ b/Iceberg-Memory/IceMemoryProject.class.st @@ -1,14 +1,15 @@ Class { - #name : #IceMemoryProject, - #superclass : #Object, + #name : 'IceMemoryProject', + #superclass : 'Object', #instVars : [ 'repository', 'commitish' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #'instance-creation' } +{ #category : 'instance-creation' } IceMemoryProject class >> onRepository: anIceMemoryRepository commitish: aCommitish [ ^ self new @@ -17,54 +18,54 @@ IceMemoryProject class >> onRepository: anIceMemoryRepository commitish: aCommit yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceMemoryProject >> = aMemoryProject [ ^ aMemoryProject isMemoryProject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryProject >> commitish: aCommitish [ commitish := aCommitish ] -{ #category : #testing } +{ #category : 'testing' } IceMemoryProject >> isDirty [ ^ repository workingCopy referenceCommit project ~= self ] -{ #category : #testing } +{ #category : 'testing' } IceMemoryProject >> isInvalid [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceMemoryProject >> isMemoryProject [ ^ true ] -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } IceMemoryProject >> isUnbornProject [ ^ false ] -{ #category : #'API-projects' } +{ #category : 'API-projects' } IceMemoryProject >> packages [ ^ commitish packages ] -{ #category : #'API-packages' } +{ #category : 'API-packages' } IceMemoryProject >> packagesFrom: anIceMemoryCommit [ ^ anIceMemoryCommit packages ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryProject >> repository: anIceMemoryRepository [ repository := anIceMemoryRepository ] diff --git a/Iceberg-Memory/IceMemoryRemote.class.st b/Iceberg-Memory/IceMemoryRemote.class.st index 7a316a1325..ca63cf54c6 100644 --- a/Iceberg-Memory/IceMemoryRemote.class.st +++ b/Iceberg-Memory/IceMemoryRemote.class.st @@ -1,14 +1,15 @@ Class { - #name : #IceMemoryRemote, - #superclass : #IceRemote, + #name : 'IceMemoryRemote', + #superclass : 'IceRemote', #instVars : [ 'remoteRepository', 'branchRepository' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #'instance-creation' } +{ #category : 'instance-creation' } IceMemoryRemote class >> name: aString remoteRepository: aRepository branchRepository: aMCBranchRepository [ ^ self new @@ -18,19 +19,19 @@ IceMemoryRemote class >> name: aString remoteRepository: aRepository branchRepos yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceMemoryRemote >> = anIceMemoryRemote [ ^ self species = anIceMemoryRemote species and: [ self remoteRepository = anIceMemoryRemote remoteRepository ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRemote >> branchRepository: aMCDictionaryRepository [ branchRepository := aMCDictionaryRepository ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRemote >> branches [ ^ (self latestCommitsOf: branchRepository) @@ -47,7 +48,7 @@ IceMemoryRemote >> branches [ yourself ] ] -{ #category : #fetching } +{ #category : 'fetching' } IceMemoryRemote >> fetch [ self fetchCommitsThat: [ :each | true ]. @@ -56,13 +57,13 @@ IceMemoryRemote >> fetch [ localRepository postFetch. ] -{ #category : #fetching } +{ #category : 'fetching' } IceMemoryRemote >> fetchBranch: anIceMemoryRemoteBranch [ self fetchCommitsThat: [ :each | each name = anIceMemoryRemoteBranch name ] ] -{ #category : #fetching } +{ #category : 'fetching' } IceMemoryRemote >> fetchCommitsThat: aBlock [ "Really low level. @@ -85,7 +86,7 @@ IceMemoryRemote >> fetchCommitsThat: aBlock [ ifAbsent: [ localRepository codeRepository storeVersion: (remoteCodeRepository versionWithInfo: dependencyInfo) ] ] ] ] -{ #category : #'private-commits' } +{ #category : 'private-commits' } IceMemoryRemote >> latestCommitsOf: aMCDictionaryRepository [ ^ (aMCDictionaryRepository sortedVersionInfos @@ -95,7 +96,7 @@ IceMemoryRemote >> latestCommitsOf: aMCDictionaryRepository [ aMCDictionaryRepository versionWithInfo: versionInfo ] ] -{ #category : #'private-commits' } +{ #category : 'private-commits' } IceMemoryRemote >> latestMCVersionForBranchNamed: aName ifPresent: presentBlock ifAbsent: absentBlock [ | latestVersionInfo latestVersion branchCommits | @@ -110,7 +111,7 @@ IceMemoryRemote >> latestMCVersionForBranchNamed: aName ifPresent: presentBlock presentBlock value: latestVersion ] -{ #category : #printing } +{ #category : 'printing' } IceMemoryRemote >> printOn: aStream [ aStream @@ -120,7 +121,7 @@ IceMemoryRemote >> printOn: aStream [ nextPutAll: ')' ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRemote >> remoteBranchNamed: aName ifPresent: presentBlock ifAbsent: absentBlock [ ^ self @@ -138,12 +139,12 @@ IceMemoryRemote >> remoteBranchNamed: aName ifPresent: presentBlock ifAbsent: ab ifAbsent: absentBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRemote >> remoteRepository [ ^ remoteRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRemote >> remoteRepository: aRepository [ remoteRepository := aRepository ] diff --git a/Iceberg-Memory/IceMemoryRemoteBranch.class.st b/Iceberg-Memory/IceMemoryRemoteBranch.class.st index 4c78919fc8..e338e9b308 100644 --- a/Iceberg-Memory/IceMemoryRemoteBranch.class.st +++ b/Iceberg-Memory/IceMemoryRemoteBranch.class.st @@ -1,36 +1,37 @@ Class { - #name : #IceMemoryRemoteBranch, - #superclass : #IceRemoteBranch, + #name : 'IceMemoryRemoteBranch', + #superclass : 'IceRemoteBranch', #instVars : [ 'remote', 'commit' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRemoteBranch >> commit [ ^ commit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRemoteBranch >> commit: anIceMemoryCommit [ commit := anIceMemoryCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRemoteBranch >> remote: anIceMemoryRemote [ remote := anIceMemoryRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRemoteBranch >> remoteName [ ^ remote name ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRemoteBranch >> shortname [ ^ name diff --git a/Iceberg-Memory/IceMemoryRepository.class.st b/Iceberg-Memory/IceMemoryRepository.class.st index 579198b7b6..e07eae0d14 100644 --- a/Iceberg-Memory/IceMemoryRepository.class.st +++ b/Iceberg-Memory/IceMemoryRepository.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceMemoryRepository, - #superclass : #IceRepository, + #name : 'IceMemoryRepository', + #superclass : 'IceRepository', #instVars : [ 'branchRepository', 'codeRepository', @@ -9,10 +9,11 @@ Class { 'remoteBranchRepository', 'tagDictionary' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #examples } +{ #category : 'examples' } IceMemoryRepository class >> exampleDetachedHead [ | repository | @@ -22,7 +23,7 @@ IceMemoryRepository class >> exampleDetachedHead [ ^ repository ] -{ #category : #examples } +{ #category : 'examples' } IceMemoryRepository class >> exampleDetachedWorkingCopy [ | repository | @@ -34,7 +35,7 @@ IceMemoryRepository class >> exampleDetachedWorkingCopy [ ^ repository ] -{ #category : #examples } +{ #category : 'examples' } IceMemoryRepository class >> exampleNotLoaded [ | repository | @@ -46,7 +47,7 @@ IceMemoryRepository class >> exampleNotLoaded [ ^ repository ] -{ #category : #examples } +{ #category : 'examples' } IceMemoryRepository class >> exampleUnbornRepository [ | repository | @@ -55,7 +56,7 @@ IceMemoryRepository class >> exampleUnbornRepository [ ^ repository ] -{ #category : #examples } +{ #category : 'examples' } IceMemoryRepository class >> exampleWithChanges [ | repository anotherPackageName | @@ -70,7 +71,7 @@ IceMemoryRepository class >> exampleWithChanges [ ^ repository ] -{ #category : #examples } +{ #category : 'examples' } IceMemoryRepository class >> exampleWithNoChanges [ | repository | @@ -80,7 +81,7 @@ IceMemoryRepository class >> exampleWithNoChanges [ ^ repository ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMemoryRepository class >> new [ | newRepository | @@ -91,7 +92,7 @@ IceMemoryRepository class >> new [ ^ newRepository ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRepository >> allBranches [ ^ self latestMCCommits collect: [ :latestVersion | @@ -106,14 +107,14 @@ IceMemoryRepository >> allBranches [ yourself ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRepository >> branch [ head validateIsBranch. ^ head ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRepository >> branchNamed: aName ifPresent: presentBlock ifAbsent: absentBlock [ ^ self @@ -131,23 +132,23 @@ IceMemoryRepository >> branchNamed: aName ifPresent: presentBlock ifAbsent: abse inBranchMCRepository: branchRepository ] -{ #category : #'private-accessing' } +{ #category : 'private-accessing' } IceMemoryRepository >> branchRepository [ ^ branchRepository ] -{ #category : #'API-registry' } +{ #category : 'API-registry' } IceMemoryRepository >> checkForRegistryConflicts [ "Nothing. I never create registry conflicts" ] -{ #category : #'private-accessing' } +{ #category : 'private-accessing' } IceMemoryRepository >> codeRepository [ ^ codeRepository ] -{ #category : #'private-commits' } +{ #category : 'private-commits' } IceMemoryRepository >> commitPackage: aMCPackage author: aString ancestors: ancestors dependencies: dependencies inInternalRepository: aRepository [ ^ self @@ -159,7 +160,7 @@ IceMemoryRepository >> commitPackage: aMCPackage author: aString ancestors: ance inInternalRepository: aRepository ] -{ #category : #'private-commits' } +{ #category : 'private-commits' } IceMemoryRepository >> commitPackage: aMCPackage author: authorString message: messageString ancestors: ancestors dependencies: dependencies inInternalRepository: aRepository [ | newCommit | @@ -179,14 +180,14 @@ IceMemoryRepository >> commitPackage: aMCPackage author: authorString message: m ^ newCommit ] -{ #category : #TOMOVE } +{ #category : 'TOMOVE' } IceMemoryRepository >> computeLoadedVersionOf: anIceSavedPackage [ ^ IceSavedPackageVersion fromCommit: head commit package: anIceSavedPackage ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRepository >> createBranch: branchName inCommit: aCommit [ | newBranchCommit iceCommit | @@ -217,7 +218,7 @@ IceMemoryRepository >> createBranch: branchName inCommit: aCommit [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceMemoryRepository >> hasBranchNamed: aString [ "This could be optimized at the cost of complicating a bit the code. @@ -226,19 +227,19 @@ IceMemoryRepository >> hasBranchNamed: aString [ [ self branchNamed: aString. ^ true ] on: IceBranchNotFound do: [ ^ false ] ] -{ #category : #'API-tags' } +{ #category : 'API-tags' } IceMemoryRepository >> hasTagNamed: aString [ ^ tagDictionary includesKey: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRepository >> head [ ^ head ] -{ #category : #initialization } +{ #category : 'initialization' } IceMemoryRepository >> initialize [ super initialize. @@ -246,7 +247,7 @@ IceMemoryRepository >> initialize [ remotes := Dictionary new ] -{ #category : #'private-initialize-release' } +{ #category : 'private-initialize-release' } IceMemoryRepository >> initializeWithBranchRepository: aRepository initializeWithCodeRepository: anotherRepository [ branchRepository := aRepository. @@ -254,19 +255,19 @@ IceMemoryRepository >> initializeWithBranchRepository: aRepository initializeWit self setHead: (IceMemoryUnbornBranch inRepository: self named: 'master'). ] -{ #category : #'private-monticello' } +{ #category : 'private-monticello' } IceMemoryRepository >> internalStoreVersion: aMCVersion [ codeRepository storeVersion: aMCVersion ] -{ #category : #TOMOVE } +{ #category : 'TOMOVE' } IceMemoryRepository >> isPackageExported: anIceSavedPackage [ ^ head commit packageNames includes: anIceSavedPackage packageName ] -{ #category : #'private-commits' } +{ #category : 'private-commits' } IceMemoryRepository >> latestCommitsOf: aRepository [ self halt. ^ (aRepository sortedVersionInfos @@ -276,7 +277,7 @@ self halt. aRepository versionWithInfo: versionInfo ] ] -{ #category : #'private-commits' } +{ #category : 'private-commits' } IceMemoryRepository >> latestMCCommits [ ^ (branchRepository sortedVersionInfos @@ -286,7 +287,7 @@ IceMemoryRepository >> latestMCCommits [ branchRepository versionWithInfo: versionInfo ] ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRepository >> latestMCVersionForBranchNamed: aName ifPresent: presentBlock ifAbsent: absentBlock inBranchMCRepository: aBranchMCRepository [ | latestVersionInfo latestVersion branchCommits | @@ -301,7 +302,7 @@ IceMemoryRepository >> latestMCVersionForBranchNamed: aName ifPresent: presentBl presentBlock value: latestVersion ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRepository >> localBranches [ ^ (self latestCommitsOf: branchRepository) collect: [ :latestVersion | @@ -316,7 +317,7 @@ IceMemoryRepository >> localBranches [ yourself ] ] -{ #category : #TOMOVE } +{ #category : 'TOMOVE' } IceMemoryRepository >> mcVersionFor: iceVersion [ | branchCommit dependencyCommitInfo | @@ -332,7 +333,7 @@ IceMemoryRepository >> mcVersionFor: iceVersion [ ^ codeRepository versionWithInfo: dependencyCommitInfo ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRepository >> newBranchNamed: aString commit: aCommit [ ^ IceMemoryLocalBranch new @@ -342,62 +343,62 @@ IceMemoryRepository >> newBranchNamed: aString commit: aCommit [ yourself ] -{ #category : #commits } +{ #category : 'commits' } IceMemoryRepository >> newCommitWalk [ ^ IceMemoryCommitWalk forRepository: self ] -{ #category : #'private-changes' } +{ #category : 'private-changes' } IceMemoryRepository >> newIndex [ ^ IceMemoryIndex on: self ] -{ #category : #'API-commits' } +{ #category : 'API-commits' } IceMemoryRepository >> newNoCommit [ ^ IceMemoryNoCommit repository: self ] -{ #category : #'API-project' } +{ #category : 'API-project' } IceMemoryRepository >> newProjectFromCommit: aCommit [ ^ IceMemoryProject onRepository: self ] -{ #category : #'API-project' } +{ #category : 'API-project' } IceMemoryRepository >> newUnbornProject [ ^ IceMemoryProject onRepository: self commitish: workingCopy referenceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRepository >> origin [ ^ self remoteNamed: 'origin' ] -{ #category : #'private-tags' } +{ #category : 'private-tags' } IceMemoryRepository >> peelTag: anIceTag [ ^ tagDictionary at: anIceTag name ] -{ #category : #printing } +{ #category : 'printing' } IceMemoryRepository >> printOn: aStream [ aStream nextPutAll: 'an'; nextPutAll: self class name ] -{ #category : #remotes } +{ #category : 'remotes' } IceMemoryRepository >> remoteAt: aString put: aRemote [ remotes at: aString put: aRemote ] -{ #category : #'remote-branches' } +{ #category : 'remote-branches' } IceMemoryRepository >> remoteBranchNamed: aName ifPresent: presentBlock ifAbsent: absentBlock [ self halt. @@ -416,74 +417,74 @@ IceMemoryRepository >> remoteBranchNamed: aName ifPresent: presentBlock ifAbsent inBranchMCRepository: remoteBranchRepository ] -{ #category : #'private-accessing' } +{ #category : 'private-accessing' } IceMemoryRepository >> remoteBranchRepository [ self halt. ^ remoteBranchRepository ] -{ #category : #'initialize-release' } +{ #category : 'initialize-release' } IceMemoryRepository >> remoteBranchRepository: aMCRepository [ self halt. remoteBranchRepository := aMCRepository ] -{ #category : #remotes } +{ #category : 'remotes' } IceMemoryRepository >> remoteNamed: aString ifAbsent: aBlockClosure [ ^ remotes at: aString ifAbsent: aBlockClosure ] -{ #category : #'remote-branches' } +{ #category : 'remote-branches' } IceMemoryRepository >> remoteTrackedBranches [ ^ remotes flatCollect: [ :each | each branches ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRepository >> remotes [ ^ remotes values ] -{ #category : #'API-tags' } +{ #category : 'API-tags' } IceMemoryRepository >> removeTag: aTag [ tagDictionary removeKey: aTag name ] -{ #category : #'private-head' } +{ #category : 'private-head' } IceMemoryRepository >> setHead: aCommitish [ head := aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryRepository >> subdirectory [ "Required for compatibility with some diff utilities that expect a tree" ^ '' ] -{ #category : #'API-accessing' } +{ #category : 'API-accessing' } IceMemoryRepository >> subdirectoryPath [ ^ RelativePath new ] -{ #category : #branches } +{ #category : 'branches' } IceMemoryRepository >> switchToBranchNamed: aString onCommit: aCommit [ head := self newBranchNamed: aString commit: aCommit ] -{ #category : #'API-tags' } +{ #category : 'API-tags' } IceMemoryRepository >> tags [ ^ tagDictionary keys collect: [ :k | IceTag named: k inRepository: self ] ] -{ #category : #'private-tags' } +{ #category : 'private-tags' } IceMemoryRepository >> tagsAt: aString put: anIceMemoryCommit [ tagDictionary at: aString put: anIceMemoryCommit diff --git a/Iceberg-Memory/IceMemoryUnbornBranch.class.st b/Iceberg-Memory/IceMemoryUnbornBranch.class.st index e2013e3567..b7a9dc59d5 100644 --- a/Iceberg-Memory/IceMemoryUnbornBranch.class.st +++ b/Iceberg-Memory/IceMemoryUnbornBranch.class.st @@ -1,13 +1,14 @@ Class { - #name : #IceMemoryUnbornBranch, - #superclass : #IceUnbornBranch, + #name : 'IceMemoryUnbornBranch', + #superclass : 'IceUnbornBranch', #instVars : [ 'name' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #'instance-creation' } +{ #category : 'instance-creation' } IceMemoryUnbornBranch class >> inRepository: anIceMemoryRepository named: aString [ ^ (super inRepository: anIceMemoryRepository) @@ -15,13 +16,13 @@ IceMemoryUnbornBranch class >> inRepository: anIceMemoryRepository named: aStrin yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryUnbornBranch >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceMemoryUnbornBranch >> name: aString [ name := aString diff --git a/Iceberg-Memory/IceRingWorkingCopy.class.st b/Iceberg-Memory/IceRingWorkingCopy.class.st index b1a62346ee..c0571d4cd6 100644 --- a/Iceberg-Memory/IceRingWorkingCopy.class.st +++ b/Iceberg-Memory/IceRingWorkingCopy.class.st @@ -1,20 +1,21 @@ Class { - #name : #IceRingWorkingCopy, - #superclass : #IceWorkingCopy, + #name : 'IceRingWorkingCopy', + #superclass : 'IceWorkingCopy', #instVars : [ 'ringEnvironment' ], - #category : 'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> addClassVariable: aVariableName to: aClassName [ | class | class := ringEnvironment ensureClassNamed: aClassName. class addClassVariable: (RG2ClassVariableDefinition named: aVariableName asSymbol parent: class ). ] -{ #category : #'private-impacting-changes' } +{ #category : 'private-impacting-changes' } IceRingWorkingCopy >> applyDefinition: anIceDefinition inNode: aNode [ | visitor | @@ -22,14 +23,14 @@ IceRingWorkingCopy >> applyDefinition: anIceDefinition inNode: aNode [ aNode accept: visitor. ] -{ #category : #packages } +{ #category : 'packages' } IceRingWorkingCopy >> basicAddPackage: aPackage [ super basicAddPackage: aPackage. ringEnvironment ensurePackageNamed: aPackage name. ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> createClass: className inPackage: packageName [ self @@ -38,7 +39,7 @@ IceRingWorkingCopy >> createClass: className inPackage: packageName [ with: [ :class | class superclass name: 'Object' ] ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> createClass: className inPackage: packageName with: aBlock [ | package class | @@ -52,7 +53,7 @@ IceRingWorkingCopy >> createClass: className inPackage: packageName with: aBlock self markAsDirtyPackageNamed: package name ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> createMethod: source extendingClass: aClassName inPackage: packageName [ | class method package | @@ -68,7 +69,7 @@ IceRingWorkingCopy >> createMethod: source extendingClass: aClassName inPackage: self markAsDirtyPackageNamed: packageName. ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> createMethod: source inClass: aClassName [ | class method | @@ -79,7 +80,7 @@ IceRingWorkingCopy >> createMethod: source inClass: aClassName [ self markAsDirtyPackageNamed: class package name. ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> createMethod: source inClass: aClassName isMeta: aBoolean [ | class method package | @@ -92,7 +93,7 @@ IceRingWorkingCopy >> createMethod: source inClass: aClassName isMeta: aBoolean self markAsDirtyPackageNamed: package name. ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> createMethod: source tagged: tagName extendingClass: aClassName inPackage: packageName [ | class method package | @@ -108,13 +109,13 @@ IceRingWorkingCopy >> createMethod: source tagged: tagName extendingClass: aClas self markAsDirtyPackageNamed: packageName. ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> createTrait: traitName inPackage: packageName [ ^ self createTrait: traitName inPackage: packageName with: [ :aTrait | ] ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> createTrait: traitName inPackage: packageName with: aBlock [ | package class | @@ -128,26 +129,26 @@ IceRingWorkingCopy >> createTrait: traitName inPackage: packageName with: aBlock self markAsDirtyPackageNamed: package name ] -{ #category : #accessing } +{ #category : 'accessing' } IceRingWorkingCopy >> environment [ ^ ringEnvironment ] -{ #category : #initialization } +{ #category : 'initialization' } IceRingWorkingCopy >> initialize [ super initialize. ringEnvironment := RG2Environment new. ] -{ #category : #packages } +{ #category : 'packages' } IceRingWorkingCopy >> isLoadedPackageNamed: aString [ ^ (ringEnvironment ask packageNamed: aString) notNil ] -{ #category : #'private-changes' } +{ #category : 'private-changes' } IceRingWorkingCopy >> loadChangesInWorkingCopy: aTree [ | visitor | @@ -159,7 +160,7 @@ IceRingWorkingCopy >> loadChangesInWorkingCopy: aTree [ ] -{ #category : #'private-monticello' } +{ #category : 'private-monticello' } IceRingWorkingCopy >> loadPackagesNamed: packageNames fromCommit: aCommit [ packageNames do: [ :packageName | | package snapshot | @@ -174,7 +175,7 @@ IceRingWorkingCopy >> loadPackagesNamed: packageNames fromCommit: aCommit [ self referenceCommit: aCommit ] -{ #category : #'private-impacting-changes' } +{ #category : 'private-impacting-changes' } IceRingWorkingCopy >> removeClassNamed: aString [ | class | @@ -185,7 +186,7 @@ IceRingWorkingCopy >> removeClassNamed: aString [ self markAsDirtyPackageNamed: class package name. ] -{ #category : #'private-impacting changes' } +{ #category : 'private-impacting changes' } IceRingWorkingCopy >> removeMethod: anIceMethodDefinition [ self @@ -193,7 +194,7 @@ IceRingWorkingCopy >> removeMethod: anIceMethodDefinition [ fromClass: anIceMethodDefinition ownerName ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> removeMethod: selector extendingClass: aClassName fromPackage: aPackageName [ | method class | @@ -203,7 +204,7 @@ IceRingWorkingCopy >> removeMethod: selector extendingClass: aClassName fromPack self markAsDirtyPackageNamed: aPackageName. ] -{ #category : #helpers } +{ #category : 'helpers' } IceRingWorkingCopy >> removeMethod: selector fromClass: aClassName [ | class method | @@ -213,13 +214,13 @@ IceRingWorkingCopy >> removeMethod: selector fromClass: aClassName [ self markAsDirtyPackageNamed: class package name. ] -{ #category : #actions } +{ #category : 'actions' } IceRingWorkingCopy >> snapshotForPackage: aPackage [ ^ (ringEnvironment ensurePackageNamed: aPackage name) asMCSnapshot. ] -{ #category : #'private-monticello' } +{ #category : 'private-monticello' } IceRingWorkingCopy >> unloadPackage: aPackage [ | package | diff --git a/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st b/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st index 5d17fb68da..188ba5bc1a 100644 --- a/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st +++ b/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st @@ -1,69 +1,70 @@ Class { - #name : #IceRingWorkingCopyChangerVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceRingWorkingCopyChangerVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'workingCopy' ], - #category : #'Iceberg-Memory' + #category : 'Iceberg-Memory', + #package : 'Iceberg-Memory' } -{ #category : #'instance-creation' } +{ #category : 'instance-creation' } IceRingWorkingCopyChangerVisitor class >> on: anIceRingWorkingCopy [ ^ self new workingCopy: anIceRingWorkingCopy; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceRingWorkingCopyChangerVisitor >> environment [ ^ self workingCopy environment ] -{ #category : #accessing } +{ #category : 'accessing' } IceRingWorkingCopyChangerVisitor >> packages [ ^ self workingCopy packages ] -{ #category : #patching } +{ #category : 'patching' } IceRingWorkingCopyChangerVisitor >> removeClass: anIceClassDefinition [ workingCopy removeClassNamed: anIceClassDefinition name ] -{ #category : #operations } +{ #category : 'operations' } IceRingWorkingCopyChangerVisitor >> removeFile: anIceFileDefinition [ (workingCopy repository location resolvePath: anIceFileDefinition path) ensureDelete ] -{ #category : #actions } +{ #category : 'actions' } IceRingWorkingCopyChangerVisitor >> removeFileReferenceInPath: aRelativePath [ (workingCopy fileSystem resolve: aRelativePath) ensureDelete ] -{ #category : #patching } +{ #category : 'patching' } IceRingWorkingCopyChangerVisitor >> removeMethod: anIceMethodDefinition [ workingCopy removeMethod: anIceMethodDefinition selector fromClass: anIceMethodDefinition className. ] -{ #category : #patching } +{ #category : 'patching' } IceRingWorkingCopyChangerVisitor >> removePackage: anIcePackageDefinition [ workingCopy unloadPackage: anIcePackageDefinition ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitAddition: anIceAddition [ anIceAddition definition accept: self. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitClassDefinition: anIceClassDefinition [ | package | @@ -79,7 +80,7 @@ IceRingWorkingCopyChangerVisitor >> visitClassDefinition: anIceClassDefinition [ class instanceVariables: anIceClassDefinition asMCDefinition instVarNames ]. ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitConflictingOperation: anIceConflictingOperation [ anIceConflictingOperation isResolved @@ -88,25 +89,25 @@ IceRingWorkingCopyChangerVisitor >> visitConflictingOperation: anIceConflictingO ^ anIceConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitDirectoryDefinition: anIceDirectoryDefinition [ "Do nothing for a ring working copy." ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitExtensionDefinition: anExtensionDefinition [ workingCopy environment ask behaviorNamed: anExtensionDefinition name ifAbsent: [ self error: 'Not found' ]. ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitFileNode: anIceFileDefinition [ "Nothing, there are no files in the working copy" ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitMethodNode: anIceMethodDefinition [ | isExtensionMethod | @@ -123,51 +124,46 @@ IceRingWorkingCopyChangerVisitor >> visitMethodNode: anIceMethodDefinition [ inClass: anIceMethodDefinition className ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitModification: aModification [ aModification leftDefinition accept: self. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitNoModification: anIceNoModification [ "Nothing with me. Just visit children" self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation chosenOperation accept: self. ] -{ #category : #visiting } -IceRingWorkingCopyChangerVisitor >> visitPackage: anIcePackageDefinition [ - - | visitor | - - anIcePackageDefinition categories do: [ :categoryName | - self workingCopy packages - detect: [ :package | categoryName beginsWith: package name ] - ifFound: [ :package | - (self environment ensurePackageNamed: package name) - addClassTag: categoryName ] - ifNone: [ self environment ensurePackageNamed: categoryName ] ]. - +{ #category : 'visiting' } +IceRingWorkingCopyChangerVisitor >> visitPackage: anIcePackageDefinition [ + + | visitor package | + package := self environment ensurePackageNamed: anIcePackageDefinition packageName. + + anIcePackageDefinition tagNames do: [ :tagName | package addClassTag: tagName ]. + visitor := IceRingWorkingCopyChangerVisitor on: self workingCopy. - currentNode childrenDo: [ :each | each accept: visitor ] + currentNode childrenDo: [ :each | each accept: visitor ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitRemoval: anIceRemoval [ anIceRemoval definition removeFrom: self. ] -{ #category : #visiting } +{ #category : 'visiting' } IceRingWorkingCopyChangerVisitor >> visitTraitDefinition: anIceTraitDefinition [ |package| @@ -192,13 +188,13 @@ IceRingWorkingCopyChangerVisitor >> visitTraitDefinition: anIceTraitDefinition [ transformations do: [ :each | composition addTransformation: each ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRingWorkingCopyChangerVisitor >> workingCopy [ ^ workingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceRingWorkingCopyChangerVisitor >> workingCopy: anIceRingWorkingCopy [ workingCopy := anIceRingWorkingCopy ] diff --git a/Iceberg-Memory/package.st b/Iceberg-Memory/package.st index f98bc5bba9..c0f6cda66d 100644 --- a/Iceberg-Memory/package.st +++ b/Iceberg-Memory/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Memory' } +Package { #name : 'Iceberg-Memory' } From d5ae7a067abb07907bffa02f98ca74d73376aa4b Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 15 Sep 2023 22:08:22 +0200 Subject: [PATCH 31/83] Remove test of removed method --- .../IceConvertFormatActionTest.class.st | 47 ++++++------------- Iceberg-Plugin-Migration-Tests/package.st | 2 +- 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/Iceberg-Plugin-Migration-Tests/IceConvertFormatActionTest.class.st b/Iceberg-Plugin-Migration-Tests/IceConvertFormatActionTest.class.st index 8fa0a73263..de5a900d85 100644 --- a/Iceberg-Plugin-Migration-Tests/IceConvertFormatActionTest.class.st +++ b/Iceberg-Plugin-Migration-Tests/IceConvertFormatActionTest.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceConvertFormatActionTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Plugin-Migration-Tests' + #name : 'IceConvertFormatActionTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Plugin-Migration-Tests', + #package : 'Iceberg-Plugin-Migration-Tests' } -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> commitProjectFile [ | change1 change2 | @@ -24,12 +25,12 @@ IceConvertFormatActionTest >> commitProjectFile [ self repository commitWithMessage: 'Add project file'. ] -{ #category : #running } +{ #category : 'running' } IceConvertFormatActionTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertEmptyRepositoryToFiletree [ self commitProjectFile. @@ -46,7 +47,7 @@ IceConvertFormatActionTest >> testConvertEmptyRepositoryToFiletree [ equals: IceLibgitFiletreeWriter ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertEmptyRepositoryToTonel [ self commitProjectFile. @@ -63,7 +64,7 @@ IceConvertFormatActionTest >> testConvertEmptyRepositoryToTonel [ equals: IceLibgitTonelWriter ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertToFiletree [ self repository properties fileFormat: IceLibgitTonelWriter. self repository workingCopy addPackageNamed: self packageName1. @@ -89,7 +90,7 @@ IceConvertFormatActionTest >> testConvertToFiletree [ self assert: (self repository headCommit packageNames includes: self packageName1) ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertToFiletreeDoesNotCorruptPropertiesFile [ self repository properties fileFormat: IceLibgitTonelWriter. self repository workingCopy addPackageNamed: self packageName1. @@ -116,7 +117,7 @@ IceConvertFormatActionTest >> testConvertToFiletreeDoesNotCorruptPropertiesFile }') ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertToTonel [ self repository properties fileFormat: IceLibgitFiletreeWriter. self repository workingCopy addPackageNamed: self packageName1. @@ -142,7 +143,7 @@ IceConvertFormatActionTest >> testConvertToTonel [ self assert: (self repository headCommit packageNames includes: self packageName1) ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertToTonelDoesNotCorruptPropertiesFile [ self repository properties fileFormat: IceLibgitFiletreeWriter. self repository workingCopy addPackageNamed: self packageName1. @@ -169,7 +170,7 @@ IceConvertFormatActionTest >> testConvertToTonelDoesNotCorruptPropertiesFile [ }') ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertToTonelRemovesFiletreeMetadataFile [ self repository properties fileFormat: IceLibgitFiletreeWriter. self repository workingCopy addPackageNamed: self packageName1. @@ -199,7 +200,7 @@ IceConvertFormatActionTest >> testConvertToTonelRemovesFiletreeMetadataFile [ self deny: (self repository subdirectoryReference / '.filetree') exists ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertToTonelUsesCorrectPackageName [ self repository properties fileFormat: IceLibgitFiletreeWriter. @@ -231,7 +232,7 @@ IceConvertFormatActionTest >> testConvertToTonelUsesCorrectPackageName [ self deny: (self repository headCommit packageNames includes: (self packageName1, '-Tagged')) ] -{ #category : #tests } +{ #category : 'tests' } IceConvertFormatActionTest >> testConvertToTonelUsesCorrectPackageNameWhenMethodExtensions [ self repository properties fileFormat: IceLibgitFiletreeWriter. @@ -263,21 +264,3 @@ IceConvertFormatActionTest >> testConvertToTonelUsesCorrectPackageNameWhenMethod self assert: (self repository headCommit packageNames includes: self packageName1). self deny: (self repository headCommit packageNames includes: (self packageName1, '-Tagged')) ] - -{ #category : #tests } -IceConvertFormatActionTest >> testObtainCommonCategoryFrom [ - | action categories | - - action := IceConvertFormatAction new. - categories := #('Seaside-Tests-Component-Stubs' 'Seaside-Tests-Component-Base'). - - self - assert: (action obtainCommonCategory: 'Seaside-Tests-Component-Stubs' from: categories) - equals: 'Seaside-Tests-Component'. - self - assert: (action obtainCommonCategory: 'Seaside-Tests' from: categories) - equals: 'Seaside-Tests'. - self - assert: (action obtainCommonCategory: 'NONE' from: categories) - equals: '' -] diff --git a/Iceberg-Plugin-Migration-Tests/package.st b/Iceberg-Plugin-Migration-Tests/package.st index 14e0f06dc6..70f8560e84 100644 --- a/Iceberg-Plugin-Migration-Tests/package.st +++ b/Iceberg-Plugin-Migration-Tests/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-Migration-Tests' } +Package { #name : 'Iceberg-Plugin-Migration-Tests' } From bc11b6b027f13a4ca768d0f80c3f25906b0f99fa Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Sat, 16 Sep 2023 16:21:32 +0200 Subject: [PATCH 32/83] Remove dead code --- .../CannotIdentifyVersionForCommit.class.st | 8 +- Iceberg/DateAndTime.extension.st | 6 +- Iceberg/FileSystemDirectoryEntry.extension.st | 4 +- Iceberg/IceAbstractCommitWalk.class.st | 52 ++-- Iceberg/IceAbstractCredentials.class.st | 26 +- Iceberg/IceAbstractNode.class.st | 54 ++-- Iceberg/IceAbstractProject.class.st | 46 ++-- Iceberg/IceAddition.class.st | 28 +- Iceberg/IceAnnouncement.class.st | 10 +- Iceberg/IceAnnouncer.class.st | 22 +- Iceberg/IceAsDependencyVisitor.class.st | 22 +- ...eAttachedSingleVersionWorkingCopy.class.st | 26 +- Iceberg/IceAuthenticationError.class.st | 14 +- Iceberg/IceBackendWriterAdapter.class.st | 18 +- Iceberg/IceBasicProject.class.st | 64 ++--- Iceberg/IceBasicProjectReader.class.st | 12 +- Iceberg/IceBranch.class.st | 50 ++-- Iceberg/IceBranchAlreadyExists.class.st | 12 +- Iceberg/IceChange.class.st | 12 +- Iceberg/IceChangeImporter.class.st | 28 +- Iceberg/IceChangeSetChanged.class.st | 8 +- Iceberg/IceCheckoutAllPackages.class.st | 12 +- .../IceCheckoutAlreadyLoadedPackages.class.st | 14 +- Iceberg/IceCheckoutConflictError.class.st | 10 +- Iceberg/IceCheckoutDoNotLoadPackages.class.st | 12 +- Iceberg/IceCheckoutSelectedPackages.class.st | 16 +- Iceberg/IceCheckoutStrategy.class.st | 30 ++- Iceberg/IceCherrypicker.class.st | 54 ++-- Iceberg/IceCherrypickerDiffPruner.class.st | 22 +- ...ickerInitialDependenciesCollector.class.st | 30 ++- Iceberg/IceClassDefinition.class.st | 20 +- Iceberg/IceClassDependency.class.st | 24 +- Iceberg/IceCodeDefinition.class.st | 22 +- Iceberg/IceCommit.class.st | 88 +++---- Iceberg/IceCommited.class.st | 8 +- Iceberg/IceCommitish.class.st | 90 +++---- Iceberg/IceConflictingOperation.class.st | 42 +-- Iceberg/IceCredentialStore.class.st | 52 ++-- Iceberg/IceCredentialsProvider.class.st | 58 +++-- Iceberg/IceCritiquesVisitor.class.st | 36 +-- Iceberg/IceCypressPropertiesChange.class.st | 12 +- Iceberg/IceDefinedDependency.class.st | 24 +- Iceberg/IceDefinition.class.st | 46 ++-- Iceberg/IceDependency.class.st | 16 +- Iceberg/IceDependencyEnvironment.class.st | 26 +- Iceberg/IceDiff.class.st | 70 ++--- Iceberg/IceDirectoryDefinition.class.st | 14 +- Iceberg/IceDuplicatedRepository.class.st | 8 +- Iceberg/IceEmptyMerge.class.st | 12 +- Iceberg/IceEmptyNode.class.st | 40 +-- Iceberg/IceEmptyWorkingCopy.class.st | 16 +- Iceberg/IceError.class.st | 10 +- Iceberg/IceErrorVisitor.class.st | 34 +-- Iceberg/IceExtendedClassDependency.class.st | 22 +- Iceberg/IceExtensionDefinition.class.st | 32 +-- Iceberg/IceExternalJob.class.st | 32 +-- Iceberg/IceFileDefinition.class.st | 32 +-- Iceberg/IceFileSystemDefinition.class.st | 20 +- Iceberg/IceGenericError.class.st | 10 +- Iceberg/IceGitCheckoutProgress.class.st | 14 +- Iceberg/IceGitTransferProgress.class.st | 14 +- .../IceGitUsernameOrEmailNotFound.class.st | 14 +- Iceberg/IceHistory.class.st | 28 +- Iceberg/IceHistoryCommit.class.st | 40 +-- Iceberg/IceHttpsProtocol.class.st | 12 +- Iceberg/IceImageChange.class.st | 18 +- Iceberg/IceInMergeWorkingCopy.class.st | 18 +- Iceberg/IceIndex.class.st | 26 +- Iceberg/IceInvalidProject.class.st | 12 +- Iceberg/IceInvalidProjectReader.class.st | 14 +- Iceberg/IceLocalBranch.class.st | 58 +++-- Iceberg/IceLocalRepositoryMissing.class.st | 14 +- Iceberg/IceLog.class.st | 32 +-- Iceberg/IceLogVersion.class.st | 42 +-- Iceberg/IceMCDefinitionImporter.class.st | 30 ++- Iceberg/IceMCPackageImporter.class.st | 20 +- Iceberg/IceMCVersionInfo.class.st | 32 +-- Iceberg/IceMerge.class.st | 62 ++--- Iceberg/IceMergeAborted.class.st | 10 +- Iceberg/IceMergeResolutionRequest.class.st | 14 +- Iceberg/IceMergeToChangeTreeVisitor.class.st | 22 +- ...ceMetacelloDuplicatedNotification.class.st | 24 +- .../IceMetacelloProjectRegistration.class.st | 14 +- .../IceMetacelloRepositoryAdapter.class.st | 60 ++--- Iceberg/IceMetaclassDependency.class.st | 16 +- Iceberg/IceMethodContainerDefinition.class.st | 28 +- Iceberg/IceMethodDefinition.class.st | 54 ++-- Iceberg/IceMethodDependency.class.st | 28 +- Iceberg/IceMissingRepositoryEntry.class.st | 18 +- Iceberg/IceModification.class.st | 42 +-- Iceberg/IceNoCommit.class.st | 52 ++-- Iceberg/IceNoModification.class.st | 28 +- Iceberg/IceNoRemote.class.st | 8 +- Iceberg/IceNoRemoteBranch.class.st | 8 +- Iceberg/IceNode.class.st | 116 ++++----- Iceberg/IceNodeQuery.class.st | 42 +-- Iceberg/IceNonConflictingOperation.class.st | 40 +-- ...NonInteractiveCredentialsProvider.class.st | 14 +- Iceberg/IceNotInBranch.class.st | 8 +- Iceberg/IceNothingToCommit.class.st | 10 +- Iceberg/IceNullCommitWalk.class.st | 12 +- Iceberg/IceOperation.class.st | 66 ++--- Iceberg/IceOperationMerge.class.st | 44 ++-- Iceberg/IcePackage.class.st | 86 ++++--- Iceberg/IcePackageDefinition.class.st | 38 +-- Iceberg/IcePackageDependency.class.st | 20 +- Iceberg/IcePackageLoaded.class.st | 14 +- Iceberg/IcePackageUnloaded.class.st | 8 +- Iceberg/IcePlaintextCredentials.class.st | 28 +- Iceberg/IcePlaintextOtpCredentials.class.st | 12 +- Iceberg/IceProjectChange.class.st | 12 +- Iceberg/IceProjectReader.class.st | 18 +- Iceberg/IceProxyMCVersionInfo.class.st | 38 +-- Iceberg/IcePushTransferProgress.class.st | 16 +- Iceberg/IcePushed.class.st | 8 +- Iceberg/IceRemote.class.st | 66 ++--- Iceberg/IceRemoteAlreadyExistsError.class.st | 14 +- Iceberg/IceRemoteBranch.class.st | 26 +- Iceberg/IceRemoteDesynchronized.class.st | 20 +- Iceberg/IceRemoteNotFoundError.class.st | 12 +- Iceberg/IceRemoteWithOnlyHostname.class.st | 14 +- Iceberg/IceRemoval.class.st | 26 +- Iceberg/IceRepository.class.st | 240 +++++++++--------- Iceberg/IceRepositoryAnnouncement.class.st | 16 +- Iceberg/IceRepositoryCreated.class.st | 8 +- Iceberg/IceRepositoryForgotten.class.st | 8 +- Iceberg/IceRepositoryModified.class.st | 8 +- ...IceRepositoryRegistryAnnouncement.class.st | 10 +- .../IceRepositoryRegistryModified.class.st | 14 +- Iceberg/IceRootDefinition.class.st | 14 +- Iceberg/IceSSHProtocol.class.st | 12 +- Iceberg/IceSavedPackageVersion.class.st | 64 ++--- Iceberg/IceShouldCommitBeforePull.class.st | 12 +- Iceberg/IceSshCredentials.class.st | 46 ++-- Iceberg/IceSystemEventListener.class.st | 24 +- Iceberg/IceTag.class.st | 34 +-- Iceberg/IceTagAlreadyExists.class.st | 14 +- Iceberg/IceTagNotFound.class.st | 10 +- Iceberg/IceTipCommitSettings.class.st | 28 +- Iceberg/IceTokenCredentials.class.st | 28 +- Iceberg/IceTraitDefinition.class.st | 22 +- Iceberg/IceTraitDependency.class.st | 22 +- Iceberg/IceTreeMerger.class.st | 10 +- Iceberg/IceTreeVisitor.class.st | 20 +- Iceberg/IceUnbornBranch.class.st | 62 ++--- Iceberg/IceUnbornProject.class.st | 14 +- Iceberg/IceUnbornProjectReader.class.st | 14 +- Iceberg/IceUndefinedRemote.class.st | 20 +- Iceberg/IceUnknownCommit.class.st | 42 +-- Iceberg/IceUnknownVersionWorkingCopy.class.st | 14 +- Iceberg/IceUpstreamNotConfigured.class.st | 8 +- Iceberg/IceUrlBuilder.class.st | 28 +- Iceberg/IceUrlProtocol.class.st | 14 +- Iceberg/IceVersionDoesNotExist.class.st | 14 +- Iceberg/IceWorkingCopy.class.st | 180 ++++++------- Iceberg/IceWorkingCopyDesyncronized.class.st | 10 +- Iceberg/IceWorkingCopyPatcherVisitor.class.st | 50 ++-- Iceberg/IceWorkingCopyState.class.st | 38 +-- Iceberg/IceWrongUrl.class.st | 8 +- Iceberg/Iceberg.class.st | 48 ++-- Iceberg/LGitCommit.extension.st | 6 +- Iceberg/LGitCredentialsPlaintext.extension.st | 4 +- Iceberg/LGitCredentialsSSH.extension.st | 4 +- Iceberg/LGitDiff.extension.st | 8 +- Iceberg/LGitReturnCodeEnum.extension.st | 4 +- Iceberg/LGitTag.extension.st | 4 +- Iceberg/LGitTreeEntry.extension.st | 8 +- Iceberg/MCAddition.extension.st | 4 +- Iceberg/MCBitbucketRepository.extension.st | 6 +- Iceberg/MCClassDefinition.extension.st | 8 +- Iceberg/MCClassTraitDefinition.extension.st | 6 +- Iceberg/MCDefinition.extension.st | 8 +- .../MCGitBasedNetworkRepository.extension.st | 12 +- Iceberg/MCGitHubRepository.extension.st | 12 +- Iceberg/MCGitlabRepository.extension.st | 6 +- Iceberg/MCMethodDefinition.extension.st | 8 +- Iceberg/MCModification.extension.st | 6 +- Iceberg/MCOrganizationDefinition.extension.st | 15 +- Iceberg/MCPatchOperation.extension.st | 6 +- Iceberg/MCPatcher.extension.st | 4 +- Iceberg/MCPostscriptDefinition.extension.st | 4 +- Iceberg/MCRemoval.extension.st | 4 +- Iceberg/MCRepository.extension.st | 4 +- Iceberg/MCVersion.extension.st | 4 +- Iceberg/MCWorkingCopy.extension.st | 8 +- Iceberg/ManifestIceberg.class.st | 16 +- ...etacelloResolveProjectUpgrade.extension.st | 4 +- Iceberg/RPackage.extension.st | 4 +- Iceberg/RPackageSet.extension.st | 4 +- Iceberg/package.st | 2 +- 190 files changed, 2557 insertions(+), 2256 deletions(-) diff --git a/Iceberg/CannotIdentifyVersionForCommit.class.st b/Iceberg/CannotIdentifyVersionForCommit.class.st index 660634df59..6812be1847 100644 --- a/Iceberg/CannotIdentifyVersionForCommit.class.st +++ b/Iceberg/CannotIdentifyVersionForCommit.class.st @@ -4,7 +4,9 @@ This error is signaled when looking for a version in a commit (and its ancestry) This should not happen if the repository is consistent. " Class { - #name : #CannotIdentifyVersionForCommit, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'CannotIdentifyVersionForCommit', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } diff --git a/Iceberg/DateAndTime.extension.st b/Iceberg/DateAndTime.extension.st index 10804e5f4f..d6b5539b82 100644 --- a/Iceberg/DateAndTime.extension.st +++ b/Iceberg/DateAndTime.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #DateAndTime } +Extension { #name : 'DateAndTime' } -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } DateAndTime >> asLocalStringYMDHM [ ^ self asLocal asStringYMDHM ] -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } DateAndTime >> asStringYMDHM [ ^ String streamContents: [ :aStream | self printYMDOn: aStream. diff --git a/Iceberg/FileSystemDirectoryEntry.extension.st b/Iceberg/FileSystemDirectoryEntry.extension.st index 3b7714e80d..87ca4a1a12 100644 --- a/Iceberg/FileSystemDirectoryEntry.extension.st +++ b/Iceberg/FileSystemDirectoryEntry.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FileSystemDirectoryEntry } +Extension { #name : 'FileSystemDirectoryEntry' } -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } FileSystemDirectoryEntry >> packageName [ ^ self asFileReference basenameWithoutExtension diff --git a/Iceberg/IceAbstractCommitWalk.class.st b/Iceberg/IceAbstractCommitWalk.class.st index 34b061dd8f..a22455ad28 100644 --- a/Iceberg/IceAbstractCommitWalk.class.st +++ b/Iceberg/IceAbstractCommitWalk.class.st @@ -2,33 +2,35 @@ Base class for shared code between different commit walk implementations. " Class { - #name : #IceAbstractCommitWalk, - #superclass : #Object, + #name : 'IceAbstractCommitWalk', + #superclass : 'Object', #instVars : [ 'repository', 'modifyingPackage', 'maxNumber' ], - #category : 'Iceberg-Adapters' + #category : 'Iceberg-Adapters', + #package : 'Iceberg', + #tag : 'Adapters' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceAbstractCommitWalk class >> forRepository: repository [ ^ self new repository: repository; yourself ] -{ #category : #testing } +{ #category : 'testing' } IceAbstractCommitWalk class >> isAbstract [ ^ self == IceAbstractCommitWalk ] -{ #category : #private } +{ #category : 'private' } IceAbstractCommitWalk >> commitFrom: result [ ^ self repository commitFromGitCommit: result ] -{ #category : #walking } +{ #category : 'walking' } IceAbstractCommitWalk >> commits [ | commits | commits := OrderedCollection new. @@ -36,99 +38,99 @@ IceAbstractCommitWalk >> commits [ ^ commits ] -{ #category : #walking } +{ #category : 'walking' } IceAbstractCommitWalk >> commitsDo: aBlock [ self rawResultsDo: [ :result | aBlock value: (self commitFrom: result) ] ] -{ #category : #walking } +{ #category : 'walking' } IceAbstractCommitWalk >> firstCommit [ ^ self commitsDo: [ :commit | ^ commit ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceAbstractCommitWalk >> fromCommit: aCommit [ self subclassResponsibility ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceAbstractCommitWalk >> fromTag: anIceTag [ self subclassResponsibility ] -{ #category : #walking } +{ #category : 'walking' } IceAbstractCommitWalk >> includesCommit: aCommit [ self commitsDo: [ :commit | commit id = aCommit id ifTrue: [ ^ true ]]. ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCommitWalk >> maxNumber [ ^ maxNumber ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCommitWalk >> maxNumber: anObject [ maxNumber := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCommitWalk >> modifyingPackage [ ^ modifyingPackage ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCommitWalk >> modifyingPackage: anObject [ modifyingPackage := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCommitWalk >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCommitWalk >> repository: anObject [ repository := anObject ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceAbstractCommitWalk >> upto: aCommitish [ self uptoCommit: aCommitish commit ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceAbstractCommitWalk >> uptoBranch: anIceBranch [ self uptoCommit: anIceBranch lastCommit ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceAbstractCommitWalk >> uptoBranches: branches [ ^ branches do: [ :branch | self uptoBranch: branch ] ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceAbstractCommitWalk >> uptoCommits: commits [ commits do: [ :commit | self uptoCommit: commit ] ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceAbstractCommitWalk >> uptoVersion: version [ version hideYourselfFromCommitWalk: self ] -{ #category : #walking } +{ #category : 'walking' } IceAbstractCommitWalk >> versionsFor: package [ self modifyingPackage: package. ^ self commits collect: [ :commit | commit versionFor: package ] ] -{ #category : #walking } +{ #category : 'walking' } IceAbstractCommitWalk >> versionsFor: package detect: selectBlock ifNone: ifNoneBlock [ self modifyingPackage: package. self commitsDo: [ :commit | diff --git a/Iceberg/IceAbstractCredentials.class.st b/Iceberg/IceAbstractCredentials.class.st index 849893a2a6..1f2cc9608a 100644 --- a/Iceberg/IceAbstractCredentials.class.st +++ b/Iceberg/IceAbstractCredentials.class.st @@ -2,57 +2,59 @@ I represent the common behavior of all iceberg credentials. " Class { - #name : #IceAbstractCredentials, - #superclass : #Object, + #name : 'IceAbstractCredentials', + #superclass : 'Object', #instVars : [ 'host' ], - #category : #'Iceberg-Security' + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #testing } +{ #category : 'testing' } IceAbstractCredentials class >> isAbstract [ ^ self == IceAbstractCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCredentials >> description [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCredentials >> host [ ^ host ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCredentials >> host: anObject [ host := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCredentials >> hostDescription [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceAbstractCredentials >> isDefault [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCredentials >> isPresent [ ^ self subclassResponsibility ] -{ #category : #'API - storing' } +{ #category : 'API - storing' } IceAbstractCredentials >> storeInto: aCredentialStore forHostname: aHost [ host := aHost. aCredentialStore storePlaintextCredential: self forHostname: aHost ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractCredentials >> type [ ^ self subclassResponsibility ] diff --git a/Iceberg/IceAbstractNode.class.st b/Iceberg/IceAbstractNode.class.st index 29cb839bf4..81c46749b8 100644 --- a/Iceberg/IceAbstractNode.class.st +++ b/Iceberg/IceAbstractNode.class.st @@ -2,30 +2,32 @@ My subclasses implement a tree used for diffing and merging. " Class { - #name : #IceAbstractNode, - #superclass : #Object, - #category : #'Iceberg-Changes' + #name : 'IceAbstractNode', + #superclass : 'Object', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #testing } +{ #category : 'testing' } IceAbstractNode class >> isAbstract [ ^ self == IceAbstractNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> accept: aVisitor [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> addTo: anotherNode [ ^ self subclassResponsibility ] -{ #category : #'accessing - children' } +{ #category : 'accessing - children' } IceAbstractNode >> allChildren [ | children | @@ -34,7 +36,7 @@ IceAbstractNode >> allChildren [ ^ children ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> allChildrenDo: aBlockClosure [ "Evaluate aBlockClosure with my direct and indirect children." @@ -43,113 +45,113 @@ IceAbstractNode >> allChildrenDo: aBlockClosure [ each allChildrenDo: aBlockClosure ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> anySatisfy: aBlockClosure [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> children [ "Answer the (direct) children of this node." ^ self subclassResponsibility ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceAbstractNode >> childrenDo: aBlockClosure [ self children do: aBlockClosure ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> collect: aBlockClosure [ "Collect the results of aBlockClosure on my value and the values of my children." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> collectWithPath: aBlockClosure [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> do: aBlockClosure [ "Evaluate aBlockClosure on my value and the values of my children." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> firstNodeSuchThat: conditionBlock [ ^ self firstNodeSuchThat: conditionBlock ifNone: [ NotFound signalFor: conditionBlock ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> firstNodeSuchThat: foundBlock ifNone: noneBlock [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> hasChanges [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> includesKey: anObject [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> isEmpty [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> isEmptyNode [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> mergeWith: anotherNode onLeft: leftBlock onRight: rightBlock onMerge: mergeBlock [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> notEmpty [ ^ self isEmpty not ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> path [ "Answer a RelativePath to the top parent." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> resolve: aRelativePath ifPresent: presentBlock ifAbsent: absentBlock [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractNode >> select: aBlockClosure [ ^ self subclassResponsibility ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceAbstractNode >> withAllChildrenDo: aBlockClosure [ aBlockClosure value: self. diff --git a/Iceberg/IceAbstractProject.class.st b/Iceberg/IceAbstractProject.class.st index 2b5c88bece..65433921a5 100644 --- a/Iceberg/IceAbstractProject.class.st +++ b/Iceberg/IceAbstractProject.class.st @@ -2,21 +2,23 @@ Abstract superclass for projects " Class { - #name : #IceAbstractProject, - #superclass : #Object, + #name : 'IceAbstractProject', + #superclass : 'Object', #instVars : [ 'commitish' ], - #category : #'Iceberg-Project' + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #testing } +{ #category : 'testing' } IceAbstractProject class >> isAbstract [ ^ self == IceAbstractProject ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceAbstractProject class >> onCommitish: anIceCommitish [ ^ self new @@ -24,13 +26,13 @@ IceAbstractProject class >> onCommitish: anIceCommitish [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceAbstractProject class >> onRepository: aRepository [ ^ self onCommitish: aRepository workingCopy ] -{ #category : #comparing } +{ #category : 'comparing' } IceAbstractProject >> = anotherProject [ self species = anotherProject species ifFalse: [ ^ false ]. @@ -39,38 +41,38 @@ IceAbstractProject >> = anotherProject [ ^ true. ] -{ #category : #writing } +{ #category : 'writing' } IceAbstractProject >> addToChangeBuilder: anIceChangeImporter [ "Nothing by default" ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractProject >> commitish: anIceCommitish [ commitish := anIceCommitish ] -{ #category : #testing } +{ #category : 'testing' } IceAbstractProject >> isDirty [ "Compare against the project extracted from the HEAD commit. If the commit has no project, it will be an unborn project." ^ self repository workingCopy referenceCommit project ~= self readOnlyVersion ] -{ #category : #testing } +{ #category : 'testing' } IceAbstractProject >> isInvalid [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceAbstractProject >> isUnborn [ ^ false ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceAbstractProject >> packages [ self repository handleLibgitError: [ | writerClass sourceFileReference | @@ -85,7 +87,7 @@ IceAbstractProject >> packages [ IcePackage named: packageName repository: self repository ] ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceAbstractProject >> packagesFrom: aCommit [ self repository handleLibgitError: [ | writerClass sourceFileReference | @@ -100,31 +102,31 @@ IceAbstractProject >> packagesFrom: aCommit [ IcePackage named: packageName repository: self repository ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractProject >> properties [ ^ Dictionary new ] -{ #category : #testing } +{ #category : 'testing' } IceAbstractProject >> readOnlyVersion [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractProject >> repository [ ^ commitish repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractProject >> sourceDirectory [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractProject >> sourceDirectoryPath [ "API compatible both with Pharo6 and Pharo7. @@ -135,19 +137,19 @@ IceAbstractProject >> sourceDirectoryPath [ ^ (RelativePath withAll: (RelativePath canonicalizeElements: ($/ split: self sourceDirectory))) ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractProject >> sourceDirectoryReference [ ^ commitish fileSystem resolve: self sourceDirectoryPath ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractProject >> tags [ ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractProject >> writerClass [ ^ self repository properties writerClass diff --git a/Iceberg/IceAddition.class.st b/Iceberg/IceAddition.class.st index 4593b45ee0..318d617bf7 100644 --- a/Iceberg/IceAddition.class.st +++ b/Iceberg/IceAddition.class.st @@ -2,36 +2,38 @@ I am an addition in a tree. I contain the definition I'm adding. I know what is the icon for addition and how to calculate a conflict with other operations. " Class { - #name : #IceAddition, - #superclass : #IceOperation, - #category : 'Iceberg-Changes' + #name : 'IceAddition', + #superclass : 'IceOperation', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceAddition >> accept: aVisitor [ ^ aVisitor visitAddition: self ] -{ #category : #operations } +{ #category : 'operations' } IceAddition >> inverse [ ^ IceRemoval definition: definition ] -{ #category : #testing } +{ #category : 'testing' } IceAddition >> isAddition [ ^ true ] -{ #category : #contents } +{ #category : 'contents' } IceAddition >> leftContents [ ^ definition contents ] -{ #category : #merging } +{ #category : 'merging' } IceAddition >> mergeWithLeftAddition: anIceAddition [ "If the addition is the same, I can just keep any of them." @@ -41,7 +43,7 @@ IceAddition >> mergeWithLeftAddition: anIceAddition [ ^ IceConflictingOperation left: anIceAddition right: self ] -{ #category : #merging } +{ #category : 'merging' } IceAddition >> mergeWithLeftModification: anIceModification [ "This should not happen. If I represent an addition of a node, that means that the original definition did not exist on the base version. @@ -49,7 +51,7 @@ IceAddition >> mergeWithLeftModification: anIceModification [ self shouldNotImplement ] -{ #category : #merging } +{ #category : 'merging' } IceAddition >> mergeWithLeftNoOperation: anIceNoModification [ "This should not happen. If I represent an addition of a node, that means that the original definition did not exist on the base version. @@ -57,7 +59,7 @@ IceAddition >> mergeWithLeftNoOperation: anIceNoModification [ self shouldNotImplement ] -{ #category : #merging } +{ #category : 'merging' } IceAddition >> mergeWithLeftRemoval: anIceRemoval [ "This should not happen. If I represent an addition of a node, that means that the original definition did not exist on the base version. @@ -65,13 +67,13 @@ IceAddition >> mergeWithLeftRemoval: anIceRemoval [ self shouldNotImplement ] -{ #category : #merging } +{ #category : 'merging' } IceAddition >> mergeWithOperation: anOperation [ ^ anOperation mergeWithLeftAddition: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceAddition >> rightContents [ ^ '' diff --git a/Iceberg/IceAnnouncement.class.st b/Iceberg/IceAnnouncement.class.st index eb5a64b433..60edaa51af 100644 --- a/Iceberg/IceAnnouncement.class.st +++ b/Iceberg/IceAnnouncement.class.st @@ -2,12 +2,14 @@ I'm a generic announcement in the iceberg context. " Class { - #name : #IceAnnouncement, - #superclass : #Announcement, - #category : 'Iceberg-Announcements' + #name : 'IceAnnouncement', + #superclass : 'Announcement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } -{ #category : #testing } +{ #category : 'testing' } IceAnnouncement >> appliesToRepository: aRepository [ ^ false ] diff --git a/Iceberg/IceAnnouncer.class.st b/Iceberg/IceAnnouncer.class.st index c8b23a20d5..4ee406e100 100644 --- a/Iceberg/IceAnnouncer.class.st +++ b/Iceberg/IceAnnouncer.class.st @@ -6,23 +6,25 @@ In current implementation of Iceberg, I will be used mainly for the convenience " Class { - #name : #IceAnnouncer, - #superclass : #Announcer, + #name : 'IceAnnouncer', + #superclass : 'Announcer', #instVars : [ 'suspendedConditions', 'suspendAll' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #announce } +{ #category : 'announce' } IceAnnouncer >> announce: anAnnouncement [ (self isAnnouncementSuspended: anAnnouncement) ifTrue: [ ^ anAnnouncement asAnnouncement ]. ^ super announce: anAnnouncement ] -{ #category : #initialization } +{ #category : 'initialization' } IceAnnouncer >> initialize [ super initialize. @@ -30,7 +32,7 @@ IceAnnouncer >> initialize [ suspendedConditions := OrderedCollection new: 5 ] -{ #category : #testing } +{ #category : 'testing' } IceAnnouncer >> isAnnouncementSuspended: anAnnouncement [ suspendAll ifTrue: [ ^ true ]. @@ -39,13 +41,13 @@ IceAnnouncer >> isAnnouncementSuspended: anAnnouncement [ each value: anAnnouncement ] ] -{ #category : #testing } +{ #category : 'testing' } IceAnnouncer >> isSuspended [ ^ suspendAll ] -{ #category : #suspending } +{ #category : 'suspending' } IceAnnouncer >> suspendAllForRepository: aRepository while: aBlock [ ^ self @@ -53,14 +55,14 @@ IceAnnouncer >> suspendAllForRepository: aRepository while: aBlock [ while: aBlock ] -{ #category : #suspending } +{ #category : 'suspending' } IceAnnouncer >> suspendAllMatching: matchBlock while: aBlock [ suspendedConditions add: matchBlock. aBlock ensure: [ suspendedConditions remove: matchBlock ] ] -{ #category : #suspending } +{ #category : 'suspending' } IceAnnouncer >> suspendAllWhile: aBlock [ | previousSuspensionState | diff --git a/Iceberg/IceAsDependencyVisitor.class.st b/Iceberg/IceAsDependencyVisitor.class.st index fd6deace79..b26c4dcd38 100644 --- a/Iceberg/IceAsDependencyVisitor.class.st +++ b/Iceberg/IceAsDependencyVisitor.class.st @@ -1,18 +1,20 @@ Class { - #name : #IceAsDependencyVisitor, - #superclass : #Object, + #name : 'IceAsDependencyVisitor', + #superclass : 'Object', #instVars : [ 'cherrypicker' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #accessing } +{ #category : 'accessing' } IceAsDependencyVisitor >> cherrypicker: anIceCherrypicker [ cherrypicker := anIceCherrypicker ] -{ #category : #visiting } +{ #category : 'visiting' } IceAsDependencyVisitor >> visitClassDefinition: anIceClassDefinition [ ^ IceClassDependency new definition: anIceClassDefinition; @@ -20,7 +22,7 @@ IceAsDependencyVisitor >> visitClassDefinition: anIceClassDefinition [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceAsDependencyVisitor >> visitExtensionDefinition: anIceExtensionDefinition [ ^ IceExtendedClassDependency new definition: anIceExtensionDefinition; @@ -28,7 +30,7 @@ IceAsDependencyVisitor >> visitExtensionDefinition: anIceExtensionDefinition [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceAsDependencyVisitor >> visitMethodNode: anIceMethodDefinition [ ^ IceMethodDependency new definition: anIceMethodDefinition ; @@ -36,7 +38,7 @@ IceAsDependencyVisitor >> visitMethodNode: anIceMethodDefinition [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceAsDependencyVisitor >> visitPackage: anIcePackageDefinition [ ^ IcePackageDependency new definition: anIcePackageDefinition; @@ -44,7 +46,7 @@ IceAsDependencyVisitor >> visitPackage: anIcePackageDefinition [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceAsDependencyVisitor >> visitTraitDefinition: anIceTraitDefinition [ ^ IceTraitDependency new definition: anIceTraitDefinition; @@ -52,7 +54,7 @@ IceAsDependencyVisitor >> visitTraitDefinition: anIceTraitDefinition [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceAsDependencyVisitor >> visitTreeNode: anIceNode [ ^ anIceNode value definition accept: self ] diff --git a/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st b/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st index 0c9f1cc626..1e10b97f1d 100644 --- a/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st +++ b/Iceberg/IceAttachedSingleVersionWorkingCopy.class.st @@ -2,12 +2,14 @@ I am a working copy whose packages were all loaded from the same single commit. " Class { - #name : #IceAttachedSingleVersionWorkingCopy, - #superclass : #IceWorkingCopyState, - #category : #'Iceberg-WorkingCopy' + #name : 'IceAttachedSingleVersionWorkingCopy', + #superclass : 'IceWorkingCopyState', + #category : 'Iceberg-WorkingCopy', + #package : 'Iceberg', + #tag : 'WorkingCopy' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceAttachedSingleVersionWorkingCopy class >> on: anIceCommit repository: aRepository [ ^ self new @@ -16,37 +18,37 @@ IceAttachedSingleVersionWorkingCopy class >> on: anIceCommit repository: aReposi yourself ] -{ #category : #displaying } +{ #category : 'displaying' } IceAttachedSingleVersionWorkingCopy >> description [ ^ self referenceCommit description ] -{ #category : #testing } +{ #category : 'testing' } IceAttachedSingleVersionWorkingCopy >> includesCommit: anIceCommit [ ^ self referenceCommit = anIceCommit ] -{ #category : #testing } +{ #category : 'testing' } IceAttachedSingleVersionWorkingCopy >> isCommitMerged: aCommit [ ^ aCommit isAncestorOf: self referenceCommit ] -{ #category : #testing } +{ #category : 'testing' } IceAttachedSingleVersionWorkingCopy >> isDetached [ ^ self referenceCommit ~= repository head commit ] -{ #category : #testing } +{ #category : 'testing' } IceAttachedSingleVersionWorkingCopy >> isSingleCommitState [ ^ true ] -{ #category : #merging } +{ #category : 'merging' } IceAttachedSingleVersionWorkingCopy >> mergeCommit: mergeCommit [ ^ IceMerge new @@ -55,13 +57,13 @@ IceAttachedSingleVersionWorkingCopy >> mergeCommit: mergeCommit [ execute. ] -{ #category : #accessing } +{ #category : 'accessing' } IceAttachedSingleVersionWorkingCopy >> singleCommit [ ^ self referenceCommit ] -{ #category : #validating } +{ #category : 'validating' } IceAttachedSingleVersionWorkingCopy >> validateCanCommit [ self isDetached diff --git a/Iceberg/IceAuthenticationError.class.st b/Iceberg/IceAuthenticationError.class.st index 07b9788398..c670e3b9bd 100644 --- a/Iceberg/IceAuthenticationError.class.st +++ b/Iceberg/IceAuthenticationError.class.st @@ -2,17 +2,19 @@ I indicate when an error trying to authenticate occurs (tipically, when cloning without credentials) " Class { - #name : #IceAuthenticationError, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceAuthenticationError', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceAuthenticationError >> acceptError: aVisitor [ aVisitor visitAuthenticationError: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceAuthenticationError >> defaultMessageText [ ^ 'There was an authentication error while trying to execute the operation: {1}. This happens usually because you didn''t provide a valid set of credentials. @@ -24,7 +26,7 @@ add your public and private keys). 3. using HTTPS instead SSH (Just use an url in the form HTTPS://etc.git)' ] -{ #category : #accessing } +{ #category : 'accessing' } IceAuthenticationError >> messageText [ ^ messageText ifNil: [self defaultMessageText format: { super messageText }] ] diff --git a/Iceberg/IceBackendWriterAdapter.class.st b/Iceberg/IceBackendWriterAdapter.class.st index a95d672968..7f28968015 100644 --- a/Iceberg/IceBackendWriterAdapter.class.st +++ b/Iceberg/IceBackendWriterAdapter.class.st @@ -2,35 +2,37 @@ Adapter for having MCFileTreeWriters being able to write into Iceberg backend repositories without introducing unpleasant modifications in them. " Class { - #name : #IceBackendWriterAdapter, - #superclass : #Object, + #name : 'IceBackendWriterAdapter', + #superclass : 'Object', #instVars : [ 'backend' ], - #category : #'Iceberg-Adapters' + #category : 'Iceberg-Adapters', + #package : 'Iceberg', + #tag : 'Adapters' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceBackendWriterAdapter class >> for: anIceBackend [ ^ self new backend: anIceBackend; yourself. ] -{ #category : #accessing } +{ #category : 'accessing' } IceBackendWriterAdapter >> backend [ ^ backend ] -{ #category : #accessing } +{ #category : 'accessing' } IceBackendWriterAdapter >> backend: anObject [ backend := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceBackendWriterAdapter >> directory [ ^ self backend codeDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceBackendWriterAdapter >> propertyFileExtension [ ^ MCFileTreeRepository defaultPropertyFileExtension ] diff --git a/Iceberg/IceBasicProject.class.st b/Iceberg/IceBasicProject.class.st index 16ec8ef94a..ebaceb51bc 100644 --- a/Iceberg/IceBasicProject.class.st +++ b/Iceberg/IceBasicProject.class.st @@ -3,15 +3,17 @@ A basic project is the project defined in a .project file. It contains properties like sourceDirectory, format and tags. " Class { - #name : #IceBasicProject, - #superclass : #IceAbstractProject, + #name : 'IceBasicProject', + #superclass : 'IceAbstractProject', #instVars : [ 'properties' ], - #category : #'Iceberg-Project' + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceBasicProject class >> onProperties: properties commitish: aCommitish [ ^ self basicNew @@ -21,7 +23,7 @@ IceBasicProject class >> onProperties: properties commitish: aCommitish [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceBasicProject class >> onRepository: aRepository [ ^ self basicNew @@ -31,7 +33,7 @@ IceBasicProject class >> onRepository: aRepository [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceBasicProject class >> onRepository: aRepository withSourceDirectory: aDirectory [ ^ self basicNew @@ -42,7 +44,7 @@ IceBasicProject class >> onRepository: aRepository withSourceDirectory: aDirecto yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceBasicProject >> = anotherProject [ self species = anotherProject species ifFalse: [ ^ false ]. @@ -52,7 +54,7 @@ IceBasicProject >> = anotherProject [ ^ true. ] -{ #category : #writing } +{ #category : 'writing' } IceBasicProject >> addProjectFileToChangeBuilder: anIceChangeImporter [ | projectFileName | @@ -67,20 +69,20 @@ IceBasicProject >> addProjectFileToChangeBuilder: anIceChangeImporter [ contents: self contentsString. ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> addTag: aString [ self tags: (self tags copyWith: aString) ] -{ #category : #writing } +{ #category : 'writing' } IceBasicProject >> addToChangeBuilder: anIceChangeImporter [ self addProjectFileToChangeBuilder: anIceChangeImporter. "self addPropertiesFileToChangeBuilder: anIceChangeImporter." ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> backwardsCompatibleFormat [ ^ TIceRepositoryWriter users @@ -88,12 +90,12 @@ IceBasicProject >> backwardsCompatibleFormat [ ifNone: [ Smalltalk at: #IceLibgitFiletreeWriter ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> commitish [ ^ commitish ] -{ #category : #storing } +{ #category : 'storing' } IceBasicProject >> contentsString [ ^ ByteArray streamContents: [ :stream | @@ -103,31 +105,31 @@ IceBasicProject >> contentsString [ nextPut: self properties ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> fileFormat: aFileFormat [ self fileFormatId: aFileFormat id ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> fileFormatId: aFileFormat [ self repositoryProperties fileFormatId: aFileFormat ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> fileSystem [ ^ commitish fileSystem ] -{ #category : #comparing } +{ #category : 'comparing' } IceBasicProject >> hash [ ^ commitish hash ] -{ #category : #initialization } +{ #category : 'initialization' } IceBasicProject >> initialize [ super initialize. " repositoryProperties := self readProperties. @@ -136,72 +138,72 @@ IceBasicProject >> initialize [ ifAbsent: [ repositoryProperties fileFormat: self backwardsCompatibleFormat ]" ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> name [ ^ self repository name ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> projectFileIn: aCommitish [ ^ aCommitish fileSystem resolve: self projectFilePath ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> projectFilePath [ ^ RelativePath with: '.project'. ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> projectFileReference [ ^ self projectFileIn: commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> projectName [ ^ properties at: #projectName ifAbsent: [ self repository name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> properties [ ^ properties ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> properties: aDictionary [ properties := aDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> removeTag: aString [ self tags: (self tags copyWithout: aString) ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> repositoryProperties [ ^ self repository properties ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> sourceDirectory [ ^ properties at: 'srcDirectory' ifAbsent: [ 'src' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> sourceDirectory: aString [ properties at: 'srcDirectory' put: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> tags [ ^ self properties @@ -209,7 +211,7 @@ IceBasicProject >> tags [ ifAbsent: [ #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicProject >> tags: anArray [ self properties diff --git a/Iceberg/IceBasicProjectReader.class.st b/Iceberg/IceBasicProjectReader.class.st index bf02aca046..0a8fdbe2b3 100644 --- a/Iceberg/IceBasicProjectReader.class.st +++ b/Iceberg/IceBasicProjectReader.class.st @@ -3,18 +3,20 @@ I am a basic project reader that is used by default in case no other project rea I create an IceBasicProject in case a .project file is found, or an IceUnbornProject otherwise. " Class { - #name : #IceBasicProjectReader, - #superclass : #IceProjectReader, - #category : 'Iceberg-Project' + #name : 'IceBasicProjectReader', + #superclass : 'IceProjectReader', + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #testing } +{ #category : 'testing' } IceBasicProjectReader >> canReadProjectFromCommitish: aCommitish [ ^ (aCommitish fileSystem / '.project') exists ] -{ #category : #reading } +{ #category : 'reading' } IceBasicProjectReader >> readProjectFromCommitish: anIceCommitish [ | properties projectFileReference | diff --git a/Iceberg/IceBranch.class.st b/Iceberg/IceBranch.class.st index 9182293543..4a1f22f2fa 100644 --- a/Iceberg/IceBranch.class.st +++ b/Iceberg/IceBranch.class.st @@ -4,15 +4,17 @@ I am an abstract class representing a branch. My history and accessing operation Check my superclass and subclasses for more information. " Class { - #name : #IceBranch, - #superclass : #IceCommitish, + #name : 'IceBranch', + #superclass : 'IceCommitish', #instVars : [ 'name' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceBranch class >> named: aName inRepository: aRepository [ | branch | @@ -21,100 +23,100 @@ IceBranch class >> named: aName inRepository: aRepository [ ^ branch ] -{ #category : #comparing } +{ #category : 'comparing' } IceBranch >> = aBranch [ ^ self fullname = aBranch fullname ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceBranch >> changesFromCommit: anIceCommit [ ^ self commit changesFromCommit: anIceCommit ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceBranch >> delete [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceBranch >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceBranch >> fullname [ ^ name ] -{ #category : #comparing } +{ #category : 'comparing' } IceBranch >> hash [ ^ self fullname hash ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceBranch >> includesCommit: aCommit [ ^ self newCommitWalk includesCommit: aCommit ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceBranch >> includesPackageNamed: aString [ ^ self commit includesPackageNamed: aString ] -{ #category : #testing } +{ #category : 'testing' } IceBranch >> isBranch [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceBranch >> isHead [ ^ self repository head = self ] -{ #category : #testing } +{ #category : 'testing' } IceBranch >> isLocal [ ^ self isRemote not ] -{ #category : #accessing } +{ #category : 'accessing' } IceBranch >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceBranch >> name: aString [ name := aString ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceBranch >> newCommitWalk [ ^ repository newCommitWalk fromBranch: self ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceBranch >> packageNames [ ^ self commit packageNames ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceBranch >> packages [ ^ self commit packages ] -{ #category : #printing } +{ #category : 'printing' } IceBranch >> printOn: aStream [ aStream @@ -124,19 +126,19 @@ IceBranch >> printOn: aStream [ nextPutAll: ')' ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceBranch >> properties [ ^ self commit properties ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceBranch >> snapshotFor: anIceSavedPackage [ ^ self commit snapshotFor: anIceSavedPackage ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceBranch >> versionFor: anIcePackage [ ^ self commit versionFor: anIcePackage diff --git a/Iceberg/IceBranchAlreadyExists.class.st b/Iceberg/IceBranchAlreadyExists.class.st index 8a1733e327..2cd127a8ba 100644 --- a/Iceberg/IceBranchAlreadyExists.class.st +++ b/Iceberg/IceBranchAlreadyExists.class.st @@ -1,19 +1,21 @@ Class { - #name : #IceBranchAlreadyExists, - #superclass : #IceError, + #name : 'IceBranchAlreadyExists', + #superclass : 'IceError', #instVars : [ 'branchName' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #accessing } +{ #category : 'accessing' } IceBranchAlreadyExists >> branchName [ ^ branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceBranchAlreadyExists >> branchName: aBranchName [ branchName := aBranchName diff --git a/Iceberg/IceChange.class.st b/Iceberg/IceChange.class.st index 9e7fcdcb40..864db9091f 100644 --- a/Iceberg/IceChange.class.st +++ b/Iceberg/IceChange.class.st @@ -2,17 +2,19 @@ I represent an abstract change. " Class { - #name : #IceChange, - #superclass : #Object, - #category : #'Iceberg-Changes' + #name : 'IceChange', + #superclass : 'Object', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #displaying } +{ #category : 'displaying' } IceChange >> accept: anIceChangeImporter [ ^ self subclassResponsibility ] -{ #category : #displaying } +{ #category : 'displaying' } IceChange >> displayingProgressString [ ^ self subclassResponsibility ] diff --git a/Iceberg/IceChangeImporter.class.st b/Iceberg/IceChangeImporter.class.st index bc0025d172..ea48017b5e 100644 --- a/Iceberg/IceChangeImporter.class.st +++ b/Iceberg/IceChangeImporter.class.st @@ -6,17 +6,19 @@ I receive the node where I have to work on, a version, and the I can be visited I work recursively: I create new instances of myself to build the children nodes of my node. " Class { - #name : #IceChangeImporter, - #superclass : #Object, + #name : 'IceChangeImporter', + #superclass : 'Object', #instVars : [ 'parentNode', 'diff', 'version' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #importing } +{ #category : 'importing' } IceChangeImporter >> addFileNamed: aString path: aRelativePath contents: aByteArray [ | fileParentNode | @@ -34,12 +36,12 @@ IceChangeImporter >> addFileNamed: aString path: aRelativePath contents: aByteAr contents: aByteArray). ] -{ #category : #accessing } +{ #category : 'accessing' } IceChangeImporter >> diff: anIceDiff [ diff := anIceDiff ] -{ #category : #private } +{ #category : 'private' } IceChangeImporter >> ensureDirectoryAtPath: aPathSegments inNode: aNode [ | firstChild | @@ -48,7 +50,7 @@ IceChangeImporter >> ensureDirectoryAtPath: aPathSegments inNode: aNode [ ^ self ensureDirectoryAtPath: aPathSegments allButFirst inNode: firstChild ] -{ #category : #private } +{ #category : 'private' } IceChangeImporter >> ensureDirectoryNamed: aName inNode: aNode [ aNode childAt: aName ifPresent: [ :node | @@ -57,7 +59,7 @@ IceChangeImporter >> ensureDirectoryNamed: aName inNode: aNode [ ^ aNode addChild: (IceDirectoryDefinition named: aName path: aNode path / aName) ] -{ #category : #private } +{ #category : 'private' } IceChangeImporter >> ensureSourceCodeParentNodeIn: aNode [ ^ self @@ -65,24 +67,24 @@ IceChangeImporter >> ensureSourceCodeParentNodeIn: aNode [ inNode: aNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceChangeImporter >> parentNode: anIcePackageNode [ parentNode := anIcePackageNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceChangeImporter >> version: aVersion [ version := aVersion ] -{ #category : #visiting } +{ #category : 'visiting' } IceChangeImporter >> visitCypressPropertiesChange: anIceCypressPropertiesChange [ version properties addToChangeBuilder: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceChangeImporter >> visitImageChange: anIceImageChange [ | importer | @@ -93,7 +95,7 @@ IceChangeImporter >> visitImageChange: anIceImageChange [ ^ importer importOn: (self ensureSourceCodeParentNodeIn: parentNode) ] -{ #category : #visiting } +{ #category : 'visiting' } IceChangeImporter >> visitProjectChange: anIceProjectChange [ "Import the project file extracted from the commit without utterly post-treatment to create the new project file" diff --git a/Iceberg/IceChangeSetChanged.class.st b/Iceberg/IceChangeSetChanged.class.st index 6306853876..d289e73d9f 100644 --- a/Iceberg/IceChangeSetChanged.class.st +++ b/Iceberg/IceChangeSetChanged.class.st @@ -2,7 +2,9 @@ I announce when a IceChangeSet has changed. " Class { - #name : #IceChangeSetChanged, - #superclass : #IceAnnouncement, - #category : 'Iceberg-Announcements' + #name : 'IceChangeSetChanged', + #superclass : 'IceAnnouncement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } diff --git a/Iceberg/IceCheckoutAllPackages.class.st b/Iceberg/IceCheckoutAllPackages.class.st index 0ed7aa2191..bf238548cb 100644 --- a/Iceberg/IceCheckoutAllPackages.class.st +++ b/Iceberg/IceCheckoutAllPackages.class.st @@ -4,17 +4,19 @@ I'm the simplest possible checkout strategy: I will load into image all packages This strategy is very dangerous since it can introduce in image package versions that were not there before. Or it may cause the packages/classes became incorrectly initialised. But some project can find this strategy very apeleable nevertheless. " Class { - #name : #IceCheckoutAllPackages, - #superclass : #IceCheckoutStrategy, - #category : #'Iceberg-Core' + #name : 'IceCheckoutAllPackages', + #superclass : 'IceCheckoutStrategy', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutAllPackages class >> order [ ^ 20 ] -{ #category : #checkout } +{ #category : 'checkout' } IceCheckoutAllPackages >> checkoutOn: anIceWorkingCopy [ diff --git a/Iceberg/IceCheckoutAlreadyLoadedPackages.class.st b/Iceberg/IceCheckoutAlreadyLoadedPackages.class.st index d4bd652de3..e8f8408463 100644 --- a/Iceberg/IceCheckoutAlreadyLoadedPackages.class.st +++ b/Iceberg/IceCheckoutAlreadyLoadedPackages.class.st @@ -6,17 +6,19 @@ This strategy is still dangerous bacause packages installed may be incorrectly i " Class { - #name : #IceCheckoutAlreadyLoadedPackages, - #superclass : #IceCheckoutStrategy, - #category : #'Iceberg-Core' + #name : 'IceCheckoutAlreadyLoadedPackages', + #superclass : 'IceCheckoutStrategy', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutAlreadyLoadedPackages class >> order [ ^ 10 ] -{ #category : #checkout } +{ #category : 'checkout' } IceCheckoutAlreadyLoadedPackages >> checkoutOn: anIceWorkingCopy [ anIceWorkingCopy loadChangesInWorkingCopy: self diff. @@ -25,7 +27,7 @@ IceCheckoutAlreadyLoadedPackages >> checkoutOn: anIceWorkingCopy [ anIceWorkingCopy markAllPackagesAsClean. ] -{ #category : #testing } +{ #category : 'testing' } IceCheckoutAlreadyLoadedPackages >> isLoadAlreadyLoadedStrategy [ ^ true diff --git a/Iceberg/IceCheckoutConflictError.class.st b/Iceberg/IceCheckoutConflictError.class.st index 31acaef008..7ad3b2e1d3 100644 --- a/Iceberg/IceCheckoutConflictError.class.st +++ b/Iceberg/IceCheckoutConflictError.class.st @@ -2,12 +2,14 @@ I indicate there are conflicts when I try to checkout so I can't perform the operation. " Class { - #name : #IceCheckoutConflictError, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceCheckoutConflictError', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceCheckoutConflictError >> acceptError: aVisitor [ aVisitor visitCheckoutConflict: self ] diff --git a/Iceberg/IceCheckoutDoNotLoadPackages.class.st b/Iceberg/IceCheckoutDoNotLoadPackages.class.st index d151b26e7e..1fb631c0cb 100644 --- a/Iceberg/IceCheckoutDoNotLoadPackages.class.st +++ b/Iceberg/IceCheckoutDoNotLoadPackages.class.st @@ -2,17 +2,19 @@ A strategy to checkout but not load packages into the image " Class { - #name : #IceCheckoutDoNotLoadPackages, - #superclass : #IceCheckoutStrategy, - #category : #'Iceberg-Core' + #name : 'IceCheckoutDoNotLoadPackages', + #superclass : 'IceCheckoutStrategy', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutDoNotLoadPackages class >> order [ ^ 1000 ] -{ #category : #checkout } +{ #category : 'checkout' } IceCheckoutDoNotLoadPackages >> checkoutOn: anIceWorkingCopy [ committish commit adopt. self repository setHead: committish diff --git a/Iceberg/IceCheckoutSelectedPackages.class.st b/Iceberg/IceCheckoutSelectedPackages.class.st index 25c8f5088c..9dea087f5d 100644 --- a/Iceberg/IceCheckoutSelectedPackages.class.st +++ b/Iceberg/IceCheckoutSelectedPackages.class.st @@ -2,27 +2,29 @@ This is an alternative checkout strategy that includes a list of new packages to be loaded. It works like the load existing package strategy and including new packages in list. " Class { - #name : #IceCheckoutSelectedPackages, - #superclass : #IceCheckoutStrategy, + #name : 'IceCheckoutSelectedPackages', + #superclass : 'IceCheckoutStrategy', #instVars : [ 'packageNames' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutSelectedPackages class >> canBeUsedFromUI [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutSelectedPackages class >> order [ ^ 30 ] -{ #category : #checkout } +{ #category : 'checkout' } IceCheckoutSelectedPackages >> checkoutOn: anIceWorkingCopy [ anIceWorkingCopy loadChangesInWorkingCopy: self diff. @@ -36,7 +38,7 @@ IceCheckoutSelectedPackages >> checkoutOn: anIceWorkingCopy [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutSelectedPackages >> packages: aCollection [ packageNames := aCollection diff --git a/Iceberg/IceCheckoutStrategy.class.st b/Iceberg/IceCheckoutStrategy.class.st index 711848c5ec..eab31a6bb4 100644 --- a/Iceberg/IceCheckoutStrategy.class.st +++ b/Iceberg/IceCheckoutStrategy.class.st @@ -5,16 +5,18 @@ Doing a checkout then means also introduce new versions into the image, and ther My children will implement method #checkoutPackagesOn: to perform this task. " Class { - #name : #IceCheckoutStrategy, - #superclass : #Object, + #name : 'IceCheckoutStrategy', + #superclass : 'Object', #instVars : [ 'committish', 'diff' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy class >> allStrategies [ ^ (self allSubclasses sorted: [ :a :b | a order < b order ]) @@ -22,61 +24,61 @@ IceCheckoutStrategy class >> allStrategies [ thenCollect: [ :e | e new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy class >> canBeUsedFromUI [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy class >> order [ ^ self subclassResponsibility ] -{ #category : #checkout } +{ #category : 'checkout' } IceCheckoutStrategy >> checkoutOn: anIceWorkingCopy [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy >> commitish: aCommittish [ committish := aCommittish ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy >> committish: aCommittish [ committish := aCommittish ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy >> diff [ ^ diff ifNil: [ diff := committish diffTo: self workingCopy ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy >> diff: anIceDiff [ diff := anIceDiff ] -{ #category : #testing } +{ #category : 'testing' } IceCheckoutStrategy >> isLoadAlreadyLoadedStrategy [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy >> repository [ ^ committish repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceCheckoutStrategy >> workingCopy [ ^ self repository workingCopy diff --git a/Iceberg/IceCherrypicker.class.st b/Iceberg/IceCherrypicker.class.st index bddafce676..fcf48bdd20 100644 --- a/Iceberg/IceCherrypicker.class.st +++ b/Iceberg/IceCherrypicker.class.st @@ -6,8 +6,8 @@ I know how to cherry-pick changes from a source IceDiff into a target IceDiff. " Class { - #name : #IceCherrypicker, - #superclass : #Object, + #name : 'IceCherrypicker', + #superclass : 'Object', #instVars : [ 'dependencies', 'sourceDiff', @@ -16,10 +16,12 @@ Class { 'incomingChangesDiff', 'environment' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #dependencies } +{ #category : 'dependencies' } IceCherrypicker >> addClassDependencyOf: aIceClassDefinition [ dependencies add: @@ -29,12 +31,12 @@ IceCherrypicker >> addClassDependencyOf: aIceClassDefinition [ yourself) ] -{ #category : #'accessing - options' } +{ #category : 'accessing - options' } IceCherrypicker >> addDependency: anIceDependency [ self dependencies add: anIceDependency . ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceCherrypicker >> addExtendedClassDependency: aIceExtensionDefinition [ dependencies add: @@ -44,7 +46,7 @@ IceCherrypicker >> addExtendedClassDependency: aIceExtensionDefinition [ yourself) ] -{ #category : #'execution - private' } +{ #category : 'execution - private' } IceCherrypicker >> addInitialDependencies [ sourceDiff accept: (IceCherrypickerInitialDependenciesCollector new @@ -52,7 +54,7 @@ IceCherrypicker >> addInitialDependencies [ yourself) ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceCherrypicker >> addMetaclassDependency: anIceClassDefinition [ dependencies add: @@ -62,7 +64,7 @@ IceCherrypicker >> addMetaclassDependency: anIceClassDefinition [ yourself) ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceCherrypicker >> addMethodDependencyOf: aIceMethodDefinition [ dependencies add: @@ -72,7 +74,7 @@ IceCherrypicker >> addMethodDependencyOf: aIceMethodDefinition [ yourself) ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceCherrypicker >> addPackageDependency: aIcePackageDefinition [ dependencies add: @@ -82,7 +84,7 @@ IceCherrypicker >> addPackageDependency: aIcePackageDefinition [ yourself) ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceCherrypicker >> addTraitDependencyOf: aIceTraitDefinition [ dependencies add: @@ -92,7 +94,7 @@ IceCherrypicker >> addTraitDependencyOf: aIceTraitDefinition [ yourself) ] -{ #category : #'execution - private' } +{ #category : 'execution - private' } IceCherrypicker >> addTransitiveDependencies [ | originalDependencies | originalDependencies := nil. @@ -103,22 +105,22 @@ IceCherrypicker >> addTransitiveDependencies [ do: [ :each | each addTransitiveDependenciesFrom: incomingChangesDiff to: self ]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> dependencies [ ^ dependencies ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> environment [ ^ environment ifNil: [ environment := IceDependencyEnvironment on: receiverToAncestorDiff targetVersion ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> environment: anObject [ environment:= anObject ] -{ #category : #'execution - public' } +{ #category : 'execution - public' } IceCherrypicker >> execute [ "Obtain the initial change set (ICS)" @@ -135,27 +137,27 @@ IceCherrypicker >> execute [ ^ mergeTree ] -{ #category : #testing } +{ #category : 'testing' } IceCherrypicker >> includesDependencyTo: aDefinition [ ^ dependencies anySatisfy: [ :each | each isDependencyTo: aDefinition ]. ] -{ #category : #initialization } +{ #category : 'initialization' } IceCherrypicker >> initialize [ super initialize. dependencies := Set new ] -{ #category : #operations } +{ #category : 'operations' } IceCherrypicker >> mergeWithCurrentBranch [ mergeTree := IceTreeMerger new merge: self targetDiff tree into: self receiverToAncestorDiff tree ] -{ #category : #'execution - private' } +{ #category : 'execution - private' } IceCherrypicker >> pruneUndependedNodesInTargetDiff [ IceCherrypickerDiffPruner new @@ -163,32 +165,32 @@ IceCherrypicker >> pruneUndependedNodesInTargetDiff [ applyTo: incomingChangesDiff ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> receiverToAncestorDiff [ ^ receiverToAncestorDiff ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> receiverToAncestorDiff: anIceDiff [ receiverToAncestorDiff:= anIceDiff. ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> sourceDiff [ ^ sourceDiff ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> sourceDiff: anObject [ sourceDiff := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> targetDiff [ ^ incomingChangesDiff ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypicker >> targetDiff: anObject [ incomingChangesDiff := anObject ] diff --git a/Iceberg/IceCherrypickerDiffPruner.class.st b/Iceberg/IceCherrypickerDiffPruner.class.st index b55fc091ef..825d305680 100644 --- a/Iceberg/IceCherrypickerDiffPruner.class.st +++ b/Iceberg/IceCherrypickerDiffPruner.class.st @@ -3,16 +3,18 @@ I am an IceDiff visitor to remove nodes that are not required the IceCherrypicke " Class { - #name : #IceCherrypickerDiffPruner, - #superclass : #IceTreeVisitor, + #name : 'IceCherrypickerDiffPruner', + #superclass : 'IceTreeVisitor', #instVars : [ 'cherrypicker', 'nodesToRemove' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #applying } +{ #category : 'applying' } IceCherrypickerDiffPruner >> applyTo: anIceDiff [ nodesToRemove := Set new. @@ -23,31 +25,31 @@ IceCherrypickerDiffPruner >> applyTo: anIceDiff [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypickerDiffPruner >> cherrypicker [ ^ cherrypicker ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypickerDiffPruner >> cherrypicker: anIceCherrypicker [ cherrypicker := anIceCherrypicker ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerDiffPruner >> visitAddition: anIceAddition [ (cherrypicker includesDependencyTo: anIceAddition definition) ifFalse: [ nodesToRemove add: currentNode ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerDiffPruner >> visitModification: anIceModification [ (cherrypicker includesDependencyTo: anIceModification definition) ifFalse: [ nodesToRemove add: currentNode ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerDiffPruner >> visitNoModification: anIceNoModification [ "Nothing with me. Just visit children" @@ -55,7 +57,7 @@ IceCherrypickerDiffPruner >> visitNoModification: anIceNoModification [ ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerDiffPruner >> visitRemoval: anIceRemoval [ (cherrypicker includesDependencyTo: anIceRemoval definition) ifFalse: [ nodesToRemove add: currentNode ] diff --git a/Iceberg/IceCherrypickerInitialDependenciesCollector.class.st b/Iceberg/IceCherrypickerInitialDependenciesCollector.class.st index 3a9533824e..543e19bcf9 100644 --- a/Iceberg/IceCherrypickerInitialDependenciesCollector.class.st +++ b/Iceberg/IceCherrypickerInitialDependenciesCollector.class.st @@ -3,32 +3,34 @@ I am a visitor of IceDiff (and IceDefinition) collect the initial ser of depende " Class { - #name : #IceCherrypickerInitialDependenciesCollector, - #superclass : #IceTreeVisitor, + #name : 'IceCherrypickerInitialDependenciesCollector', + #superclass : 'IceTreeVisitor', #instVars : [ 'cherrypicker' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypickerInitialDependenciesCollector >> cherrypicker [ ^ cherrypicker ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypickerInitialDependenciesCollector >> cherrypicker: anIceCherrypicker [ cherrypicker := anIceCherrypicker ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerInitialDependenciesCollector >> visitAddition: anIceAddition [ anIceAddition definition accept: self. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerInitialDependenciesCollector >> visitClassDefinition: anIceClassDefinition [ anIceClassDefinition isMeta ifTrue: [ cherrypicker @@ -36,43 +38,43 @@ IceCherrypickerInitialDependenciesCollector >> visitClassDefinition: anIceClassD ifFalse: [ cherrypicker addClassDependencyOf: anIceClassDefinition ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCherrypickerInitialDependenciesCollector >> visitExtensionDefinition: anIceExtensionDefinition [ cherrypicker addExtendedClassDependency: anIceExtensionDefinition ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerInitialDependenciesCollector >> visitMethodNode: anIceMethodDefinition [ cherrypicker addMethodDependencyOf: anIceMethodDefinition ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerInitialDependenciesCollector >> visitModification: anIceModification [ anIceModification definition accept: self. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerInitialDependenciesCollector >> visitNoModification: anIceNoModification [ "Nothing with me. Just visit children" self visitChildrenOf: currentNode. ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerInitialDependenciesCollector >> visitPackage: anIcePackageDefinition [ cherrypicker addPackageDependency: anIcePackageDefinition ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerInitialDependenciesCollector >> visitRemoval: anIceRemoval [ anIceRemoval definition accept: self. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceCherrypickerInitialDependenciesCollector >> visitTraitDefinition: anIceTraitDefinition [ cherrypicker addTraitDependencyOf: anIceTraitDefinition diff --git a/Iceberg/IceClassDefinition.class.st b/Iceberg/IceClassDefinition.class.st index 1936f03a9d..6fe53d093e 100644 --- a/Iceberg/IceClassDefinition.class.st +++ b/Iceberg/IceClassDefinition.class.st @@ -6,18 +6,20 @@ My contents is the class definition code. See my superclasses for more information. " Class { - #name : #IceClassDefinition, - #superclass : #IceMethodContainerDefinition, - #category : #'Iceberg-Changes' + #name : 'IceClassDefinition', + #superclass : 'IceMethodContainerDefinition', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceClassDefinition >> accept: aVisitor [ ^ aVisitor visitClassDefinition: self ] -{ #category : #patching } +{ #category : 'patching' } IceClassDefinition >> addModification: anIceModification toPatcher: aMCPatcher [ "If we are replacing an existing class, we need to handle the case. @@ -45,7 +47,7 @@ IceClassDefinition >> addModification: anIceModification toPatcher: aMCPatcher [ to: anIceModification leftDefinition asMCDefinition ] -{ #category : #patching } +{ #category : 'patching' } IceClassDefinition >> addToPatcher: aMCPatcher [ "We should not handle metaclasses if their mcDefinition is nil. @@ -57,20 +59,20 @@ IceClassDefinition >> addToPatcher: aMCPatcher [ aMCPatcher addDefinition: self asMCDefinition ] -{ #category : #converting } +{ #category : 'converting' } IceClassDefinition >> asMCDefinitionWithoutMetaSide [ ^ mcDefinition deepCopy removeMetaSideVariables ] -{ #category : #testing } +{ #category : 'testing' } IceClassDefinition >> isClassDefinition [ ^ true ] -{ #category : #patching } +{ #category : 'patching' } IceClassDefinition >> removeFromPatcher: aMCPatcher [ "If the meta side is removed, we should modify the class definition to not include the meta-parts such as class-instance-variables" diff --git a/Iceberg/IceClassDependency.class.st b/Iceberg/IceClassDependency.class.st index 995fcc1226..2ee4e0a267 100644 --- a/Iceberg/IceClassDependency.class.st +++ b/Iceberg/IceClassDependency.class.st @@ -2,54 +2,56 @@ I am a dependency to a class. " Class { - #name : #IceClassDependency, - #superclass : #IceDefinedDependency, - #category : #'Iceberg-Cherrypicking' + #name : 'IceClassDependency', + #superclass : 'IceDefinedDependency', + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #comparing } +{ #category : 'comparing' } IceClassDependency >> = anObject [ ^ super = anObject and: [ definition asMCDefinition superclassName = anObject definition asMCDefinition superclassName ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceClassDependency >> hash [ "Answer an integer value that is related to the identity of the receiver." ^ super hash bitXor: self definition asMCDefinition superclassName hash ] -{ #category : #visiting } +{ #category : 'visiting' } IceClassDependency >> isDependencyTo: aIceDefinition [ ^ aIceDefinition asMCDefinition className = definition asMCDefinition className ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceClassDependency >> referencedClasses [ ^ {definition asMCDefinition superclassName} , self subclassNames , self referencedSharedPool ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceClassDependency >> referencedPackages [ ^ self definition asMCDefinition category ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceClassDependency >> referencedSharedPool [ ^ (definition asMCDefinition sharedPoolsString splitOn: ' ') collect: #asSymbol ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceClassDependency >> referencedTraits [ ^ ((RBParser parseExpression: definition asMCDefinition traitComposition) allChildren select: #isVariable) collect: #name ] -{ #category : #private } +{ #category : 'private' } IceClassDependency >> subclassNames [ ^ self cherrypicker environment diff --git a/Iceberg/IceCodeDefinition.class.st b/Iceberg/IceCodeDefinition.class.st index 59382d9958..f49a2e8665 100644 --- a/Iceberg/IceCodeDefinition.class.st +++ b/Iceberg/IceCodeDefinition.class.st @@ -4,12 +4,14 @@ I am an IceDefinition that have some source code in my contents. See my sub/superclasses for more information. " Class { - #name : #IceCodeDefinition, - #superclass : #IceDefinition, - #category : #'Iceberg-Changes' + #name : 'IceCodeDefinition', + #superclass : 'IceDefinition', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceCodeDefinition class >> named: aName source: aString [ ^ (super named: aName) @@ -17,14 +19,14 @@ IceCodeDefinition class >> named: aName source: aString [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceCodeDefinition >> = anotherDefinition [ ^ super = anotherDefinition and: [ self contents = anotherDefinition contents ] ] -{ #category : #patching } +{ #category : 'patching' } IceCodeDefinition >> addModification: anIceModification toPatcher: aMCPatcher [ aMCPatcher @@ -32,25 +34,25 @@ IceCodeDefinition >> addModification: anIceModification toPatcher: aMCPatcher [ to: anIceModification leftDefinition asMCDefinition ] -{ #category : #patching } +{ #category : 'patching' } IceCodeDefinition >> addToPatcher: aMCPatcher [ self subclassResponsibility ] -{ #category : #comparing } +{ #category : 'comparing' } IceCodeDefinition >> hash [ ^ self contents hash ] -{ #category : #patching } +{ #category : 'patching' } IceCodeDefinition >> removeFrom: aPatcher [ self subclassResponsibility ] -{ #category : #patching } +{ #category : 'patching' } IceCodeDefinition >> removeFromPatcher: aMCPatcher [ self subclassResponsibility diff --git a/Iceberg/IceCommit.class.st b/Iceberg/IceCommit.class.st index 242ceaebf1..a92c564384 100644 --- a/Iceberg/IceCommit.class.st +++ b/Iceberg/IceCommit.class.st @@ -20,12 +20,14 @@ And to the packages existing in that commit: IMPORTANT IMPLEMENTATION NOTE. For optimization purposes, a commit caches the names of the packages inside himself. This was made under the assumption that a commit is immutble and nobody ""cooks"" the commit once it is in the repository. " Class { - #name : #IceCommit, - #superclass : #IceCommitish, - #category : #'Iceberg-Core' + #name : 'IceCommit', + #superclass : 'IceCommitish', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'API - working copy' } +{ #category : 'API - working copy' } IceCommit >> adopt [ "Low level. @@ -34,24 +36,24 @@ IceCommit >> adopt [ self repository workingCopy adoptCommit: self ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommit >> ancestors [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommit >> author [ ^ self subclassResponsibility ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommit >> canRevertChanges [ ^ false ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceCommit >> changedPackagesToWorkingCopy: left [ | leftPackageNames rightPackageNames added removed | @@ -82,55 +84,55 @@ IceCommit >> changedPackagesToWorkingCopy: left [ removed ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceCommit >> changesFromNoCommit: anIceNoCommit [ ^ self packages collect: [ :each | IceImageChange package: each ] ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommit >> changesTo: aCommitish [ ^ aCommitish changesFromCommit: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommit >> comment [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommit >> commit [ ^ self ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommit >> commonAncestorWith: aCommitish [ ^ aCommitish commonAncestorWithCommit: self ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceCommit >> compatibleUsername [ ^ 'CompatibleUserName' ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceCommit >> createTag: aString [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommit >> datetime [ self subclassResponsibility ] -{ #category : #printing } +{ #category : 'printing' } IceCommit >> description [ self tags @@ -140,12 +142,12 @@ IceCommit >> description [ ^ 'Detached at {1}' format: { self shortId } ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommit >> diffFromHead [ ^ self repository headCommit diffTo: self ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommit >> diffToParent [ "returns a diff between me and my first parent/ancestor" ^ self diffTo: (self ancestors @@ -153,18 +155,18 @@ IceCommit >> diffToParent [ ifEmpty: [ nil ]) ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommit >> diffToWorkingCopy [ ^ self diffTo: self repository workingCopy ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommit >> diffToWorkingCopyForPackage: aPackage [ ^ self diffToWorkingCopyForPackages: { aPackage } ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommit >> diffToWorkingCopyForPackages: aCollection [ ^ IceDiff new @@ -173,7 +175,7 @@ IceCommit >> diffToWorkingCopyForPackages: aCollection [ buildForPackages: aCollection ] -{ #category : #testing } +{ #category : 'testing' } IceCommit >> hasMultipleAncestors [ | ancestors | ancestors := self ancestors. @@ -181,54 +183,54 @@ IceCommit >> hasMultipleAncestors [ and: [ ancestors size > 1 ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommit >> id [ self subclassResponsibility ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceCommit >> includesPackageNamed: aName [ ^ self packageNames includes: aName ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommit >> isAncestorOf: aCommit [ ^ aCommit isParentOf: self ] -{ #category : #testing } +{ #category : 'testing' } IceCommit >> isMergeCommit [ ^ self ancestors size > 1 ] -{ #category : #testing } +{ #category : 'testing' } IceCommit >> isMerged [ ^ self repository workingCopy isCommitMerged: self ] -{ #category : #testing } +{ #category : 'testing' } IceCommit >> isNoCommit [ ^ false ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommit >> isParentOf: aCommit [ ^ self newCommitWalk includesCommit: aCommit ] -{ #category : #testing } +{ #category : 'testing' } IceCommit >> isUnknownCommit [ ^ false ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceCommit >> mcPackageSnapshotsOfPackages: aCollection [ self flag: #pharoTodo. "I'm not sure I need to answer an empty snapshot. if there is no mcVersion it likely means the package was removed and an empty snapshow will @@ -243,31 +245,31 @@ IceCommit >> mcPackageSnapshotsOfPackages: aCollection [ do: [ :e | MCSnapshot empty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommit >> name [ ^ self id ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommit >> newCommitWalk [ ^ repository newCommitWalk fromCommit: self ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceCommit >> packages [ ^ self packageNames collect: [ :name | IcePackage named: name repository: self repository ] ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommit >> parent [ ^ self ancestors first ] -{ #category : #printing } +{ #category : 'printing' } IceCommit >> printOn: aStream [ aStream @@ -277,7 +279,7 @@ IceCommit >> printOn: aStream [ nextPutAll: ')' ] -{ #category : #printing } +{ #category : 'printing' } IceCommit >> shortId [ "This is just for presentation purposes. @@ -285,7 +287,7 @@ IceCommit >> shortId [ ^ self id first: 7 ] -{ #category : #printing } +{ #category : 'printing' } IceCommit >> status [ (self repository workingCopy referenceCommits includes: self) @@ -301,25 +303,25 @@ IceCommit >> status [ ^ 'Not merged' ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceCommit >> tags [ ^ self repository tags select: [ :each | each commit = self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommit >> timeStamp [ self subclassResponsibility ] -{ #category : #validating } +{ #category : 'validating' } IceCommit >> validateIsBranch [ "Operation not permitted in a detached commit state" IceNotInBranch signal ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceCommit >> versionFor: aPackage [ ^ IceSavedPackageVersion fromCommit: self package: aPackage diff --git a/Iceberg/IceCommited.class.st b/Iceberg/IceCommited.class.st index d93f3801f3..505dcb2b45 100644 --- a/Iceberg/IceCommited.class.st +++ b/Iceberg/IceCommited.class.st @@ -2,7 +2,9 @@ Announces when a repository has commited. " Class { - #name : #IceCommited, - #superclass : #IceRepositoryAnnouncement, - #category : 'Iceberg-Announcements' + #name : 'IceCommited', + #superclass : 'IceRepositoryAnnouncement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } diff --git a/Iceberg/IceCommitish.class.st b/Iceberg/IceCommitish.class.st index 485c042179..b6f9ef9d24 100644 --- a/Iceberg/IceCommitish.class.st +++ b/Iceberg/IceCommitish.class.st @@ -25,15 +25,17 @@ I can also be queried for packages, ancestry and to make diffs to another commit aCommitish newCommitWalk. " Class { - #name : #IceCommitish, - #superclass : #Object, + #name : 'IceCommitish', + #superclass : 'Object', #instVars : [ 'repository' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceCommitish class >> inRepository: aRepository [ ^ self new @@ -41,19 +43,19 @@ IceCommitish class >> inRepository: aRepository [ yourself ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommitish >> changesFromCommit: anIceCommit [ ^ self subclassResponsibility ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommitish >> changesTo: aCommitish [ ^ self commit changesTo: aCommitish ] -{ #category : #'API - actions' } +{ #category : 'API - actions' } IceCommitish >> checkout [ self checkout: (IceCheckoutAlreadyLoadedPackages new @@ -61,14 +63,14 @@ IceCommitish >> checkout [ yourself) ] -{ #category : #'API - checkout' } +{ #category : 'API - checkout' } IceCommitish >> checkout: aCheckoutStrategy [ aCheckoutStrategy committish: self. ^ repository checkout: aCheckoutStrategy ] -{ #category : #'API - actions' } +{ #category : 'API - actions' } IceCommitish >> checkoutAllPackages [ repository checkout: (IceCheckoutAllPackages new @@ -76,20 +78,20 @@ IceCommitish >> checkoutAllPackages [ yourself) ] -{ #category : #'API - actions' } +{ #category : 'API - actions' } IceCommitish >> checkoutWithStrategy: aCheckoutStrategy [ "Load code of a myself into the working copy (following strategy), and set myself as HEAD." repository checkout: (aCheckoutStrategy commitish: self) ] -{ #category : #'API - cherry-picking' } +{ #category : 'API - cherry-picking' } IceCommitish >> cherryPickFrom: anotherCommit [ ^ anotherCommit cherryPickTo: self ] -{ #category : #'cherry-picking' } +{ #category : 'cherry-picking' } IceCommitish >> cherryPickTo: anotherCommit [ | initialDiff extendedDiff commonAncestor receiverDiff | @@ -108,79 +110,79 @@ IceCommitish >> cherryPickTo: anotherCommit [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommitish >> commit [ self subclassResponsibility ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommitish >> commits [ ^ self newCommitWalk commits ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommitish >> commitsDo: aBlockClosure [ self newCommitWalk commitsDo: aBlockClosure ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommitish >> commonAncestorWith: anIceWorkingCopy [ ^ self commit commonAncestorWith: anIceWorkingCopy ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommitish >> diffTo: aCommitish [ ^ IceDiff from: self to: aCommitish ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceCommitish >> diffToParent [ ^ self diffTo: self parent ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceCommitish >> includesPackageNamed: aString [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceCommitish >> isBranch [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceCommitish >> isDetached [ ^ self isBranch not ] -{ #category : #testing } +{ #category : 'testing' } IceCommitish >> isTag [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceCommitish >> isUnbornBranch [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceCommitish >> isWorkingCopy [ ^ false ] -{ #category : #'API - actions' } +{ #category : 'API - actions' } IceCommitish >> loadPackageNamed: aString [ "Load the code of the given package into the working copy. Does not modify HEAD" @@ -190,67 +192,67 @@ IceCommitish >> loadPackageNamed: aString [ fromCommit: self ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceCommitish >> mcVersionFor: anIceSavedPackageVersion [ ^ repository mcVersionFor: anIceSavedPackageVersion ] -{ #category : #'API - actions' } +{ #category : 'API - actions' } IceCommitish >> merge [ ^ self repository workingCopy mergeCommit: self commit ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceCommitish >> newCommitWalk [ self subclassResponsibility ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceCommitish >> packageNames [ ^ self subclassResponsibility ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceCommitish >> packages [ ^ #() ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceCommitish >> project [ self subclassResponsibility ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceCommitish >> properties [ ^ IceRepositoryProperties fromFileReferenceDirectory: self project sourceDirectoryReference commitish: self ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceCommitish >> readerClass [ ^ self commit readerClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommitish >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceCommitish >> repository: aRepository [ repository := aRepository ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceCommitish >> snapshotForPackage: anIceSavedPackage [ ^ [ (self mcVersionFor: (self versionFor: anIceSavedPackage)) snapshot ] @@ -258,13 +260,13 @@ IceCommitish >> snapshotForPackage: anIceSavedPackage [ do: [ MCSnapshot empty ] ] -{ #category : #'API - actions' } +{ #category : 'API - actions' } IceCommitish >> switch [ self checkout: IceCheckoutDoNotLoadPackages new ] -{ #category : #'API - actions' } +{ #category : 'API - actions' } IceCommitish >> switchAndMergeWorkingCopy [ self switch. self flag: #pharoTodo. "Demeters law" @@ -272,19 +274,19 @@ IceCommitish >> switchAndMergeWorkingCopy [ self commit merge ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceCommitish >> tagNames [ ^ self tags collect: #name ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceCommitish >> tags [ ^ self commit tags ] -{ #category : #validating } +{ #category : 'validating' } IceCommitish >> validateCanMerge [ | imageCommit headCommit mergeCommit | @@ -304,19 +306,19 @@ IceCommitish >> validateCanMerge [ imageCommit description }) ]. ] -{ #category : #validating } +{ #category : 'validating' } IceCommitish >> validateIsBranch [ "Nothing. I'm a branch" ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceCommitish >> versionFor: aPackage [ self subclassResponsibility ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceCommitish >> writerClass [ ^ self commit writerClass diff --git a/Iceberg/IceConflictingOperation.class.st b/Iceberg/IceConflictingOperation.class.st index a811e63dc7..1898e11727 100644 --- a/Iceberg/IceConflictingOperation.class.st +++ b/Iceberg/IceConflictingOperation.class.st @@ -2,16 +2,18 @@ I reprensent a conflict between two operations that can be solved by using #selectLeft and #selectRight. " Class { - #name : #IceConflictingOperation, - #superclass : #IceOperationMerge, + #name : 'IceConflictingOperation', + #superclass : 'IceOperationMerge', #instVars : [ 'leftOperation', 'rightOperation' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceConflictingOperation class >> left: leftOperation right: rightOperation [ ^ self new @@ -20,100 +22,100 @@ IceConflictingOperation class >> left: leftOperation right: rightOperation [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceConflictingOperation >> accept: aVisitor [ ^ aVisitor visitConflictingOperation: self ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceConflictingOperation >> actualClass [ ^ leftOperation definition actualClass ] -{ #category : #resolution } +{ #category : 'resolution' } IceConflictingOperation >> chosenOperation [ ^ chosen ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceConflictingOperation >> contextClass [ ^ leftOperation contextClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceConflictingOperation >> definition [ "This is just for compatibility" ^ leftOperation definition ] -{ #category : #accessing } +{ #category : 'accessing' } IceConflictingOperation >> description [ "Any of my instances should have the same description" ^ leftOperation description ] -{ #category : #testing } +{ #category : 'testing' } IceConflictingOperation >> isConflict [ ^ true ] -{ #category : #resolution } +{ #category : 'resolution' } IceConflictingOperation >> isLeftChosen [ ^ chosen = leftOperation ] -{ #category : #resolution } +{ #category : 'resolution' } IceConflictingOperation >> isRightChosen [ ^ chosen = rightOperation ] -{ #category : #accessing } +{ #category : 'accessing' } IceConflictingOperation >> key [ "Any of my operations should have the same key" ^ leftOperation key ] -{ #category : #accessing } +{ #category : 'accessing' } IceConflictingOperation >> leftContents [ ^ leftOperation leftContents ] -{ #category : #accessing } +{ #category : 'accessing' } IceConflictingOperation >> leftOperation: anOperation [ leftOperation := anOperation ] -{ #category : #accessing } +{ #category : 'accessing' } IceConflictingOperation >> rightContents [ ^ rightOperation leftContents ] -{ #category : #accessing } +{ #category : 'accessing' } IceConflictingOperation >> rightOperation: anOperation [ rightOperation := anOperation ] -{ #category : #resolution } +{ #category : 'resolution' } IceConflictingOperation >> selectLeft [ chosen := leftOperation ] -{ #category : #resolution } +{ #category : 'resolution' } IceConflictingOperation >> selectRight [ chosen := rightOperation diff --git a/Iceberg/IceCredentialStore.class.st b/Iceberg/IceCredentialStore.class.st index 22d80867c7..bc70460d33 100644 --- a/Iceberg/IceCredentialStore.class.st +++ b/Iceberg/IceCredentialStore.class.st @@ -8,8 +8,8 @@ There is a default instance that stores the credentials in a file per image, in In the settings you can modify the location of the credentials file. " Class { - #name : #IceCredentialStore, - #superclass : #Object, + #name : 'IceCredentialStore', + #superclass : 'Object', #instVars : [ 'plainCredentials', 'sshCredentials', @@ -19,10 +19,12 @@ Class { 'CurrentStore', 'StoreFile' ], - #category : #'Iceberg-Security' + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialStore class >> current [ ^ CurrentStore ifNil: [ CurrentStore := self new @@ -30,12 +32,12 @@ IceCredentialStore class >> current [ yourself ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialStore class >> defaultCredentialsStoreFile [ ^ FileLocator localDirectory / #iceberg / 'credentials.fuel' ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialStore class >> settingsOn: aBuilder [ @@ -56,18 +58,18 @@ IceCredentialStore class >> settingsOn: aBuilder [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialStore class >> storeFile [ ^ StoreFile ifNil: [ StoreFile := self defaultCredentialsStoreFile ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialStore class >> storeFile: aValue [ StoreFile := aValue ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceCredentialStore >> allCredentials [ self loadFromStore. self defaultSSHCredential. @@ -75,7 +77,7 @@ IceCredentialStore >> allCredentials [ ^ plainCredentials values , sshCredentials values ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceCredentialStore >> defaultSSHCredential [ ^ sshCredentials at: #* @@ -84,7 +86,7 @@ IceCredentialStore >> defaultSSHCredential [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceCredentialStore >> initialize [ super initialize. @@ -92,12 +94,12 @@ IceCredentialStore >> initialize [ sshCredentials := Dictionary new. ] -{ #category : #testing } +{ #category : 'testing' } IceCredentialStore >> isCurrent [ ^ self == CurrentStore ] -{ #category : #'API - storing' } +{ #category : 'API - storing' } IceCredentialStore >> loadFromStore [ | array | @@ -125,39 +127,39 @@ IceCredentialStore >> loadFromStore [ sshCredentials := array at: 2 ] -{ #category : #'private - lookup' } +{ #category : 'private - lookup' } IceCredentialStore >> lookup: aHostName in: dict ifAbsent: aBlock [ self loadFromStore. ^ dict at: aHostName ifAbsent: aBlock ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceCredentialStore >> plaintextCredentialForHostname: aHostname [ ^ self lookup: aHostname in: plainCredentials ifAbsent: [ IcePlaintextCredentials new ] ] -{ #category : #'API - storing' } +{ #category : 'API - storing' } IceCredentialStore >> removeCredential: aCredential [ aCredential removeFrom: self. self saveIntoStore. ] -{ #category : #'private - storing' } +{ #category : 'private - storing' } IceCredentialStore >> removePlainTextCredential: anIcePlaintextCredentials [ plainCredentials removeKey: anIcePlaintextCredentials host ] -{ #category : #'private - storing' } +{ #category : 'private - storing' } IceCredentialStore >> removeSSHCredential: aCredential [ sshCredentials removeKey: aCredential host ] -{ #category : #'API - storing' } +{ #category : 'API - storing' } IceCredentialStore >> saveIntoStore [ self flag: #pharoTodo. "implement an encrypted version" @@ -183,13 +185,13 @@ IceCredentialStore >> saveIntoStore [ sshCredentials } ] ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceCredentialStore >> sshCredentialForHostname: aHostname [ ^ self lookup: aHostname in: sshCredentials ifAbsent: [ self defaultSSHCredential ]. ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceCredentialStore >> storeCredential: credential [ self loadFromStore. @@ -197,7 +199,7 @@ IceCredentialStore >> storeCredential: credential [ self saveIntoStore ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceCredentialStore >> storeCredential: credential forHostname: aHostname [ self loadFromStore. @@ -205,18 +207,18 @@ IceCredentialStore >> storeCredential: credential forHostname: aHostname [ self saveIntoStore ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialStore >> storeFile: aFileLocator [ storeFile := aFileLocator ] -{ #category : #'private - storing' } +{ #category : 'private - storing' } IceCredentialStore >> storePlaintextCredential: credential forHostname: aHostname [ plainCredentials at: aHostname put: credential ] -{ #category : #'private - storing' } +{ #category : 'private - storing' } IceCredentialStore >> storeSshCredential: credential forHostname: aHostname [ sshCredentials at: aHostname put: credential diff --git a/Iceberg/IceCredentialsProvider.class.st b/Iceberg/IceCredentialsProvider.class.st index 08c7ceb140..c8311e0cfd 100644 --- a/Iceberg/IceCredentialsProvider.class.st +++ b/Iceberg/IceCredentialsProvider.class.st @@ -4,8 +4,8 @@ I am in charge of remembering credentials information, configuration and providi I have a counter to avoid for trying for ever with the same credentials. " Class { - #name : #IceCredentialsProvider, - #superclass : #Object, + #name : 'IceCredentialsProvider', + #superclass : 'Object', #instVars : [ 'tries', 'remote' @@ -14,10 +14,12 @@ Class { 'ProviderType', 'UseCustomSsh' ], - #category : #'Iceberg-Security' + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #private } +{ #category : 'private' } IceCredentialsProvider class >> defaultCredentialProviderClass [ | providers | providers := self allSubclasses. @@ -25,43 +27,43 @@ IceCredentialsProvider class >> defaultCredentialProviderClass [ ^ providers detect: #isDefault ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceCredentialsProvider class >> defaultForHost: aString [ ^ self defaultForRemote: (IceRemoteWithOnlyHostname for: aString) ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceCredentialsProvider class >> defaultForRemote: aRemote [ ^ self providerType new remote: aRemote; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceCredentialsProvider class >> defaultForRemoteUrl: url [ ^ self providerType new remote: (IceGitRemote url: url); yourself ] -{ #category : #private } +{ #category : 'private' } IceCredentialsProvider class >> isDefault [ ^ false ] -{ #category : #private } +{ #category : 'private' } IceCredentialsProvider class >> providerType [ ^ ProviderType ifNil: [ ProviderType := self defaultCredentialProviderClass ] ] -{ #category : #private } +{ #category : 'private' } IceCredentialsProvider class >> providerType: anObject [ ProviderType := anObject ] -{ #category : #settings } +{ #category : 'settings' } IceCredentialsProvider class >> settingsOn: aBuilder [ (aBuilder setting: #useCustomSsh) @@ -101,68 +103,68 @@ IceCredentialsProvider class >> settingsOn: aBuilder [ label: 'Passphrase of your SSH key' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider class >> sshCredentials [ "It returns the default ssh credentials to use when not configured new for the host" ^ IceCredentialStore current defaultSSHCredential ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider class >> sshCredentialsClass [ self useCustomSsh ifTrue: [ ^ LGitCredentialsSSH ]. ^ LGitCredentialsSSHAgent ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider class >> useCustomSsh [ ^ UseCustomSsh ifNil: [ UseCustomSsh := false ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider class >> useCustomSsh: aBoolean [ UseCustomSsh := aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider >> credentialStore [ ^ IceCredentialStore current ] -{ #category : #initialization } +{ #category : 'initialization' } IceCredentialsProvider >> initialize [ tries := 0. ] -{ #category : #private } +{ #category : 'private' } IceCredentialsProvider >> obtainCredentials: response [ self subclassResponsibility ] -{ #category : #private } +{ #category : 'private' } IceCredentialsProvider >> obtainPlaintextCredentials: response [ self subclassResponsibility ] -{ #category : #private } +{ #category : 'private' } IceCredentialsProvider >> obtainSshCredentials: response [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider >> plaintextCredentials [ ^ self credentialStore plaintextCredentialForHostname: remote host. ] -{ #category : #actions } +{ #category : 'actions' } IceCredentialsProvider >> providePlaintextCredentials [ ^self plaintextCredentials isPresent ifTrue: [ self plaintextCredentials copy ] ifFalse: [ self providePlaintextCredentialsTo: IcePlaintextCredentials new ]. ] -{ #category : #actions } +{ #category : 'actions' } IceCredentialsProvider >> providePlaintextCredentialsTo: credentials [ tries := tries + 1. @@ -177,7 +179,7 @@ IceCredentialsProvider >> providePlaintextCredentialsTo: credentials [ ] -{ #category : #actions } +{ #category : 'actions' } IceCredentialsProvider >> provideSshAgentCredentialsTo: credentials [ "Just check for tries to ensure we do not enter an infinite cycle in libgit2" tries := tries + 1. @@ -186,7 +188,7 @@ IceCredentialsProvider >> provideSshAgentCredentialsTo: credentials [ LGitNoCredentialsProvided signal: 'No ssh-agent credentials found.' ] ] -{ #category : #actions } +{ #category : 'actions' } IceCredentialsProvider >> provideSshCredentialsTo: credentials [ tries := tries + 1. @@ -199,17 +201,17 @@ IceCredentialsProvider >> provideSshCredentialsTo: credentials [ ifFalse: [ self obtainSshCredentials: credentials ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider >> remote: anObject [ remote := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider >> sshCredentials [ ^ IceCredentialStore current sshCredentialForHostname: remote host. ] -{ #category : #accessing } +{ #category : 'accessing' } IceCredentialsProvider >> sshCredentialsClass [ ^ self class sshCredentialsClass ] diff --git a/Iceberg/IceCritiquesVisitor.class.st b/Iceberg/IceCritiquesVisitor.class.st index feb69d1763..8015483c6c 100644 --- a/Iceberg/IceCritiquesVisitor.class.st +++ b/Iceberg/IceCritiquesVisitor.class.st @@ -2,33 +2,35 @@ I am a tree visitor that returns a set of critics to the elements in the collection " Class { - #name : #IceCritiquesVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceCritiquesVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'critiques' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #accessing } +{ #category : 'accessing' } IceCritiquesVisitor >> critiques [ ^ critiques ] -{ #category : #initialization } +{ #category : 'initialization' } IceCritiquesVisitor >> initialize [ super initialize. critiques := Set new ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitAddition: anIceAddition [ ^ anIceAddition definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitAll: aCollection [ aCollection @@ -36,19 +38,19 @@ IceCritiquesVisitor >> visitAll: aCollection [ displayingProgress: [ :each | 'Calculating Critiques...' ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitClassDefinition: anIceClassDefinition [ anIceClassDefinition canBeBrowsed ifTrue: [ critiques addAll: anIceClassDefinition actualClass critiques ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitDirectoryDefinition: anIceDirectoryDefinition [ "no critiques for directories" ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitExtensionDefinition: anIceExtension [ "^ anIceExtension definition accept: self" | actualClass methods | @@ -59,32 +61,32 @@ IceCritiquesVisitor >> visitExtensionDefinition: anIceExtension [ ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitFileNode: anIceFileDefinition [ ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitMethodNode: anIceMethodDefinition [ anIceMethodDefinition canBeBrowsed ifTrue: [ critiques addAll: (anIceMethodDefinition contextClass >> anIceMethodDefinition name) critiques ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitModification: anIceModification [ ^ anIceModification definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitNoModification: anIceNoModification [ "If there is no modification I don't generate critics for this node" ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitPackage: anIcePackageDefinition [ | aPackage | @@ -92,13 +94,13 @@ IceCritiquesVisitor >> visitPackage: anIcePackageDefinition [ critiques addAll: aPackage critiques ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitRemoval: anIceRemoval [ "We do nothing on removal" ] -{ #category : #visiting } +{ #category : 'visiting' } IceCritiquesVisitor >> visitTraitDefinition: anIceClassDefinition [ anIceClassDefinition canBeBrowsed ifTrue: [ diff --git a/Iceberg/IceCypressPropertiesChange.class.st b/Iceberg/IceCypressPropertiesChange.class.st index 3963fda378..8543166a70 100644 --- a/Iceberg/IceCypressPropertiesChange.class.st +++ b/Iceberg/IceCypressPropertiesChange.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceCypressPropertiesChange, - #superclass : #IceChange, - #category : #'Iceberg-Changes' + #name : 'IceCypressPropertiesChange', + #superclass : 'IceChange', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceCypressPropertiesChange >> accept: anIceChangeImporter [ anIceChangeImporter visitCypressPropertiesChange: self ] -{ #category : #displaying } +{ #category : 'displaying' } IceCypressPropertiesChange >> displayingProgressString [ ^ 'Comparing Cypress changes' ] diff --git a/Iceberg/IceDefinedDependency.class.st b/Iceberg/IceDefinedDependency.class.st index f3894968b8..d5efc6d3e5 100644 --- a/Iceberg/IceDefinedDependency.class.st +++ b/Iceberg/IceDefinedDependency.class.st @@ -2,15 +2,17 @@ I am a dependency for the IceDefinitions that have a MCDefinition. " Class { - #name : #IceDefinedDependency, - #superclass : #IceDependency, + #name : 'IceDefinedDependency', + #superclass : 'IceDependency', #instVars : [ 'definition' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #comparing } +{ #category : 'comparing' } IceDefinedDependency >> = anObject [ "Answer whether the receiver and anObject represent the same object." self == anObject @@ -20,7 +22,7 @@ IceDefinedDependency >> = anObject [ ^ definition className = anObject definition className ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceDefinedDependency >> addTransitiveDependenciesFrom: anIceDiff to: anIceCherrypicker [ | asDependencyVisitor | asDependencyVisitor := IceAsDependencyVisitor new. @@ -54,35 +56,35 @@ IceDefinedDependency >> addTransitiveDependenciesFrom: anIceDiff to: anIceCherry [ :iceNode | anIceCherrypicker addDependency: (iceNode accept: asDependencyVisitor) ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceDefinedDependency >> definition [ ^ definition ] -{ #category : #accessing } +{ #category : 'accessing' } IceDefinedDependency >> definition: anObject [ definition := anObject ] -{ #category : #comparing } +{ #category : 'comparing' } IceDefinedDependency >> hash [ "Answer an integer value that is related to the identity of the receiver." ^ definition className hash ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceDefinedDependency >> referencedClasses [ ^ self subclassResponsibility ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceDefinedDependency >> referencedPackages [ ^ self subclassResponsibility ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceDefinedDependency >> referencedTraits [ ^ self subclassResponsibility diff --git a/Iceberg/IceDefinition.class.st b/Iceberg/IceDefinition.class.st index 88c944cbd8..c187b37de2 100644 --- a/Iceberg/IceDefinition.class.st +++ b/Iceberg/IceDefinition.class.st @@ -13,15 +13,17 @@ My main API is used to show myself in a diff or merge browser: I am also used for comparison to build diffs. See my definitions of equality along my subclasses. " Class { - #name : #IceDefinition, - #superclass : #Object, + #name : 'IceDefinition', + #superclass : 'Object', #instVars : [ 'name' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceDefinition class >> named: aString [ ^ self new @@ -29,110 +31,110 @@ IceDefinition class >> named: aString [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceDefinition >> = anotherDefinition [ ^ self species = anotherDefinition species and: [ self name = anotherDefinition name ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceDefinition >> accept: aVisitor [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceDefinition >> basicName [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceDefinition >> contents [ self subclassResponsibility ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceDefinition >> contextClass [ ^ nil ] -{ #category : #comparing } +{ #category : 'comparing' } IceDefinition >> hash [ ^ self name hash ] -{ #category : #testing } +{ #category : 'testing' } IceDefinition >> isClassDefinition [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceDefinition >> isDirectoryDefinition [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceDefinition >> isExtensionDefinition [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceDefinition >> isFileDefinition [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceDefinition >> isMethodDefinition [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceDefinition >> isPackageDefinition [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceDefinition >> isRootDefinition [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceDefinition >> isTraitDefinition [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceDefinition >> key [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceDefinition >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceDefinition >> name: aString [ name := aString ] -{ #category : #visiting } +{ #category : 'visiting' } IceDefinition >> removeFrom: aVisitor [ self subclassResponsibility diff --git a/Iceberg/IceDependency.class.st b/Iceberg/IceDependency.class.st index 7a9d7ae979..8378438a78 100644 --- a/Iceberg/IceDependency.class.st +++ b/Iceberg/IceDependency.class.st @@ -3,30 +3,32 @@ I am a dependency of an IceDefinition in a IceDiff. " Class { - #name : #IceDependency, - #superclass : #Object, + #name : 'IceDependency', + #superclass : 'Object', #instVars : [ 'cherrypicker' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #adding } +{ #category : 'adding' } IceDependency >> addTransitiveDependenciesFrom: anIceDiff to: anIceCherrypicker [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceDependency >> cherrypicker [ ^ cherrypicker ] -{ #category : #accessing } +{ #category : 'accessing' } IceDependency >> cherrypicker: anIceCherrypicker [ cherrypicker :=anIceCherrypicker ] -{ #category : #adding } +{ #category : 'adding' } IceDependency >> isDependencyTo: aDefinition [ ^ self subclassResponsibility ] diff --git a/Iceberg/IceDependencyEnvironment.class.st b/Iceberg/IceDependencyEnvironment.class.st index e612bba28b..6bdb9ffb02 100644 --- a/Iceberg/IceDependencyEnvironment.class.st +++ b/Iceberg/IceDependencyEnvironment.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceDependencyEnvironment, - #superclass : #Object, + #name : 'IceDependencyEnvironment', + #superclass : 'Object', #instVars : [ 'commit', 'definitions' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceDependencyEnvironment class >> on: anIceGitCommit [ ^ self new commit: anIceGitCommit; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceDependencyEnvironment >> allSubclassesNamesOf: aName [ | result | @@ -25,7 +27,7 @@ IceDependencyEnvironment >> allSubclassesNamesOf: aName [ ^ result , (result flatCollect: [ :e | self allSubclassesNamesOf: e ]). ] -{ #category : #accessing } +{ #category : 'accessing' } IceDependencyEnvironment >> allUsingTraitNamed: aName [ | result | result := self usersOfTraitNamed: aName. @@ -35,18 +37,18 @@ IceDependencyEnvironment >> allUsingTraitNamed: aName [ , (result flatCollect: [ :e | self allUsingTraitNamed: e ]) ] -{ #category : #querying } +{ #category : 'querying' } IceDependencyEnvironment >> classes [ ^ self definitions select: [ :e | e isClassDefinition ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceDependencyEnvironment >> commit: anIceGitCommit [ commit := anIceGitCommit ] -{ #category : #private } +{ #category : 'private' } IceDependencyEnvironment >> definitions [ ^ definitions @@ -54,19 +56,19 @@ IceDependencyEnvironment >> definitions [ definitions := commit packages flatCollect: [ :package | (commit snapshotForPackage: package) definitions ] ] ] -{ #category : #querying } +{ #category : 'querying' } IceDependencyEnvironment >> subclassNamesOf: aString [ ^ self classes select: [ :e | e superclassName = aString ] thenCollect: [ :e | e className ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceDependencyEnvironment >> traits [ ^ self definitions select: [ :e | e isTraitDefinition ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceDependencyEnvironment >> usersOfTraitNamed: aName [ ^ (self traits , self classes) select: [ :e | e traitComposition includesSubstring: aName ] diff --git a/Iceberg/IceDiff.class.st b/Iceberg/IceDiff.class.st index 62fc40b0dd..563307d3e4 100644 --- a/Iceberg/IceDiff.class.st +++ b/Iceberg/IceDiff.class.st @@ -18,8 +18,8 @@ I am created by doing one of the following: yourself " Class { - #name : #IceDiff, - #superclass : #Object, + #name : 'IceDiff', + #superclass : 'Object', #instVars : [ 'tree', 'source', @@ -27,10 +27,12 @@ Class { 'writerClass', 'mergedTree' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceDiff class >> from: sourceCommitish to: targetCommitish [ ^ self new @@ -40,19 +42,19 @@ IceDiff class >> from: sourceCommitish to: targetCommitish [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceDiff >> accept: aVisitor [ ^ tree accept: aVisitor ] -{ #category : #building } +{ #category : 'building' } IceDiff >> build [ self buildForChanges: (source changesTo: target) ] -{ #category : #building } +{ #category : 'building' } IceDiff >> buildForAllFiles [ | files changes | @@ -62,7 +64,7 @@ IceDiff >> buildForAllFiles [ self buildForChanges: changes ] -{ #category : #building } +{ #category : 'building' } IceDiff >> buildForChanges: aCollection [ | leftTree rightTree | @@ -86,13 +88,13 @@ IceDiff >> buildForChanges: aCollection [ tree := mergedTree select: [ :operation | operation hasChanges ]. ] -{ #category : #building } +{ #category : 'building' } IceDiff >> buildForPackages: aCollection [ self buildForChanges: (aCollection collect: [ :package | IceImageChange package: package ]) ] -{ #category : #building } +{ #category : 'building' } IceDiff >> buildFull [ "Image changes should be processed before commit changes @@ -100,13 +102,13 @@ IceDiff >> buildFull [ self buildForChanges: self imageChanges, (source referenceCommit changesTo: target) asArray ] -{ #category : #testing } +{ #category : 'testing' } IceDiff >> canRevertChanges [ ^ source canRevertChanges ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> codeSubdirectoryNode [ ^ self repository subdirectory @@ -115,7 +117,7 @@ IceDiff >> codeSubdirectoryNode [ ] -{ #category : #copying } +{ #category : 'copying' } IceDiff >> copyWithOnly: aCollection [ | treeCopy selectedOperations | @@ -129,44 +131,44 @@ IceDiff >> copyWithOnly: aCollection [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> description [ ^ target description ] -{ #category : #operations } +{ #category : 'operations' } IceDiff >> diff: leftTree with: rightTree [ ^ (self mergedTreeOf: leftTree with: rightTree) select: [ :operation | operation hasChanges ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> diffTree: anIceTreeDiff [ tree := anIceTreeDiff ] -{ #category : #building } +{ #category : 'building' } IceDiff >> imageChanges [ ^ self imageChangesForPackages: source loadedPackages ] -{ #category : #building } +{ #category : 'building' } IceDiff >> imageChangesForPackages: aCollection [ ^ aCollection collect: [ :package | IceImageChange package: package ] as: Array ] -{ #category : #testing } +{ #category : 'testing' } IceDiff >> includesPackageNamed: aString [ ^ self isEmpty not and: [ self codeSubdirectoryNode includesKey: aString ] ] -{ #category : #testing } +{ #category : 'testing' } IceDiff >> isCodeSubdirectory: aNode [ | nodeLocation repositorySubdirectoryLocation | @@ -175,24 +177,24 @@ IceDiff >> isCodeSubdirectory: aNode [ ^ nodeLocation pathString = repositorySubdirectoryLocation pathString ] -{ #category : #testing } +{ #category : 'testing' } IceDiff >> isEmpty [ ^ tree isEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceDiff >> isValidPackage: aFileReference [ ^ self writerClass isValidPackage: aFileReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> mergedTree [ ^ mergedTree ] -{ #category : #operations } +{ #category : 'operations' } IceDiff >> mergedTreeOf: leftTree with: rightTree [ ^ leftTree @@ -205,55 +207,55 @@ IceDiff >> mergedTreeOf: leftTree with: rightTree [ ifFalse: [ IceModification left: left right: right ] ] ] -{ #category : #converting } +{ #category : 'converting' } IceDiff >> packageNameFromDirectory: aString [ ^ self writerClass packageNameFromDirectory: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> packages [ tree isEmpty ifTrue: [ ^ #( ) ]. ^ self codeSubdirectoryNode children ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> repository [ ^ source repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> sourceVersion [ ^ source ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> sourceVersion: aCommitish [ source := aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> targetVersion [ ^ target ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> targetVersion: aCommitish [ target := aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> tree [ ^ tree ] -{ #category : #accessing } +{ #category : 'accessing' } IceDiff >> treeToShow [ "Returns the tree to show in the UI. For a diff it is always the same tree. @@ -261,7 +263,7 @@ IceDiff >> treeToShow [ ^ self tree ] -{ #category : #converting } +{ #category : 'converting' } IceDiff >> writerClass [ "I am cached per instance of diff because obtaining the writer class is an expensive operation (600ms per call)" diff --git a/Iceberg/IceDirectoryDefinition.class.st b/Iceberg/IceDirectoryDefinition.class.st index 2a51a80dca..da23beecb0 100644 --- a/Iceberg/IceDirectoryDefinition.class.st +++ b/Iceberg/IceDirectoryDefinition.class.st @@ -6,24 +6,26 @@ My contents is an empty string. See my superclasses for more information. " Class { - #name : #IceDirectoryDefinition, - #superclass : #IceFileSystemDefinition, - #category : 'Iceberg-Changes' + #name : 'IceDirectoryDefinition', + #superclass : 'IceFileSystemDefinition', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceDirectoryDefinition >> accept: aVisitor [ ^ aVisitor visitDirectoryDefinition: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceDirectoryDefinition >> contents [ ^ '' ] -{ #category : #testing } +{ #category : 'testing' } IceDirectoryDefinition >> isDirectoryDefinition [ ^ true diff --git a/Iceberg/IceDuplicatedRepository.class.st b/Iceberg/IceDuplicatedRepository.class.st index a51b518de2..7e0f3a4775 100644 --- a/Iceberg/IceDuplicatedRepository.class.st +++ b/Iceberg/IceDuplicatedRepository.class.st @@ -2,7 +2,9 @@ When trying to create a repository I found another one with a conflicting location (i.e. the same director on disk). " Class { - #name : #IceDuplicatedRepository, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceDuplicatedRepository', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } diff --git a/Iceberg/IceEmptyMerge.class.st b/Iceberg/IceEmptyMerge.class.st index eab1c43a31..abeb699a15 100644 --- a/Iceberg/IceEmptyMerge.class.st +++ b/Iceberg/IceEmptyMerge.class.st @@ -2,18 +2,20 @@ I am a null object representing the absence of a merge. I am used when no merge is needed between two versions, for example, in case the commit to merge is already in the image and the commit to merge into is an ancestor of this commit. " Class { - #name : #IceEmptyMerge, - #superclass : #Object, - #category : 'Iceberg-Changes' + #name : 'IceEmptyMerge', + #superclass : 'Object', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #accessing } +{ #category : 'accessing' } IceEmptyMerge >> mergeTree [ ^ IceEmptyNode new ] -{ #category : #accessing } +{ #category : 'accessing' } IceEmptyMerge >> tree [ ^ self mergeTree diff --git a/Iceberg/IceEmptyNode.class.st b/Iceberg/IceEmptyNode.class.st index 9d51ad0495..ffc0d72327 100644 --- a/Iceberg/IceEmptyNode.class.st +++ b/Iceberg/IceEmptyNode.class.st @@ -2,51 +2,53 @@ I am a null object representing an empty node of a tree. I'm used together with IceNode. " Class { - #name : #IceEmptyNode, - #superclass : #IceAbstractNode, - #category : #'Iceberg-Changes' + #name : 'IceEmptyNode', + #superclass : 'IceAbstractNode', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceEmptyNode >> accept: aVisitor [ ^ aVisitor visitEmptyNode: self ] -{ #category : #adding } +{ #category : 'adding' } IceEmptyNode >> addTo: anotherNode [ "I'm empty, so I do not add myself to a tree." ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceEmptyNode >> anySatisfy: aBlockClosure [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceEmptyNode >> children [ ^ #() ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceEmptyNode >> collect: aBlockClosure [ ^ self ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceEmptyNode >> collectWithPath: aBlockClosure [ ^ self ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceEmptyNode >> do: aBlock [ "Do nothing" ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceEmptyNode >> firstNodeSuchThat: conditionBlock ifNone: noneBlock [ ^ (conditionBlock value: self) @@ -54,48 +56,48 @@ IceEmptyNode >> firstNodeSuchThat: conditionBlock ifNone: noneBlock [ ifFalse: noneBlock ] -{ #category : #testing } +{ #category : 'testing' } IceEmptyNode >> hasChanges [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceEmptyNode >> includesKey: aString [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceEmptyNode >> isEmpty [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceEmptyNode >> isEmptyNode [ ^ true ] -{ #category : #merging } +{ #category : 'merging' } IceEmptyNode >> mergeWith: anotherNode onLeft: leftBlock onRight: rightBlock onMerge: mergeBlock [ ^ anotherNode collect: rightBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceEmptyNode >> path [ ^ RelativePath new ] -{ #category : #accessing } +{ #category : 'accessing' } IceEmptyNode >> resolve: aRelativePath ifPresent: presentBlock ifAbsent: absentBlock [ ^ absentBlock value ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceEmptyNode >> select: aBlockClosure [ ^ self diff --git a/Iceberg/IceEmptyWorkingCopy.class.st b/Iceberg/IceEmptyWorkingCopy.class.st index 50e8c2e960..a312a9045f 100644 --- a/Iceberg/IceEmptyWorkingCopy.class.st +++ b/Iceberg/IceEmptyWorkingCopy.class.st @@ -2,30 +2,32 @@ I am an empty working copy, with no loaded packages. " Class { - #name : #IceEmptyWorkingCopy, - #superclass : #IceWorkingCopyState, - #category : #'Iceberg-WorkingCopy' + #name : 'IceEmptyWorkingCopy', + #superclass : 'IceWorkingCopyState', + #category : 'Iceberg-WorkingCopy', + #package : 'Iceberg', + #tag : 'WorkingCopy' } -{ #category : #display } +{ #category : 'display' } IceEmptyWorkingCopy >> description [ ^ 'Nothing loaded' ] -{ #category : #testing } +{ #category : 'testing' } IceEmptyWorkingCopy >> isDetached [ "I have no reference commit, I cannot be detached" ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceEmptyWorkingCopy >> referenceCommit [ ^ repository head commit ] -{ #category : #validating } +{ #category : 'validating' } IceEmptyWorkingCopy >> validateCanCommit [ "I've no packages loaded. I can always commit. diff --git a/Iceberg/IceError.class.st b/Iceberg/IceError.class.st index 463a6ca019..e4b198cd4f 100644 --- a/Iceberg/IceError.class.st +++ b/Iceberg/IceError.class.st @@ -2,12 +2,14 @@ Base class for all errors in Iceberg. " Class { - #name : #IceError, - #superclass : #Error, - #category : 'Iceberg-Errors' + #name : 'IceError', + #superclass : 'Error', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceError >> acceptError: aVisitor [ aVisitor visitGenericError: self ] diff --git a/Iceberg/IceErrorVisitor.class.st b/Iceberg/IceErrorVisitor.class.st index 3e55dea613..c541a16ebf 100644 --- a/Iceberg/IceErrorVisitor.class.st +++ b/Iceberg/IceErrorVisitor.class.st @@ -2,73 +2,75 @@ I'm a generic visitor for IceError instances. My subclasses can override my methods to specialize handling. " Class { - #name : #IceErrorVisitor, - #superclass : #Object, - #category : #'Iceberg-Errors' + #name : 'IceErrorVisitor', + #superclass : 'Object', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitAuthenticationError: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitCheckoutConflict: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitCloneLocationAlreadyExists: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitCloneRemoteNotFound: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitGenericError: anError [ "Just re-send as default (to have a debugger)" anError pass ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitMergeAborted: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitMissingCredentialsError: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitNoRemote: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitNothingToCommitError: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitRemoteAlreadyExistError: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitRemoteDesynchronizedError: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitShouldCommitBeforePullError: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceErrorVisitor >> visitWorkingCopyDesynchronizedError: anError [ self visitGenericError: anError ] diff --git a/Iceberg/IceExtendedClassDependency.class.st b/Iceberg/IceExtendedClassDependency.class.st index 38a1025d98..8581e1b8da 100644 --- a/Iceberg/IceExtendedClassDependency.class.st +++ b/Iceberg/IceExtendedClassDependency.class.st @@ -1,41 +1,43 @@ Class { - #name : #IceExtendedClassDependency, - #superclass : #IceDefinedDependency, - #category : #'Iceberg-Cherrypicking' + #name : 'IceExtendedClassDependency', + #superclass : 'IceDefinedDependency', + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #comparing } +{ #category : 'comparing' } IceExtendedClassDependency >> = anObject [ ^ super = anObject and: [ self definition name = anObject definition name ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceExtendedClassDependency >> hash [ ^ super hash bitXor: self definition name hash ] -{ #category : #adding } +{ #category : 'adding' } IceExtendedClassDependency >> isDependencyTo: anIceDefinition [ ^ anIceDefinition name = self definition name ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceExtendedClassDependency >> referencedClasses [ ^ {definition name asSymbol } ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceExtendedClassDependency >> referencedPackages [ ^ {self definition packageName} ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceExtendedClassDependency >> referencedTraits [ ^ self referencedClasses ] -{ #category : #visiting } +{ #category : 'visiting' } IceExtendedClassDependency >> visitExtensionDefinition: anIceExtensionDefinition [ ^ definition name = anIceExtensionDefinition name ] diff --git a/Iceberg/IceExtensionDefinition.class.st b/Iceberg/IceExtensionDefinition.class.st index 4ded617fb0..b089756cc2 100644 --- a/Iceberg/IceExtensionDefinition.class.st +++ b/Iceberg/IceExtensionDefinition.class.st @@ -7,15 +7,17 @@ My contents is just an empty string as the extended class/trait is not defined i See my superclasses for more information. " Class { - #name : #IceExtensionDefinition, - #superclass : #IceMethodContainerDefinition, + #name : 'IceExtensionDefinition', + #superclass : 'IceMethodContainerDefinition', #instVars : [ 'packageName' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceExtensionDefinition class >> named: aString isMeta: isMeta packageName: aName [ ^ self new name: aString; @@ -24,64 +26,64 @@ IceExtensionDefinition class >> named: aString isMeta: isMeta packageName: aName yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceExtensionDefinition >> = otherExtension [ ^ self species = otherExtension species and: [ self name = otherExtension name ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceExtensionDefinition >> accept: aVisitor [ ^ aVisitor visitExtensionDefinition: self ] -{ #category : #patching } +{ #category : 'patching' } IceExtensionDefinition >> addModification: anIceModification toPatcher: aMCPatcher [ "Do nothing. Monticello does not have definitions for extensions" ] -{ #category : #patching } +{ #category : 'patching' } IceExtensionDefinition >> addToPatcher: aMCPatcher [ "Monticello does not reify extensions" ] -{ #category : #visiting } +{ #category : 'visiting' } IceExtensionDefinition >> contents [ ^ '' ] -{ #category : #comparing } +{ #category : 'comparing' } IceExtensionDefinition >> hash [ ^ self name hash ] -{ #category : #testing } +{ #category : 'testing' } IceExtensionDefinition >> isExtensionDefinition [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceExtensionDefinition >> packageName [ ^ packageName ] -{ #category : #accessing } +{ #category : 'accessing' } IceExtensionDefinition >> packageName: anObject [ packageName := anObject ] -{ #category : #patching } +{ #category : 'patching' } IceExtensionDefinition >> removeFrom: aPatcher [ "Do nothing. Do not remove extensions" ] -{ #category : #patching } +{ #category : 'patching' } IceExtensionDefinition >> removeFromPatcher: aMCPatcher [ "Monticello does not reify extensions" diff --git a/Iceberg/IceExternalJob.class.st b/Iceberg/IceExternalJob.class.st index 319d671b9b..47be8ec012 100644 --- a/Iceberg/IceExternalJob.class.st +++ b/Iceberg/IceExternalJob.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceExternalJob, - #superclass : #Object, + #name : 'IceExternalJob', + #superclass : 'Object', #instVars : [ 'title', 'started', @@ -8,70 +8,72 @@ Class { 'max', 'current' ], - #category : 'Iceberg-Progress' + #category : 'Iceberg-Progress', + #package : 'Iceberg', + #tag : 'Progress' } -{ #category : #events } +{ #category : 'events' } IceExternalJob >> changed [ current >= max ifTrue: [ ^ Job jobAnnouncer announce: (JobEnd on: self) ]. Job jobAnnouncer announce: (JobChange on: self) ] -{ #category : #accessing } +{ #category : 'accessing' } IceExternalJob >> current: anInteger [ current := anInteger ] -{ #category : #events } +{ #category : 'events' } IceExternalJob >> end [ Job jobAnnouncer announce: (JobEnd on: self) ] -{ #category : #events } +{ #category : 'events' } IceExternalJob >> ensureStarted [ started ifFalse: [ self start ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceExternalJob >> initialize [ super initialize. started := false ] -{ #category : #accessing } +{ #category : 'accessing' } IceExternalJob >> max: anInteger [ max := anInteger ] -{ #category : #accessing } +{ #category : 'accessing' } IceExternalJob >> min: anInteger [ min := anInteger ] -{ #category : #accessing } +{ #category : 'accessing' } IceExternalJob >> owner [ ^ nil ] -{ #category : #accessing } +{ #category : 'accessing' } IceExternalJob >> progress [ ^ min >= max ifTrue: [ 1 ] ifFalse: [ (current - min) / (max - min) ] ] -{ #category : #events } +{ #category : 'events' } IceExternalJob >> start [ started := true. Job jobAnnouncer announce: (JobStart on: self) ] -{ #category : #accessing } +{ #category : 'accessing' } IceExternalJob >> title [ ^ title ] -{ #category : #accessing } +{ #category : 'accessing' } IceExternalJob >> title: aString [ title := aString ] diff --git a/Iceberg/IceFileDefinition.class.st b/Iceberg/IceFileDefinition.class.st index b167677a6e..aedecf786e 100644 --- a/Iceberg/IceFileDefinition.class.st +++ b/Iceberg/IceFileDefinition.class.st @@ -6,15 +6,17 @@ My contents are the contents of the file, utf8 decoded. See my superclasses for more information. " Class { - #name : #IceFileDefinition, - #superclass : #IceFileSystemDefinition, + #name : 'IceFileDefinition', + #superclass : 'IceFileSystemDefinition', #instVars : [ 'contents' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceFileDefinition class >> named: aString path: aPath contents: contents [ ^ (self named: aString path: aPath) @@ -22,7 +24,7 @@ IceFileDefinition class >> named: aString path: aPath contents: contents [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceFileDefinition class >> named: aString path: aPath fileReference: aFileReference [ ^ self named: aString @@ -30,31 +32,31 @@ IceFileDefinition class >> named: aString path: aPath fileReference: aFileRefere contents: (aFileReference binaryReadStreamDo: [ :each | each upToEnd ]) ] -{ #category : #comparing } +{ #category : 'comparing' } IceFileDefinition >> = anotherDefinition [ ^ super = anotherDefinition and: [ contents = anotherDefinition basicContents ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceFileDefinition >> accept: aVisitor [ ^ aVisitor visitFileNode: self ] -{ #category : #comparing } +{ #category : 'comparing' } IceFileDefinition >> basicContents [ ^ contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceFileDefinition >> basicContents: anObject [ contents := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceFileDefinition >> contents [ "Contents for display purposes. If the file is binary (or could not detect as utf8 file) then just return an hexa dump representation of the contents @@ -65,32 +67,32 @@ IceFileDefinition >> contents [ ifFalse: [ contents utf8Decoded ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceFileDefinition >> contents: anObject [ contents := anObject ] -{ #category : #comparing } +{ #category : 'comparing' } IceFileDefinition >> hash [ ^ self contents hash ] -{ #category : #testing } +{ #category : 'testing' } IceFileDefinition >> isBinary [ [contents utf8Decoded] on: ZnInvalidUTF8 do: [ ^ true ]. ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceFileDefinition >> isFileDefinition [ ^ true ] -{ #category : #operations } +{ #category : 'operations' } IceFileDefinition >> removeFrom: aVisitor [ aVisitor removeFile: self ] diff --git a/Iceberg/IceFileSystemDefinition.class.st b/Iceberg/IceFileSystemDefinition.class.st index 3554a75dcb..1548d92d2a 100644 --- a/Iceberg/IceFileSystemDefinition.class.st +++ b/Iceberg/IceFileSystemDefinition.class.st @@ -6,16 +6,18 @@ My concrete subclasses represent directories and files. See my superclasses for more information. " Class { - #name : #IceFileSystemDefinition, - #superclass : #IceDefinition, + #name : 'IceFileSystemDefinition', + #superclass : 'IceDefinition', #instVars : [ 'path', 'fileReference' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceFileSystemDefinition class >> named: aString path: aPath [ ^ (self named: aString) @@ -23,30 +25,30 @@ IceFileSystemDefinition class >> named: aString path: aPath [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceFileSystemDefinition >> fileReference [ ^ fileReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceFileSystemDefinition >> fileReference: aFileReference [ fileReference := aFileReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceFileSystemDefinition >> path [ ^ path ] -{ #category : #accessing } +{ #category : 'accessing' } IceFileSystemDefinition >> path: anObject [ path := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceFileSystemDefinition >> removeFrom: aVisitor [ aVisitor removeFileReferenceInPath: self path diff --git a/Iceberg/IceGenericError.class.st b/Iceberg/IceGenericError.class.st index 7e4acc576a..ef82561f94 100644 --- a/Iceberg/IceGenericError.class.st +++ b/Iceberg/IceGenericError.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceGenericError, - #superclass : #IceError, + #name : 'IceGenericError', + #superclass : 'IceError', #instVars : [ 'wrappedException' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #accessing } +{ #category : 'accessing' } IceGenericError >> wrappedException: anError [ wrappedException := anError diff --git a/Iceberg/IceGitCheckoutProgress.class.st b/Iceberg/IceGitCheckoutProgress.class.st index 9a9df35446..138d86bc66 100644 --- a/Iceberg/IceGitCheckoutProgress.class.st +++ b/Iceberg/IceGitCheckoutProgress.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceGitCheckoutProgress, - #superclass : #LGitCheckoutProgressCallback, + #name : 'IceGitCheckoutProgress', + #superclass : 'LGitCheckoutProgressCallback', #instVars : [ 'job' ], - #category : 'Iceberg-Progress' + #category : 'Iceberg-Progress', + #package : 'Iceberg', + #tag : 'Progress' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitCheckoutProgress >> block [ ^ [ :path :completed :total :payload | job ensureStarted. @@ -21,7 +23,7 @@ IceGitCheckoutProgress >> block [ ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitCheckoutProgress >> initialize [ super initialize. @@ -32,7 +34,7 @@ IceGitCheckoutProgress >> initialize [ self initializeBlock. ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitCheckoutProgress >> initializeBlock [ self signature: self class fnSpec block: self block. ] diff --git a/Iceberg/IceGitTransferProgress.class.st b/Iceberg/IceGitTransferProgress.class.st index f313570252..5fd401574e 100644 --- a/Iceberg/IceGitTransferProgress.class.st +++ b/Iceberg/IceGitTransferProgress.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceGitTransferProgress, - #superclass : #LGitTransferProgressCallback, + #name : 'IceGitTransferProgress', + #superclass : 'LGitTransferProgressCallback', #instVars : [ 'job' ], - #category : #'Iceberg-Progress' + #category : 'Iceberg-Progress', + #package : 'Iceberg', + #tag : 'Progress' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitTransferProgress >> block [ ^ [ :stats :payload | | gitStats | @@ -25,7 +27,7 @@ IceGitTransferProgress >> block [ ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTransferProgress >> initialize [ super initialize. @@ -36,7 +38,7 @@ IceGitTransferProgress >> initialize [ self initializeBlock. ] -{ #category : #'initialize-release' } +{ #category : 'initialize-release' } IceGitTransferProgress >> initializeBlock [ self signature: self class fnSpec block: self block. ] diff --git a/Iceberg/IceGitUsernameOrEmailNotFound.class.st b/Iceberg/IceGitUsernameOrEmailNotFound.class.st index 17b15b18ff..e213350aa6 100644 --- a/Iceberg/IceGitUsernameOrEmailNotFound.class.st +++ b/Iceberg/IceGitUsernameOrEmailNotFound.class.st @@ -2,12 +2,14 @@ I'm an error to be sent when the error that comes from external library can be guessed to be the absense of user.name and user.email properties. " Class { - #name : #IceGitUsernameOrEmailNotFound, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceGitUsernameOrEmailNotFound', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitUsernameOrEmailNotFound class >> guessKind: anError ifNot: notBlock [ (anError messageText asLowercase = 'Config value ''user.name'' was not found' asLowercase or: [ anError messageText asLowercase = 'Config value ''user.email'' was not found' asLowercase @@ -16,12 +18,12 @@ IceGitUsernameOrEmailNotFound class >> guessKind: anError ifNot: notBlock [ notBlock value ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitUsernameOrEmailNotFound >> acceptError: anObject [ anObject visitMissingCredentialsError: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitUsernameOrEmailNotFound >> isResumable [ ^ true diff --git a/Iceberg/IceHistory.class.st b/Iceberg/IceHistory.class.st index 5162af65c8..ca2df5f313 100644 --- a/Iceberg/IceHistory.class.st +++ b/Iceberg/IceHistory.class.st @@ -7,8 +7,8 @@ Future optimizations: - implement pagination " Class { - #name : #IceHistory, - #superclass : #Object, + #name : 'IceHistory', + #superclass : 'Object', #instVars : [ 'commitish', 'commits', @@ -16,10 +16,12 @@ Class { 'headHistory', 'repository' ], - #category : 'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceHistory class >> on: commitish repository: anIceRepository [ ^ self new @@ -28,45 +30,45 @@ IceHistory class >> on: commitish repository: anIceRepository [ yourself ] -{ #category : #history } +{ #category : 'history' } IceHistory >> commitDictionary [ commitDictionary ifNil: [ self lookupCommits ]. ^ commitDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistory >> commitish: aCommitish [ commitish := aCommitish ] -{ #category : #history } +{ #category : 'history' } IceHistory >> commits [ commits ifNil: [ self lookupCommits ]. ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistory >> headHistory [ ^ headHistory ifNil: [ headHistory := IceHistory on: repository headCommit repository: repository ] ] -{ #category : #testing } +{ #category : 'testing' } IceHistory >> includes: anIceGitCommit [ ^ self commitDictionary includesKey: anIceGitCommit id ] -{ #category : #testing } +{ #category : 'testing' } IceHistory >> isHead [ ^ commitish = repository head ] -{ #category : #history } +{ #category : 'history' } IceHistory >> lookupCommits [ | newCommitDictionary newCommits | @@ -80,13 +82,13 @@ IceHistory >> lookupCommits [ commits := newCommits. ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistory >> name [ ^ commitish name ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistory >> repository: aRepository [ repository := aRepository ] diff --git a/Iceberg/IceHistoryCommit.class.st b/Iceberg/IceHistoryCommit.class.st index 2f381a0937..87abf9eaaa 100644 --- a/Iceberg/IceHistoryCommit.class.st +++ b/Iceberg/IceHistoryCommit.class.st @@ -4,16 +4,18 @@ I am a commit optimizing history access. I know a history and can determine if I All other operations are simply forwarded to my wrapped ice commit. " Class { - #name : #IceHistoryCommit, - #superclass : #Object, + #name : 'IceHistoryCommit', + #superclass : 'Object', #instVars : [ 'iceCommit', 'history' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceHistoryCommit class >> commit: anIceCommit history: aHistory [ ^ self new @@ -22,87 +24,87 @@ IceHistoryCommit class >> commit: anIceCommit history: aHistory [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> ancestors [ ^ iceCommit ancestorIds ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> author [ ^ iceCommit author ] -{ #category : #testing } +{ #category : 'testing' } IceHistoryCommit >> canRevertChanges [ ^ iceCommit canRevertChanges ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> comment [ ^ iceCommit comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> datetime [ ^ iceCommit datetime ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceHistoryCommit >> diffFromHead [ ^ iceCommit diffFromHead ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceHistoryCommit >> diffToParent [ ^ iceCommit diffToParent ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> history [ ^ history ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> history: anObject [ history := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> iceCommit [ ^ iceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> iceCommit: anIceGitCommit [ iceCommit := anIceGitCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> id [ ^ iceCommit id ] -{ #category : #testing } +{ #category : 'testing' } IceHistoryCommit >> isMerged [ ^ history headHistory includes: iceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> repository [ ^ iceCommit repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceHistoryCommit >> shortId [ ^ iceCommit shortId diff --git a/Iceberg/IceHttpsProtocol.class.st b/Iceberg/IceHttpsProtocol.class.st index 54c17da23d..a098425032 100644 --- a/Iceberg/IceHttpsProtocol.class.st +++ b/Iceberg/IceHttpsProtocol.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceHttpsProtocol, - #superclass : #IceUrlProtocol, - #category : 'Iceberg-Url' + #name : 'IceHttpsProtocol', + #superclass : 'IceUrlProtocol', + #category : 'Iceberg-Url', + #package : 'Iceberg', + #tag : 'Url' } -{ #category : #accessing } +{ #category : 'accessing' } IceHttpsProtocol class >> description [ ^ 'HTTPS' ] -{ #category : #composing } +{ #category : 'composing' } IceHttpsProtocol >> composeUrlWithHost: host repositoryPath: path [ ^ 'https://{1}/{2}.git' format: { host . path } diff --git a/Iceberg/IceImageChange.class.st b/Iceberg/IceImageChange.class.st index 78f741c831..d6d52611c7 100644 --- a/Iceberg/IceImageChange.class.st +++ b/Iceberg/IceImageChange.class.st @@ -2,15 +2,17 @@ I represent a change coming from the image (in contrast to a change coming from git). I know the changed file and I can be visited to define the create a more detailed diff. " Class { - #name : #IceImageChange, - #superclass : #IceChange, + #name : 'IceImageChange', + #superclass : 'IceChange', #instVars : [ 'package' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceImageChange class >> package: anIcePackage [ ^ self new @@ -18,23 +20,23 @@ IceImageChange class >> package: anIcePackage [ yourself ] -{ #category : #building } +{ #category : 'building' } IceImageChange >> accept: aVisitor [ ^ aVisitor visitImageChange: self ] -{ #category : #displaying } +{ #category : 'displaying' } IceImageChange >> displayingProgressString [ ^ 'Comparing image changes of ' , self package name ] -{ #category : #accessing } +{ #category : 'accessing' } IceImageChange >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IceImageChange >> package: anIcePackage [ package := anIcePackage ] diff --git a/Iceberg/IceInMergeWorkingCopy.class.st b/Iceberg/IceInMergeWorkingCopy.class.st index 72ce08b86d..3461a9c795 100644 --- a/Iceberg/IceInMergeWorkingCopy.class.st +++ b/Iceberg/IceInMergeWorkingCopy.class.st @@ -2,36 +2,38 @@ I am a working copy whose packages are all in merge status in the same commits. " Class { - #name : #IceInMergeWorkingCopy, - #superclass : #IceWorkingCopyState, - #category : #'Iceberg-WorkingCopy' + #name : 'IceInMergeWorkingCopy', + #superclass : 'IceWorkingCopyState', + #category : 'Iceberg-WorkingCopy', + #package : 'Iceberg', + #tag : 'WorkingCopy' } -{ #category : #display } +{ #category : 'display' } IceInMergeWorkingCopy >> description [ ^ ', ' join: (self referenceCommits collect: #description) ] -{ #category : #testing } +{ #category : 'testing' } IceInMergeWorkingCopy >> isDetached [ ^ self referenceCommits first ~= self repository headCommit ] -{ #category : #testing } +{ #category : 'testing' } IceInMergeWorkingCopy >> isInMerge [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceInMergeWorkingCopy >> referenceCommits [ ^ self workingCopy referenceCommit ] -{ #category : #validating } +{ #category : 'validating' } IceInMergeWorkingCopy >> validateCanCommit [ self workingCopy referenceCommit first = repository head commit diff --git a/Iceberg/IceIndex.class.st b/Iceberg/IceIndex.class.st index cfe7f63649..f489f18c0d 100644 --- a/Iceberg/IceIndex.class.st +++ b/Iceberg/IceIndex.class.st @@ -6,15 +6,17 @@ My main responsibility is to store temporary changes and commit them. However, I'm an abstract class, check my subclasses for more concrete information. " Class { - #name : #IceIndex, - #superclass : #Object, + #name : 'IceIndex', + #superclass : 'Object', #instVars : [ 'repository' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceIndex class >> on: anIceLibgitRepository [ ^ self new @@ -22,48 +24,48 @@ IceIndex class >> on: anIceLibgitRepository [ yourself ] -{ #category : #adding } +{ #category : 'adding' } IceIndex >> addPackage: aPackage [ self subclassResponsibility ] -{ #category : #'API - commiting' } +{ #category : 'API - commiting' } IceIndex >> commitWithMessage: message andParents: parentCommits [ self subclassResponsibility. ] -{ #category : #testing } +{ #category : 'testing' } IceIndex >> isEmpty [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceIndex >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceIndex >> repository: anIceLibgitRepository [ repository := anIceLibgitRepository ] -{ #category : #storing } +{ #category : 'storing' } IceIndex >> storeVersion: aMCVersion [ self subclassResponsibility ] -{ #category : #updating } +{ #category : 'updating' } IceIndex >> updateDiskWorkingCopy: anIceDiff [ self subclassResponsibility ] -{ #category : #updating } +{ #category : 'updating' } IceIndex >> updateIndex: anIceDiff [ anIceDiff tree diff --git a/Iceberg/IceInvalidProject.class.st b/Iceberg/IceInvalidProject.class.st index 66ef372079..7773fb1d22 100644 --- a/Iceberg/IceInvalidProject.class.st +++ b/Iceberg/IceInvalidProject.class.st @@ -3,18 +3,20 @@ I represent a project that cannot be read from the history. I fetch most of my properties from the current project that may be a project or an unborn project. " Class { - #name : #IceInvalidProject, - #superclass : #IceAbstractProject, - #category : 'Iceberg-Project' + #name : 'IceInvalidProject', + #superclass : 'IceAbstractProject', + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #testing } +{ #category : 'testing' } IceInvalidProject >> isInvalid [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceInvalidProject >> sourceDirectory [ "I'm an invalid project. diff --git a/Iceberg/IceInvalidProjectReader.class.st b/Iceberg/IceInvalidProjectReader.class.st index 50424ae816..9ea78887f4 100644 --- a/Iceberg/IceInvalidProjectReader.class.st +++ b/Iceberg/IceInvalidProjectReader.class.st @@ -4,26 +4,28 @@ I return an invalid project for those commits that are not the current checked o This is because an invalid project cannot be fixed since it is already in the history. " Class { - #name : #IceInvalidProjectReader, - #superclass : #IceProjectReader, - #category : 'Iceberg-Project' + #name : 'IceInvalidProjectReader', + #superclass : 'IceProjectReader', + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #testing } +{ #category : 'testing' } IceInvalidProjectReader >> canReadProjectFromCommitish: aCommitish [ ^ aCommitish isWorkingCopy not and: [ (aCommitish fileSystem / '.project') exists not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceInvalidProjectReader >> priority [ "The unborn project reader should be the default one in case no other matches" ^ 100000 ] -{ #category : #reading } +{ #category : 'reading' } IceInvalidProjectReader >> readProjectFromCommitish: aCommitish [ ^ IceInvalidProject onCommitish: aCommitish diff --git a/Iceberg/IceLocalBranch.class.st b/Iceberg/IceLocalBranch.class.st index 04c7974e2c..9bd639b5b2 100644 --- a/Iceberg/IceLocalBranch.class.st +++ b/Iceberg/IceLocalBranch.class.st @@ -21,25 +21,27 @@ A local branch can also pull from its tracked branch or pull from a given remote branch pullFrom: aRemote. " Class { - #name : #IceLocalBranch, - #superclass : #IceBranch, - #category : #'Iceberg-Core' + #name : 'IceLocalBranch', + #superclass : 'IceBranch', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceLocalBranch >> commit: anIceCommit [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceLocalBranch >> hasIncomingCommits [ self hasUpstream ifFalse: [ ^ false ]. ^ self hasIncomingCommitsFrom: self upstream remote ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> hasIncomingCommitsFrom: aRemote [ | localCommits remoteCommits | @@ -52,14 +54,14 @@ IceLocalBranch >> hasIncomingCommitsFrom: aRemote [ (localCommits includes: each) not ] ] -{ #category : #testing } +{ #category : 'testing' } IceLocalBranch >> hasOutgoingCommits [ self hasUpstream ifFalse: [ ^ false ]. ^ self hasOutgoingCommitsTo: self upstream remote ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> hasOutgoingCommitsTo: aRemote [ | localCommits remoteCommits | @@ -72,20 +74,20 @@ IceLocalBranch >> hasOutgoingCommitsTo: aRemote [ (remoteCommits includes: each) not ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> hasUpstream [ ^ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> incomingCommits [ self hasUpstream ifFalse: [ ^ #() ]. ^ self incomingCommitsFrom: self upstream remote ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> incomingCommitsFrom: aRemote [ | remoteBranch | @@ -96,7 +98,7 @@ IceLocalBranch >> incomingCommitsFrom: aRemote [ commits ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> incomingCommitsFromBranch: aBranch [ ^ aBranch newCommitWalk @@ -104,32 +106,32 @@ IceLocalBranch >> incomingCommitsFromBranch: aBranch [ commits ] -{ #category : #testing } +{ #category : 'testing' } IceLocalBranch >> isRemote [ ^ false ] -{ #category : #'API - merging' } +{ #category : 'API - merging' } IceLocalBranch >> mergeWith: aCommit [ self subclassResponsibility ] -{ #category : #'API - merging' } +{ #category : 'API - merging' } IceLocalBranch >> mergeWithBranch: aBranch [ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> outgoingCommits [ self hasUpstream ifFalse: [ ^ #() ]. ^ self outgoingCommitsTo: self upstream remote ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> outgoingCommitsTo: aRemote [ | remoteBranch walk | @@ -143,13 +145,13 @@ IceLocalBranch >> outgoingCommitsTo: aRemote [ ^ walk commits ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> pull [ self pullFrom: self upstream remote ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> pullFrom: aRemote [ | remoteBranch | @@ -160,26 +162,26 @@ IceLocalBranch >> pullFrom: aRemote [ self repository workingCopy mergeCommit: remoteBranch commit. ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> push [ self pushTo: self upstream remote ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> pushTo: aRemote [ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> reducedOutgoingCommitsWhenNoRemote [ ^ self newCommitWalk maxNumber: 20; commits ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceLocalBranch >> resetToCommit: anIceGitCommit [ "Equivalent to a `git reset --hard` but not touching the image" "1) Change the current commit of this branch @@ -190,31 +192,31 @@ IceLocalBranch >> resetToCommit: anIceGitCommit [ self commit: anIceGitCommit ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> setUpstream: anUpstreamBranch [ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> setUpstreamRemote: aRemote [ self setUpstream: (aRemote remoteBranchNamed: self name) ] -{ #category : #accessing } +{ #category : 'accessing' } IceLocalBranch >> trackedBranch [ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> tracksRemoteBranch [ ^ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLocalBranch >> upstream [ ^ self subclassResponsibility diff --git a/Iceberg/IceLocalRepositoryMissing.class.st b/Iceberg/IceLocalRepositoryMissing.class.st index 7eb1826883..8fec7b5a9a 100644 --- a/Iceberg/IceLocalRepositoryMissing.class.st +++ b/Iceberg/IceLocalRepositoryMissing.class.st @@ -4,27 +4,29 @@ The repository code directory does not exist, maybe because the image was moved. Default action is to clone the repository again, but signal an error and allow for other components to react accordingly. " Class { - #name : #IceLocalRepositoryMissing, - #superclass : #IceError, + #name : 'IceLocalRepositoryMissing', + #superclass : 'IceError', #instVars : [ 'repository' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #exceptioninstantiator } +{ #category : 'exceptioninstantiator' } IceLocalRepositoryMissing class >> signalFor: repository [ ^ self new repository: repository; signal ] -{ #category : #accessing } +{ #category : 'accessing' } IceLocalRepositoryMissing >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceLocalRepositoryMissing >> repository: anObject [ repository := anObject ] diff --git a/Iceberg/IceLog.class.st b/Iceberg/IceLog.class.st index 0f4216255d..55868af25d 100644 --- a/Iceberg/IceLog.class.st +++ b/Iceberg/IceLog.class.st @@ -7,37 +7,39 @@ I'm used through a repository: aRepository ice historyOfMethod: aMethod " Class { - #name : #IceLog, - #superclass : #Object, + #name : 'IceLog', + #superclass : 'Object', #instVars : [ 'repository' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLog class >> for: aRepository [ ^ self basicNew initializeRepository: aRepository; yourself ] -{ #category : #testing } +{ #category : 'testing' } IceLog class >> isAvailableFor: aRepository [ ^ false ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLog class >> new [ self error: '#for:' ] -{ #category : #private } +{ #category : 'private' } IceLog >> basepathOf: aPath [ self subclassResponsibility ] -{ #category : #private } +{ #category : 'private' } IceLog >> collectCommitsFor: aMethod path: aPath [ | commit pathSpec options commits pathSpecArray | @@ -66,7 +68,7 @@ IceLog >> collectCommitsFor: aMethod path: aPath [ ^ commits ] -{ #category : #private } +{ #category : 'private' } IceLog >> collectVersionsFrom: aCollection method: aMethod path: aPath [ | lastDefinition basepath history | @@ -84,12 +86,12 @@ IceLog >> collectVersionsFrom: aCollection method: aMethod path: aPath [ ^ history reversed ] -{ #category : #private } +{ #category : 'private' } IceLog >> definitionFor: aMethod path: aPath commit: aCommit [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceLog >> historyOfMethod: aMethod [ | path commits | @@ -102,23 +104,23 @@ IceLog >> historyOfMethod: aMethod [ path: path ] -{ #category : #private } +{ #category : 'private' } IceLog >> iceCommitFrom: aLGitCommit [ ^ self repository iceCommitFrom: aLGitCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceLog >> initializeRepository: aRepository [ repository := aRepository. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceLog >> repository [ ^ repository ] -{ #category : #private } +{ #category : 'private' } IceLog >> toFileName: aMethod [ ^ self subclassResponsibility ] diff --git a/Iceberg/IceLogVersion.class.st b/Iceberg/IceLogVersion.class.st index 3b60202df5..d044e350ba 100644 --- a/Iceberg/IceLogVersion.class.st +++ b/Iceberg/IceLogVersion.class.st @@ -3,16 +3,18 @@ I'm a log version. I keep a commit and a method definition from each method version tracked on IceLog>>#historyOfMethod:. " Class { - #name : #IceLogVersion, - #superclass : #Object, + #name : 'IceLogVersion', + #superclass : 'Object', #instVars : [ 'commit', 'definition' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLogVersion class >> commit: aCommit definition: aRingDefinition [ ^ self new commit: aCommit; @@ -20,68 +22,68 @@ IceLogVersion class >> commit: aCommit definition: aRingDefinition [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> ancestors [ ^ self commit ancestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> author [ ^ self commit author ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> comment [ ^ self commit comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> commit [ ^ commit ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> commit: aCommit [ commit := aCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> datetime [ ^ self commit datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> definition [ ^ definition ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> definition: aRingDefinition [ definition := aRingDefinition ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> description [ ^ '{1} at {2}' format: { self author. self datetime asLocalStringYMDHM } ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> id [ ^ self commit id ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> originMethod [ ^ (Smalltalk at: self definition methodClass name) >> self definition selector ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> shortId [ ^ self commit shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> source [ ^ String streamContents: [ :stream | stream @@ -89,17 +91,17 @@ IceLogVersion >> source [ << self definition sourceCode ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> tagNames [ ^ self commit tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> tags [ ^ self commit tags ] -{ #category : #accessing } +{ #category : 'accessing' } IceLogVersion >> timeStamp [ ^ self commit timeStamp ] diff --git a/Iceberg/IceMCDefinitionImporter.class.st b/Iceberg/IceMCDefinitionImporter.class.st index 1aea3ee983..5f89299011 100644 --- a/Iceberg/IceMCDefinitionImporter.class.st +++ b/Iceberg/IceMCDefinitionImporter.class.st @@ -2,16 +2,18 @@ I am an importer that visits MCDefinitions and creates IceDefinitions from them. I install those definitions into a corresponding package node. " Class { - #name : #IceMCDefinitionImporter, - #superclass : #Object, + #name : 'IceMCDefinitionImporter', + #superclass : 'Object', #instVars : [ 'packageNode', 'snapshot' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceMCDefinitionImporter >> ensureMethodOwnerNamed: ownerName isMeta: isMeta isTrait: isTrait isExtension: isExtension [ | newDefinition | newDefinition := isExtension @@ -25,14 +27,14 @@ IceMCDefinitionImporter >> ensureMethodOwnerNamed: ownerName isMeta: isMeta isTr ifAbsentPut: [ newDefinition ] ] -{ #category : #testing } +{ #category : 'testing' } IceMCDefinitionImporter >> isExtension: aName [ snapshot classDefinitionNamed: aName ifAbsent: [ ^ true ]. ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceMCDefinitionImporter >> isTrait: aName [ | definition | @@ -40,17 +42,17 @@ IceMCDefinitionImporter >> isTrait: aName [ ^ definition isTraitDefinition ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCDefinitionImporter >> packageNode: anIcePackageNode [ packageNode := anIcePackageNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCDefinitionImporter >> snapshot: aMCSnapshot [ snapshot := aMCSnapshot ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCDefinitionImporter >> visitClassDefinition: aMCClassDefinition [ | classDefinitionNode classDefinition | @@ -75,7 +77,7 @@ IceMCDefinitionImporter >> visitClassDefinition: aMCClassDefinition [ ^ classDefinitionNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCDefinitionImporter >> visitClassTraitDefinition: aMCClassTraitDefinition [ | classTraitDefinitionNode | @@ -88,7 +90,7 @@ IceMCDefinitionImporter >> visitClassTraitDefinition: aMCClassTraitDefinition [ ^ classTraitDefinitionNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCDefinitionImporter >> visitMetaclassDefinition: aMCClassDefinition [ "We do nothing because of Monticello meta-model. @@ -99,7 +101,7 @@ IceMCDefinitionImporter >> visitMetaclassDefinition: aMCClassDefinition [ ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCDefinitionImporter >> visitMethodDefinition: aMCMethodDefinition [ | ownerName isMeta isTrait ownerNode | @@ -122,7 +124,7 @@ IceMCDefinitionImporter >> visitMethodDefinition: aMCMethodDefinition [ sourceCode: aMCMethodDefinition source) ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCDefinitionImporter >> visitOrganizationDefinition: aMCOrganizationDefinition [ packageNode value @@ -130,7 +132,7 @@ IceMCDefinitionImporter >> visitOrganizationDefinition: aMCOrganizationDefinitio tagNames: aMCOrganizationDefinition tagNames ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCDefinitionImporter >> visitTraitDefinition: aMCTraitDefinition [ | traitDefinitionNode classTraitDefinition | diff --git a/Iceberg/IceMCPackageImporter.class.st b/Iceberg/IceMCPackageImporter.class.st index 6440392218..25f35ca23d 100644 --- a/Iceberg/IceMCPackageImporter.class.st +++ b/Iceberg/IceMCPackageImporter.class.st @@ -2,16 +2,18 @@ I am an importer of MCPackages into an IceNode. I am created from a version and a node. I calculate the snapshot of that definition and import all those definitions into my node, delegating to a IceMCDefinitionImporter. " Class { - #name : #IceMCPackageImporter, - #superclass : #Object, + #name : 'IceMCPackageImporter', + #superclass : 'Object', #instVars : [ 'version', 'package' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #importing } +{ #category : 'importing' } IceMCPackageImporter >> importOn: aNode [ | packageNode snapshot definition | @@ -31,30 +33,30 @@ IceMCPackageImporter >> importOn: aNode [ ^ packageNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCPackageImporter >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCPackageImporter >> package: aPackage [ package := aPackage ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCPackageImporter >> packageName [ ^ self package name ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCPackageImporter >> snapshot [ ^ version snapshotForPackage: self package ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCPackageImporter >> version: aVersion [ version := aVersion diff --git a/Iceberg/IceMCVersionInfo.class.st b/Iceberg/IceMCVersionInfo.class.st index a4871b3de4..75a7f9951b 100644 --- a/Iceberg/IceMCVersionInfo.class.st +++ b/Iceberg/IceMCVersionInfo.class.st @@ -2,28 +2,30 @@ Adapter to produce an MCVersionInfo that knows how to (lazily) load ancestors from an Iceberg repository. " Class { - #name : #IceMCVersionInfo, - #superclass : #MCLazyVersionInfo, + #name : 'IceMCVersionInfo', + #superclass : 'MCLazyVersionInfo', #instVars : [ 'commit', 'package' ], - #category : #'Iceberg-Adapters' + #category : 'Iceberg-Adapters', + #package : 'Iceberg', + #tag : 'Adapters' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMCVersionInfo class >> package: package message: commitMessage [ ^ self new fromPackage: package message: commitMessage ] -{ #category : #utilities } +{ #category : 'utilities' } IceMCVersionInfo class >> uuidFromCommit: aCommit package: aPackage [ ^ self uuidFromSHA: (SHA1 new hashStream: (ReadStream on: aCommit id, aPackage name)) ] -{ #category : #utilities } +{ #category : 'utilities' } IceMCVersionInfo class >> uuidFromSHA: cid [ "Return an adequate uuid from a git commit ID. Copied from GitFileTree." @@ -35,19 +37,19 @@ IceMCVersionInfo class >> uuidFromSHA: cid [ uuid ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceMCVersionInfo >> = anotherIceMCVersionInfo [ ^ super = anotherIceMCVersionInfo and: [ package name = anotherIceMCVersionInfo package name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCVersionInfo >> commit [ ^ commit ] -{ #category : #initialization } +{ #category : 'initialization' } IceMCVersionInfo >> fromCommit: aCommit package: aPackage [ "This method can be used for first initializing a version info or to update a partially initialized version info." "See #fromPackage:message:" @@ -70,7 +72,7 @@ IceMCVersionInfo >> fromCommit: aCommit package: aPackage [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceMCVersionInfo >> fromPackage: aPackage message: commitMessage [ "This creates a partial version info. Full version info can not be created until we commit into a repository, but current fileout tools require it, so we first create an incomplete info and after committing it will be completed @@ -85,30 +87,30 @@ IceMCVersionInfo >> fromPackage: aPackage message: commitMessage [ ] -{ #category : #comparing } +{ #category : 'comparing' } IceMCVersionInfo >> hash [ ^ super hash << 10 + package hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCVersionInfo >> iceVersion [ ^ commit versionFor: package ] -{ #category : #initialization } +{ #category : 'initialization' } IceMCVersionInfo >> initialize [ super initialize. date := Date today. time := Time now ] -{ #category : #private } +{ #category : 'private' } IceMCVersionInfo >> loadAncestorsAndStepChildren [ self shouldBeImplemented ] -{ #category : #accessing } +{ #category : 'accessing' } IceMCVersionInfo >> package [ ^ package ] diff --git a/Iceberg/IceMerge.class.st b/Iceberg/IceMerge.class.st index a83e414b65..987851121d 100644 --- a/Iceberg/IceMerge.class.st +++ b/Iceberg/IceMerge.class.st @@ -12,8 +12,8 @@ I am created by doing one of the following: yourself " Class { - #name : #IceMerge, - #superclass : #Object, + #name : 'IceMerge', + #superclass : 'Object', #instVars : [ 'mergeTree', 'repository', @@ -21,10 +21,12 @@ Class { 'imageCommit', 'changesToWorkingCopyTree' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #executing } +{ #category : 'executing' } IceMerge >> calculateChanges [ | commonAncestor sourceDiff targetDiff | @@ -44,21 +46,21 @@ IceMerge >> calculateChanges [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> changesToWorkingCopyTree [ self calculateChanges. ^ changesToWorkingCopyTree ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceMerge >> conflictsDo: aBlockClosure [ mergeTree do: [ :each | each isConflict ifTrue: [ aBlockClosure value: each value ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceMerge >> execute [ "at begining of this, there is a possibility that imageCommit needs to be 'fixed' to use." | commitToAdvance | @@ -76,25 +78,25 @@ IceMerge >> execute [ ^ commitToAdvance ] -{ #category : #testing } +{ #category : 'testing' } IceMerge >> hasConflicts [ self calculateChanges. ^ mergeTree anySatisfy: [ :e | e isConflict ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> headCommit [ ^ repository headCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> imageCommit [ ^ imageCommit ifNil: [ imageCommit := repository workingCopy referenceCommit ] ] -{ #category : #testing } +{ #category : 'testing' } IceMerge >> isAlreadyMerged [ "The commit is already merged in the image and in the head commit. This means the selected commit is already in the history and there is nothing to do about it." @@ -102,18 +104,18 @@ IceMerge >> isAlreadyMerged [ ^ mergeCommit isAncestorOf: self leftCommit ] -{ #category : #testing } +{ #category : 'testing' } IceMerge >> isEmpty [ ^ mergeTree isEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceMerge >> isFastForward [ ^ self headCommit isAncestorOf: mergeCommit ] -{ #category : #testing } +{ #category : 'testing' } IceMerge >> isInverseMerge [ "When the image commit corresponds to the mergeCommit. It means we are in an inverse merge. We want to merge the changes from the image into head commit. @@ -122,14 +124,14 @@ IceMerge >> isInverseMerge [ ^ self imageCommit = mergeCommit ] -{ #category : #testing } +{ #category : 'testing' } IceMerge >> isMerged [ ^ mergeTree allSatisfy: [ :operation | operation isConflict not or: [ operation isResolved ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> leftCommit [ ^ self isInverseMerge @@ -138,29 +140,29 @@ IceMerge >> leftCommit [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> mergeCommit: aCommit [ mergeCommit := aCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> mergeTree [ self calculateChanges. ^ mergeTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> repository: anIceRepository [ repository := anIceRepository ] -{ #category : #executing } +{ #category : 'executing' } IceMerge >> resolveConflicts [ self hasConflicts ifTrue: [ | resolved | @@ -174,12 +176,12 @@ IceMerge >> resolveConflicts [ ifFalse: [ IceMergeAborted signal ] ] ] -{ #category : #descriptions } +{ #category : 'descriptions' } IceMerge >> sourceDescription [ ^ 'Working Copy version: ' , self repository workingCopy description ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> sourceVersion [ "This is the commit that will provide the changes. In a merge, the commit providing the changes is the merge commit." @@ -187,40 +189,40 @@ IceMerge >> sourceVersion [ ^ mergeCommit ] -{ #category : #descriptions } +{ #category : 'descriptions' } IceMerge >> targetDescription [ ^ 'Merging commit: ' , self sourceVersion description ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> targetVersion [ "This is the commit that will receive the changes. In a merge, the commit receiving the changes is the head of the repository." ^ self leftCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> tree [ "Returns the tree to merge. Polymorphic with an ice Diff" ^ self mergeTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> treeToShow [ "Returns the tree to show in the UI. Polymorphic with an ice Diff" ^ self changesToWorkingCopyTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceMerge >> unresolvedConflictCount [ ^ mergeTree count: [ :operation | operation isConflict and: [ operation isResolved not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceMerge >> updateHead [ " 2 - Update HEAD. If the merged commits are from diverging branches, generate a merge commit. @@ -243,7 +245,7 @@ IceMerge >> updateHead [ repository branch commit: commitToAdvance ] -{ #category : #executing } +{ #category : 'executing' } IceMerge >> updateWorkingCopy [ " 3 - Load changes in the image. diff --git a/Iceberg/IceMergeAborted.class.st b/Iceberg/IceMergeAborted.class.st index 5f49906027..352ddfa8ea 100644 --- a/Iceberg/IceMergeAborted.class.st +++ b/Iceberg/IceMergeAborted.class.st @@ -2,12 +2,14 @@ Attempting to merge arised a conflict so merge was aborted. " Class { - #name : #IceMergeAborted, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceMergeAborted', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceMergeAborted >> acceptError: aVisitor [ aVisitor visitMergeAborted: self ] diff --git a/Iceberg/IceMergeResolutionRequest.class.st b/Iceberg/IceMergeResolutionRequest.class.st index d6450b1954..6ec4dbca7d 100644 --- a/Iceberg/IceMergeResolutionRequest.class.st +++ b/Iceberg/IceMergeResolutionRequest.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceMergeResolutionRequest, - #superclass : #Notification, + #name : 'IceMergeResolutionRequest', + #superclass : 'Notification', #instVars : [ 'merge' ], - #category : #'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #'exception description' } +{ #category : 'exception description' } IceMergeResolutionRequest >> defaultAction [ | window mergeMorph | @@ -25,12 +27,12 @@ IceMergeResolutionRequest >> defaultAction [ ^ mergeMorph merged ] -{ #category : #accessing } +{ #category : 'accessing' } IceMergeResolutionRequest >> merge [ ^ merge ] -{ #category : #accessing } +{ #category : 'accessing' } IceMergeResolutionRequest >> merger: anIceMerge [ merge := anIceMerge diff --git a/Iceberg/IceMergeToChangeTreeVisitor.class.st b/Iceberg/IceMergeToChangeTreeVisitor.class.st index 97e7a089e0..ab156fc571 100644 --- a/Iceberg/IceMergeToChangeTreeVisitor.class.st +++ b/Iceberg/IceMergeToChangeTreeVisitor.class.st @@ -2,44 +2,46 @@ I visit a tree of IceNode with IceOperationMerge with all operations already chosen and return the coresponding tree of changes (IceNodes with IceOperation) " Class { - #name : #IceMergeToChangeTreeVisitor, - #superclass : #IceTreeVisitor, - #category : #'Iceberg-Changes' + #name : 'IceMergeToChangeTreeVisitor', + #superclass : 'IceTreeVisitor', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #utilities } +{ #category : 'utilities' } IceMergeToChangeTreeVisitor >> convertMergeNodeToChangeNode [ currentNode value: currentNode value chosenOperation . ] -{ #category : #visiting } +{ #category : 'visiting' } IceMergeToChangeTreeVisitor >> visitAddition: anIceAddition [ self convertMergeNodeToChangeNode. ] -{ #category : #visiting } +{ #category : 'visiting' } IceMergeToChangeTreeVisitor >> visitClassDefinition: anIceClassDefinition [ self convertMergeNodeToChangeNode. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMergeToChangeTreeVisitor >> visitNoModification: anIceNoModification [ anIceNoModification definition accept: self. ] -{ #category : #visiting } +{ #category : 'visiting' } IceMergeToChangeTreeVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation chosenOperation accept: self. ] -{ #category : #visiting } +{ #category : 'visiting' } IceMergeToChangeTreeVisitor >> visitPackage: anIcePackageDefinition [ self convertMergeNodeToChangeNode. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMergeToChangeTreeVisitor >> visitRootDefinition: anIceRootDefinition [ self visitChildrenOf: currentNode ] diff --git a/Iceberg/IceMetacelloDuplicatedNotification.class.st b/Iceberg/IceMetacelloDuplicatedNotification.class.st index 4203a2a067..bbb112f356 100644 --- a/Iceberg/IceMetacelloDuplicatedNotification.class.st +++ b/Iceberg/IceMetacelloDuplicatedNotification.class.st @@ -1,30 +1,32 @@ Class { - #name : #IceMetacelloDuplicatedNotification, - #superclass : #MetacelloAllowProjectUpgrade, + #name : 'IceMetacelloDuplicatedNotification', + #superclass : 'MetacelloAllowProjectUpgrade', #instVars : [ 'builder' ], - #category : 'Iceberg-Adapters' + #category : 'Iceberg-Adapters', + #package : 'Iceberg', + #tag : 'Adapters' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloDuplicatedNotification >> builder [ ^ builder ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloDuplicatedNotification >> builder: anObject [ builder := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloDuplicatedNotification >> defaultAction [ "Default for Upgrade is to allow" ^ self useIncoming ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloDuplicatedNotification >> existingProjectRegistration [ | repository | @@ -35,7 +37,7 @@ IceMetacelloDuplicatedNotification >> existingProjectRegistration [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloDuplicatedNotification >> newProjectRegistration [ ^ IceMetacelloProjectRegistration new @@ -43,18 +45,18 @@ IceMetacelloDuplicatedNotification >> newProjectRegistration [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloDuplicatedNotification >> projectName [ ^ builder locationToUse basename ] -{ #category : #'exception handling' } +{ #category : 'exception handling' } IceMetacelloDuplicatedNotification >> useIncoming [ ^ self resume: self builder addLocalRepositoryAndCheckout ] -{ #category : #'exception handling' } +{ #category : 'exception handling' } IceMetacelloDuplicatedNotification >> useLoaded [ ^ self resume: self builder addLocalRepository ] diff --git a/Iceberg/IceMetacelloProjectRegistration.class.st b/Iceberg/IceMetacelloProjectRegistration.class.st index b863897397..f19ce40e38 100644 --- a/Iceberg/IceMetacelloProjectRegistration.class.st +++ b/Iceberg/IceMetacelloProjectRegistration.class.st @@ -4,27 +4,29 @@ I represent a project registration in iceberg. I adapt the behavior of metacello For the moment I'm only used for compatibility reasons. " Class { - #name : #IceMetacelloProjectRegistration, - #superclass : #Object, + #name : 'IceMetacelloProjectRegistration', + #superclass : 'Object', #instVars : [ 'version' ], - #category : 'Iceberg-Adapters' + #category : 'Iceberg-Adapters', + #package : 'Iceberg', + #tag : 'Adapters' } -{ #category : #printing } +{ #category : 'printing' } IceMetacelloProjectRegistration >> locked [ "Only for compatibility for now" ^ false ] -{ #category : #printing } +{ #category : 'printing' } IceMetacelloProjectRegistration >> printOn: aStream [ aStream nextPutAll: version asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloProjectRegistration >> version: aString [ version := aString ] diff --git a/Iceberg/IceMetacelloRepositoryAdapter.class.st b/Iceberg/IceMetacelloRepositoryAdapter.class.st index 0d48f7aa09..43f6b91a27 100644 --- a/Iceberg/IceMetacelloRepositoryAdapter.class.st +++ b/Iceberg/IceMetacelloRepositoryAdapter.class.st @@ -2,16 +2,18 @@ Adapter for allowing metacello to use Iceberg to download packages and versions. " Class { - #name : #IceMetacelloRepositoryAdapter, - #superclass : #Object, + #name : 'IceMetacelloRepositoryAdapter', + #superclass : 'Object', #instVars : [ 'repository', 'projectVersion' ], - #category : #'Iceberg-Adapters' + #category : 'Iceberg-Adapters', + #package : 'Iceberg', + #tag : 'Adapters' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMetacelloRepositoryAdapter class >> for: anIceRepository withVersion: aString [ | projectVersion | @@ -26,18 +28,18 @@ IceMetacelloRepositoryAdapter class >> for: anIceRepository withVersion: aString yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceMetacelloRepositoryAdapter >> = other [ ^ other species = self species and: [ other description = self description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> addTo: aMCRepositoryGroup [ "Do nothing, we do not need to register the repository into the monticello registry" ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryAdapter >> canUpgradeTo: anMCGitBasedRepository [ (anMCGitBasedRepository isKindOf: self class) ifFalse: [ ^ false ]. @@ -45,35 +47,35 @@ IceMetacelloRepositoryAdapter >> canUpgradeTo: anMCGitBasedRepository [ and: [ self repoPath = anMCGitBasedRepository repoPath and: [ self projectVersion = anMCGitBasedRepository projectVersion ]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> commitIdFor: aWorkingCopy ifFound: aBlock [ self flag: #pharoTodo. "Do nothing?" ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> description [ ^ self repository origin url, '[', projectVersion, ']' ] -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloRepositoryAdapter >> flushForScriptGet [ "do nothing" ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> getOrCreateIcebergRepository [ ^ self repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> goferPriority [ ^ 8 ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> goferReferences [ self repository head description = projectVersion ifFalse: [ (self repository commitishNamed: projectVersion) checkoutWithStrategy: IceCheckoutDoNotLoadPackages new ]. @@ -85,7 +87,7 @@ IceMetacelloRepositoryAdapter >> goferReferences [ repository: self ] ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryAdapter >> hasNoLoadConflicts: anMCGitBasedRepository [ "Copied from MCGitBasedNetworkRepository" (anMCGitBasedRepository isKindOf: self class) ifFalse: [ ^ false ]. @@ -95,30 +97,30 @@ IceMetacelloRepositoryAdapter >> hasNoLoadConflicts: anMCGitBasedRepository [ self projectVersion = anMCGitBasedRepository projectVersion ] ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceMetacelloRepositoryAdapter >> hash [ "Not a good hash, but is copied from MCRepository" ^ self description hash ] -{ #category : #compatibility } +{ #category : 'compatibility' } IceMetacelloRepositoryAdapter >> isCache [ "User for Kommiter and Versionner" ^ false ] -{ #category : #compatibility } +{ #category : 'compatibility' } IceMetacelloRepositoryAdapter >> isRemote [ "User for Komitter" ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryAdapter >> isValid [ ^ true ] -{ #category : #MonticelloGUI } +{ #category : 'MonticelloGUI' } IceMetacelloRepositoryAdapter >> morphicOpen: workingCopy [ | shouldOpenIceberg | @@ -136,55 +138,55 @@ Do you want to open the Iceberg Browser instead?' format: { IceTipRepositoriesBrowser new open ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> projectPath [ ^ self repository origin projectPath ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> projectVersion [ ^ projectVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> projectVersion: anObject [ projectVersion := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> repoPath [ ^ self repository subdirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> repository: anObject [ repository := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryAdapter >> repositoryDescription [ ^ self repository description ] -{ #category : #querying } +{ #category : 'querying' } IceMetacelloRepositoryAdapter >> repositoryVersionString [ ^ self repository workingCopy referenceCommit id ] -{ #category : #compatibility } +{ #category : 'compatibility' } IceMetacelloRepositoryAdapter >> unregister [ ^ MCRepositoryGroup default removeRepository: self ] -{ #category : #versions } +{ #category : 'versions' } IceMetacelloRepositoryAdapter >> versionFrom: aVersionName [ | packageName package version | packageName := (MCFileTreeRepository parseName: aVersionName) first. diff --git a/Iceberg/IceMetaclassDependency.class.st b/Iceberg/IceMetaclassDependency.class.st index 41bf0504dc..c3dc65e808 100644 --- a/Iceberg/IceMetaclassDependency.class.st +++ b/Iceberg/IceMetaclassDependency.class.st @@ -2,15 +2,17 @@ I am a dependency to a metaclass. " Class { - #name : #IceMetaclassDependency, - #superclass : #IceDependency, + #name : 'IceMetaclassDependency', + #superclass : 'IceDependency', #instVars : [ 'definition' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #dependencies } +{ #category : 'dependencies' } IceMetaclassDependency >> addTransitiveDependenciesFrom: anIceDiff to: anIceCherrypicker [ IceNodeQuery new on: anIceDiff tree; @@ -20,17 +22,17 @@ IceMetaclassDependency >> addTransitiveDependenciesFrom: anIceDiff to: anIceCher [ :anIceNode | anIceCherrypicker addClassDependencyOf: anIceNode value definition ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetaclassDependency >> definition [ ^ definition ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetaclassDependency >> definition: anIceClassDefinition [ definition:= anIceClassDefinition ] -{ #category : #visiting } +{ #category : 'visiting' } IceMetaclassDependency >> isDependencyTo: anIceClassDefinition [ ^ anIceClassDefinition basicName = definition basicName ] diff --git a/Iceberg/IceMethodContainerDefinition.class.st b/Iceberg/IceMethodContainerDefinition.class.st index 149ebd03be..d27b5e4d89 100644 --- a/Iceberg/IceMethodContainerDefinition.class.st +++ b/Iceberg/IceMethodContainerDefinition.class.st @@ -8,16 +8,18 @@ I also contain the monticello definition that corresponds to me. See my super/subclasses for more information. " Class { - #name : #IceMethodContainerDefinition, - #superclass : #IceCodeDefinition, + #name : 'IceMethodContainerDefinition', + #superclass : 'IceCodeDefinition', #instVars : [ 'isMeta', 'mcDefinition' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMethodContainerDefinition class >> named: aString isMeta: isMeta [ ^ self new @@ -26,19 +28,19 @@ IceMethodContainerDefinition class >> named: aString isMeta: isMeta [ yourself ] -{ #category : #patching } +{ #category : 'patching' } IceMethodContainerDefinition >> asMCDefinition [ ^ mcDefinition ] -{ #category : #converting } +{ #category : 'converting' } IceMethodContainerDefinition >> asMCDefinitionWithoutMetaSide [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodContainerDefinition >> contents [ mcDefinition ifNil: [ ^ '' ]. ^ self isMeta @@ -46,34 +48,34 @@ IceMethodContainerDefinition >> contents [ ifTrue: [ mcDefinition classDefinitionString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodContainerDefinition >> isMeta [ ^ isMeta ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodContainerDefinition >> isMeta: anObject [ isMeta := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodContainerDefinition >> key [ ^ super key , (self isMeta ifTrue: [ ' class' ] ifFalse: [ '' ]) ] -{ #category : #patching } +{ #category : 'patching' } IceMethodContainerDefinition >> mcDefinition: aMCDefinition [ mcDefinition := aMCDefinition ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodContainerDefinition >> name [ ^ name , (isMeta ifTrue: [ ' class' ] ifFalse: [ '' ]) ] -{ #category : #patching } +{ #category : 'patching' } IceMethodContainerDefinition >> removeFrom: aPatcher [ aPatcher removeClass: self diff --git a/Iceberg/IceMethodDefinition.class.st b/Iceberg/IceMethodDefinition.class.st index 66bb7f32c8..8f85c4f61b 100644 --- a/Iceberg/IceMethodDefinition.class.st +++ b/Iceberg/IceMethodDefinition.class.st @@ -6,18 +6,20 @@ My contents is the code of the method. See my superclasses for more information. " Class { - #name : #IceMethodDefinition, - #superclass : #IceCodeDefinition, + #name : 'IceMethodDefinition', + #superclass : 'IceCodeDefinition', #instVars : [ 'className', 'classIsMeta', 'protocol', 'sourceCode' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMethodDefinition class >> className: aClassName classIsMeta: classIsMeta protocol: protocol name: aString sourceCode: source [ ^ (self named: aString) @@ -28,7 +30,7 @@ IceMethodDefinition class >> className: aClassName classIsMeta: classIsMeta prot yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceMethodDefinition >> = anotherDefinition [ "A method can be equal and belong to another class (and be in the other side). And yes, even if this usually should not happen, it happens (and not always is incorrect)" @@ -37,25 +39,25 @@ IceMethodDefinition >> = anotherDefinition [ and: [ self classIsMeta = anotherDefinition classIsMeta ] ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceMethodDefinition >> accept: aVisitor [ ^ aVisitor visitMethodNode: self ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceMethodDefinition >> actualClass [ ^ self contextClass ] -{ #category : #patching } +{ #category : 'patching' } IceMethodDefinition >> addToPatcher: aMCPatcher [ aMCPatcher addDefinition: self asMCDefinition ] -{ #category : #patching } +{ #category : 'patching' } IceMethodDefinition >> asMCDefinition [ ^ MCMethodDefinition @@ -67,35 +69,35 @@ IceMethodDefinition >> asMCDefinition [ source: sourceCode ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> classIsMeta [ ^ classIsMeta ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> classIsMeta: anObject [ classIsMeta := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> className [ ^ className ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> className: anObject [ className := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> contents [ ^ '"', self protocol, '" ', sourceCode ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceMethodDefinition >> contextClass [ | class | @@ -104,64 +106,64 @@ IceMethodDefinition >> contextClass [ ^ class ] -{ #category : #actions } +{ #category : 'actions' } IceMethodDefinition >> install [ self asMCDefinition load ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceMethodDefinition >> isLoadable [ ^ self contextClass notNil ] -{ #category : #testing } +{ #category : 'testing' } IceMethodDefinition >> isMethodDefinition [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> ownerName [ ^ className ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> protocol [ ^ protocol ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> protocol: anObject [ protocol := anObject ] -{ #category : #patching } +{ #category : 'patching' } IceMethodDefinition >> removeFrom: aPatcher [ aPatcher removeMethod: self ] -{ #category : #patching } +{ #category : 'patching' } IceMethodDefinition >> removeFromPatcher: aMCPatcher [ aMCPatcher removeDefinition: self asMCDefinition ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> selector [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> sourceCode [ ^ sourceCode ] -{ #category : #accessing } +{ #category : 'accessing' } IceMethodDefinition >> sourceCode: aString [ sourceCode := aString diff --git a/Iceberg/IceMethodDependency.class.st b/Iceberg/IceMethodDependency.class.st index a54952db78..e9020cea1d 100644 --- a/Iceberg/IceMethodDependency.class.st +++ b/Iceberg/IceMethodDependency.class.st @@ -2,18 +2,20 @@ I am a dependency to a method. " Class { - #name : #IceMethodDependency, - #superclass : #IceDefinedDependency, - #category : #'Iceberg-Cherrypicking' + #name : 'IceMethodDependency', + #superclass : 'IceDefinedDependency', + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #comparing } +{ #category : 'comparing' } IceMethodDependency >> = anObject [ ^ super = anObject and: [ definition asMCDefinition selector = anObject definition asMCDefinition selector ] ] -{ #category : #testing } +{ #category : 'testing' } IceMethodDependency >> addTransitiveDependenciesFrom: anIceDiff to: anIceCherrypicker [ super addTransitiveDependenciesFrom: anIceDiff to: anIceCherrypicker. @@ -26,12 +28,12 @@ IceMethodDependency >> addTransitiveDependenciesFrom: anIceDiff to: anIceCherryp ifFound: [ :anIceNode | anIceCherrypicker addDependency: (anIceNode accept: IceAsDependencyVisitor new )] ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceMethodDependency >> hash [ ^ super hash bitXor: definition asMCDefinition className hash ] -{ #category : #testing } +{ #category : 'testing' } IceMethodDependency >> isDependencyTo: anIceMethodDefinition [ ^ anIceMethodDefinition isMethodDefinition and: [ @@ -39,34 +41,34 @@ IceMethodDependency >> isDependencyTo: anIceMethodDefinition [ anIceMethodDefinition asMCDefinition selector = definition selector ] ] ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceMethodDependency >> methodAST [ ^ RBParser parseMethod: definition asMCDefinition source ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceMethodDependency >> referencedClasses [ ^ self referencedNames , {definition className} ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceMethodDependency >> referencedNames [ ^ (self methodAST allChildren select: #isVariable) collect: #name ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceMethodDependency >> referencedPackages [ ^ { } ] -{ #category : #'computing - dependencies' } +{ #category : 'computing - dependencies' } IceMethodDependency >> referencedSelectors [ ^ (self methodAST allChildren select: #isMessage) collect: #selector ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceMethodDependency >> referencedTraits [ "The method cannot diferenciate if the reference is a trait or a class, so I try both" diff --git a/Iceberg/IceMissingRepositoryEntry.class.st b/Iceberg/IceMissingRepositoryEntry.class.st index 964eb73155..2abe2951e7 100644 --- a/Iceberg/IceMissingRepositoryEntry.class.st +++ b/Iceberg/IceMissingRepositoryEntry.class.st @@ -2,36 +2,38 @@ Directory does not exist in the specified version in the repository. " Class { - #name : #IceMissingRepositoryEntry, - #superclass : #IceError, + #name : 'IceMissingRepositoryEntry', + #superclass : 'IceError', #instVars : [ 'name', 'owner' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #accessing } +{ #category : 'accessing' } IceMissingRepositoryEntry >> messageText [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceMissingRepositoryEntry >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceMissingRepositoryEntry >> name: anObject [ name := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMissingRepositoryEntry >> owner [ ^ owner ] -{ #category : #accessing } +{ #category : 'accessing' } IceMissingRepositoryEntry >> owner: anObject [ owner := anObject ] diff --git a/Iceberg/IceModification.class.st b/Iceberg/IceModification.class.st index 03a243218d..1d38844098 100644 --- a/Iceberg/IceModification.class.st +++ b/Iceberg/IceModification.class.st @@ -2,15 +2,17 @@ I am a modification in a tree. I contain the definition I'm changing (right) and the new (left) version of the definition. I know what is the icon for modification and how to calculate a conflict with other operations. " Class { - #name : #IceModification, - #superclass : #IceOperation, + #name : 'IceModification', + #superclass : 'IceOperation', #instVars : [ 'oldNode' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceModification class >> left: leftDefinition right: rightDefinition [ ^ self new @@ -19,38 +21,38 @@ IceModification class >> left: leftDefinition right: rightDefinition [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceModification >> = anotherOperation [ ^ super = anotherOperation and: [ self rightDefinition = anotherOperation rightDefinition ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceModification >> accept: aVisitor [ ^ aVisitor visitModification: self ] -{ #category : #operations } +{ #category : 'operations' } IceModification >> inverse [ ^ IceModification left: self rightDefinition right: self leftDefinition ] -{ #category : #testing } +{ #category : 'testing' } IceModification >> isModification [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceModification >> leftContents [ ^ definition contents ] -{ #category : #merging } +{ #category : 'merging' } IceModification >> mergeWithLeftAddition: anIceAddition [ "This should not happen. If I represent a modification of a node, that means that the original definition existed on the base version. @@ -58,7 +60,7 @@ IceModification >> mergeWithLeftAddition: anIceAddition [ self shouldNotImplement ] -{ #category : #merging } +{ #category : 'merging' } IceModification >> mergeWithLeftModification: anIceModification [ "If the modification is the same, I can just keep any of them." @@ -68,55 +70,55 @@ IceModification >> mergeWithLeftModification: anIceModification [ ^ IceConflictingOperation left: anIceModification right: self ] -{ #category : #merging } +{ #category : 'merging' } IceModification >> mergeWithLeftNoOperation: anIceNoModification [ ^ IceNonConflictingOperation operation: self ] -{ #category : #merging } +{ #category : 'merging' } IceModification >> mergeWithLeftRemoval: anIceRemoval [ ^ IceConflictingOperation left: anIceRemoval right: self ] -{ #category : #merging } +{ #category : 'merging' } IceModification >> mergeWithOperation: anOperation [ ^ anOperation mergeWithLeftModification: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceModification >> oldDefinition [ ^ oldNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceModification >> oldNode [ ^ oldNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceModification >> oldNode: aNode [ oldNode := aNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceModification >> rightContents [ ^ oldNode contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceModification >> rightDefinition [ ^ oldNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceModification >> rightDefinition: aDefinition [ oldNode := aDefinition diff --git a/Iceberg/IceNoCommit.class.st b/Iceberg/IceNoCommit.class.st index 6ce23bb0b0..0ac718aaca 100644 --- a/Iceberg/IceNoCommit.class.st +++ b/Iceberg/IceNoCommit.class.st @@ -2,12 +2,14 @@ I am a null object representing the absence of a commit. I'm used generally in the case of unborn branches, or when a package was loaded but no iceberg information is available. " Class { - #name : #IceNoCommit, - #superclass : #IceCommitish, - #category : #'Iceberg-Core' + #name : 'IceNoCommit', + #superclass : 'IceCommitish', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNoCommit class >> repository: aRepository [ ^ self new @@ -15,104 +17,104 @@ IceNoCommit class >> repository: aRepository [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceNoCommit >> = aNoCommit [ ^ aNoCommit isNoCommit ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceNoCommit >> changedPackagesToCommitInfo: anIceGitCommit [ ^ anIceGitCommit packages ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceNoCommit >> changesFromCommit: anIceNoCommit [ ^ anIceNoCommit changesFromNoCommit: self ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceNoCommit >> changesFromNoCommit: anIceNoCommit [ ^ #() ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceNoCommit >> changesTo: aCommitish [ ^ aCommitish changesFromNoCommit: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommit >> commit [ ^ self ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceNoCommit >> commonAncestorWith: aCommitish [ ^ aCommitish ] -{ #category : #printing } +{ #category : 'printing' } IceNoCommit >> description [ ^ 'No code loaded' ] -{ #category : #'accessing - file' } +{ #category : 'accessing - file' } IceNoCommit >> fileSystem [ "This should belong to a Git specific No-Commit only..." ^ FileSystem memory root ] -{ #category : #comparing } +{ #category : 'comparing' } IceNoCommit >> hash [ ^ self class hash ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceNoCommit >> includesPackageNamed: aName [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceNoCommit >> isAncestorOf: aCommit [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceNoCommit >> isLoaded [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceNoCommit >> isNoCommit [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceNoCommit >> isParentOf: aCommit [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceNoCommit >> isUnknownCommit [ ^ false ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceNoCommit >> mcCommit [ "This method is just for compatibility. @@ -121,25 +123,25 @@ IceNoCommit >> mcCommit [ ^ MCVersion new ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceNoCommit >> packageNames [ ^ #() ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceNoCommit >> project [ ^ repository newUnbornProject ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceNoCommit >> snapshotFor: anIceSavedPackage [ ^ MCSnapshot empty ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceNoCommit >> writerClass [ ^ self properties writerClass diff --git a/Iceberg/IceNoModification.class.st b/Iceberg/IceNoModification.class.st index 7934ddddbd..d8801feaff 100644 --- a/Iceberg/IceNoModification.class.st +++ b/Iceberg/IceNoModification.class.st @@ -2,42 +2,44 @@ I am a no modification in a tree. I am useful to represent a container (that did not change) containing elements that did change. I contain the definition I represent to be able to show it. I delegate the icon to my definition and I know how to calculate a conflict with other operations. " Class { - #name : #IceNoModification, - #superclass : #IceOperation, - #category : #'Iceberg-Changes' + #name : 'IceNoModification', + #superclass : 'IceOperation', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceNoModification >> accept: aVisitor [ ^ aVisitor visitNoModification: self ] -{ #category : #testing } +{ #category : 'testing' } IceNoModification >> hasChanges [ ^ false ] -{ #category : #operations } +{ #category : 'operations' } IceNoModification >> inverse [ ^ self ] -{ #category : #testing } +{ #category : 'testing' } IceNoModification >> isNoModification [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceNoModification >> leftContents [ ^ definition contents ] -{ #category : #merging } +{ #category : 'merging' } IceNoModification >> mergeWithLeftAddition: anIceAddition [ "This should not happen. If I represent a no modification of a node, that means that the original definition existed on the base version. @@ -45,20 +47,20 @@ IceNoModification >> mergeWithLeftAddition: anIceAddition [ self shouldNotImplement ] -{ #category : #merging } +{ #category : 'merging' } IceNoModification >> mergeWithLeftModification: anIceModification [ ^ IceNonConflictingOperation operation: anIceModification ] -{ #category : #merging } +{ #category : 'merging' } IceNoModification >> mergeWithLeftNoOperation: anIceNoModification [ "There was no modifications on both sides, I can just return the left side" ^ IceNonConflictingOperation operation: anIceNoModification ] -{ #category : #merging } +{ #category : 'merging' } IceNoModification >> mergeWithLeftRemoval: anIceRemoval [ "We assume that if I'm in the operation tree this means my children have modifications. @@ -68,7 +70,7 @@ IceNoModification >> mergeWithLeftRemoval: anIceRemoval [ ^ IceConflictingOperation left: anIceRemoval right: self ] -{ #category : #merging } +{ #category : 'merging' } IceNoModification >> mergeWithOperation: anOperation [ ^ anOperation mergeWithLeftNoOperation: self diff --git a/Iceberg/IceNoRemote.class.st b/Iceberg/IceNoRemote.class.st index 05749afa27..604e0237a8 100644 --- a/Iceberg/IceNoRemote.class.st +++ b/Iceberg/IceNoRemote.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceNoRemote, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceNoRemote', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } diff --git a/Iceberg/IceNoRemoteBranch.class.st b/Iceberg/IceNoRemoteBranch.class.st index b0eea1c322..21f4cb5c17 100644 --- a/Iceberg/IceNoRemoteBranch.class.st +++ b/Iceberg/IceNoRemoteBranch.class.st @@ -2,7 +2,9 @@ The operation you tried (for example push) requires that your branch has a configured upstream (something like origin/branchName), but is has none. " Class { - #name : #IceNoRemoteBranch, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceNoRemoteBranch', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } diff --git a/Iceberg/IceNode.class.st b/Iceberg/IceNode.class.st index b4e623811b..493f5b415b 100644 --- a/Iceberg/IceNode.class.st +++ b/Iceberg/IceNode.class.st @@ -29,17 +29,19 @@ Visiting API: - visit: " Class { - #name : #IceNode, - #superclass : #IceAbstractNode, + #name : 'IceNode', + #superclass : 'IceAbstractNode', #instVars : [ 'parent', 'childrenDictionary', 'value' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNode class >> value: aValue [ ^ self new @@ -47,7 +49,7 @@ IceNode class >> value: aValue [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNode class >> value: aValue parent: aParentNode [ ^ (self value: aValue) @@ -55,51 +57,51 @@ IceNode class >> value: aValue parent: aParentNode [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> / aString [ ^ childrenDictionary at: aString ] -{ #category : #comparing } +{ #category : 'comparing' } IceNode >> = anotherNode [ ^ (self basicEqualsTo: anotherNode) and: [ self children asSet = anotherNode children asSet ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceNode >> accept: aVisitor [ ^ aVisitor visitTreeNode: self ] -{ #category : #adding } +{ #category : 'adding' } IceNode >> addChild: aChild [ ^ self addNode: (self class value: aChild). ] -{ #category : #adding } +{ #category : 'adding' } IceNode >> addNode: aNode [ self at: aNode key put: aNode. ^ aNode ] -{ #category : #adding } +{ #category : 'adding' } IceNode >> addTo: anotherNode [ anotherNode addNode: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> allPathSegments [ ^ self withAllParentNodes collect: [ :each | each key ] ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> allSatisfy: aBlockClosure [ (aBlockClosure value: self value) @@ -112,7 +114,7 @@ IceNode >> allSatisfy: aBlockClosure [ ^ true ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> anySatisfy: aBlockClosure [ (aBlockClosure value: self value) @@ -125,20 +127,20 @@ IceNode >> anySatisfy: aBlockClosure [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> at: aString put: aNode [ aNode parent: self. childrenDictionary at: aString put: aNode ] -{ #category : #comparing } +{ #category : 'comparing' } IceNode >> basicEqualsTo: aNode [ ^ self value = aNode value ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> childAt: aString ifAbsentPut: aBlock [ ^ childrenDictionary @@ -146,19 +148,19 @@ IceNode >> childAt: aString ifAbsentPut: aBlock [ ifAbsent: [ self addChild: aBlock value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> childAt: aString ifPresent: aBlockClosure [ ^ childrenDictionary at: aString ifPresent: aBlockClosure ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> children [ ^ childrenDictionary values sorted: [ :a :b | a key < b key ] ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> collect: aBlock [ | newNode | newNode := self class value: (aBlock value: self value). @@ -167,7 +169,7 @@ IceNode >> collect: aBlock [ ^ newNode ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> collectWithPath: aBlock [ | newNode | newNode := self class value: (aBlock value: self value value: self path). @@ -176,7 +178,7 @@ IceNode >> collectWithPath: aBlock [ ^ newNode ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> count: aBlockClosure [ | count | @@ -188,31 +190,31 @@ IceNode >> count: aBlockClosure [ ^ count ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> definition [ ^ value definition ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> description [ ^ value description ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> detect: aBlock [ ^ (self firstNodeSuchThat: aBlock) value ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> do: aBlockClosure [ aBlockClosure value: self value. self childrenDo: [ :node | node do: aBlockClosure ] ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> firstNodeSuchThat: conditionBlock ifNone: noneBlock [ (conditionBlock value: self) @@ -231,68 +233,68 @@ IceNode >> firstNodeSuchThat: conditionBlock ifNone: noneBlock [ ifNone: noneBlock ] ] -{ #category : #testing } +{ #category : 'testing' } IceNode >> hasChanges [ ^ value hasChanges or: [ self children anySatisfy: [ :child | child hasChanges ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceNode >> hasParent [ ^ self parent notNil ] -{ #category : #comparing } +{ #category : 'comparing' } IceNode >> hash [ ^ self key hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> includesKey: anObject [ ^ childrenDictionary includesKey: anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceNode >> initialize [ super initialize. childrenDictionary := Dictionary new ] -{ #category : #testing } +{ #category : 'testing' } IceNode >> isEmpty [ ^ childrenDictionary isEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceNode >> isEmptyNode [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> key [ ^ value key ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> keys [ ^ childrenDictionary keys ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> keysDo: aBlockClosure [ childrenDictionary keysDo: aBlockClosure ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> mergeWith: anotherTree onLeft: leftBlock onRight: rightBlock onMerge: mergeBlock [ | mergedTree newNode | @@ -319,7 +321,7 @@ IceNode >> mergeWith: anotherTree onLeft: leftBlock onRight: rightBlock onMerge: ^ newNode ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> mergeWith: anotherTree onMerge: mergeBlock [ ^ self @@ -329,7 +331,7 @@ IceNode >> mergeWith: anotherTree onMerge: mergeBlock [ onMerge: mergeBlock ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> nextChildNodeStartingFrom: anIceNode suchThat: conditionBlock ifNone: noneBlock [ | aCollection | @@ -351,7 +353,7 @@ IceNode >> nextChildNodeStartingFrom: anIceNode suchThat: conditionBlock ifNone: ifNone: noneBlock ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> nextNodeSuchThat: conditionBlock ifFound: foundBlock [ self children do: [ :each | @@ -362,7 +364,7 @@ IceNode >> nextNodeSuchThat: conditionBlock ifFound: foundBlock [ ifFound: [ :found | ^ foundBlock value: found ] ]. ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> nextNodeSuchThat: conditionBlock ifNone: noneBlock [ self children do: [ :each | @@ -378,24 +380,24 @@ IceNode >> nextNodeSuchThat: conditionBlock ifNone: noneBlock [ ifNone: noneBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> parent [ ^ parent ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> parent: anObject [ parent := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> path [ ^ RelativePath withAll: self allPathSegments ] -{ #category : #printing } +{ #category : 'printing' } IceNode >> printOn: aStream [ aStream nextPutAll: 'IceNode('; @@ -403,38 +405,38 @@ IceNode >> printOn: aStream [ nextPutAll: ')' ] -{ #category : #removing } +{ #category : 'removing' } IceNode >> removeChild: anIceNode [ childrenDictionary removeKey: anIceNode key ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> replace: oldNode with: newNode [ self assert: oldNode name = newNode name. childrenDictionary at: oldNode name put: newNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> replaceBy: aNode [ parent replace: self with: aNode ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> resolve: aRelativePath [ ^ self resolve: aRelativePath ifAbsent: [ NotFound signalFor: aRelativePath ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> resolve: aRelativePath ifAbsent: aBlock [ ^ self resolve: aRelativePath ifPresent: [ :each | each ] ifAbsent: aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> resolve: aRelativePath ifPresent: presentBlock ifAbsent: absentBlock [ | segments node | segments := aRelativePath segments. @@ -449,13 +451,13 @@ IceNode >> resolve: aRelativePath ifPresent: presentBlock ifAbsent: absentBlock ifAbsent: absentBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> rootNode [ ^ self parent rootNode ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceNode >> select: aBlock [ | selectedChildren newNode | @@ -472,19 +474,19 @@ IceNode >> select: aBlock [ ^ newNode ] -{ #category : #evaluating } +{ #category : 'evaluating' } IceNode >> value [ ^ value ] -{ #category : #evaluating } +{ #category : 'evaluating' } IceNode >> value: aValue [ value := aValue ] -{ #category : #accessing } +{ #category : 'accessing' } IceNode >> withAllParentNodes [ self hasParent ifFalse: [ ^ #() ]. diff --git a/Iceberg/IceNodeQuery.class.st b/Iceberg/IceNodeQuery.class.st index ccc8644770..c0d5a0ca8d 100644 --- a/Iceberg/IceNodeQuery.class.st +++ b/Iceberg/IceNodeQuery.class.st @@ -2,117 +2,119 @@ I am a IceNode (and IceDefinition) visitor that can detect a code entity in the tree. " Class { - #name : #IceNodeQuery, - #superclass : #IceTreeVisitor, + #name : 'IceNodeQuery', + #superclass : 'IceTreeVisitor', #instVars : [ 'root', 'results', 'selector', 'entityName' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #building } +{ #category : 'building' } IceNodeQuery >> className: aString [ entityName := aString ] -{ #category : #executing } +{ #category : 'executing' } IceNodeQuery >> execute [ root accept: self ] -{ #category : #querying } +{ #category : 'querying' } IceNodeQuery >> ifFound: aBlockClosure [ results do: aBlockClosure ] -{ #category : #initialization } +{ #category : 'initialization' } IceNodeQuery >> initialize [ super initialize. results := Set new ] -{ #category : #building } +{ #category : 'building' } IceNodeQuery >> on: anIceNode [ root := anIceNode ] -{ #category : #building } +{ #category : 'building' } IceNodeQuery >> packageName: aString [ entityName := aString ] -{ #category : #building } +{ #category : 'building' } IceNodeQuery >> selector: aSelector [ selector := aSelector ] -{ #category : #building } +{ #category : 'building' } IceNodeQuery >> traitName: aString [ entityName := aString ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitAddition: anIceAddition [ anIceAddition definition accept: self. self visitChildrenOf: currentNode. ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitClassDefinition: anIceClassDefinition [ anIceClassDefinition asMCDefinition className = entityName ifTrue: [ results add: currentNode ]. ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitExtensionDefinition: anIceExtensionDefinition [ anIceExtensionDefinition name = entityName ifTrue: [ results add: currentNode ]. ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitMethodNode: anIceMethodDefinition [ anIceMethodDefinition asMCDefinition selector = selector ifTrue: [ results add: currentNode ]. ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitModification: anIceModification [ anIceModification definition accept: self. self visitChildrenOf: currentNode. ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitNoModification: anIceNoModification [ "Nothing with me. Just visit children" self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitPackage: anIcePackageDefinition [ anIcePackageDefinition name = entityName ifTrue: [ results add: currentNode ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitRemoval: anIceRemoval [ anIceRemoval definition accept: self. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeQuery >> visitTraitDefinition: anIceTraitDefinition [ anIceTraitDefinition asMCDefinition className = entityName ifTrue: [ results add: currentNode ]. diff --git a/Iceberg/IceNonConflictingOperation.class.st b/Iceberg/IceNonConflictingOperation.class.st index a0ef72a030..75d301db94 100644 --- a/Iceberg/IceNonConflictingOperation.class.st +++ b/Iceberg/IceNonConflictingOperation.class.st @@ -2,15 +2,17 @@ I reprensent a non-conflict between two operations that can be solved automatically. The user can still override the automatic choice using #selectLeft and #selectRight. " Class { - #name : #IceNonConflictingOperation, - #superclass : #IceOperationMerge, + #name : 'IceNonConflictingOperation', + #superclass : 'IceOperationMerge', #instVars : [ 'operation' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNonConflictingOperation class >> operation: anOperation [ ^ self new @@ -18,19 +20,19 @@ IceNonConflictingOperation class >> operation: anOperation [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceNonConflictingOperation >> accept: aVisitor [ ^ aVisitor visitNonConflictingOperation: self ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceNonConflictingOperation >> actualClass [ ^ operation definition actualClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceNonConflictingOperation >> chosenOperation [ ^ chosen @@ -38,75 +40,75 @@ IceNonConflictingOperation >> chosenOperation [ ifNotNil: [ chosen ] ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceNonConflictingOperation >> contextClass [ ^ operation contextClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceNonConflictingOperation >> definition [ "This is just for compatibility" ^ operation definition ] -{ #category : #accessing } +{ #category : 'accessing' } IceNonConflictingOperation >> description [ "Any of my instances should have the same description" ^ operation description ] -{ #category : #testing } +{ #category : 'testing' } IceNonConflictingOperation >> isConflict [ ^ false ] -{ #category : #resolution } +{ #category : 'resolution' } IceNonConflictingOperation >> isLeftChosen [ ^ chosen = operation ] -{ #category : #resolution } +{ #category : 'resolution' } IceNonConflictingOperation >> isRightChosen [ ^ chosen = operation inverse ] -{ #category : #accessing } +{ #category : 'accessing' } IceNonConflictingOperation >> key [ "Any of my operations should have the same key" ^ operation key ] -{ #category : #accessing } +{ #category : 'accessing' } IceNonConflictingOperation >> leftContents [ ^ operation leftContents ] -{ #category : #accessing } +{ #category : 'accessing' } IceNonConflictingOperation >> operation: anIceModification [ operation := anIceModification ] -{ #category : #accessing } +{ #category : 'accessing' } IceNonConflictingOperation >> rightContents [ ^ operation rightContents ] -{ #category : #resolution } +{ #category : 'resolution' } IceNonConflictingOperation >> selectLeft [ chosen := operation ] -{ #category : #resolution } +{ #category : 'resolution' } IceNonConflictingOperation >> selectRight [ chosen := operation inverse diff --git a/Iceberg/IceNonInteractiveCredentialsProvider.class.st b/Iceberg/IceNonInteractiveCredentialsProvider.class.st index fccb123420..04e1987f79 100644 --- a/Iceberg/IceNonInteractiveCredentialsProvider.class.st +++ b/Iceberg/IceNonInteractiveCredentialsProvider.class.st @@ -2,24 +2,26 @@ A credentials provider that retrieves defaults or throws exceptions (but do not interacts with the user) " Class { - #name : #IceNonInteractiveCredentialsProvider, - #superclass : #IceCredentialsProvider, - #category : 'Iceberg-Security' + #name : 'IceNonInteractiveCredentialsProvider', + #superclass : 'IceCredentialsProvider', + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #private } +{ #category : 'private' } IceNonInteractiveCredentialsProvider >> obtainCredentials: response [ "Maybe I can read a file here?" LGitNoCredentialsProvided signal ] -{ #category : #private } +{ #category : 'private' } IceNonInteractiveCredentialsProvider >> obtainPlaintextCredentials: response [ "Maybe I can read a file here?" LGitNoCredentialsProvided signal ] -{ #category : #private } +{ #category : 'private' } IceNonInteractiveCredentialsProvider >> obtainSshCredentials: response [ "Maybe I can read a file here?" LGitNoCredentialsProvided signal diff --git a/Iceberg/IceNotInBranch.class.st b/Iceberg/IceNotInBranch.class.st index 4936f58d3d..b68d19dd40 100644 --- a/Iceberg/IceNotInBranch.class.st +++ b/Iceberg/IceNotInBranch.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceNotInBranch, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceNotInBranch', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } diff --git a/Iceberg/IceNothingToCommit.class.st b/Iceberg/IceNothingToCommit.class.st index 3b6ecd78d6..ad6258bb7b 100644 --- a/Iceberg/IceNothingToCommit.class.st +++ b/Iceberg/IceNothingToCommit.class.st @@ -2,12 +2,14 @@ I indicate when there is nothing to commit (and you tried to do it) " Class { - #name : #IceNothingToCommit, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceNothingToCommit', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceNothingToCommit >> acceptError: anObject [ anObject visitNothingToCommitError: self ] diff --git a/Iceberg/IceNullCommitWalk.class.st b/Iceberg/IceNullCommitWalk.class.st index b278efe41c..209a58cfab 100644 --- a/Iceberg/IceNullCommitWalk.class.st +++ b/Iceberg/IceNullCommitWalk.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceNullCommitWalk, - #superclass : #Object, - #category : #'Iceberg-Core' + #name : 'IceNullCommitWalk', + #superclass : 'Object', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceNullCommitWalk >> commits [ "A null commit walk has no commits" ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceNullCommitWalk >> commitsDo: aBlock [ "Do nothing. A null commit does not has any commits to walk." ] diff --git a/Iceberg/IceOperation.class.st b/Iceberg/IceOperation.class.st index 2ea3b093b1..1f646e4a40 100644 --- a/Iceberg/IceOperation.class.st +++ b/Iceberg/IceOperation.class.st @@ -2,15 +2,17 @@ I represent a merge operation. I know how to install myself in the system, how to inverse myself and how to show the definitions I'm being applied to. Check my subclasses for more information. " Class { - #name : #IceOperation, - #superclass : #Object, + #name : 'IceOperation', + #superclass : 'Object', #instVars : [ 'definition' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceOperation class >> definition: aDefinition [ ^ self new @@ -18,161 +20,161 @@ IceOperation class >> definition: aDefinition [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceOperation >> = anotherOperation [ ^ self species = anotherOperation species and: [ self leftDefinition = anotherOperation leftDefinition ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceOperation >> accept: aVisitor [ self subclassResponsibility ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceOperation >> contextClass [ ^ definition contextClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> definition [ ^ definition ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> definition: aDefinition [ definition := aDefinition ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> description [ ^ definition name ] -{ #category : #testing } +{ #category : 'testing' } IceOperation >> hasChanges [ ^ true ] -{ #category : #comparing } +{ #category : 'comparing' } IceOperation >> hash [ ^ self leftDefinition hash ] -{ #category : #operations } +{ #category : 'operations' } IceOperation >> install [ self leftDefinition install ] -{ #category : #operations } +{ #category : 'operations' } IceOperation >> inverse [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceOperation >> isAddition [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceOperation >> isConflict [ ^false. ] -{ #category : #testing } +{ #category : 'testing' } IceOperation >> isModification [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceOperation >> isNoModification [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceOperation >> isRemoval [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceOperation >> isResolved [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> key [ ^ definition key ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> leftContents [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> leftDefinition [ ^ definition ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> leftDefinition: aNode [ definition := aNode ] -{ #category : #merging } +{ #category : 'merging' } IceOperation >> mergeWithLeftAddition: anIceAddition [ self subclassResponsibility ] -{ #category : #merging } +{ #category : 'merging' } IceOperation >> mergeWithLeftModification: anIceModification [ ^ self subclassResponsibility ] -{ #category : #merging } +{ #category : 'merging' } IceOperation >> mergeWithLeftNoOperation: anIceNoModification [ ^ self subclassResponsibility ] -{ #category : #merging } +{ #category : 'merging' } IceOperation >> mergeWithLeftRemoval: anIceRemoval [ self subclassResponsibility ] -{ #category : #merging } +{ #category : 'merging' } IceOperation >> mergeWithOperation: anOperation [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> name [ ^ definition name ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> printOn: aStream [ super printOn: aStream . @@ -181,7 +183,7 @@ IceOperation >> printOn: aStream [ nextPutAll: ' )'. ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperation >> rightContents [ ^ definition contents diff --git a/Iceberg/IceOperationMerge.class.st b/Iceberg/IceOperationMerge.class.st index d3bed6a254..f8ed377709 100644 --- a/Iceberg/IceOperationMerge.class.st +++ b/Iceberg/IceOperationMerge.class.st @@ -2,105 +2,107 @@ I represent a merge between two operations. I know if I'm a conflict or not, if I have changes, and the user can use me to resolve a conflict. " Class { - #name : #IceOperationMerge, - #superclass : #Object, + #name : 'IceOperationMerge', + #superclass : 'Object', #instVars : [ 'chosen' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceOperationMerge >> accept: aVisitor [ ^ self subclassResponsibility ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceOperationMerge >> actualClass [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperationMerge >> chosenOperation [ self subclassResponsibility ] -{ #category : #resolution } +{ #category : 'resolution' } IceOperationMerge >> clearSelection [ chosen := nil ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceOperationMerge >> contextClass [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperationMerge >> definition [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperationMerge >> description [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceOperationMerge >> hasChanges [ ^ self chosenOperation hasChanges ] -{ #category : #testing } +{ #category : 'testing' } IceOperationMerge >> isConflict [ self subclassResponsibility ] -{ #category : #resolution } +{ #category : 'resolution' } IceOperationMerge >> isLeftChosen [ self subclassResponsibility ] -{ #category : #'morphic - compatibility' } +{ #category : 'morphic - compatibility' } IceOperationMerge >> isLoadable [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceOperationMerge >> isResolved [ ^ chosen notNil ] -{ #category : #resolution } +{ #category : 'resolution' } IceOperationMerge >> isRightChosen [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperationMerge >> key [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperationMerge >> leftContents [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceOperationMerge >> rightContents [ self subclassResponsibility ] -{ #category : #resolution } +{ #category : 'resolution' } IceOperationMerge >> selectLeft [ self subclassResponsibility ] -{ #category : #resolution } +{ #category : 'resolution' } IceOperationMerge >> selectRight [ self subclassResponsibility ] diff --git a/Iceberg/IcePackage.class.st b/Iceberg/IcePackage.class.st index 733db10c87..ed73b91d78 100644 --- a/Iceberg/IcePackage.class.st +++ b/Iceberg/IcePackage.class.st @@ -6,17 +6,19 @@ Can give information about a package that is saved in a repository, for example: " Class { - #name : #IcePackage, - #superclass : #Object, + #name : 'IcePackage', + #superclass : 'Object', #instVars : [ 'package', 'repository', 'isDirty' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IcePackage class >> named: packageName repository: repository [ ^ self new package: packageName; @@ -24,7 +26,7 @@ IcePackage class >> named: packageName repository: repository [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IcePackage >> = another [ ^ self species = another species and: [ self repository = another repository @@ -32,165 +34,165 @@ IcePackage >> = another [ ] -{ #category : #loading } +{ #category : 'loading' } IcePackage >> beClean [ isDirty := false ] -{ #category : #loading } +{ #category : 'loading' } IcePackage >> beDirty [ isDirty := true ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackage >> beDirty: aBoolean [ isDirty := aBoolean ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IcePackage >> currentCommit [ ^ repository workingCopy referenceCommit ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IcePackage >> currentCommits [ ^ repository workingCopy referenceCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackage >> directoryName [ ^ self repository directoryNameForPackage: self ] -{ #category : #comparing } +{ #category : 'comparing' } IcePackage >> hash [ ^ self name hash ] -{ #category : #initialization } +{ #category : 'initialization' } IcePackage >> initialize [ super initialize. isDirty := false ] -{ #category : #loading } +{ #category : 'loading' } IcePackage >> isClean [ ^ self isDirty not ] -{ #category : #loading } +{ #category : 'loading' } IcePackage >> isDirty [ ^ self isLoaded and: [isDirty ifNil: [ isDirty := false ]] ] -{ #category : #testing } +{ #category : 'testing' } IcePackage >> isExported [ ^ repository isPackageExported: self ] -{ #category : #testing } +{ #category : 'testing' } IcePackage >> isLoaded [ ^ repository workingCopy isLoadedPackageNamed: self packageName ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IcePackage >> isMetacelloBaseline [ ^ self name beginsWith: self metacelloBaselinePrefix ] -{ #category : #testing } +{ #category : 'testing' } IcePackage >> isModified [ ^ self isDirty ] -{ #category : #TOMOVE } +{ #category : 'TOMOVE' } IcePackage >> latestVersion [ ^ self versionFor: self repository head commit ] -{ #category : #loading } +{ #category : 'loading' } IcePackage >> load [ self repository workingCopy loadPackageNamed: self name ] -{ #category : #querying } +{ #category : 'querying' } IcePackage >> loadedVersion [ ^ self repository workingCopy versionFor: self ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IcePackage >> mcPackage [ ^ MCPackage named: self packageName ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IcePackage >> mcSnapshotInRepository [ "Answer a version of the package as it is present on repository. Useful to browse non-loaded packages." ^ self repository branch snapshotFor: self ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IcePackage >> mcWorkingCopy [ ^ self isLoaded ifTrue: [ self mcPackage workingCopy ] ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IcePackage >> metacelloBaselineName [ ^ self name allButFirst: self metacelloBaselinePrefix size ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IcePackage >> metacelloBaselinePrefix [ ^ 'BaselineOf' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackage >> name [ ^ package ] -{ #category : #querying } +{ #category : 'querying' } IcePackage >> outgoingCommits [ ^ self repository branch outgoingCommits: [ :walk | walk modifyingPackage: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackage >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackage >> package: anObject [ package := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackage >> packageName [ ^ package ] -{ #category : #printing } +{ #category : 'printing' } IcePackage >> printDescriptionOn: aStream [ aStream nextPut: $(; nextPutAll: package; @@ -199,46 +201,46 @@ IcePackage >> printDescriptionOn: aStream [ nextPut: $) ] -{ #category : #printing } +{ #category : 'printing' } IcePackage >> printOn: aStream [ aStream nextPutAll: self class name. self printDescriptionOn: aStream ] -{ #category : #actions } +{ #category : 'actions' } IcePackage >> reload [ self load ] -{ #category : #actions } +{ #category : 'actions' } IcePackage >> remove [ "Removes the package from the repository. Does not unload from the image" repository workingCopy basicRemovePackage: self ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackage >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackage >> repository: anObject [ repository := anObject ] -{ #category : #actions } +{ #category : 'actions' } IcePackage >> unload [ repository workingCopy unloadPackage: self ] -{ #category : #querying } +{ #category : 'querying' } IcePackage >> versionFor: aCommitId [ ^ aCommitId commit versionFor: self ] -{ #category : #versions } +{ #category : 'versions' } IcePackage >> versionLike: selectBlock ifNone: ifNoneBlock [ "Return all versions of this package in the current branch, latest first. Containing info in the repo makes it easier to refresh." @@ -249,7 +251,7 @@ IcePackage >> versionLike: selectBlock ifNone: ifNoneBlock [ ] -{ #category : #querying } +{ #category : 'querying' } IcePackage >> versions [ "Return all versions of this package in the current branch, latest first. Containing info in the repo makes it easier to refresh." diff --git a/Iceberg/IcePackageDefinition.class.st b/Iceberg/IcePackageDefinition.class.st index a1392a0d5d..1d7887ee54 100644 --- a/Iceberg/IcePackageDefinition.class.st +++ b/Iceberg/IcePackageDefinition.class.st @@ -6,24 +6,26 @@ My contents are the tags defined in the package. See my superclasses for more information. " Class { - #name : #IcePackageDefinition, - #superclass : #IceDefinition, + #name : 'IcePackageDefinition', + #superclass : 'IceDefinition', #instVars : [ 'package', 'path', 'packageName', 'tagNames' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IcePackageDefinition >> accept: aVisitor [ ^ aVisitor visitPackage: self ] -{ #category : #patching } +{ #category : 'patching' } IcePackageDefinition >> addModification: anIceModification toPatcher: aMCPatcher [ "In MC there is no such thing as a MCPackage definition. @@ -36,19 +38,19 @@ IcePackageDefinition >> addModification: anIceModification toPatcher: aMCPatcher ^ aMCPatcher addDefinition: anIceModification leftDefinition asMCDefinition ] -{ #category : #patching } +{ #category : 'patching' } IcePackageDefinition >> addToPatcher: aPatcher [ aPatcher addDefinition: self asMCDefinition ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> asMCDefinition [ ^ MCOrganizationDefinition packageName: packageName tagNames: tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> contents [ ^ String streamContents: [ :stream | @@ -64,59 +66,59 @@ IcePackageDefinition >> contents [ nextPutAll: tagName ] ] ] -{ #category : #testing } +{ #category : 'testing' } IcePackageDefinition >> isPackageDefinition [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> packageName [ ^ packageName ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> packageName: anObject [ packageName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> path [ ^ path ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> path: aRelativePath [ path := aRelativePath ] -{ #category : #operations } +{ #category : 'operations' } IcePackageDefinition >> removeFrom: aVisitor [ aVisitor removePackage: self ] -{ #category : #patching } +{ #category : 'patching' } IcePackageDefinition >> removeFromPatcher: aPatcher [ aPatcher removeDefinition: self asMCDefinition ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> tagNames [ ^ tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDefinition >> tagNames: anObject [ tagNames := anObject diff --git a/Iceberg/IcePackageDependency.class.st b/Iceberg/IcePackageDependency.class.st index da27d9e9ac..b73ca4fa56 100644 --- a/Iceberg/IcePackageDependency.class.st +++ b/Iceberg/IcePackageDependency.class.st @@ -2,15 +2,17 @@ I am a dependency to a package. " Class { - #name : #IcePackageDependency, - #superclass : #IceDependency, + #name : 'IcePackageDependency', + #superclass : 'IceDependency', #instVars : [ 'definition' ], - #category : #'Iceberg-Cherrypicking' + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #comparing } +{ #category : 'comparing' } IcePackageDependency >> = anObject [ "Answer whether the receiver and anObject represent the same object." @@ -21,29 +23,29 @@ IcePackageDependency >> = anObject [ ^ definition name = anObject definition name ] -{ #category : #dependencies } +{ #category : 'dependencies' } IcePackageDependency >> addTransitiveDependenciesFrom: anIceDiff to: anIceCherrypicker [ "No transitive dependencies of a package" ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDependency >> definition [ ^ definition ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageDependency >> definition: aIcePackageDefinition [ definition := aIcePackageDefinition ] -{ #category : #comparing } +{ #category : 'comparing' } IcePackageDependency >> hash [ "Answer an integer value that is related to the identity of the receiver." ^ definition name hash ] -{ #category : #testing } +{ #category : 'testing' } IcePackageDependency >> isDependencyTo: anIcePackageDefinition [ ^ definition name = anIcePackageDefinition name ] diff --git a/Iceberg/IcePackageLoaded.class.st b/Iceberg/IcePackageLoaded.class.st index c2b1f093d6..d92cfc4e2a 100644 --- a/Iceberg/IcePackageLoaded.class.st +++ b/Iceberg/IcePackageLoaded.class.st @@ -2,25 +2,27 @@ I announce when a package has been loaded. " Class { - #name : #IcePackageLoaded, - #superclass : #IceAnnouncement, + #name : 'IcePackageLoaded', + #superclass : 'IceAnnouncement', #instVars : [ 'loadedVersion' ], - #category : 'Iceberg-Announcements' + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IcePackageLoaded class >> version: version [ ^ self new loadedVersion: version ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageLoaded >> loadedVersion [ ^ loadedVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IcePackageLoaded >> loadedVersion: anObject [ loadedVersion := anObject ] diff --git a/Iceberg/IcePackageUnloaded.class.st b/Iceberg/IcePackageUnloaded.class.st index 7da710666a..4f932e7757 100644 --- a/Iceberg/IcePackageUnloaded.class.st +++ b/Iceberg/IcePackageUnloaded.class.st @@ -2,7 +2,9 @@ I announce when a package has been unloaded. " Class { - #name : #IcePackageUnloaded, - #superclass : #IceAnnouncement, - #category : 'Iceberg-Announcements' + #name : 'IcePackageUnloaded', + #superclass : 'IceAnnouncement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } diff --git a/Iceberg/IcePlaintextCredentials.class.st b/Iceberg/IcePlaintextCredentials.class.st index 806e4ac692..66ee5c58b0 100644 --- a/Iceberg/IcePlaintextCredentials.class.st +++ b/Iceberg/IcePlaintextCredentials.class.st @@ -2,63 +2,65 @@ In addition to my base I have a one time token as well. " Class { - #name : #IcePlaintextCredentials, - #superclass : #IceAbstractCredentials, + #name : 'IcePlaintextCredentials', + #superclass : 'IceAbstractCredentials', #instVars : [ 'username', 'password' ], - #category : #'Iceberg-Security' + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #printing } +{ #category : 'printing' } IcePlaintextCredentials >> description [ ^ 'User: ' , username ] -{ #category : #printing } +{ #category : 'printing' } IcePlaintextCredentials >> hostDescription [ ^ host ] -{ #category : #testing } +{ #category : 'testing' } IcePlaintextCredentials >> isPresent [ ^ self username isEmpty not and: [ self password isEmpty not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaintextCredentials >> password [ ^ password ifNil: [ password := '' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaintextCredentials >> password: anObject [ password := anObject ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IcePlaintextCredentials >> readFrom: credentials [ self username: credentials username. self password: credentials password ] -{ #category : #'API - storing' } +{ #category : 'API - storing' } IcePlaintextCredentials >> removeFrom: aStore [ aStore removePlainTextCredential: self ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaintextCredentials >> type [ ^ 'Plain Text' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaintextCredentials >> username [ ^ username ifNil: [ username := '' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaintextCredentials >> username: anObject [ username := anObject ] diff --git a/Iceberg/IcePlaintextOtpCredentials.class.st b/Iceberg/IcePlaintextOtpCredentials.class.st index 987176ced4..e68e61ddd8 100644 --- a/Iceberg/IcePlaintextOtpCredentials.class.st +++ b/Iceberg/IcePlaintextOtpCredentials.class.st @@ -2,20 +2,22 @@ In addition to my base I have a one time token as well. " Class { - #name : #IcePlaintextOtpCredentials, - #superclass : #IcePlaintextCredentials, + #name : 'IcePlaintextOtpCredentials', + #superclass : 'IcePlaintextCredentials', #instVars : [ 'token' ], - #category : #'Iceberg-Security' + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #accessing } +{ #category : 'accessing' } IcePlaintextOtpCredentials >> token [ ^token ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaintextOtpCredentials >> token: aToken [ token := aToken ] diff --git a/Iceberg/IceProjectChange.class.st b/Iceberg/IceProjectChange.class.st index 9d23c1d37f..8082aa6554 100644 --- a/Iceberg/IceProjectChange.class.st +++ b/Iceberg/IceProjectChange.class.st @@ -2,18 +2,20 @@ I represent the fact that the project changed. I'm using during the double-dispatch of diff calculation, so concrete projects can add themselves to the change calculation. " Class { - #name : #IceProjectChange, - #superclass : #IceChange, - #category : #'Iceberg-Project' + #name : 'IceProjectChange', + #superclass : 'IceChange', + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #visiting } +{ #category : 'visiting' } IceProjectChange >> accept: anIceChangeImporter [ anIceChangeImporter visitProjectChange: self ] -{ #category : #displaying } +{ #category : 'displaying' } IceProjectChange >> displayingProgressString [ ^ 'Comparing Project change' ] diff --git a/Iceberg/IceProjectReader.class.st b/Iceberg/IceProjectReader.class.st index 1497e07488..a3a33d51fd 100644 --- a/Iceberg/IceProjectReader.class.st +++ b/Iceberg/IceProjectReader.class.st @@ -7,12 +7,14 @@ Then, a reader must implement: - #readProjectFromCommitish: returns a project object " Class { - #name : #IceProjectReader, - #superclass : #Object, - #category : #'Iceberg-Project' + #name : 'IceProjectReader', + #superclass : 'Object', + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #accessing } +{ #category : 'accessing' } IceProjectReader class >> availableReaders [ ^ (self allSubclasses @@ -20,7 +22,7 @@ IceProjectReader class >> availableReaders [ sorted: [ :a :b | a priority < b priority ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceProjectReader class >> readProjectFrom: anIceCommitish [ ^ (self availableReaders @@ -28,20 +30,20 @@ IceProjectReader class >> readProjectFrom: anIceCommitish [ readProjectFromCommitish: anIceCommitish ] -{ #category : #testing } +{ #category : 'testing' } IceProjectReader >> canReadProjectFromCommitish: aCommitish [ "Return a boolean indicating if I know how to read the project from the commitish" self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceProjectReader >> priority [ "By default all readers are important..." ^ 1 ] -{ #category : #reading } +{ #category : 'reading' } IceProjectReader >> readProjectFromCommitish: aCommitish [ "Return a project object read from the commitish" self subclassResponsibility diff --git a/Iceberg/IceProxyMCVersionInfo.class.st b/Iceberg/IceProxyMCVersionInfo.class.st index 7866862d02..a06a411b54 100644 --- a/Iceberg/IceProxyMCVersionInfo.class.st +++ b/Iceberg/IceProxyMCVersionInfo.class.st @@ -3,8 +3,8 @@ I'm a proxy to keep information on pre-loaded packages when repository is not pr This is the case of pharo project, which is distributed without a repository connection, but users may still need to link with it to make contributions. " Class { - #name : #IceProxyMCVersionInfo, - #superclass : #ProtoObject, + #name : 'IceProxyMCVersionInfo', + #superclass : 'ProtoObject', #instVars : [ 'commitId', 'packageName', @@ -14,15 +14,17 @@ Class { #classVars : [ 'LastCommitFound' ], - #category : #'Iceberg-Adapters' + #category : 'Iceberg-Adapters', + #package : 'Iceberg', + #tag : 'Adapters' } -{ #category : #private } +{ #category : 'private' } IceProxyMCVersionInfo class >> lastCommitFound [ ^ LastCommitFound ] -{ #category : #private } +{ #category : 'private' } IceProxyMCVersionInfo class >> lastCommitFound: aCommit [ | oldCommit | oldCommit := LastCommitFound. @@ -35,7 +37,7 @@ IceProxyMCVersionInfo class >> lastCommitFound: aCommit [ LastCommitFound := nil ] fork ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceProxyMCVersionInfo class >> remoteUrl: anUrl packageName: aName commit: aCommit message: aString author: authorString [ ^ self remoteUrl: anUrl @@ -51,7 +53,7 @@ IceProxyMCVersionInfo class >> remoteUrl: anUrl packageName: aName commit: aComm ancestors: #()) ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceProxyMCVersionInfo class >> remoteUrl: urlString packageName: nameString commitId: idString [ ^ self new remoteUrl: urlString @@ -60,7 +62,7 @@ IceProxyMCVersionInfo class >> remoteUrl: urlString packageName: nameString comm stub: nil ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceProxyMCVersionInfo class >> remoteUrl: urlString packageName: nameString commitId: idString stub: aVersionInfo [ ^ self new remoteUrl: urlString @@ -69,7 +71,7 @@ IceProxyMCVersionInfo class >> remoteUrl: urlString packageName: nameString comm stub: aVersionInfo ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceProxyMCVersionInfo >> becomeForward: otherObject copyHash: copyHash [ "Primitive. All variables in the entire system that used to point to the receiver now point to the argument. If copyHash is true, the argument's identity hash bits will be set to those of the receiver. @@ -80,14 +82,14 @@ IceProxyMCVersionInfo >> becomeForward: otherObject copyHash: copyHash [ copyHash: copyHash ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceProxyMCVersionInfo >> doesNotUnderstand: aMessage [ ^ aMessage sendTo: (self findVersionInfo ifNotNil: [ :versionInfo | self becomeForward: versionInfo copyHash: false ] ifNil: [ self stubVersionInfo ]) ] -{ #category : #private } +{ #category : 'private' } IceProxyMCVersionInfo >> findVersionInfo [ | repo remote commit | @@ -115,28 +117,28 @@ Please fetch from "{1}" and try again.' package: (IcePackage named: packageName repository: repo) ] -{ #category : #inspecting } +{ #category : 'inspecting' } IceProxyMCVersionInfo >> inspect [ "Create and schedule an Inspector in which the user can examine the receiver's variables." ^ Smalltalk tools inspector inspect: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceProxyMCVersionInfo >> lazy [ ^ self ] -{ #category : #printing } +{ #category : 'printing' } IceProxyMCVersionInfo >> printOn: aStream [ aStream << self class name << '(' << packageName << ')' ] -{ #category : #printing } +{ #category : 'printing' } IceProxyMCVersionInfo >> printString [ ^ String streamContents: [ :stream | self printOn: stream ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceProxyMCVersionInfo >> remoteUrl: urlString packageName: nameString commitId: idString stub: aStub [ remoteUrl := urlString. packageName := nameString. @@ -144,7 +146,7 @@ IceProxyMCVersionInfo >> remoteUrl: urlString packageName: nameString commitId: stubVersionInfo := aStub ] -{ #category : #accessing } +{ #category : 'accessing' } IceProxyMCVersionInfo >> stubVersionInfo [ ^ stubVersionInfo ifNil: [ stubVersionInfo := MCVersionInfo @@ -157,7 +159,7 @@ IceProxyMCVersionInfo >> stubVersionInfo [ ancestors: #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProxyMCVersionInfo >> stubVersionInfo: aVersionInfo [ stubVersionInfo := aVersionInfo ] diff --git a/Iceberg/IcePushTransferProgress.class.st b/Iceberg/IcePushTransferProgress.class.st index 4bbc706b5d..be10811877 100644 --- a/Iceberg/IcePushTransferProgress.class.st +++ b/Iceberg/IcePushTransferProgress.class.st @@ -1,13 +1,15 @@ Class { - #name : #IcePushTransferProgress, - #superclass : #LGitPushTransferProgressCallback, + #name : 'IcePushTransferProgress', + #superclass : 'LGitPushTransferProgressCallback', #instVars : [ 'job' ], - #category : 'Iceberg-Progress' + #category : 'Iceberg-Progress', + #package : 'Iceberg', + #tag : 'Progress' } -{ #category : #accessing } +{ #category : 'accessing' } IcePushTransferProgress >> block [ ^ [ :current :total :bytes :payload | job ensureStarted. @@ -23,7 +25,7 @@ IcePushTransferProgress >> block [ ] ] -{ #category : #initialization } +{ #category : 'initialization' } IcePushTransferProgress >> initialize [ super initialize. @@ -34,12 +36,12 @@ IcePushTransferProgress >> initialize [ self initializeBlock. ] -{ #category : #initialization } +{ #category : 'initialization' } IcePushTransferProgress >> initializeBlock [ self signature: self class fnSpec block: self block. ] -{ #category : #accessing } +{ #category : 'accessing' } IcePushTransferProgress >> title [ ^ 'Pushing...' ] diff --git a/Iceberg/IcePushed.class.st b/Iceberg/IcePushed.class.st index 4bb08bc079..045ca14db9 100644 --- a/Iceberg/IcePushed.class.st +++ b/Iceberg/IcePushed.class.st @@ -2,7 +2,9 @@ Announces when a repository has been pushed. " Class { - #name : #IcePushed, - #superclass : #IceRepositoryAnnouncement, - #category : 'Iceberg-Announcements' + #name : 'IcePushed', + #superclass : 'IceRepositoryAnnouncement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } diff --git a/Iceberg/IceRemote.class.st b/Iceberg/IceRemote.class.st index d163aefd2a..1b677fc1e9 100644 --- a/Iceberg/IceRemote.class.st +++ b/Iceberg/IceRemote.class.st @@ -10,35 +10,37 @@ Internal Representation and Key Implementation Points. url: " Class { - #name : #IceRemote, - #superclass : #Object, + #name : 'IceRemote', + #superclass : 'Object', #instVars : [ 'url', 'projectName', 'name', 'localRepository' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #comparing } +{ #category : 'comparing' } IceRemote >> = another [ self subclassResponsibility ] -{ #category : #private } +{ #category : 'private' } IceRemote >> basicUrl: aString [ url := aString ] -{ #category : #branches } +{ #category : 'branches' } IceRemote >> branches [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> branchesFrom: aRepository [ "I return all the branches of my remote from a repository" @@ -46,36 +48,36 @@ IceRemote >> branchesFrom: aRepository [ select: [ :branch | branch isRemote and: [ branch remoteName = self name ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> detailedInfo [ ^ #() ] -{ #category : #displaying } +{ #category : 'displaying' } IceRemote >> displayString [ ^ '{1}: {2}' format: { self name. self url } ] -{ #category : #fetching } +{ #category : 'fetching' } IceRemote >> fetch [ self subclassResponsibility ] -{ #category : #fetching } +{ #category : 'fetching' } IceRemote >> fetchBranch: aRemoteBranch [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceRemote >> hasBranches [ ^ self branches isNotEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceRemote >> hasRemoteBranchNamed: aString [ self @@ -84,12 +86,12 @@ IceRemote >> hasRemoteBranchNamed: aString [ ifAbsent: [ ^ false ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> host [ ^ self subclassResponsibility ] -{ #category : #patches } +{ #category : 'patches' } IceRemote >> httpsUrl [ "This method is used to compare exchangeable addresses (https:// and git@). So it has sense in my children, and is notably used on #isSameUrl: @@ -97,70 +99,70 @@ IceRemote >> httpsUrl [ ^ self url ] -{ #category : #testing } +{ #category : 'testing' } IceRemote >> isSame: aRemote [ ^ (self referencesSameRemoteLocationAs: aRemote) and: [ self name = aRemote name ] ] -{ #category : #testing } +{ #category : 'testing' } IceRemote >> isUndefined [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> localRepository [ ^ localRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> localRepository: aRepository [ localRepository := aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> name: aString [ name := aString ] -{ #category : #private } +{ #category : 'private' } IceRemote >> parseUrl [ ^ self subclassResponsibility ] -{ #category : #printing } +{ #category : 'printing' } IceRemote >> printOn: stream [ stream << (self name ifNil: [ 'noname' ]) << ' (' << self url << ')' ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> projectBasename [ ^ self projectName withoutSuffix: '.git' ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> projectName [ ^ projectName ] -{ #category : #testing } +{ #category : 'testing' } IceRemote >> referencesSameRemoteLocationAs: another [ "Base/trivial implementation is that two urls are the same if they are equal, but some subclasses have more complicated logic to detect two urls pointing to the same remote" ^ self url sameAs: another url ] -{ #category : #branches } +{ #category : 'branches' } IceRemote >> remoteBranchNamed: aString [ ^ self @@ -171,7 +173,7 @@ IceRemote >> remoteBranchNamed: aString [ signal ] ] -{ #category : #branches } +{ #category : 'branches' } IceRemote >> remoteBranchNamed: aString ifAbsent: aBlock [ ^ self @@ -180,13 +182,13 @@ IceRemote >> remoteBranchNamed: aString ifAbsent: aBlock [ ifAbsent: [ ^ aBlock value ] ] -{ #category : #branches } +{ #category : 'branches' } IceRemote >> remoteBranchNamed: aString ifPresent: presentClosure ifAbsent: absentClosure [ ^ absentClosure value ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> upstreamForBranch: aBranch backend: backend [ ^ backend lookupBranchNamed: aBranch name @@ -194,12 +196,12 @@ IceRemote >> upstreamForBranch: aBranch backend: backend [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> url [ ^ url ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemote >> url: aString [ self basicUrl: aString. self parseUrl diff --git a/Iceberg/IceRemoteAlreadyExistsError.class.st b/Iceberg/IceRemoteAlreadyExistsError.class.st index 37ba297c9b..962a8c8d0c 100644 --- a/Iceberg/IceRemoteAlreadyExistsError.class.st +++ b/Iceberg/IceRemoteAlreadyExistsError.class.st @@ -1,23 +1,25 @@ Class { - #name : #IceRemoteAlreadyExistsError, - #superclass : #IceError, + #name : 'IceRemoteAlreadyExistsError', + #superclass : 'IceError', #instVars : [ 'remoteName' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceRemoteAlreadyExistsError >> acceptError: aVisitor [ aVisitor visitRemoteAlreadyExistError: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteAlreadyExistsError >> remoteName [ ^ remoteName ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteAlreadyExistsError >> remoteName: aString [ remoteName := aString ] diff --git a/Iceberg/IceRemoteBranch.class.st b/Iceberg/IceRemoteBranch.class.st index a9242b16e0..af9acbc540 100644 --- a/Iceberg/IceRemoteBranch.class.st +++ b/Iceberg/IceRemoteBranch.class.st @@ -8,19 +8,21 @@ I am a remote tracked branch. I am a copy to a branch that exists in a remote. I branch hasOutgoingCommits. " Class { - #name : #IceRemoteBranch, - #superclass : #IceBranch, - #category : #'Iceberg-Core' + #name : 'IceRemoteBranch', + #superclass : 'IceBranch', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #comparing } +{ #category : 'comparing' } IceRemoteBranch >> = aBranch [ ^ aBranch isRemote and: [ self name = aBranch name ] ] -{ #category : #'API - checkout' } +{ #category : 'API - checkout' } IceRemoteBranch >> checkout: aCheckoutStrategy [ | localBranch | @@ -36,7 +38,7 @@ IceRemoteBranch >> checkout: aCheckoutStrategy [ ^ localBranch checkout: aCheckoutStrategy ] -{ #category : #'API - actions' } +{ #category : 'API - actions' } IceRemoteBranch >> checkoutWithStrategy: aCheckoutStrategy [ "checkouts a remote branch" @@ -53,34 +55,34 @@ IceRemoteBranch >> checkoutWithStrategy: aCheckoutStrategy [ ^ super checkoutWithStrategy: aCheckoutStrategy ] -{ #category : #comparing } +{ #category : 'comparing' } IceRemoteBranch >> hash [ ^ self name hash ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRemoteBranch >> incomingCommits [ ^ #() ] -{ #category : #testing } +{ #category : 'testing' } IceRemoteBranch >> isRemote [ ^ true ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRemoteBranch >> outgoingCommits [ ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteBranch >> remote [ ^ repository remoteNamed: self remoteName ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteBranch >> shortName [ ^ self name copyAfter: $/ ] diff --git a/Iceberg/IceRemoteDesynchronized.class.st b/Iceberg/IceRemoteDesynchronized.class.st index 4d4b6c709a..c22086de22 100644 --- a/Iceberg/IceRemoteDesynchronized.class.st +++ b/Iceberg/IceRemoteDesynchronized.class.st @@ -3,42 +3,44 @@ I indicate when a remote is desyncronized. It means the version I have in the working copy (not the image) is different to the version I have in the remote (then I need to pull/branch/whatever before commiting). " Class { - #name : #IceRemoteDesynchronized, - #superclass : #IceError, + #name : 'IceRemoteDesynchronized', + #superclass : 'IceError', #instVars : [ 'remote', 'resumable' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceRemoteDesynchronized >> acceptError: aVisitor [ aVisitor visitRemoteDesynchronizedError: self ] -{ #category : #converting } +{ #category : 'converting' } IceRemoteDesynchronized >> asResumable [ resumable := true ] -{ #category : #initialization } +{ #category : 'initialization' } IceRemoteDesynchronized >> initialize [ super initialize. resumable := false ] -{ #category : #private } +{ #category : 'private' } IceRemoteDesynchronized >> isResumable [ ^ resumable ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteDesynchronized >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteDesynchronized >> remote: anObject [ remote := anObject ] diff --git a/Iceberg/IceRemoteNotFoundError.class.st b/Iceberg/IceRemoteNotFoundError.class.st index d2e0aeefbd..6056ade61c 100644 --- a/Iceberg/IceRemoteNotFoundError.class.st +++ b/Iceberg/IceRemoteNotFoundError.class.st @@ -1,18 +1,20 @@ Class { - #name : #IceRemoteNotFoundError, - #superclass : #IceError, + #name : 'IceRemoteNotFoundError', + #superclass : 'IceError', #instVars : [ 'remoteName' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteNotFoundError >> remoteName [ ^ remoteName ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteNotFoundError >> remoteName: aString [ remoteName := aString ] diff --git a/Iceberg/IceRemoteWithOnlyHostname.class.st b/Iceberg/IceRemoteWithOnlyHostname.class.st index 2dfe069d74..10da965220 100644 --- a/Iceberg/IceRemoteWithOnlyHostname.class.st +++ b/Iceberg/IceRemoteWithOnlyHostname.class.st @@ -5,27 +5,29 @@ This is to not intended to be polymorphic with all the uses of remotes in iceber It is only used in the credential " Class { - #name : #IceRemoteWithOnlyHostname, - #superclass : #Object, + #name : 'IceRemoteWithOnlyHostname', + #superclass : 'Object', #instVars : [ 'host' ], - #category : 'Iceberg-Security' + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRemoteWithOnlyHostname class >> for: aHost [ ^ self new host: aHost; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteWithOnlyHostname >> host [ ^ host ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoteWithOnlyHostname >> host: aString [ host := aString ] diff --git a/Iceberg/IceRemoval.class.st b/Iceberg/IceRemoval.class.st index ade8d11007..d40e90a75a 100644 --- a/Iceberg/IceRemoval.class.st +++ b/Iceberg/IceRemoval.class.st @@ -2,36 +2,38 @@ I am a removal in a tree. I contain the definition I'm removing. I know what is the icon for removal and how to calculate a conflict with other operations. " Class { - #name : #IceRemoval, - #superclass : #IceOperation, - #category : 'Iceberg-Changes' + #name : 'IceRemoval', + #superclass : 'IceOperation', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceRemoval >> accept: aVisitor [ ^ aVisitor visitRemoval: self ] -{ #category : #operations } +{ #category : 'operations' } IceRemoval >> inverse [ ^ IceAddition definition: definition ] -{ #category : #testing } +{ #category : 'testing' } IceRemoval >> isRemoval [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceRemoval >> leftContents [ ^ '' ] -{ #category : #merging } +{ #category : 'merging' } IceRemoval >> mergeWithLeftAddition: anIceAddition [ "This should not happen. If I represent a removal of a node, that means that the original definition existed on the base version. @@ -39,7 +41,7 @@ IceRemoval >> mergeWithLeftAddition: anIceAddition [ self shouldNotImplement ] -{ #category : #merging } +{ #category : 'merging' } IceRemoval >> mergeWithLeftModification: anIceModification [ ^ IceConflictingOperation @@ -47,7 +49,7 @@ IceRemoval >> mergeWithLeftModification: anIceModification [ right: self ] -{ #category : #merging } +{ #category : 'merging' } IceRemoval >> mergeWithLeftNoOperation: anIceNoModification [ "We assume that if the IceNoModification is in the tree this means its children have modifications. @@ -57,13 +59,13 @@ IceRemoval >> mergeWithLeftNoOperation: anIceNoModification [ ^ IceConflictingOperation left: anIceNoModification right: self ] -{ #category : #merging } +{ #category : 'merging' } IceRemoval >> mergeWithLeftRemoval: anIceRemoval [ ^ IceNonConflictingOperation operation: anIceRemoval ] -{ #category : #merging } +{ #category : 'merging' } IceRemoval >> mergeWithOperation: anOperation [ ^ anOperation mergeWithLeftRemoval: self diff --git a/Iceberg/IceRepository.class.st b/Iceberg/IceRepository.class.st index 96245a9174..3cbaa58929 100644 --- a/Iceberg/IceRepository.class.st +++ b/Iceberg/IceRepository.class.st @@ -140,8 +140,8 @@ From the repository point of view, only some convenience methods are provided to " Class { - #name : #IceRepository, - #superclass : #Object, + #name : 'IceRepository', + #superclass : 'Object', #instVars : [ 'name', 'workingCopy', @@ -151,41 +151,43 @@ Class { #classVars : [ 'Registry' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceRepository class >> isAbstract [ ^ self == IceRepository ] -{ #category : #registry } +{ #category : 'registry' } IceRepository class >> registerRepository: aRepository [ self registry add: aRepository. ^ aRepository ] -{ #category : #registry } +{ #category : 'registry' } IceRepository class >> registeredRepositoryIncludingPackage: aPackage [ ^ self registry detect: [ :repoitory | repoitory includesPackageNamed: aPackage name ] ifNone: [ nil ] ] -{ #category : #registry } +{ #category : 'registry' } IceRepository class >> registry [ ^ Registry ifNil: [ Registry := OrderedCollection new ] ] -{ #category : #registry } +{ #category : 'registry' } IceRepository class >> repositories [ ^ self registry ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository class >> repositoryNamed: aString [ ^ self repositories @@ -193,20 +195,20 @@ IceRepository class >> repositoryNamed: aString [ ifNone: [ nil ] ] -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceRepository class >> reset [ Registry := nil. Iceberg announcer announce: IceRepositoryForgotten new. ] -{ #category : #registry } +{ #category : 'registry' } IceRepository class >> unregisterRepository: aRepository ifAbsent: aBlock [ ^ self registry remove: aRepository ifAbsent: aBlock ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> addRemote: aRemote [ "Add a remote to the current repository. @@ -221,14 +223,14 @@ IceRepository >> addRemote: aRemote [ aRemote localRepository: self. ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> allBranches [ "Returns all local and remote branches, instances of IceBranch, from the current repository. This method will return only already fetched branches." self subclassResponsibility ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceRepository >> branch [ "Returns head if head is a branch. Throws an exception if HEAD is not a branch" @@ -237,7 +239,7 @@ IceRepository >> branch [ ^ self head ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceRepository >> branchName [ "Returns current branch name. @@ -246,7 +248,7 @@ IceRepository >> branchName [ ^ self branch name ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> branchNamed: aName [ "Access a branch by name. Throws an IceBranchNotFound is the branch does not exist in the repository." @@ -260,7 +262,7 @@ IceRepository >> branchNamed: aName [ signal ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> branchNamed: aName ifAbsent: absentBlock [ "Access a branch by name. Returns the result of the second argument if absent." @@ -271,7 +273,7 @@ IceRepository >> branchNamed: aName ifAbsent: absentBlock [ ifAbsent: absentBlock ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> branchNamed: aString ifPresent: aBlockClosure [ "Access a branch by name. If present, evaluate the block used as second argument with the branch found. @@ -283,7 +285,7 @@ IceRepository >> branchNamed: aString ifPresent: aBlockClosure [ ifAbsent: [ self ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> branchNamed: aName ifPresent: presentBlock ifAbsent: absentBlock [ "Access a branch by name. If present, evaluate the block used as second argument with the branch found. @@ -292,33 +294,33 @@ IceRepository >> branchNamed: aName ifPresent: presentBlock ifAbsent: absentBloc self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceRepository >> canPush [ ^ self head isDetached not and: [ self branch tracksRemoteBranch ] ] -{ #category : #'API - registry' } +{ #category : 'API - registry' } IceRepository >> checkForRegistryConflicts [ self subclassResponsibility ] -{ #category : #'API - working copy' } +{ #category : 'API - working copy' } IceRepository >> checkout: aCheckoutStrategy [ self workingCopy checkout: aCheckoutStrategy ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceRepository >> checkoutAllPackages [ "A checkout operation loads all packages from the current branch in the image" self branch checkoutAllPackages ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceRepository >> checkoutBranch: branchName [ "Convenience method to checkout all packages from a branch given a branch name" @@ -328,19 +330,19 @@ IceRepository >> checkoutBranch: branchName [ self createBranch: branchName ]) checkout ] -{ #category : #'API - cherry-picking' } +{ #category : 'API - cherry-picking' } IceRepository >> cherryPickFrom: anotherCommit [ ^ self head cherryPickFrom: anotherCommit ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceRepository >> commitAt: commitId [ ^ self lookupCommit: commitId ] -{ #category : #'API - commit' } +{ #category : 'API - commit' } IceRepository >> commitChanges: changes withMessage: message [ "Creates a commit with the given changes using the comment given as argument. @@ -354,7 +356,7 @@ IceRepository >> commitChanges: changes withMessage: message [ withMessage: message ] -{ #category : #'API - commit' } +{ #category : 'API - commit' } IceRepository >> commitIndexWithMessage: message andParents: parentCommitishList [ "Low level. @@ -368,7 +370,7 @@ IceRepository >> commitIndexWithMessage: message andParents: parentCommitishList ^ newCommit ] -{ #category : #'API - commit' } +{ #category : 'API - commit' } IceRepository >> commitWithMessage: message [ "Creates a commit with all changed code using the comment given as argument. @@ -380,7 +382,7 @@ IceRepository >> commitWithMessage: message [ ^ self workingCopy commitWithMessage: message ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceRepository >> commitishNamed: aName [ "Resolve a name in the form of: - a commit hash @@ -391,77 +393,77 @@ IceRepository >> commitishNamed: aName [ ^ self subclassResponsibility ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceRepository >> commitsInPackageCache [ ^ commitsInPackageCache ifNil: [ commitsInPackageCache := LRUCache new maximumWeight: 30 ] ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceRepository >> commitsInPackageCache: aCache [ commitsInPackageCache := aCache ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> createBranch: branchName [ "Creates a new branch from #headCommit and switch to it" ^ self createBranch: branchName inCommit: self headCommit ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> createBranch: branchName inCommit: aCommit [ "Creates a new branch from a given commit and switch to it" self subclassResponsibility ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> createNewBranch: branchName [ "Creates a new branch starting on HEAD commit and switch to it" self createBranch: branchName inCommit: self headCommit ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceRepository >> createTag: aString [ ^ self workingCopy referenceCommit createTag: aString ] -{ #category : #'API - registry' } +{ #category : 'API - registry' } IceRepository >> delete [ "Delete is idempotent. If the repository does not exist, do nothing. Otherwise, forget the repository" self forget ] -{ #category : #printing } +{ #category : 'printing' } IceRepository >> description [ ^ self origin url, '[', self head description, ']' ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceRepository >> discardChanges [ self workingCopy discardChanges ] -{ #category : #'private - remotes' } +{ #category : 'private - remotes' } IceRepository >> doRemoveRemote: aRemote [ self subclassResponsibility ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> ensureBranch: branchName [ (self hasLocalBranchNamed: branchName) ifFalse: [ self createBranch: branchName ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> fetch [ "Fetch all commits and branches from all remotes" @@ -469,20 +471,20 @@ IceRepository >> fetch [ displayingProgress: [ :each | 'Remote: ' , each name asString ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> fetchFrom: aRemote [ "Fetch all commits and branches from the pull remote" aRemote fetch ] -{ #category : #'API - registry' } +{ #category : 'API - registry' } IceRepository >> forget [ self class unregisterRepository: self ifAbsent: [ ^ nil ]. Iceberg announcer announce: (IceRepositoryForgotten repository: self) ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository >> fullWorkingCopyDiff [ ^ IceDiff new source: self workingCopy; @@ -491,29 +493,29 @@ IceRepository >> fullWorkingCopyDiff [ yourself ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> hasIncomingCommits [ ^ self branch hasIncomingCommits ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> hasIncomingCommitsFrom: aRemote [ ^ self branch hasIncomingCommitsFrom: aRemote ] -{ #category : #testing } +{ #category : 'testing' } IceRepository >> hasLoadedPackages [ ^ self loadedPackages notEmpty ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> hasLocalBraches [ ^ self localBranches isNotEmpty ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> hasLocalBranchNamed: aString [ ^ self branchNamed: aString @@ -521,26 +523,26 @@ IceRepository >> hasLocalBranchNamed: aString [ ifAbsent: [ false ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> hasOutgoingCommits [ ^ self branch hasOutgoingCommits ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> hasRemoteNamed: aString [ self remoteNamed: aString ifAbsent: [ ^ false ]. ^ true ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceRepository >> hasTagNamed: aString [ self subclassResponsibility ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceRepository >> head [ "The repository HEAD is a reference to our current working commit/branch in the repository. @@ -549,33 +551,33 @@ IceRepository >> head [ self subclassResponsibility ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceRepository >> headCommit [ "The head can be either a branch or a commit. To access the current commit you can ask the head for its commit, or directly the repository for its headCommit (Yes, commits and branches are polymorphic, a commit returns self when asked for its commit)." ^ self head commit ] -{ #category : #printing } +{ #category : 'printing' } IceRepository >> headDescription [ ^ self head description ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceRepository >> includesCommit: anIceCommit [ self lookupCommit: anIceCommit id ifAbsent: [ ^ false ]. ^ true ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceRepository >> includesPackageNamed: aString [ "Returns true if the given package name belongs to a package loaded in the image" ^ self workingCopy includesPackageNamed: aString ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> incomingCommits [ (self head isDetached) @@ -583,12 +585,12 @@ IceRepository >> incomingCommits [ ^ self branch incomingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository >> index [ ^ index ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepository >> initialize [ super initialize. @@ -599,51 +601,51 @@ IceRepository >> initialize [ index := self newIndex. ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceRepository >> internalStoreVersion: aMCVersion [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceRepository >> isCloneOfUrl: aString [ ^ self origin url = aString ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceRepository >> isModified [ "Returns true if a package in the working copy has modifications" ^ self workingCopy isModified ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceRepository >> loadedPackages [ "Lists all loaded packages" ^ self workingCopy loadedPackages ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> localBranchNames [ ^ self localBranches collect: #name ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> localBranches [ "Lists local branches" self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository >> log [ ^ self subclassResponsibility ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceRepository >> lookupCommit: commitId [ ^ self @@ -653,24 +655,24 @@ IceRepository >> lookupCommit: commitId [ id: commitId; yourself ] ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceRepository >> lookupCommit: commitId ifAbsent: aBlock [ self subclassResponsibility ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceRepository >> modifiedPackages [ "Lists all modified packages currently loaded in the image" ^ self workingCopy modifiedPackages ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository >> name: aString [ "Change the name of the repository as is seen inside image (real project name resides externally, in repository). This can be confusing, but some times you need it to create new @@ -678,72 +680,72 @@ IceRepository >> name: aString [ name := aString ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceRepository >> newCommitWalk [ self subclassResponsibility ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceRepository >> newIndex [ self subclassResponsibility ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceRepository >> newNoCommit [ self subclassResponsibility ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceRepository >> newProjectFromCommit: aCommit [ self subclassResponsibility ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceRepository >> newUnbornProject [ ^ IceUnbornProject onRepository: self ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceRepository >> notifyPackageModified: aString [ ^ self workingCopy notifyPackageModified: aString ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> origin [ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> outgoingCommits [ ^ self branch outgoingCommits ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> outgoingCommitsTo: aRemote [ ^ self branch outgoingCommitsTo: aRemote ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceRepository >> packageNamed: packageName [ "Returns the loaded package with the given name" ^ self workingCopy packageNamed: packageName ] -{ #category : #'private - tags' } +{ #category : 'private - tags' } IceRepository >> peelTag: anIceTag [ self subclassResponsibility ] -{ #category : #'private - remotes' } +{ #category : 'private - remotes' } IceRepository >> postFetch [ "This method is called after every fetch. Fox possible broken references using unknown commits." @@ -754,7 +756,7 @@ IceRepository >> postFetch [ maybeGoodCommit isUnknownCommit ifFalse: [ maybeGoodCommit adopt ] ] -{ #category : #printing } +{ #category : 'printing' } IceRepository >> printOn: aStream [ aStream nextPutAll: self class name; nextPut: $(; @@ -762,40 +764,40 @@ IceRepository >> printOn: aStream [ nextPut: $) ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceRepository >> project [ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> pull [ "Fetch new commits corresponding to the current branch from the default pull remote. Then merge the remote branch with the current branch." self branch pull ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> pullFrom: aRemote [ "Fetch new commits corresponding to the remote. Then merge the remote branch with the current branch." self branch pullFrom: aRemote ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> push [ "Push current commits to the default push remote" self branch push ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> pushTo: aRemote [ self branch pushTo: aRemote ] -{ #category : #'API - registry' } +{ #category : 'API - registry' } IceRepository >> register [ self checkForRegistryConflicts. self class registerRepository: self. @@ -804,13 +806,13 @@ IceRepository >> register [ ] -{ #category : #'private - remotes' } +{ #category : 'private - remotes' } IceRepository >> remoteAt: aString put: aRemote [ self subclassResponsibility ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> remoteBranchNamed: aString [ "Access a remote branch by name. Throws an IceBranchNotFound is the branch does not exist in the repository." @@ -823,7 +825,7 @@ IceRepository >> remoteBranchNamed: aString [ signal ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> remoteBranchNamed: aName ifAbsent: absentBlock [ "Access a remote branch by name. Returns the result of the second argument if absent." @@ -834,7 +836,7 @@ IceRepository >> remoteBranchNamed: aName ifAbsent: absentBlock [ ifAbsent: absentBlock ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> remoteBranchNamed: aString ifPresent: aBlockClosure [ "Access a remote branch by name. If present, evaluate the block used as second argument with the branch found. @@ -846,7 +848,7 @@ IceRepository >> remoteBranchNamed: aString ifPresent: aBlockClosure [ ifAbsent: [ self ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> remoteBranchNamed: aString ifPresent: presentBlock ifAbsent: absentBlock [ "Access a remote branch by name. If present, evaluate the block used as second argument with the branch found. @@ -855,13 +857,13 @@ IceRepository >> remoteBranchNamed: aString ifPresent: presentBlock ifAbsent: ab self subclassResponsibility ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> remoteBranchNames [ ^ self remoteTrackedBranches collect: #name ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> remoteNamed: aString [ ^ self remoteNamed: aString ifAbsent: [ IceRemoteNotFoundError new @@ -869,26 +871,26 @@ IceRepository >> remoteNamed: aString [ signal ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> remoteNamed: aString ifAbsent: aBlockClosure [ self subclassResponsibility ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> remoteTrackedBranches [ "Lists branches in remotes" self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> remotes [ self subclassResponsibility ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceRepository >> removeRemote: aRemote [ (self hasRemoteNamed: aRemote name) @@ -899,19 +901,19 @@ IceRepository >> removeRemote: aRemote [ self doRemoveRemote: aRemote ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceRepository >> removeTag: anIceTag [ self subclassResponsibility ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceRepository >> setHead: anIceGitBranch [ self subclassResponsibility ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceRepository >> subdirectoryPath [ "Return a relative path containing the path to the code source. This is required to compute the diff between two versions. @@ -921,7 +923,7 @@ IceRepository >> subdirectoryPath [ self subclassResponsibility ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> switchToBranchNamed: aString [ ^ (self branchNamed: aString) @@ -929,7 +931,7 @@ IceRepository >> switchToBranchNamed: aString [ yourself ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceRepository >> switchToCommitishNamed: aString [ ^ (self commitishNamed: aString) @@ -937,7 +939,7 @@ IceRepository >> switchToCommitishNamed: aString [ yourself ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceRepository >> tagNamed: aString [ (self hasTagNamed: aString) ifFalse: [ @@ -948,26 +950,26 @@ IceRepository >> tagNamed: aString [ ^ IceTag named: aString inRepository: self ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceRepository >> tagNames [ ^ self tags collect: #name ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceRepository >> tags [ self subclassResponsibility ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceRepository >> unload [ "Unload all code loaded into the image that belong to this repository" self workingCopy unload ] -{ #category : #validating } +{ #category : 'validating' } IceRepository >> validateCanCommit [ "Private API. Do not rely on this. @@ -979,13 +981,13 @@ IceRepository >> validateCanCommit [ IceWorkingCopyDesyncronized signal ] ] -{ #category : #validating } +{ #category : 'validating' } IceRepository >> validateCanPull [ self isModified ifTrue: [ IceShouldCommitBeforePull signal ] ] -{ #category : #validating } +{ #category : 'validating' } IceRepository >> validateCanPushTo: aRemote [ | commits | @@ -1002,20 +1004,20 @@ IceRepository >> validateCanPushTo: aRemote [ signal ] -{ #category : #'private - packages' } +{ #category : 'private - packages' } IceRepository >> workingCopies [ ^ self loadedPackages collect: #workingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository >> workingCopy [ "See IceWorkingCopy" ^ workingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository >> workingCopy: aWorkingCopy [ "See IceWorkingCopy" @@ -1023,7 +1025,7 @@ IceRepository >> workingCopy: aWorkingCopy [ workingCopy repository: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepository >> workingCopyDiff [ ^ self workingCopy diffToReferenceCommit diff --git a/Iceberg/IceRepositoryAnnouncement.class.st b/Iceberg/IceRepositoryAnnouncement.class.st index 96189cafba..b6a2cdbbb0 100644 --- a/Iceberg/IceRepositoryAnnouncement.class.st +++ b/Iceberg/IceRepositoryAnnouncement.class.st @@ -2,30 +2,32 @@ Groupes different announcements that can happen in a repository. " Class { - #name : #IceRepositoryAnnouncement, - #superclass : #IceAnnouncement, + #name : 'IceRepositoryAnnouncement', + #superclass : 'IceAnnouncement', #instVars : [ 'repository' ], - #category : 'Iceberg-Announcements' + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryAnnouncement class >> for: repository [ ^ self new repository: repository; yourself ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryAnnouncement >> appliesToRepository: aRepository [ ^ self repository = aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryAnnouncement >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryAnnouncement >> repository: anObject [ repository := anObject ] diff --git a/Iceberg/IceRepositoryCreated.class.st b/Iceberg/IceRepositoryCreated.class.st index 0d472d56e9..ee66fa2d45 100644 --- a/Iceberg/IceRepositoryCreated.class.st +++ b/Iceberg/IceRepositoryCreated.class.st @@ -2,7 +2,9 @@ I announce when a repository has been created. " Class { - #name : #IceRepositoryCreated, - #superclass : #IceRepositoryRegistryAnnouncement, - #category : 'Iceberg-Announcements' + #name : 'IceRepositoryCreated', + #superclass : 'IceRepositoryRegistryAnnouncement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } diff --git a/Iceberg/IceRepositoryForgotten.class.st b/Iceberg/IceRepositoryForgotten.class.st index eb3c5b93e3..297c1b96c2 100644 --- a/Iceberg/IceRepositoryForgotten.class.st +++ b/Iceberg/IceRepositoryForgotten.class.st @@ -2,7 +2,9 @@ I announce when a repository has been forgotten (removed from iceberg). " Class { - #name : #IceRepositoryForgotten, - #superclass : #IceRepositoryRegistryAnnouncement, - #category : 'Iceberg-Announcements' + #name : 'IceRepositoryForgotten', + #superclass : 'IceRepositoryRegistryAnnouncement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } diff --git a/Iceberg/IceRepositoryModified.class.st b/Iceberg/IceRepositoryModified.class.st index 17395f3c17..994c867c64 100644 --- a/Iceberg/IceRepositoryModified.class.st +++ b/Iceberg/IceRepositoryModified.class.st @@ -2,7 +2,9 @@ Announces an unspecified change to a repository. " Class { - #name : #IceRepositoryModified, - #superclass : #IceRepositoryAnnouncement, - #category : 'Iceberg-Announcements' + #name : 'IceRepositoryModified', + #superclass : 'IceRepositoryAnnouncement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } diff --git a/Iceberg/IceRepositoryRegistryAnnouncement.class.st b/Iceberg/IceRepositoryRegistryAnnouncement.class.st index 34acc6c215..b2f6a00692 100644 --- a/Iceberg/IceRepositoryRegistryAnnouncement.class.st +++ b/Iceberg/IceRepositoryRegistryAnnouncement.class.st @@ -2,12 +2,14 @@ I'm a generic announcement to notify when the repository registry has changed. " Class { - #name : #IceRepositoryRegistryAnnouncement, - #superclass : #IceRepositoryAnnouncement, - #category : #'Iceberg-Announcements' + #name : 'IceRepositoryRegistryAnnouncement', + #superclass : 'IceRepositoryAnnouncement', + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryRegistryAnnouncement class >> repository: aRepository [ ^ self new repository: aRepository; yourself ] diff --git a/Iceberg/IceRepositoryRegistryModified.class.st b/Iceberg/IceRepositoryRegistryModified.class.st index 718097769d..0322be69f5 100644 --- a/Iceberg/IceRepositoryRegistryModified.class.st +++ b/Iceberg/IceRepositoryRegistryModified.class.st @@ -2,25 +2,27 @@ I'm a generic announcement to notify when the repository registry has changed. " Class { - #name : #IceRepositoryRegistryModified, - #superclass : #Announcement, + #name : 'IceRepositoryRegistryModified', + #superclass : 'Announcement', #instVars : [ 'repository' ], - #category : 'Iceberg-Announcements' + #category : 'Iceberg-Announcements', + #package : 'Iceberg', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryRegistryModified class >> repository: aRepository [ ^ self new repository: aRepository; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryRegistryModified >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryRegistryModified >> repository: anObject [ repository := anObject ] diff --git a/Iceberg/IceRootDefinition.class.st b/Iceberg/IceRootDefinition.class.st index 4263419e96..52ad6aecb4 100644 --- a/Iceberg/IceRootDefinition.class.st +++ b/Iceberg/IceRootDefinition.class.st @@ -4,24 +4,26 @@ I am an IceDefinition representing the repository root. I contain all packages, See my superclasses for more information. " Class { - #name : #IceRootDefinition, - #superclass : #IceDefinition, - #category : 'Iceberg-Changes' + #name : 'IceRootDefinition', + #superclass : 'IceDefinition', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #visiting } +{ #category : 'visiting' } IceRootDefinition >> accept: aVisitor [ ^ aVisitor visitRootDefinition: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceRootDefinition >> initialize [ super initialize. name := ''. ] -{ #category : #testing } +{ #category : 'testing' } IceRootDefinition >> isRootDefinition [ ^ true diff --git a/Iceberg/IceSSHProtocol.class.st b/Iceberg/IceSSHProtocol.class.st index 0714ef7c49..4beea8860e 100644 --- a/Iceberg/IceSSHProtocol.class.st +++ b/Iceberg/IceSSHProtocol.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceSSHProtocol, - #superclass : #IceUrlProtocol, - #category : 'Iceberg-Url' + #name : 'IceSSHProtocol', + #superclass : 'IceUrlProtocol', + #category : 'Iceberg-Url', + #package : 'Iceberg', + #tag : 'Url' } -{ #category : #accessing } +{ #category : 'accessing' } IceSSHProtocol class >> description [ ^ 'SSH' ] -{ #category : #url } +{ #category : 'url' } IceSSHProtocol >> composeUrlWithHost: host repositoryPath: path [ ^ 'git@{1}:{2}.git' format: { host . path } diff --git a/Iceberg/IceSavedPackageVersion.class.st b/Iceberg/IceSavedPackageVersion.class.st index bce4a947cb..189efdd2e4 100644 --- a/Iceberg/IceSavedPackageVersion.class.st +++ b/Iceberg/IceSavedPackageVersion.class.st @@ -8,24 +8,26 @@ Internal representation " Class { - #name : #IceSavedPackageVersion, - #superclass : #Object, + #name : 'IceSavedPackageVersion', + #superclass : 'Object', #instVars : [ 'entry', 'info', 'commit', 'package' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceSavedPackageVersion class >> forPackage: package [ "Use fromCommit:package: instead" self shouldNotImplement ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceSavedPackageVersion class >> fromCommit: commit package: package [ ^ self new commit: commit; @@ -33,7 +35,7 @@ IceSavedPackageVersion class >> fromCommit: commit package: package [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceSavedPackageVersion >> = another [ self species = another species ifFalse: [ ^ false ]. @@ -41,100 +43,100 @@ IceSavedPackageVersion >> = another [ ^ self commit = another commit ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> author [ ^ self info author ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> commit [ ^ commit ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> commit: anIceCommit [ commit := anIceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> entry [ ^ entry ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> entry: anObject [ entry := anObject. entry repository: self repository ] -{ #category : #comparing } +{ #category : 'comparing' } IceSavedPackageVersion >> hash [ ^ self commit hash ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceSavedPackageVersion >> hideYourselfFromCommitWalk: commitWalk [ commitWalk uptoCommit: self commit ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> info [ ^ info ifNil: [ info := IceMCVersionInfo new fromCommit: self commit package: package ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> info: anObject [ info := anObject ] -{ #category : #comparing } +{ #category : 'comparing' } IceSavedPackageVersion >> isAncestorOf: anotherVersion [ ^ self commit isAncestorOf: anotherVersion commit ] -{ #category : #comparing } +{ #category : 'comparing' } IceSavedPackageVersion >> isAncestorOfCommitId: anotherCommitId [ ^ self commit isAncestorOf: (self repository lookupCommit: anotherCommitId) ] -{ #category : #comparing } +{ #category : 'comparing' } IceSavedPackageVersion >> isNewerThan: another [ ^ self info timeStamp > another info timeStamp ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IceSavedPackageVersion >> lookupSnapshot [ ^ commit snapshotForPackage: self package ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IceSavedPackageVersion >> mcPackage [ ^ package mcPackage ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IceSavedPackageVersion >> mcSnapshot [ ^ self mcVersion snapshot ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IceSavedPackageVersion >> mcVersion [ ^ commit mcVersionFor: self ] -{ #category : #actions } +{ #category : 'actions' } IceSavedPackageVersion >> merge [ self mcVersion merge ] -{ #category : #patches } +{ #category : 'patches' } IceSavedPackageVersion >> nextVersionName [ ^ ('{1}-{2}.{3}' format: { self package packageName. @@ -144,22 +146,22 @@ IceSavedPackageVersion >> nextVersionName [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> package: anObject [ package := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> packageName [ ^ self package name ] -{ #category : #printing } +{ #category : 'printing' } IceSavedPackageVersion >> printOn: aStream [ aStream print: self class; nextPut: $(; @@ -179,18 +181,18 @@ IceSavedPackageVersion >> printOn: aStream [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceSavedPackageVersion >> repository [ ^ self package repository ] -{ #category : #'accessing - monticello' } +{ #category : 'accessing - monticello' } IceSavedPackageVersion >> snapshot [ "compatibility method" ^ self mcSnapshot ] -{ #category : #patches } +{ #category : 'patches' } IceSavedPackageVersion >> updated [ ^ self ] diff --git a/Iceberg/IceShouldCommitBeforePull.class.st b/Iceberg/IceShouldCommitBeforePull.class.st index 41842de6cd..4f3eb4f8fa 100644 --- a/Iceberg/IceShouldCommitBeforePull.class.st +++ b/Iceberg/IceShouldCommitBeforePull.class.st @@ -3,17 +3,19 @@ I'm thrown when an attempt to pull was made and there are changes in the image. This is a resumable error because user may want to do it anyway. " Class { - #name : #IceShouldCommitBeforePull, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceShouldCommitBeforePull', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceShouldCommitBeforePull >> acceptError: anObject [ anObject visitShouldCommitBeforePullError: self ] -{ #category : #private } +{ #category : 'private' } IceShouldCommitBeforePull >> isResumable [ ^ true ] diff --git a/Iceberg/IceSshCredentials.class.st b/Iceberg/IceSshCredentials.class.st index 34e85663cd..6f3dd01c33 100644 --- a/Iceberg/IceSshCredentials.class.st +++ b/Iceberg/IceSshCredentials.class.st @@ -2,125 +2,127 @@ I am a container for the credentials needed for connecting to a git repository via ssh/scp. " Class { - #name : #IceSshCredentials, - #superclass : #IceAbstractCredentials, + #name : 'IceSshCredentials', + #superclass : 'IceAbstractCredentials', #instVars : [ 'username', 'publicKey', 'privateKey', 'keyPassphrase' ], - #category : #'Iceberg-Security' + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials class >> defaultPrivateKey [ self flag: #pharoTodo. "In fact this is different for windows. We need to change this." ^ (FileLocator home asFileReference / '.ssh' / 'id_ed25519') pathString ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials class >> defaultPublicKey [ self flag: #pharoTodo. "In fact this is different for windows. We need to change this." ^ (FileLocator home asFileReference / '.ssh' / 'id_ed25519.pub') pathString ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials class >> defaultUsername [ ^ 'git' ] -{ #category : #printing } +{ #category : 'printing' } IceSshCredentials >> description [ ^ 'User: ' , self username , ' Public: ' , self publicKey , ' Private: ' , self privateKey ] -{ #category : #printing } +{ #category : 'printing' } IceSshCredentials >> hostDescription [ ^ host = #'*' ifTrue: [ 'Default' ] ifFalse: [ host ] ] -{ #category : #testing } +{ #category : 'testing' } IceSshCredentials >> isDefault [ ^ host = #'*' ] -{ #category : #testing } +{ #category : 'testing' } IceSshCredentials >> isPresent [ ^ self username notEmpty and: [ self publicKey notEmpty and: [ self privateKey notEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> keyPassphrase [ ^ keyPassphrase ifNil: [ keyPassphrase := '' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> keyPassphrase: anObject [ keyPassphrase := anObject. self storeIfDefault. ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> privateKey [ ^ privateKey ifNil: [ privateKey := self class defaultPrivateKey ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> privateKey: anObject [ privateKey := anObject. self storeIfDefault. ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> publicKey [ ^ publicKey ifNil: [ publicKey := self class defaultPublicKey ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> publicKey: anObject [ publicKey := anObject. self storeIfDefault. ] -{ #category : #'private - storing' } +{ #category : 'private - storing' } IceSshCredentials >> removeFrom: aStore [ aStore removeSSHCredential: self. ] -{ #category : #'private - storing' } +{ #category : 'private - storing' } IceSshCredentials >> storeIfDefault [ self isDefault ifFalse: [ ^ self ]. IceCredentialStore current storeCredential: self. ] -{ #category : #'API - storing' } +{ #category : 'API - storing' } IceSshCredentials >> storeInto: aCredentialStore forHostname: aHost [ host := aHost. aCredentialStore storeSshCredential: self forHostname: aHost ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> type [ ^ 'SSH Keys' ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> username [ ^ username ifNil: [ username := self class defaultUsername ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSshCredentials >> username: anObject [ username := anObject ] diff --git a/Iceberg/IceSystemEventListener.class.st b/Iceberg/IceSystemEventListener.class.st index ed1f4e01fc..1eae7b3a34 100644 --- a/Iceberg/IceSystemEventListener.class.st +++ b/Iceberg/IceSystemEventListener.class.st @@ -5,12 +5,14 @@ I'm mainly used to mark as dirty packages whose methods and classes are modified I'm implemented as class side methods to avoid memory leaks and problems when unsubscribing to events. " Class { - #name : #IceSystemEventListener, - #superclass : #Object, - #category : #'Iceberg-Changes' + #name : 'IceSystemEventListener', + #superclass : 'Object', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'event handling' } +{ #category : 'event handling' } IceSystemEventListener class >> handleClassChange: aClassChange [ "We should take care not only about the class package but also the package of the methods extending that class." @@ -18,19 +20,19 @@ IceSystemEventListener class >> handleClassChange: aClassChange [ ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceSystemEventListener class >> handleMethodChange: aMethodChange [ self handlePackagesChange: aMethodChange packagesAffected ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceSystemEventListener class >> handlePackageChange: aPackageChange [ self handlePackagesChange: aPackageChange packagesAffected ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceSystemEventListener class >> handlePackagesChange: packages [ IceRepository registry do: [ :repository | | changed | @@ -39,7 +41,7 @@ IceSystemEventListener class >> handlePackagesChange: packages [ changed ifTrue: [ Iceberg announcer announce: (IceRepositoryModified for: repository) ]] ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceSystemEventListener class >> handleVersionLoaded: ann [ "When monticello finishes to load a package, we need to verify its status to mark them as dirty or not dirty as they apply." @@ -68,13 +70,13 @@ IceSystemEventListener class >> handleVersionLoaded: ann [ Iceberg announcer announce: (IceRepositoryModified for: repository) ] ]] ] -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceSystemEventListener class >> initialize [ self registerSystemAnnouncements ] -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceSystemEventListener class >> registerSystemAnnouncements [ self unregisterSystemAnnouncements. @@ -85,7 +87,7 @@ IceSystemEventListener class >> registerSystemAnnouncements [ when: MCVersionLoaderStopped send: #handleVersionLoaded: to: self. ] -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceSystemEventListener class >> unregisterSystemAnnouncements [ SystemAnnouncer uniqueInstance unsubscribe: self diff --git a/Iceberg/IceTag.class.st b/Iceberg/IceTag.class.st index 86d8c3d0d7..f766f8e87a 100644 --- a/Iceberg/IceTag.class.st +++ b/Iceberg/IceTag.class.st @@ -2,70 +2,72 @@ Representation of a tag " Class { - #name : #IceTag, - #superclass : #IceCommitish, + #name : 'IceTag', + #superclass : 'IceCommitish', #instVars : [ 'name', 'commit' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTag class >> named: aTagName inRepository: anIceRepository [ ^ self new name: aTagName; repository: anIceRepository; yourself ] -{ #category : #querying } +{ #category : 'querying' } IceTag >> commit [ ^ commit ifNil: [ commit := self repository peelTag: self ] ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceTag >> delete [ self repository removeTag: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTag >> fileSystem [ ^ self commit fileSystem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTag >> gitRef [ ^ self name ] -{ #category : #testing } +{ #category : 'testing' } IceTag >> isTag [ ^ true ] -{ #category : #querying } +{ #category : 'querying' } IceTag >> lastCommit [ ^ self repository backend revparseCommit: self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTag >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTag >> name: anObject [ name := anObject ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceTag >> newCommitWalk [ ^ repository newCommitWalk fromTag: self ] -{ #category : #printing } +{ #category : 'printing' } IceTag >> printOn: aStream [ aStream @@ -74,12 +76,12 @@ IceTag >> printOn: aStream [ print: self name ] -{ #category : #querying } +{ #category : 'querying' } IceTag >> versionFor: package [ ^ self commit versionFor: package ] -{ #category : #accessing } +{ #category : 'accessing' } IceTag >> versionsFor: package [ ^ self commit versionsFor: package ] diff --git a/Iceberg/IceTagAlreadyExists.class.st b/Iceberg/IceTagAlreadyExists.class.st index d0f6a8448f..a55e521376 100644 --- a/Iceberg/IceTagAlreadyExists.class.st +++ b/Iceberg/IceTagAlreadyExists.class.st @@ -1,24 +1,26 @@ Class { - #name : #IceTagAlreadyExists, - #superclass : #IceError, + #name : 'IceTagAlreadyExists', + #superclass : 'IceError', #instVars : [ 'tagName' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #accessing } +{ #category : 'accessing' } IceTagAlreadyExists >> messageText [ ^ 'Tag {1} already exists' format: { tagName } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTagAlreadyExists >> tagName [ ^ tagName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTagAlreadyExists >> tagName: anObject [ tagName := anObject ] diff --git a/Iceberg/IceTagNotFound.class.st b/Iceberg/IceTagNotFound.class.st index e9fd1e7096..22d34753b3 100644 --- a/Iceberg/IceTagNotFound.class.st +++ b/Iceberg/IceTagNotFound.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTagNotFound, - #superclass : #IceError, + #name : 'IceTagNotFound', + #superclass : 'IceError', #instVars : [ 'tagName' ], - #category : 'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceTagNotFound >> tagName: aString [ tagName := aString ] diff --git a/Iceberg/IceTipCommitSettings.class.st b/Iceberg/IceTipCommitSettings.class.st index e677e7130f..55041b99bf 100644 --- a/Iceberg/IceTipCommitSettings.class.st +++ b/Iceberg/IceTipCommitSettings.class.st @@ -1,69 +1,71 @@ Class { - #name : #IceTipCommitSettings, - #superclass : #Object, + #name : 'IceTipCommitSettings', + #superclass : 'Object', #classInstVars : [ 'pushOnCommit', 'saveImageOnCommit', 'critiquesOnCommit' ], - #category : #'Iceberg-Settings' + #category : 'Iceberg-Settings', + #package : 'Iceberg', + #tag : 'Settings' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> critiquesOnCommit [ ^ critiquesOnCommit ifNil: [ critiquesOnCommit := self critiquesOnCommitDefaultValue ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> critiquesOnCommit: aBoolean [ critiquesOnCommit := aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> critiquesOnCommitDefaultValue [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> pushOnCommit [ ^ pushOnCommit ifNil: [ pushOnCommit := self pushOnCommitDefaultValue ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> pushOnCommit: aBoolean [ pushOnCommit := aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> pushOnCommitDefaultValue [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> saveImageOnCommit [ ^ saveImageOnCommit ifNil: [ saveImageOnCommit := self saveImageOnCommitDefaultValue ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> saveImageOnCommit: aBoolean [ saveImageOnCommit := aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitSettings class >> saveImageOnCommitDefaultValue [ ^ true ] -{ #category : #settings } +{ #category : 'settings' } IceTipCommitSettings class >> settingsOn: aBuilder [ diff --git a/Iceberg/IceTokenCredentials.class.st b/Iceberg/IceTokenCredentials.class.st index 986e84ae97..2f31bb936b 100644 --- a/Iceberg/IceTokenCredentials.class.st +++ b/Iceberg/IceTokenCredentials.class.st @@ -8,31 +8,33 @@ I implement authentication credentials via OAUTH-like token. " Class { - #name : #IceTokenCredentials, - #superclass : #IceAbstractCredentials, + #name : 'IceTokenCredentials', + #superclass : 'IceAbstractCredentials', #instVars : [ 'token', 'username' ], - #category : #'Iceberg-Security' + #category : 'Iceberg-Security', + #package : 'Iceberg', + #tag : 'Security' } -{ #category : #printing } +{ #category : 'printing' } IceTokenCredentials >> description [ ^ 'User: ', username ] -{ #category : #printing } +{ #category : 'printing' } IceTokenCredentials >> hostDescription [ ^ host ] -{ #category : #accessing } +{ #category : 'accessing' } IceTokenCredentials >> isPresent [ ^ self token notEmpty ] -{ #category : #accessing } +{ #category : 'accessing' } IceTokenCredentials >> password [ "For git operations in GitHub, the token can be used as password. @@ -41,36 +43,36 @@ IceTokenCredentials >> password [ ^ token ] -{ #category : #removing } +{ #category : 'removing' } IceTokenCredentials >> removeFrom: anIceCredentialStore [ anIceCredentialStore removePlainTextCredential: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTokenCredentials >> token [ ^ token ] -{ #category : #accessing } +{ #category : 'accessing' } IceTokenCredentials >> token: aString [ token := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTokenCredentials >> type [ ^ 'Token' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTokenCredentials >> username [ ^ username ] -{ #category : #accessing } +{ #category : 'accessing' } IceTokenCredentials >> username: aString [ username := aString ] diff --git a/Iceberg/IceTraitDefinition.class.st b/Iceberg/IceTraitDefinition.class.st index 354af4d856..3b61370c49 100644 --- a/Iceberg/IceTraitDefinition.class.st +++ b/Iceberg/IceTraitDefinition.class.st @@ -6,25 +6,27 @@ My contents is the trait definition. See my superclasses for more information. " Class { - #name : #IceTraitDefinition, - #superclass : #IceMethodContainerDefinition, - #category : #'Iceberg-Changes' + #name : 'IceTraitDefinition', + #superclass : 'IceMethodContainerDefinition', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #comparing } +{ #category : 'comparing' } IceTraitDefinition >> = anotherDefinition [ ^ super = anotherDefinition and: [ mcDefinition = anotherDefinition asMCDefinition ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceTraitDefinition >> accept: aVisitor [ ^ aVisitor visitTraitDefinition: self ] -{ #category : #patching } +{ #category : 'patching' } IceTraitDefinition >> addModification: anIceModification toPatcher: aMCPatcher [ "If the new definition has no class instance vaiables, we remove the meta side variables, and apply the new changes to the patcher " @@ -46,7 +48,7 @@ IceTraitDefinition >> addModification: anIceModification toPatcher: aMCPatcher [ to: anIceModification leftDefinition asMCDefinition ] -{ #category : #patching } +{ #category : 'patching' } IceTraitDefinition >> addToPatcher: aMCPatcher [ "We should not handle metaclasses if their mcDefinition is nil. @@ -58,18 +60,18 @@ IceTraitDefinition >> addToPatcher: aMCPatcher [ aMCPatcher addDefinition: self asMCDefinition ] -{ #category : #testing } +{ #category : 'testing' } IceTraitDefinition >> isTraitDefinition [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTraitDefinition >> name [ ^ name , (isMeta ifTrue: [ ' classTrait' ] ifFalse: [ '' ]) ] -{ #category : #patching } +{ #category : 'patching' } IceTraitDefinition >> removeFromPatcher: aMCPatcher [ "We should not handle metaclasses. They will be added automatically when added the instance side" diff --git a/Iceberg/IceTraitDependency.class.st b/Iceberg/IceTraitDependency.class.st index ea895a34fd..6a20c7ee84 100644 --- a/Iceberg/IceTraitDependency.class.st +++ b/Iceberg/IceTraitDependency.class.st @@ -2,12 +2,14 @@ I am a dependency to a trait. " Class { - #name : #IceTraitDependency, - #superclass : #IceDefinedDependency, - #category : #'Iceberg-Cherrypicking' + #name : 'IceTraitDependency', + #superclass : 'IceDefinedDependency', + #category : 'Iceberg-Cherrypicking', + #package : 'Iceberg', + #tag : 'Cherrypicking' } -{ #category : #comparing } +{ #category : 'comparing' } IceTraitDependency >> = anObject [ "Answer whether the receiver and anObject represent the same object." @@ -15,37 +17,37 @@ IceTraitDependency >> = anObject [ and: [ self definition name = anObject definition name ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceTraitDependency >> hash [ "Answer an integer value that is related to the identity of the receiver." ^ super hash bitXor: definition name hash. "^ definition hash" ] -{ #category : #visiting } +{ #category : 'visiting' } IceTraitDependency >> isDependencyTo: anIceTraitDefinition [ ^ anIceTraitDefinition name = definition name ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceTraitDependency >> referencedClasses [ ^ { } ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceTraitDependency >> referencedPackages [ ^ self definition asMCDefinition category ] -{ #category : #dependencies } +{ #category : 'dependencies' } IceTraitDependency >> referencedTraits [ ^ (((RBParser parseExpression: definition asMCDefinition traitComposition) allChildren select: #isVariable) collect: #name ) , self usedTraitsNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTraitDependency >> usedTraitsNames [ ^ self cherrypicker environment allUsingTraitNamed: self definition name diff --git a/Iceberg/IceTreeMerger.class.st b/Iceberg/IceTreeMerger.class.st index 79c4191dda..ee2e84c112 100644 --- a/Iceberg/IceTreeMerger.class.st +++ b/Iceberg/IceTreeMerger.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTreeMerger, - #superclass : #Object, - #category : #'Iceberg-Changes' + #name : 'IceTreeMerger', + #superclass : 'Object', + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #building } +{ #category : 'building' } IceTreeMerger >> merge: changeTree into: currentTree [ ^ changeTree collectWithPath: [ :operation :path | diff --git a/Iceberg/IceTreeVisitor.class.st b/Iceberg/IceTreeVisitor.class.st index 576a81d2af..2db24239ed 100644 --- a/Iceberg/IceTreeVisitor.class.st +++ b/Iceberg/IceTreeVisitor.class.st @@ -2,27 +2,29 @@ I implement a basic tree visitor for Iceberg trees implemented through IceNode " Class { - #name : #IceTreeVisitor, - #superclass : #Object, + #name : 'IceTreeVisitor', + #superclass : 'Object', #instVars : [ 'currentNode' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #testing } +{ #category : 'testing' } IceTreeVisitor class >> isAbstract [ ^ self == IceTreeVisitor ] -{ #category : #visiting } +{ #category : 'visiting' } IceTreeVisitor >> visitChildrenOf: anIceNode [ anIceNode childrenDo: [ :each | each accept: self ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceTreeVisitor >> visitConflictingOperation: anIceConflictingOperation [ anIceConflictingOperation isResolved @@ -31,20 +33,20 @@ IceTreeVisitor >> visitConflictingOperation: anIceConflictingOperation [ ^ anIceConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceTreeVisitor >> visitEmptyNode: anIceEmptyNode [ "Do nothing by default" ] -{ #category : #visiting } +{ #category : 'visiting' } IceTreeVisitor >> visitTreeNode: anIceNode [ self withNode: anIceNode do: [ anIceNode value accept: self ] ] -{ #category : #visiting } +{ #category : 'visiting' } IceTreeVisitor >> withNode: anIceNode do: aBlockClosure [ | previousNode | diff --git a/Iceberg/IceUnbornBranch.class.st b/Iceberg/IceUnbornBranch.class.st index b28c830511..8b8aed2749 100644 --- a/Iceberg/IceUnbornBranch.class.st +++ b/Iceberg/IceUnbornBranch.class.st @@ -2,18 +2,20 @@ I am an unborn branch. I exist only on a new repository that has no commits inside. I manage the special case of a first repository commit and branch creation. " Class { - #name : #IceUnbornBranch, - #superclass : #IceCommitish, - #category : #'Iceberg-Core' + #name : 'IceUnbornBranch', + #superclass : 'IceCommitish', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #comparing } +{ #category : 'comparing' } IceUnbornBranch >> = anotherBranch [ ^ anotherBranch isUnbornBranch ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceUnbornBranch >> changesFromCommit: anIceNoCommit [ "I am an unborn branch. This means the repository is not yet created and the commit is a no-commit" @@ -21,61 +23,61 @@ IceUnbornBranch >> changesFromCommit: anIceNoCommit [ ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnbornBranch >> checkout: aCheckoutStreategy [ "Do nothing. An unborn branch is already HEAD" ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnbornBranch >> commit [ ^ IceNoCommit repository: repository ] -{ #category : #printing } +{ #category : 'printing' } IceUnbornBranch >> description [ ^ self name ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornBranch >> hasIncomingCommits [ ^ self hasIncomingCommitsFrom: self repository origin ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> hasIncomingCommitsFrom: aRemote [ aRemote fetch. ^ aRemote hasRemoteBranchNamed: self name ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornBranch >> hasOutgoingCommits [ ^ false ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> hasOutgoingCommitsTo: aRemote [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornBranch >> hasUpstream [ ^ false ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> incomingCommits [ "I am unborn. I have no commits" ^ #() ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> incomingCommitsFrom: aRemote [ | remoteBranch | remoteBranch := aRemote remoteBranchNamed: self name ifAbsent: [ ^ #() ]. @@ -84,67 +86,67 @@ IceUnbornBranch >> incomingCommitsFrom: aRemote [ commits ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornBranch >> isBranch [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornBranch >> isHead [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornBranch >> isLocal [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornBranch >> isRemote [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornBranch >> isUnbornBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnbornBranch >> name [ self subclassResponsibility ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceUnbornBranch >> newCommitWalk [ ^ IceNullCommitWalk new ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> outgoingCommits [ "I am unborn. I have no commits" ^ #() ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceUnbornBranch >> packageNames [ ^ #() ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> pull [ self pullFrom: repository origin ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> pullFrom: aRemote [ "This is a special operation: this branch is unborn. @@ -162,26 +164,26 @@ IceUnbornBranch >> pullFrom: aRemote [ repository createBranch: self name inCommit: remoteBranch commit. ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> push [ "Do nothing" ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> pushTo: aRemote [ "Do Nothing" ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceUnbornBranch >> snapshotFor: anIceSavedPackage [ "I am an unborn branch, I have no code, so my snapshot is empty" ^ MCSnapshot empty ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceUnbornBranch >> tracksRemoteBranch [ ^ false diff --git a/Iceberg/IceUnbornProject.class.st b/Iceberg/IceUnbornProject.class.st index 928582a475..9907dfec5b 100644 --- a/Iceberg/IceUnbornProject.class.st +++ b/Iceberg/IceUnbornProject.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceUnbornProject, - #superclass : #IceAbstractProject, - #category : 'Iceberg-Project' + #name : 'IceUnbornProject', + #superclass : 'IceAbstractProject', + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #testing } +{ #category : 'testing' } IceUnbornProject >> isUnborn [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornProject >> readOnlyVersion [ ^ IceInvalidProject onCommitish: commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnbornProject >> sourceDirectory [ "Tricky method. diff --git a/Iceberg/IceUnbornProjectReader.class.st b/Iceberg/IceUnbornProjectReader.class.st index 11f9153f96..72d09e0366 100644 --- a/Iceberg/IceUnbornProjectReader.class.st +++ b/Iceberg/IceUnbornProjectReader.class.st @@ -2,26 +2,28 @@ I create unborn projects from a commitish if it is HEAD and it does not have a '.project' file. " Class { - #name : #IceUnbornProjectReader, - #superclass : #IceProjectReader, - #category : 'Iceberg-Project' + #name : 'IceUnbornProjectReader', + #superclass : 'IceProjectReader', + #category : 'Iceberg-Project', + #package : 'Iceberg', + #tag : 'Project' } -{ #category : #testing } +{ #category : 'testing' } IceUnbornProjectReader >> canReadProjectFromCommitish: aCommitish [ ^ aCommitish isWorkingCopy and: [ (aCommitish fileSystem / '.project') exists not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnbornProjectReader >> priority [ "The unborn project reader should be the default one in case no other matches" ^ 100000 ] -{ #category : #reading } +{ #category : 'reading' } IceUnbornProjectReader >> readProjectFromCommitish: anIceCommitish [ ^ IceUnbornProject onCommitish: anIceCommitish diff --git a/Iceberg/IceUndefinedRemote.class.st b/Iceberg/IceUndefinedRemote.class.st index 1201846f2d..d1612512a0 100644 --- a/Iceberg/IceUndefinedRemote.class.st +++ b/Iceberg/IceUndefinedRemote.class.st @@ -2,17 +2,19 @@ I am a null object representing a not found remote. I'm mainly used for polimorphism when the well known remote 'origin' is not found in the repository. " Class { - #name : #IceUndefinedRemote, - #superclass : #IceRemote, - #category : 'Iceberg-Core' + #name : 'IceUndefinedRemote', + #superclass : 'IceRemote', + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceUndefinedRemote class >> canHandleUrl: aRepositoryUrl [ ^ false ] -{ #category : #fetching } +{ #category : 'fetching' } IceUndefinedRemote >> fetch [ IceRemoteNotFoundError new @@ -20,12 +22,12 @@ IceUndefinedRemote >> fetch [ signal: 'Please configure a pull remote for pulling.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceUndefinedRemote >> host [ ^ nil ] -{ #category : #initialization } +{ #category : 'initialization' } IceUndefinedRemote >> initialize [ super initialize. url := 'No remote url'. @@ -33,12 +35,12 @@ IceUndefinedRemote >> initialize [ name := 'No remote' ] -{ #category : #testing } +{ #category : 'testing' } IceUndefinedRemote >> isUndefined [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceUndefinedRemote >> upstreamForBranch: aBranch backend: backend [ ^ nil ] diff --git a/Iceberg/IceUnknownCommit.class.st b/Iceberg/IceUnknownCommit.class.st index e37280bfe3..848f5b14a9 100644 --- a/Iceberg/IceUnknownCommit.class.st +++ b/Iceberg/IceUnknownCommit.class.st @@ -2,16 +2,18 @@ I represent an commit that cannot be found in the current repository. I have a commit id/hash, but that commit was not fetched (or was wrongly set). Once the real commit is fetched, I'll be becomed into a real commit. " Class { - #name : #IceUnknownCommit, - #superclass : #IceCommitish, + #name : 'IceUnknownCommit', + #superclass : 'IceCommitish', #instVars : [ 'id', 'datetime' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'API - working copy' } +{ #category : 'API - working copy' } IceUnknownCommit >> adopt [ "Low level. @@ -20,12 +22,12 @@ IceUnknownCommit >> adopt [ self repository workingCopy adoptCommit: self ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceUnknownCommit >> changesFromCommit: anIceGitCommit [ ^ anIceGitCommit changesFromNoCommit: self ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceUnknownCommit >> changesTo: aCommitish [ aCommitish = self @@ -33,82 +35,82 @@ IceUnknownCommit >> changesTo: aCommitish [ ^ aCommitish changesFromNoCommit: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> comment [ ^ '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> commit [ self shouldBeImplemented. ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> compatibleUsername [ ^ 'CompatibleUserName' ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> datetime [ ^ datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> description [ ^ 'Unknown {1}' format: { self shortId } ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> fileSystem [ ^ FileSystem memory root ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> id [ ^ id ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> id: anObject [ id := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceUnknownCommit >> initialize [ super initialize. datetime := DateAndTime now ] -{ #category : #testing } +{ #category : 'testing' } IceUnknownCommit >> isNoCommit [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceUnknownCommit >> isParentOf: aCommit [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceUnknownCommit >> isUnknownCommit [ ^ true ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceUnknownCommit >> project [ ^ repository newUnbornProject ] -{ #category : #accessing } +{ #category : 'accessing' } IceUnknownCommit >> shortId [ ^ self id first: 7 diff --git a/Iceberg/IceUnknownVersionWorkingCopy.class.st b/Iceberg/IceUnknownVersionWorkingCopy.class.st index 9789ca614f..29047e0f37 100644 --- a/Iceberg/IceUnknownVersionWorkingCopy.class.st +++ b/Iceberg/IceUnknownVersionWorkingCopy.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceUnknownVersionWorkingCopy, - #superclass : #IceWorkingCopyState, - #category : 'Iceberg-WorkingCopy' + #name : 'IceUnknownVersionWorkingCopy', + #superclass : 'IceWorkingCopyState', + #category : 'Iceberg-WorkingCopy', + #package : 'Iceberg', + #tag : 'WorkingCopy' } -{ #category : #testing } +{ #category : 'testing' } IceUnknownVersionWorkingCopy >> description [ ^ 'Fetch required. ', self referenceCommit description ] -{ #category : #testing } +{ #category : 'testing' } IceUnknownVersionWorkingCopy >> isDetached [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceUnknownVersionWorkingCopy >> isUnknownCommitState [ ^ true diff --git a/Iceberg/IceUpstreamNotConfigured.class.st b/Iceberg/IceUpstreamNotConfigured.class.st index 96d5b40b14..b4199fbffe 100644 --- a/Iceberg/IceUpstreamNotConfigured.class.st +++ b/Iceberg/IceUpstreamNotConfigured.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceUpstreamNotConfigured, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceUpstreamNotConfigured', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } diff --git a/Iceberg/IceUrlBuilder.class.st b/Iceberg/IceUrlBuilder.class.st index fc3c4ef35a..7a35319fd4 100644 --- a/Iceberg/IceUrlBuilder.class.st +++ b/Iceberg/IceUrlBuilder.class.st @@ -1,45 +1,47 @@ Class { - #name : #IceUrlBuilder, - #superclass : #Object, + #name : 'IceUrlBuilder', + #superclass : 'Object', #instVars : [ 'host', 'protocol', 'path' ], - #category : 'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> beBitbucket [ self host: 'bitbucket.org' ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> beGitLab [ self host: 'gitlab.com' ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> beGithub [ self host: 'github.com' ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> beHttps [ protocol := IceHttpsProtocol new ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> beSsh [ protocol := IceSSHProtocol new ] -{ #category : #building } +{ #category : 'building' } IceUrlBuilder >> buildUrl [ ^ protocol @@ -47,22 +49,22 @@ IceUrlBuilder >> buildUrl [ repositoryPath: path ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> host: aString [ host := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> path: aString [ path := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> protocol: aProtocol [ protocol := aProtocol ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlBuilder >> username: aUsername project: aProject [ path := aUsername, '/', aProject diff --git a/Iceberg/IceUrlProtocol.class.st b/Iceberg/IceUrlProtocol.class.st index 8a9936aa48..78d9a8fe48 100644 --- a/Iceberg/IceUrlProtocol.class.st +++ b/Iceberg/IceUrlProtocol.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceUrlProtocol, - #superclass : #Object, - #category : 'Iceberg-Url' + #name : 'IceUrlProtocol', + #superclass : 'Object', + #category : 'Iceberg-Url', + #package : 'Iceberg', + #tag : 'Url' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceUrlProtocol class >> defaultProtocol [ ^ IceSSHProtocol ] -{ #category : #accessing } +{ #category : 'accessing' } IceUrlProtocol class >> description [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceUrlProtocol class >> isAbstract [ ^ self == IceUrlProtocol diff --git a/Iceberg/IceVersionDoesNotExist.class.st b/Iceberg/IceVersionDoesNotExist.class.st index e0d1c65d4f..9d70926a09 100644 --- a/Iceberg/IceVersionDoesNotExist.class.st +++ b/Iceberg/IceVersionDoesNotExist.class.st @@ -2,15 +2,17 @@ Version does not exist, probably the package was created in a later commit or it was deleted. " Class { - #name : #IceVersionDoesNotExist, - #superclass : #IceError, + #name : 'IceVersionDoesNotExist', + #superclass : 'IceError', #instVars : [ 'version' ], - #category : 'Iceberg-Errors' + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #accessing } +{ #category : 'accessing' } IceVersionDoesNotExist >> messageText [ ^ 'There is no version for package: {1} in commit {2}' format: { @@ -19,12 +21,12 @@ IceVersionDoesNotExist >> messageText [ } ] -{ #category : #accessing } +{ #category : 'accessing' } IceVersionDoesNotExist >> version [ ^ version ] -{ #category : #accessing } +{ #category : 'accessing' } IceVersionDoesNotExist >> version: anObject [ version := anObject ] diff --git a/Iceberg/IceWorkingCopy.class.st b/Iceberg/IceWorkingCopy.class.st index be188eb427..8d7a44daba 100644 --- a/Iceberg/IceWorkingCopy.class.st +++ b/Iceberg/IceWorkingCopy.class.st @@ -82,8 +82,8 @@ The main entry point for merging a commit is the working copy, through the metho IMPORTANT IMPLEMENTATION NOTE. The version information and commits are so far stored inside MCWorkingCopy and co. Check #updatePackage:toCommits: " Class { - #name : #IceWorkingCopy, - #superclass : #Object, + #name : 'IceWorkingCopy', + #superclass : 'Object', #instVars : [ 'repository', 'packages', @@ -92,10 +92,12 @@ Class { 'project', 'properties' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceWorkingCopy class >> fromWorkingCopy: aWorkingCopy [ ^ self basicNew repository: aWorkingCopy repository; @@ -104,7 +106,7 @@ IceWorkingCopy class >> fromWorkingCopy: aWorkingCopy [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceWorkingCopy class >> repository: repository [ ^ self basicNew repository: repository; @@ -112,26 +114,26 @@ IceWorkingCopy class >> repository: repository [ yourself ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> addPackage: aPackage [ self basicAddPackage: aPackage. aPackage beDirty. ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> addPackageNamed: aString [ self addPackage: (IcePackage named: aString asSymbol repository: repository) beDirty ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> addPackages: aCollection [ aCollection keysDo: [ :each | self addPackageNamed: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopy >> adoptCommit: aCommit [ | oldCommit | @@ -147,7 +149,7 @@ IceWorkingCopy >> adoptCommit: aCommit [ ifFalse: [ self forceCalculateDirtyPackages. ] ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceWorkingCopy >> applyDefinition: anIceDefinition inNode: aNode [ | loader | @@ -159,13 +161,13 @@ IceWorkingCopy >> applyDefinition: anIceDefinition inNode: aNode [ loader load ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> basicAddPackage: aPackage [ self packagesDictionary at: aPackage name put: aPackage. ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> basicRemovePackage: aPackage [ self packagesDictionary @@ -173,19 +175,19 @@ IceWorkingCopy >> basicRemovePackage: aPackage [ ifAbsent: [] ] -{ #category : #'private - project' } +{ #category : 'private - project' } IceWorkingCopy >> basicSetProject: aProject [ project := aProject ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> canRevertChanges [ ^ true ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceWorkingCopy >> changesFromCommit: anIceCommit [ "Image changes should be taken into account before changes in the repository" ^ (self modifiedPackages collect: [ :each | @@ -193,13 +195,13 @@ IceWorkingCopy >> changesFromCommit: anIceCommit [ (self referenceCommit changesFromCommit: anIceCommit) asArray ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceWorkingCopy >> changesFromNoCommit: anIceNoCommit [ ^ self packages collect: [ :each | IceImageChange package: each ] ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> changesTo: aCommitish [ | removedPackages changes | @@ -217,19 +219,19 @@ IceWorkingCopy >> changesTo: aCommitish [ ^ changes ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> checkout: aCheckoutStrategy [ aCheckoutStrategy checkoutOn: self ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceWorkingCopy >> commitChanges: aDiff withMessage: message [ ^ self commitChanges: aDiff withMessage: message force: false ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceWorkingCopy >> commitChanges: aDiff withMessage: message force: forcing [ "Creates a commit with the given changes using the comment given as argument. @@ -255,7 +257,7 @@ IceWorkingCopy >> commitChanges: aDiff withMessage: message force: forcing [ ^ newCommit ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceWorkingCopy >> commitWithMessage: aString [ "Creates a commit with all changed code using the comment given as argument. @@ -269,19 +271,19 @@ IceWorkingCopy >> commitWithMessage: aString [ withMessage: aString ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceWorkingCopy >> commonAncestorWith: aCommitish [ ^ self referenceCommit commonAncestorWith: aCommitish ] -{ #category : #'API - history' } +{ #category : 'API - history' } IceWorkingCopy >> commonAncestorWithCommit: aCommitish [ ^ self referenceCommit commonAncestorWithCommit: aCommitish ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> diffTo: aCommitish [ ^ IceDiff @@ -289,19 +291,19 @@ IceWorkingCopy >> diffTo: aCommitish [ to: aCommitish commit ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> diffToReferenceCommit [ ^ self diffTo: self referenceCommit ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> discardChanges [ self discardChanges: self diffToReferenceCommit tree ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> discardChanges: aTree [ self loadChangesInWorkingCopy: (aTree collect: [ :definition | @@ -309,13 +311,13 @@ IceWorkingCopy >> discardChanges: aTree [ self refreshDirtyPackages ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopy >> fileSystem [ ^ repository location ifNil: [ FileSystem memory root ] ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> forceCalculateDirtyPackages [ | diff | @@ -328,21 +330,21 @@ IceWorkingCopy >> forceCalculateDirtyPackages [ package beDirty: (diff includesPackageNamed: package name) ]. ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceWorkingCopy >> hasSingleCommit [ "Returns true if all loaded packages were loaded from the single same commit" ^ self workingCopyState isSingleCommitState ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceWorkingCopy >> hasUnknownCommit [ "Returns true if we couldn't calculate a single commit or a merge situation" ^ self workingCopyState isUnknownCommitState ] -{ #category : #'private - packages' } +{ #category : 'private - packages' } IceWorkingCopy >> ignoreNotificationsDuring: aBlock [ "While the working copy is loading code, it should ignore modifications to avoid circular refreshes" @@ -352,19 +354,19 @@ IceWorkingCopy >> ignoreNotificationsDuring: aBlock [ aBlock ensure: [ shouldIgnoreNotifications := oldValue ] ] -{ #category : #'private - packages' } +{ #category : 'private - packages' } IceWorkingCopy >> includesInWorkingCopyPackageNamed: aString [ ^ (self packagesDictionary includesKey: aString) and: [ (self packageNamed: aString) isLoaded ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> includesPackageNamed: aString [ "true if is in image or is in commit" ^ self includesInWorkingCopyPackageNamed: aString ] -{ #category : #initialization } +{ #category : 'initialization' } IceWorkingCopy >> initialize [ super initialize. @@ -376,7 +378,7 @@ IceWorkingCopy >> initialize [ properties := referenceCommit properties asBornProperties ] -{ #category : #initialization } +{ #category : 'initialization' } IceWorkingCopy >> initializePackagesFromRepository [ "If no reference commit was configured, we adopt the head commit" | commitToAdopt | @@ -386,49 +388,49 @@ IceWorkingCopy >> initializePackagesFromRepository [ self adoptCommit: commitToAdopt. ] -{ #category : #'API - merging' } +{ #category : 'API - merging' } IceWorkingCopy >> isCommitMerged: aCommit [ ^ self workingCopyState isCommitMerged: aCommit ] -{ #category : #validating } +{ #category : 'validating' } IceWorkingCopy >> isDetached [ ^ self workingCopyState isDetached ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceWorkingCopy >> isInMerge [ "Returns true if all the repository packages are in merge between the same commits." ^ self workingCopyState isInMerge ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> isLoadedPackageNamed: aString [ ^ self packageOrganizer hasPackage: aString ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> isModified [ ^ self project isDirty or: [ self loadedPackages anySatisfy: [ :e | e isDirty ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceWorkingCopy >> isWorkingCopy [ ^ true ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> loadAllPackages [ self loadPackagesNamed: repository head packageNames ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceWorkingCopy >> loadChangesInWorkingCopy: aTree [ | visitor | @@ -441,19 +443,19 @@ IceWorkingCopy >> loadChangesInWorkingCopy: aTree [ ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> loadPackageNamed: aString [ self loadPackagesNamed: { aString } ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> loadPackageNamed: aString fromCommit: aCommit [ self loadPackagesNamed: { aString } fromCommit: aCommit ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> loadPackagesNamed: aCollection [ self @@ -461,7 +463,7 @@ IceWorkingCopy >> loadPackagesNamed: aCollection [ fromCommit: self repository head commit ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceWorkingCopy >> loadPackagesNamed: aCollection fromCommit: aCommit [ aCollection ifEmpty: [ ^ self ]. @@ -480,33 +482,33 @@ IceWorkingCopy >> loadPackagesNamed: aCollection fromCommit: aCommit [ loader load ] ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> loadedPackages [ ^ self packages select: #isLoaded ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> markAllPackagesAsClean [ self markAsCleanPackagesThat: [ :each | true ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> markAsCleanPackagesNotInDiff: aDiff [ self markAsCleanPackagesThat: [ :package | (aDiff includesPackageNamed: package name) not ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> markAsCleanPackagesThat: aBlock [ self modifiedPackages do: [ :each | (aBlock value: each) ifTrue: [ each beClean ] ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> markAsDirtyPackageNamed: aPackageName [ (self packageNamed: aPackageName) beDirty @@ -514,7 +516,7 @@ IceWorkingCopy >> markAsDirtyPackageNamed: aPackageName [ ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceWorkingCopy >> mcVersionFor: anIceSavedPackageVersion [ | mcPackage mcWorkingCopy | @@ -527,19 +529,19 @@ IceWorkingCopy >> mcVersionFor: anIceSavedPackageVersion [ dependencies: #() ] -{ #category : #'API - merging' } +{ #category : 'API - merging' } IceWorkingCopy >> mergeCommit: aCommit [ ^ self workingCopyState mergeCommit: aCommit ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceWorkingCopy >> modifiedPackages [ ^ self loadedPackages select: [ :e | e isDirty ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> notifyPackageModified: aString [ self flag: #pharoTodo. "we cannot use #includesPackageNamed: as is because it can happen that a package is present in a commit but not in image yet?" @@ -555,56 +557,56 @@ IceWorkingCopy >> notifyPackageModified: aString [ ^ false ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> packageNamed: aString [ ^ self packagesDictionary at: aString ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> packageNames [ ^ self packagesDictionary keys ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> packages [ ^ self packagesDictionary values ] -{ #category : #'private - packages' } +{ #category : 'private - packages' } IceWorkingCopy >> packagesDictionary [ ^ packages ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceWorkingCopy >> project [ "For backwards compatibility, if we don't find a project, take the project from HEAD" ^ project ifNil: [ self refreshProjectFromRepository ] ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceWorkingCopy >> project: anIceProject [ self basicSetProject: anIceProject. self refreshProject. ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceWorkingCopy >> properties [ ^ properties ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceWorkingCopy >> referenceCommit [ ^ referenceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopy >> referenceCommit: aCommit [ self referenceCommit = aCommit @@ -614,7 +616,7 @@ IceWorkingCopy >> referenceCommit: aCommit [ self refreshProjectFromRepository ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceWorkingCopy >> referenceCommits [ "Returns a collection with all current loaded commits. If we are in a single commit state, return a collection with only one element." @@ -622,12 +624,12 @@ IceWorkingCopy >> referenceCommits [ ^ { referenceCommit } ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceWorkingCopy >> refreshDirtyPackages [ self markAsCleanPackagesNotInDiff: self repository workingCopyDiff ] -{ #category : #'private - packages' } +{ #category : 'private - packages' } IceWorkingCopy >> refreshPackages [ | commitPackages | commitPackages := self referenceCommit isCollection @@ -641,14 +643,14 @@ IceWorkingCopy >> refreshPackages [ ] -{ #category : #'private - project' } +{ #category : 'private - project' } IceWorkingCopy >> refreshProject [ repository commitsInPackageCache: nil. self refreshPackages ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopy >> refreshProjectFromRepository [ | commitToCheck maybeProject | @@ -665,14 +667,14 @@ IceWorkingCopy >> refreshProjectFromRepository [ ^ project ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceWorkingCopy >> refreshRepositoryProperties [ properties := self referenceCommit properties asBornProperties. ] -{ #category : #'private - impacting changes' } +{ #category : 'private - impacting changes' } IceWorkingCopy >> removeClassNamed: aString [ "Impact the system. @@ -680,52 +682,52 @@ IceWorkingCopy >> removeClassNamed: aString [ (Smalltalk globals at: aString ifAbsent: [ ^ self ]) removeFromSystem ] -{ #category : #'private - impacting changes' } +{ #category : 'private - impacting changes' } IceWorkingCopy >> removeMethod: anIceMethodDefinition [ anIceMethodDefinition asMCDefinition unload ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopy >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopy >> repository: anObject [ repository := anObject ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceWorkingCopy >> repositoryProperties [ ^ properties ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopy >> rootFileReference [ ^ repository location ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceWorkingCopy >> setMergeStateBetweenCommits: aCollection [ self referenceCommit: aCollection ] -{ #category : #'private - notifications' } +{ #category : 'private - notifications' } IceWorkingCopy >> shouldIgnoreNotifications [ ^ shouldIgnoreNotifications = true ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceWorkingCopy >> snapshotFor: package [ ^ (self versionFor: package) snapshot ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceWorkingCopy >> snapshotForPackage: aPackage [ ^ aPackage isLoaded @@ -733,27 +735,27 @@ IceWorkingCopy >> snapshotForPackage: aPackage [ ifFalse: [ self referenceCommit snapshotForPackage: aPackage ] ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> unload [ "Unload all code loaded into the image that belong to this repository" self loadedPackages do: [ :each | self unloadPackage: each ] ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> unloadPackage: aPackage [ aPackage mcWorkingCopy ifNotNil: #unload ] -{ #category : #'API - loading' } +{ #category : 'API - loading' } IceWorkingCopy >> unloadPackageNamed: aPackageName [ self unloadPackage: (IcePackage named: aPackageName repository: repository) ] -{ #category : #validating } +{ #category : 'validating' } IceWorkingCopy >> validateCanCommit [ "Verify sync between image version and working copy" "If there are incomming commits is out of sync" @@ -765,13 +767,13 @@ IceWorkingCopy >> validateCanCommit [ self workingCopyState validateCanCommit ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceWorkingCopy >> versionFor: package [ ^ IceSavedPackageVersion fromCommit: self package: package ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopy >> workingCopyState [ "The working copy can be in different states depending on the repository and the package. It is the working copy state reponsibility to decide wether we can commit, if we are on a merge, and so on... The working copy state can be obtained through the message #workingCopyState. @@ -793,7 +795,7 @@ The working copy state is calculated every time that it is called. This is becau ^ IceAttachedSingleVersionWorkingCopy repository: repository ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceWorkingCopy >> writerClass [ ^ self referenceCommit writerClass diff --git a/Iceberg/IceWorkingCopyDesyncronized.class.st b/Iceberg/IceWorkingCopyDesyncronized.class.st index ab9ad3308c..fa2710daaf 100644 --- a/Iceberg/IceWorkingCopyDesyncronized.class.st +++ b/Iceberg/IceWorkingCopyDesyncronized.class.st @@ -3,12 +3,14 @@ I indicate when a working copy is desyncronized. It means the version I have in the image is different to the version I have in the working copy. " Class { - #name : #IceWorkingCopyDesyncronized, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceWorkingCopyDesyncronized', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyDesyncronized >> acceptError: anObject [ anObject visitWorkingCopyDesynchronizedError: self ] diff --git a/Iceberg/IceWorkingCopyPatcherVisitor.class.st b/Iceberg/IceWorkingCopyPatcherVisitor.class.st index 126ce97911..a1f5089e43 100644 --- a/Iceberg/IceWorkingCopyPatcherVisitor.class.st +++ b/Iceberg/IceWorkingCopyPatcherVisitor.class.st @@ -2,122 +2,124 @@ I visit a tree of changes and apply those changes to the working copy. " Class { - #name : #IceWorkingCopyPatcherVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceWorkingCopyPatcherVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'repository', 'loader' ], - #category : #'Iceberg-Changes' + #category : 'Iceberg-Changes', + #package : 'Iceberg', + #tag : 'Changes' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceWorkingCopyPatcherVisitor class >> on: aRepository [ ^ self new repository: aRepository; yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceWorkingCopyPatcherVisitor >> initialize [ super initialize. loader := MCPackageLoader new ] -{ #category : #loading } +{ #category : 'loading' } IceWorkingCopyPatcherVisitor >> load [ loader load ] -{ #category : #actions } +{ #category : 'actions' } IceWorkingCopyPatcherVisitor >> removeClass: anIceClassDefinition [ repository workingCopy removeClassNamed: anIceClassDefinition name ] -{ #category : #removing } +{ #category : 'removing' } IceWorkingCopyPatcherVisitor >> removeFile: anIceFileDefinition [ "I do not remove nothing from the file in the image" ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> removeFileReferenceInPath: anUndefinedObject [ "I do not remove nothing from the file in the image" ] -{ #category : #actions } +{ #category : 'actions' } IceWorkingCopyPatcherVisitor >> removeMethod: anIceMethodDefinition [ repository workingCopy removeMethod: anIceMethodDefinition ] -{ #category : #operations } +{ #category : 'operations' } IceWorkingCopyPatcherVisitor >> removePackage: anIcePackageDefinition [ repository workingCopy unloadPackageNamed: anIcePackageDefinition name ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopyPatcherVisitor >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopyPatcherVisitor >> repository: anObject [ repository := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitAddition: anIceAddition [ repository workingCopy applyDefinition: anIceAddition definition inNode: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitClassDefinition: anIceClassDefinition [ repository workingCopy applyDefinition: anIceClassDefinition inNode: currentNode. self visitChildrenOf: currentNode. ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitDirectoryDefinition: anIceDirectoryDefinition [ self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitFileNode: anIceFileDefinition [ "Ignore files, they are not loaded in the image" ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitMethodNode: anIceMethodDefinition [ repository workingCopy applyDefinition: anIceMethodDefinition inNode: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitModification: anIceModification [ anIceModification definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitNoModification: anIceNoModification [ anIceNoModification definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ ^ anIceNonConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitPackage: anIcePackageDefinition [ (self repository packageNamed: anIcePackageDefinition name) isLoaded @@ -128,14 +130,14 @@ IceWorkingCopyPatcherVisitor >> visitPackage: anIcePackageDefinition [ yourself). ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitRemoval: anIceRemoval [ anIceRemoval definition removeFrom: self. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceWorkingCopyPatcherVisitor >> visitRootDefinition: anIceRootDefinition [ self visitChildrenOf: currentNode diff --git a/Iceberg/IceWorkingCopyState.class.st b/Iceberg/IceWorkingCopyState.class.st index 21ddef1be1..21bcef3801 100644 --- a/Iceberg/IceWorkingCopyState.class.st +++ b/Iceberg/IceWorkingCopyState.class.st @@ -2,21 +2,23 @@ I represent the state of a working copy. I have several methods to combine myself with package states and generate new working copy states. " Class { - #name : #IceWorkingCopyState, - #superclass : #Object, + #name : 'IceWorkingCopyState', + #superclass : 'Object', #instVars : [ 'repository' ], - #category : #'Iceberg-WorkingCopy' + #category : 'Iceberg-WorkingCopy', + #package : 'Iceberg', + #tag : 'WorkingCopy' } -{ #category : #testing } +{ #category : 'testing' } IceWorkingCopyState class >> isAbstract [ ^ self == IceWorkingCopyState ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopyState class >> repository: aRepository [ ^ self new @@ -24,77 +26,77 @@ IceWorkingCopyState class >> repository: aRepository [ yourself ] -{ #category : #displaying } +{ #category : 'displaying' } IceWorkingCopyState >> description [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceWorkingCopyState >> isCommitMerged: aCommit [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceWorkingCopyState >> isDetached [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceWorkingCopyState >> isInMerge [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceWorkingCopyState >> isSingleCommitState [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceWorkingCopyState >> isUnknownCommitState [ ^ false ] -{ #category : #merging } +{ #category : 'merging' } IceWorkingCopyState >> mergeCommit: aCommit [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopyState >> referenceCommit [ ^ repository workingCopy referenceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopyState >> referenceCommits [ ^ { self referenceCommit } ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopyState >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopyState >> repository: anIceLibgitRepository [ repository := anIceLibgitRepository ] -{ #category : #validating } +{ #category : 'validating' } IceWorkingCopyState >> validateCanCommit [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceWorkingCopyState >> workingCopy [ ^ repository workingCopy diff --git a/Iceberg/IceWrongUrl.class.st b/Iceberg/IceWrongUrl.class.st index f2cf8a413e..d3f25e9f65 100644 --- a/Iceberg/IceWrongUrl.class.st +++ b/Iceberg/IceWrongUrl.class.st @@ -2,7 +2,9 @@ We can not parse the origin URL you have introduced. Maybe you made a typo, or maybe we do not support that kind of URLs. " Class { - #name : #IceWrongUrl, - #superclass : #IceError, - #category : 'Iceberg-Errors' + #name : 'IceWrongUrl', + #superclass : 'IceError', + #category : 'Iceberg-Errors', + #package : 'Iceberg', + #tag : 'Errors' } diff --git a/Iceberg/Iceberg.class.st b/Iceberg/Iceberg.class.st index 8d4d8587cd..4bce23fd51 100644 --- a/Iceberg/Iceberg.class.st +++ b/Iceberg/Iceberg.class.st @@ -15,8 +15,8 @@ Internal Representation and Key Implementation Points. Implementation Points " Class { - #name : #Iceberg, - #superclass : #Object, + #name : 'Iceberg', + #superclass : 'Object', #classVars : [ 'EnableMetacelloIntegration', 'RemoteTypeSelector', @@ -25,15 +25,17 @@ Class { #classInstVars : [ 'icebergAnnouncer' ], - #category : #'Iceberg-Core' + #category : 'Iceberg-Core', + #package : 'Iceberg', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } Iceberg class >> announcer [ ^ icebergAnnouncer ifNil: [ icebergAnnouncer := IceAnnouncer new ] ] -{ #category : #accessing } +{ #category : 'accessing' } Iceberg class >> bootstrap [ | metacelloRegistrationEntry | metacelloRegistrationEntry := MetacelloProjectRegistration registry baselineRegistry at: 'BaselineOfIceberg'. @@ -42,7 +44,7 @@ Iceberg class >> bootstrap [ packageList: (metacelloRegistrationEntry baselineProjectSpec version packages collect: #name) ] -{ #category : #accessing } +{ #category : 'accessing' } Iceberg class >> bootstrapWithCommitId: commitId packageList: packageNameList [ | commit repository | @@ -64,17 +66,17 @@ Iceberg class >> bootstrapWithCommitId: commitId packageList: packageNameList [ repository register ] -{ #category : #settings } +{ #category : 'settings' } Iceberg class >> enableMetacelloIntegration [ ^ EnableMetacelloIntegration ifNil: [ EnableMetacelloIntegration := true ] ] -{ #category : #settings } +{ #category : 'settings' } Iceberg class >> enableMetacelloIntegration: anObject [ EnableMetacelloIntegration := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } Iceberg class >> icebergRepositoriesURLs [ ^ { 'git@github.com:pharo-vcs/iceberg.git'. @@ -83,12 +85,12 @@ Iceberg class >> icebergRepositoriesURLs [ } ] -{ #category : #'class initialization' } +{ #category : 'class initialization' } Iceberg class >> initialize [ self initializeSettings ] -{ #category : #'class initialization' } +{ #category : 'class initialization' } Iceberg class >> initializeSettings [ Smalltalk at: #SystemSettingsPersistence @@ -98,31 +100,23 @@ Iceberg class >> initializeSettings [ class updateSettingNodes: nodes ] ] -{ #category : #accessing } +{ #category : 'accessing' } Iceberg class >> mcRepositoryFor: aLocationString [ ^ (IceMetacelloRepositoryType for: aLocationString) mcRepository ] -{ #category : #accessing } -Iceberg class >> packageForCategoryNamed: categoryName [ - | systemPackage | - systemPackage := RPackageOrganizer default packageMatchingExtensionName: categoryName. - ^ self packageNamed: systemPackage name - -] - -{ #category : #accessing } +{ #category : 'accessing' } Iceberg class >> remoteTypeSelector [ "Should be #scpURL or #httpsURL" ^ RemoteTypeSelector ifNil: [ RemoteTypeSelector := #scpUrl ] ] -{ #category : #accessing } +{ #category : 'accessing' } Iceberg class >> remoteTypeSelector: anObject [ RemoteTypeSelector := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } Iceberg class >> repositoryForPackage: anRPackage [ | existingRepositories possibleRepositoryTypes | @@ -137,7 +131,7 @@ Iceberg class >> repositoryForPackage: anRPackage [ self error: ('Could not find a git repository for {1}' format: { anRPackage name }) ] -{ #category : #settings } +{ #category : 'settings' } Iceberg class >> settingsOn: aBuilder [ (aBuilder group: #Iceberg) @@ -158,17 +152,17 @@ Iceberg class >> settingsOn: aBuilder [ ('HTTP (http://github.com//.git)' -> #httpUrl)} ] ] ] -{ #category : #settings } +{ #category : 'settings' } Iceberg class >> showSystemRepositories [ ^ ShowSystemRepositories ifNil: [ ShowSystemRepositories := false ] ] -{ #category : #settings } +{ #category : 'settings' } Iceberg class >> showSystemRepositories: aBoolean [ ShowSystemRepositories := aBoolean ] -{ #category : #updating } +{ #category : 'updating' } Iceberg class >> update [ #(Iceberg LGitRepository MCFileTreeGitRepository) do: [:className | Smalltalk diff --git a/Iceberg/LGitCommit.extension.st b/Iceberg/LGitCommit.extension.st index f688b0d450..bcab6164f7 100644 --- a/Iceberg/LGitCommit.extension.st +++ b/Iceberg/LGitCommit.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #LGitCommit } +Extension { #name : 'LGitCommit' } -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } LGitCommit >> asIcebergObjectInRepository: iceRepository [ ^ iceRepository commitFromGitCommit: self ] -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } LGitCommit >> changesFileNamed: fileName [ | lookup myVersion parentVersions | lookup := [:commit | [ commit entryByPath: fileName ] on: Error do: [ nil ]]. diff --git a/Iceberg/LGitCredentialsPlaintext.extension.st b/Iceberg/LGitCredentialsPlaintext.extension.st index fdd34eb4e5..5d2fa22a8f 100644 --- a/Iceberg/LGitCredentialsPlaintext.extension.st +++ b/Iceberg/LGitCredentialsPlaintext.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitCredentialsPlaintext } +Extension { #name : 'LGitCredentialsPlaintext' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } LGitCredentialsPlaintext >> readFrom: credentials [ self username: credentials username. self passphrase: credentials password. diff --git a/Iceberg/LGitCredentialsSSH.extension.st b/Iceberg/LGitCredentialsSSH.extension.st index befaa13078..9c6525cb93 100644 --- a/Iceberg/LGitCredentialsSSH.extension.st +++ b/Iceberg/LGitCredentialsSSH.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitCredentialsSSH } +Extension { #name : 'LGitCredentialsSSH' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } LGitCredentialsSSH >> readFrom: credentials [ self username: credentials username. self passphrase: credentials keyPassphrase. diff --git a/Iceberg/LGitDiff.extension.st b/Iceberg/LGitDiff.extension.st index 6bf355909e..c4d2dd2652 100644 --- a/Iceberg/LGitDiff.extension.st +++ b/Iceberg/LGitDiff.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitDiff } +Extension { #name : 'LGitDiff' } -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } LGitDiff >> files [ | deltaFiles | @@ -11,13 +11,13 @@ LGitDiff >> files [ ^ deltaFiles ] -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } LGitDiff >> filesDo: aBlockClosure [ ^ self filesDo: aBlockClosure binaryFilesDo: aBlockClosure hunksDo: nil linesDo: nil ] -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } LGitDiff >> includesFileNamed: path [ ^ (self filesDo: [ :delta :second :third | | modifiedFileName | diff --git a/Iceberg/LGitReturnCodeEnum.extension.st b/Iceberg/LGitReturnCodeEnum.extension.st index a3b731c410..c0799fb2b3 100644 --- a/Iceberg/LGitReturnCodeEnum.extension.st +++ b/Iceberg/LGitReturnCodeEnum.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitReturnCodeEnum } +Extension { #name : 'LGitReturnCodeEnum' } -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } LGitReturnCodeEnum >> asBoolean [ ^ self value = 0 ifTrue: false ifFalse: [ self value = 1 ifTrue: true ifFalse: diff --git a/Iceberg/LGitTag.extension.st b/Iceberg/LGitTag.extension.st index b6d6a208a1..544e7c375b 100644 --- a/Iceberg/LGitTag.extension.st +++ b/Iceberg/LGitTag.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitTag } +Extension { #name : 'LGitTag' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } LGitTag >> asIcebergObjectInRepository: backend [ ^ IceTag named: self name inRepository: backend ] diff --git a/Iceberg/LGitTreeEntry.extension.st b/Iceberg/LGitTreeEntry.extension.st index eabe9f7b9d..fe0fa2ebf3 100644 --- a/Iceberg/LGitTreeEntry.extension.st +++ b/Iceberg/LGitTreeEntry.extension.st @@ -1,16 +1,16 @@ -Extension { #name : #LGitTreeEntry } +Extension { #name : 'LGitTreeEntry' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } LGitTreeEntry >> name [ ^ self filename ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } LGitTreeEntry >> readStreamDo: aBlock [ ^ aBlock value: (ReadStream on: self object contents asString) ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } LGitTreeEntry >> tree [ ^ self object ] diff --git a/Iceberg/MCAddition.extension.st b/Iceberg/MCAddition.extension.st index 2b1bdf77a8..ea963353cb 100644 --- a/Iceberg/MCAddition.extension.st +++ b/Iceberg/MCAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCAddition } +Extension { #name : 'MCAddition' } -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCAddition >> myVersionOn: aDiff [ ^ aDiff versionFromDefinition: definition diff --git a/Iceberg/MCBitbucketRepository.extension.st b/Iceberg/MCBitbucketRepository.extension.st index 3958ebf29d..47c622ae3b 100644 --- a/Iceberg/MCBitbucketRepository.extension.st +++ b/Iceberg/MCBitbucketRepository.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #MCBitbucketRepository } +Extension { #name : 'MCBitbucketRepository' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCBitbucketRepository >> httpsUrl [ ^ 'https://bitbucket.org/', projectPath, '.git' ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCBitbucketRepository >> scpUrl [ ^ 'git@bitbucket.org:', projectPath, '.git' ] diff --git a/Iceberg/MCClassDefinition.extension.st b/Iceberg/MCClassDefinition.extension.st index 581c69fc43..8b636ac077 100644 --- a/Iceberg/MCClassDefinition.extension.st +++ b/Iceberg/MCClassDefinition.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #MCClassDefinition } +Extension { #name : 'MCClassDefinition' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCClassDefinition >> classCategory [ "Avoid direct use of #category, because MCClassDefinitions and MCMethodDefinition use the same message for different things. " ^ self category ] -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCClassDefinition >> fullDefinitionString [ ^ String streamContents: [:stream | self printDefinitionOn: stream. @@ -15,7 +15,7 @@ MCClassDefinition >> fullDefinitionString [ stream << self comment ] ] -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCClassDefinition >> removeMetaSideVariables [ variables := variables reject: [ :e | e isClassInstanceVariable ]. diff --git a/Iceberg/MCClassTraitDefinition.extension.st b/Iceberg/MCClassTraitDefinition.extension.st index 5bdc618bbd..7ad0bde0a7 100644 --- a/Iceberg/MCClassTraitDefinition.extension.st +++ b/Iceberg/MCClassTraitDefinition.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #MCClassTraitDefinition } +Extension { #name : 'MCClassTraitDefinition' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCClassTraitDefinition >> classCategory [ ^ self category ] -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } MCClassTraitDefinition >> traitComposition [ ^ self classTraitComposition ] diff --git a/Iceberg/MCDefinition.extension.st b/Iceberg/MCDefinition.extension.st index 7b92581d8a..8ffd5440ce 100644 --- a/Iceberg/MCDefinition.extension.st +++ b/Iceberg/MCDefinition.extension.st @@ -1,17 +1,17 @@ -Extension { #name : #MCDefinition } +Extension { #name : 'MCDefinition' } -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCDefinition >> addAnalysisToPackageChangeSet: aPackageChangeSet change: aChange [ aPackageChangeSet addChange: aChange ] -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCDefinition >> buildOn: anIceDiffBuilder [ self subclassResponsibility ] -{ #category : #'*Iceberg-changes' } +{ #category : '*Iceberg-changes' } MCDefinition >> isFileDefinition [ ^ false diff --git a/Iceberg/MCGitBasedNetworkRepository.extension.st b/Iceberg/MCGitBasedNetworkRepository.extension.st index fbea2db0ee..8437426b82 100644 --- a/Iceberg/MCGitBasedNetworkRepository.extension.st +++ b/Iceberg/MCGitBasedNetworkRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCGitBasedNetworkRepository } +Extension { #name : 'MCGitBasedNetworkRepository' } -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCGitBasedNetworkRepository >> createIcebergRepositoryFor: remoteUrl [ | builder repository | builder := IceRepositoryCreator new @@ -22,7 +22,7 @@ MCGitBasedNetworkRepository >> createIcebergRepositoryFor: remoteUrl [ ^ repository ] -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCGitBasedNetworkRepository >> createIcebergRepositoryWithFallbackFor: remote url: remoteUrl [ | urlToUse | @@ -34,7 +34,7 @@ MCGitBasedNetworkRepository >> createIcebergRepositoryWithFallbackFor: remote ur ^ self createIcebergRepositoryFor: urlToUse ] ] -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCGitBasedNetworkRepository >> getOrCreateIcebergRepository [ | remoteUrl | @@ -46,13 +46,13 @@ MCGitBasedNetworkRepository >> getOrCreateIcebergRepository [ self createIcebergRepositoryWithFallbackFor: remote url: remoteUrl ] ] -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCGitBasedNetworkRepository >> httpUrl [ ^ self httpsUrl copyReplaceAll: 'https://' with: 'http://' ] -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCGitBasedNetworkRepository >> httpsUrl [ self subclassResponsibility diff --git a/Iceberg/MCGitHubRepository.extension.st b/Iceberg/MCGitHubRepository.extension.st index 5ae1e2d3fe..0c6f750239 100644 --- a/Iceberg/MCGitHubRepository.extension.st +++ b/Iceberg/MCGitHubRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCGitHubRepository } +Extension { #name : 'MCGitHubRepository' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCGitHubRepository >> commitId [ "This kind of repo is associated to a specific commit that was downloaded, sadly the only way to know it is to parse the directory name." @@ -9,7 +9,7 @@ MCGitHubRepository >> commitId [ ^ repoRoot basename copyAfterLast: $-. ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCGitHubRepository class >> commitIdFor: aWorkingCopy [ ^ aWorkingCopy repositoryGroup repositories detect: [ :repo | repo isKindOf: self ] @@ -18,18 +18,18 @@ MCGitHubRepository class >> commitIdFor: aWorkingCopy [ ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCGitHubRepository >> commitIdFor: aMCWorkingCopy ifFound: aBlockClosure [ (aMCWorkingCopy repositoryGroup includes: self) ifTrue: [ aBlockClosure value: self commitId ] ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCGitHubRepository >> httpsUrl [ ^ 'https://github.com/', projectPath, '.git' ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCGitHubRepository >> scpUrl [ ^ 'git@github.com:', projectPath, '.git' ] diff --git a/Iceberg/MCGitlabRepository.extension.st b/Iceberg/MCGitlabRepository.extension.st index 30f4edfb0d..85d4ffcfc2 100644 --- a/Iceberg/MCGitlabRepository.extension.st +++ b/Iceberg/MCGitlabRepository.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #MCGitlabRepository } +Extension { #name : 'MCGitlabRepository' } -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCGitlabRepository >> httpsUrl [ ^ 'https://<1s>/<2s>.git' expandMacrosWith: self hostname with: projectPath ] -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCGitlabRepository >> scpUrl [ "If the sshPort is not nil it means that we have a non default ssh port. Thus we need to add `ssh://` and th port number to the scheme" diff --git a/Iceberg/MCMethodDefinition.extension.st b/Iceberg/MCMethodDefinition.extension.st index 81e82b3c0e..11c41461d0 100644 --- a/Iceberg/MCMethodDefinition.extension.st +++ b/Iceberg/MCMethodDefinition.extension.st @@ -1,17 +1,17 @@ -Extension { #name : #MCMethodDefinition } +Extension { #name : 'MCMethodDefinition' } -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCMethodDefinition >> buildOn: anIcePackageDiff [ self shouldBeImplemented. ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCMethodDefinition >> classCategory [ ^ self actualClass ifNotNil: #category ifNil: [ RPackage defaultPackageName ] ] -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCMethodDefinition >> method [ ^ self actualClass >> self selector ] diff --git a/Iceberg/MCModification.extension.st b/Iceberg/MCModification.extension.st index 989f5661e9..fc5f066656 100644 --- a/Iceberg/MCModification.extension.st +++ b/Iceberg/MCModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCModification } +Extension { #name : 'MCModification' } -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCModification >> asIceOperationOn: aNode diff: anIceDiff [ ^ MCModification @@ -8,7 +8,7 @@ MCModification >> asIceOperationOn: aNode diff: anIceDiff [ to: aNode ] -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCModification >> myVersionOn: aDiff [ ^ aDiff versionFromDefinition: modification diff --git a/Iceberg/MCOrganizationDefinition.extension.st b/Iceberg/MCOrganizationDefinition.extension.st index 9627db29c2..16ee3d611a 100644 --- a/Iceberg/MCOrganizationDefinition.extension.st +++ b/Iceberg/MCOrganizationDefinition.extension.st @@ -1,20 +1,11 @@ -Extension { #name : #MCOrganizationDefinition } +Extension { #name : 'MCOrganizationDefinition' } -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCOrganizationDefinition >> addAnalysisToPackageChangeSet: aPackageChangeSet change: aChange [ aPackageChangeSet addOrganisationChange: aChange ] -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } MCOrganizationDefinition >> iceClass [ ^ nil ] - -{ #category : #'*Iceberg-Core' } -MCOrganizationDefinition >> icePackage [ - "TODO: Refactor this, see https://github.com/npasserini/iceberg/issues/42" - self categories - ifNotEmpty: [ ^ Iceberg packageForCategoryNamed: (self categories anyOne) ] - ifEmpty: nil - -] diff --git a/Iceberg/MCPatchOperation.extension.st b/Iceberg/MCPatchOperation.extension.st index c08e078887..98247cd427 100644 --- a/Iceberg/MCPatchOperation.extension.st +++ b/Iceberg/MCPatchOperation.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #MCPatchOperation } +Extension { #name : 'MCPatchOperation' } -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCPatchOperation >> asIceOperationOn: aNode diff: anIceDiff [ ^ MCAddition of: aNode ] -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCPatchOperation >> myVersionOn: aDiff [ self subclassResponsibility diff --git a/Iceberg/MCPatcher.extension.st b/Iceberg/MCPatcher.extension.st index 87e3ce21e8..f30390e57f 100644 --- a/Iceberg/MCPatcher.extension.st +++ b/Iceberg/MCPatcher.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCPatcher } +Extension { #name : 'MCPatcher' } -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCPatcher >> definitions [ ^ definitions ] diff --git a/Iceberg/MCPostscriptDefinition.extension.st b/Iceberg/MCPostscriptDefinition.extension.st index b50be03676..738352dab2 100644 --- a/Iceberg/MCPostscriptDefinition.extension.st +++ b/Iceberg/MCPostscriptDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCPostscriptDefinition } +Extension { #name : 'MCPostscriptDefinition' } -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCPostscriptDefinition >> addToPackageChangeSet: anIcePackageChangeSet [ "By doing nothing, this definition will not be shown in the changes tree." ] diff --git a/Iceberg/MCRemoval.extension.st b/Iceberg/MCRemoval.extension.st index 679e934eaa..c369ece39b 100644 --- a/Iceberg/MCRemoval.extension.st +++ b/Iceberg/MCRemoval.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCRemoval } +Extension { #name : 'MCRemoval' } -{ #category : #'*Iceberg-Changes' } +{ #category : '*Iceberg-Changes' } MCRemoval >> myVersionOn: aDiff [ ^ nil diff --git a/Iceberg/MCRepository.extension.st b/Iceberg/MCRepository.extension.st index 285c02c429..868ca6e212 100644 --- a/Iceberg/MCRepository.extension.st +++ b/Iceberg/MCRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCRepository } +Extension { #name : 'MCRepository' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCRepository >> commitIdFor: aMCWorkingCopy ifFound: aBlockClosure [ "Do nothing. By default MCRepositories can not provide a commitId for you." ] diff --git a/Iceberg/MCVersion.extension.st b/Iceberg/MCVersion.extension.st index d9d773667a..c5c6b51a60 100644 --- a/Iceberg/MCVersion.extension.st +++ b/Iceberg/MCVersion.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCVersion } +Extension { #name : 'MCVersion' } -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCVersion >> directoryName [ ^ (MCFileTreeRepository parseName: self info name) first , '.package' ] diff --git a/Iceberg/MCWorkingCopy.extension.st b/Iceberg/MCWorkingCopy.extension.st index 4c28ec236b..0f5ad52273 100644 --- a/Iceberg/MCWorkingCopy.extension.st +++ b/Iceberg/MCWorkingCopy.extension.st @@ -1,17 +1,17 @@ -Extension { #name : #MCWorkingCopy } +Extension { #name : 'MCWorkingCopy' } -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCWorkingCopy >> ancestry: anAncestry [ ancestry := anAncestry ] -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } MCWorkingCopy >> info [ ^ self versionInfo ] -{ #category : #'*Iceberg-Adapters' } +{ #category : '*Iceberg-Adapters' } MCWorkingCopy >> loadedVersion [ self ancestors do: [ :ancestor | (self repositoryGroup diff --git a/Iceberg/ManifestIceberg.class.st b/Iceberg/ManifestIceberg.class.st index 4c3ae850de..70fc6e94e1 100644 --- a/Iceberg/ManifestIceberg.class.st +++ b/Iceberg/ManifestIceberg.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIceberg, - #superclass : #PackageManifest, - #category : 'Iceberg-Manifest' + #name : 'ManifestIceberg', + #superclass : 'PackageManifest', + #category : 'Iceberg-Manifest', + #package : 'Iceberg', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIceberg class >> description [ ^ 'Iceberg is a set of tools that allow one to handle git repositories directly from a Pharo image. Right now we support only git, but Iceberg is designed to allow other code versioning systems in the future. The final aim of Iceberg is to become the default repository manager for Pharo-core, allowing for smoother and faster integration of contributions, as well as better branch and version management. @@ -17,17 +19,17 @@ Repository : https://github.com/pharo-vcs/iceberg This package contains the core classes of Iceberg.' ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIceberg class >> ruleRBRefersToClassRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#'IceRepository class' #isAbstract #true)) #'2018-03-13T18:40:58.956177+01:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIceberg class >> ruleRBTempsReadBeforeWrittenRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceRepository #outgoingCommits #false)) #'2016-06-16T17:24:18.524965+02:00') #(#(#RGMethodDefinition #(#IceMCGitRepository #outgoingCommits #false)) #'2016-07-06T15:14:46.350843+02:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIceberg class >> ruleRBUtilityMethodsRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceRepository #fetchFrom: #false)) #'2018-03-13T16:34:52.218313+01:00') ) ] diff --git a/Iceberg/MetacelloResolveProjectUpgrade.extension.st b/Iceberg/MetacelloResolveProjectUpgrade.extension.st index 70f9852f2b..2e8d7ce87f 100644 --- a/Iceberg/MetacelloResolveProjectUpgrade.extension.st +++ b/Iceberg/MetacelloResolveProjectUpgrade.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloResolveProjectUpgrade } +Extension { #name : 'MetacelloResolveProjectUpgrade' } -{ #category : #'*Iceberg-Metacello' } +{ #category : '*Iceberg-Metacello' } MetacelloResolveProjectUpgrade >> projectName [ ^ self existingProjectRegistration projectName diff --git a/Iceberg/RPackage.extension.st b/Iceberg/RPackage.extension.st index 168af6c0a7..1a6e62a79a 100644 --- a/Iceberg/RPackage.extension.st +++ b/Iceberg/RPackage.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #RPackage } +Extension { #name : 'RPackage' } -{ #category : #'*Iceberg-Core' } +{ #category : '*Iceberg-Core' } RPackage >> iceRepository [ ^ Iceberg repositoryForPackage: self diff --git a/Iceberg/RPackageSet.extension.st b/Iceberg/RPackageSet.extension.st index 2a8028056f..56f893dab4 100644 --- a/Iceberg/RPackageSet.extension.st +++ b/Iceberg/RPackageSet.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #RPackageSet } +Extension { #name : 'RPackageSet' } -{ #category : #'*Iceberg' } +{ #category : '*Iceberg' } RPackageSet class >> withoutCacheDo: aBlock [ | oldActive | diff --git a/Iceberg/package.st b/Iceberg/package.st index a1d1c177c4..cbcccdb2c3 100644 --- a/Iceberg/package.st +++ b/Iceberg/package.st @@ -1 +1 @@ -Package { #name : #Iceberg } +Package { #name : 'Iceberg' } From acf91a19e06e4e29d603143303852c991286280e Mon Sep 17 00:00:00 2001 From: Stijn Diependaele Date: Fri, 29 Sep 2023 16:22:34 +0200 Subject: [PATCH 33/83] Fix for https://github.com/pharo-project/pharo/issues/14648 (SpNullApplication did not understand #label:) --- Iceberg-TipUI/Clipboard.extension.st | 4 +- Iceberg-TipUI/CmCommandGroup.extension.st | 4 +- .../CmCommandGroupDecorator.extension.st | 4 +- .../CmUICommandDisplayStrategy.extension.st | 4 +- .../CmUIDisableWhenCantBeRun.extension.st | 4 +- .../CmUIHideWhenCantBeRun.extension.st | 4 +- Iceberg-TipUI/FTBasicItem.extension.st | 4 +- Iceberg-TipUI/FTRootItem.extension.st | 4 +- Iceberg-TipUI/FTTableMorph.extension.st | 6 +- Iceberg-TipUI/FTTreeItem.extension.st | 4 +- .../IceAbstractCredentials.extension.st | 6 +- Iceberg-TipUI/IceAddition.extension.st | 4 +- .../IceCheckoutAllPackages.extension.st | 4 +- ...CheckoutAlreadyLoadedPackages.extension.st | 4 +- .../IceCheckoutDoNotLoadPackages.extension.st | 4 +- .../IceCheckoutStrategy.extension.st | 6 +- Iceberg-TipUI/IceClassDefinition.extension.st | 4 +- .../IceConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceCreateBranchCommand.class.st | 10 +- Iceberg-TipUI/IceDefinition.extension.st | 4 +- .../IceDirectoryDefinition.extension.st | 4 +- Iceberg-TipUI/IceErrorVisitor.extension.st | 6 +- Iceberg-TipUI/IceExperimentalFeature.class.st | 10 +- .../IceExtensionDefinition.extension.st | 4 +- Iceberg-TipUI/IceFileDefinition.extension.st | 4 +- .../IceFileSystemDefinition.extension.st | 6 +- Iceberg-TipUI/IceMergeListWrapper.class.st | 28 ++-- .../IceMergeWorkingCopyCommand.class.st | 10 +- .../IceMethodContainerDefinition.extension.st | 10 +- .../IceMethodDefinition.extension.st | 10 +- Iceberg-TipUI/IceModification.extension.st | 4 +- Iceberg-TipUI/IceNoCommitMessage.class.st | 14 +- Iceberg-TipUI/IceNoModification.extension.st | 4 +- Iceberg-TipUI/IceNode.extension.st | 4 +- .../IceNodeCodeDisplayVisitor.class.st | 24 ++-- .../IceNonConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceOperation.extension.st | 12 +- Iceberg-TipUI/IceOperationMerge.extension.st | 6 +- Iceberg-TipUI/IcePackage.extension.st | 4 +- .../IcePackageDefinition.extension.st | 10 +- .../IcePlaintextCredentials.extension.st | 8 +- .../IcePlaintextOtpCredentials.extension.st | 4 +- Iceberg-TipUI/IcePullRemoteCommand.class.st | 14 +- Iceberg-TipUI/IceRemoval.extension.st | 4 +- Iceberg-TipUI/IceRepository.extension.st | 4 +- Iceberg-TipUI/IceRepositoryCommand.class.st | 24 ++-- .../IceSavedPackageVersion.extension.st | 4 +- Iceberg-TipUI/IceSortingStrategy.class.st | 28 ++-- Iceberg-TipUI/IceSshCredentials.extension.st | 6 +- .../IceTipAbstractCredentialCommand.class.st | 14 +- ...TipAbstractCredentialStoreCommand.class.st | 16 ++- ...ceTipAbstractCredentialsPresenter.class.st | 56 ++++---- ...ractPlaintextCredentialsPresenter.class.st | 24 ++-- ...ipAbstractSSHCredentialsPresenter.class.st | 20 +-- Iceberg-TipUI/IceTipAction.class.st | 30 +++-- ...eTipAddNewPackagesDialogPresenter.class.st | 40 +++--- .../IceTipAddPackageCommand.class.st | 20 +-- .../IceTipAddPackagesDialogPresenter.class.st | 44 +++--- ...eTipAddPlainTextCredentialCommand.class.st | 14 +- ...pAddPlaintextCredentialsPresenter.class.st | 22 +-- Iceberg-TipUI/IceTipAddRemoteCommand.class.st | 20 +-- .../IceTipAddRemoteDialogPresenter.class.st | 40 +++--- .../IceTipAddRepositoryCommand.class.st | 22 +-- .../IceTipAddSSHCredentialsPresenter.class.st | 22 +-- .../IceTipAddSshCredentialCommand.class.st | 14 +- .../IceTipAddTokenCredentialCommand.class.st | 14 +- ...ceTipAddTokenCredentialsPresenter.class.st | 28 ++-- .../IceTipAdoptCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipAnnouncement.class.st | 8 +- ...kForPlaintextCredentialsPresenter.class.st | 20 +-- ...rPlaintextOtpCredentialsPresenter.class.st | 18 +-- ...bForPlaintextCredentialsPresenter.class.st | 10 +- .../IceTipAskSSHCredentialsPresenter.class.st | 14 +- Iceberg-TipUI/IceTipBranchModel.class.st | 48 +++---- Iceberg-TipUI/IceTipBranchPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipBrowseCommand.class.st | 20 +-- .../IceTipBrowsePackageCommand.class.st | 18 +-- ...seRepositoryPackageVersionCommand.class.st | 14 +- Iceberg-TipUI/IceTipBrowser.class.st | 62 ++++----- Iceberg-TipUI/IceTipCache.class.st | 28 ++-- Iceberg-TipUI/IceTipCachedModel.class.st | 26 ++-- ...eTipCalculateDirtyPackagesCommand.class.st | 16 ++- .../IceTipCheckoutBranchCommand.class.st | 20 +-- .../IceTipCheckoutBranchDialog.class.st | 30 +++-- .../IceTipCheckoutBranchPanel.class.st | 10 +- .../IceTipCheckoutCommitCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCheckoutModel.class.st | 26 ++-- .../IceTipCheckoutNewBranchCommand.class.st | 18 +-- .../IceTipCheckoutNewBranchPanel.class.st | 40 +++--- .../IceTipCheckoutPreviewBrowser.class.st | 32 ++--- ...eTipCheckoutSelectedBranchCommand.class.st | 18 +-- .../IceTipCheckoutSelectedTagCommand.class.st | 18 +-- .../IceTipCherryPickCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCherrypickModel.class.st | 22 +-- .../IceTipCherrypickPreviewBrowser.class.st | 34 ++--- .../IceTipCleanCommandGroupVisitor.class.st | 12 +- Iceberg-TipUI/IceTipCommand.class.st | 50 +++---- ...ommandToPresenterBuildingStrategy.class.st | 12 +- Iceberg-TipUI/IceTipCommentPanel.class.st | 54 ++++---- Iceberg-TipUI/IceTipCommitAction.class.st | 28 ++-- Iceberg-TipUI/IceTipCommitBrowser.class.st | 58 ++++---- Iceberg-TipUI/IceTipCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipCommitDiffModel.class.st | 10 +- .../IceTipCommitInfoPresenter.class.st | 46 ++++--- Iceberg-TipUI/IceTipCommitModel.class.st | 64 ++++----- Iceberg-TipUI/IceTipCommitRangeModel.class.st | 18 +-- Iceberg-TipUI/IceTipCommitishModel.class.st | 18 +-- .../IceTipCopyCommitishCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagPanel.class.st | 60 +++++---- .../IceTipCredentialsSettings.class.st | 16 ++- .../IceTipCredentialsStoreBrowser.class.st | 34 ++--- ...ceTipCritiquesBeforeCommitBrowser.class.st | 50 +++---- .../IceTipDeleteBranchCommand.class.st | 18 +-- .../IceTipDeleteRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipDeleteTagCommand.class.st | 20 +-- .../IceTipDescriptionDecorator.class.st | 14 +- .../IceTipDescriptionDecoratorHead.class.st | 10 +- ...ceTipDescriptionDecoratorModified.class.st | 10 +- ...eTipDescriptionDecoratorNotLoaded.class.st | 10 +- Iceberg-TipUI/IceTipDialogPresenter.class.st | 14 +- Iceberg-TipUI/IceTipDiffEntryRemoved.class.st | 14 +- Iceberg-TipUI/IceTipDiffModel.class.st | 24 ++-- Iceberg-TipUI/IceTipDiffPanel.class.st | 66 ++++----- Iceberg-TipUI/IceTipDiffPreviewModel.class.st | 22 +-- Iceberg-TipUI/IceTipDiffRefreshed.class.st | 14 +- .../IceTipDiffSelectingPanel.class.st | 26 ++-- Iceberg-TipUI/IceTipDirectMergeType.class.st | 10 +- .../IceTipDirectoryPresenter.class.st | 10 +- ...ipDiscardAllChangesPreviewBrowser.class.st | 22 +-- Iceberg-TipUI/IceTipDiscardAllModel.class.st | 24 ++-- .../IceTipDiscardChangesCommand.class.st | 20 +-- .../IceTipEditCredentialCommand.class.st | 18 +-- ...EditPlaintextCredentialsPresenter.class.st | 20 +-- .../IceTipEditProjectDialogPresenter.class.st | 74 +++++----- .../IceTipEditRepositoryCommand.class.st | 18 +-- ...IceTipEditSSHCredentialsPresenter.class.st | 20 +-- ...eTipEditTokenCredentialsPresenter.class.st | 16 ++- Iceberg-TipUI/IceTipEntityModel.class.st | 38 +++--- .../IceTipErrorDialogPresenter.class.st | 30 +++-- .../IceTipExistingBranchPanel.class.st | 32 ++--- .../IceTipFetchAllProjectCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFetchCommand.class.st | 20 +-- .../IceTipFetchInPullCommand.class.st | 16 ++- .../IceTipFetchRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFilePresenter.class.st | 10 +- .../IceTipForgetRepositoryCommand.class.st | 18 +-- .../IceTipGitProviderRepositoryPanel.class.st | 42 +++--- .../IceTipGitRepositoryPanel.class.st | 26 ++-- ...itUsernameAndEmailDialogPresenter.class.st | 38 +++--- ...pHiedraAltComponentHistoryBrowser.class.st | 36 ++--- .../IceTipHiedraAltHistoryBrowser.class.st | 32 ++--- ...ceTipHiedraAltHistoryRowPresenter.class.st | 16 ++- .../IceTipHiedraHistoryBrowser.class.st | 18 +-- .../IceTipHistoryActionBrowser.class.st | 32 ++--- Iceberg-TipUI/IceTipHistoryBrowser.class.st | 46 ++++--- .../IceTipHistoryDiffFromHead.class.st | 12 +- .../IceTipHistoryDiffToAncestor.class.st | 12 +- .../IceTipHistoryDiffToHead.class.st | 12 +- .../IceTipHistoryDiffUpdater.class.st | 28 ++-- Iceberg-TipUI/IceTipInspectCommand.class.st | 20 +-- .../IceTipInstallVersionCommand.class.st | 18 +-- ...TipInteractiveCredentialsProvider.class.st | 18 +-- .../IceTipInteractiveErrorVisitor.class.st | 56 ++++---- .../IceTipLoadPackageCommand.class.st | 18 +-- .../IceTipLocalRepositoryPanel.class.st | 28 ++-- .../IceTipLocationPresenter.class.st | 46 ++++--- .../IceTipManagePackagesCommand.class.st | 18 +-- .../IceTipManageRepositoryCommand.class.st | 24 ++-- .../IceTipMergeBranchDialogPresenter.class.st | 30 +++-- Iceberg-TipUI/IceTipMergeBranchPanel.class.st | 18 +-- Iceberg-TipUI/IceTipMergeCommand.class.st | 18 +-- .../IceTipMergeHistoryCommand.class.st | 18 +-- Iceberg-TipUI/IceTipMergeModel.class.st | 20 +-- Iceberg-TipUI/IceTipMergeMorph.class.st | 14 +- Iceberg-TipUI/IceTipMergePatchMorph.class.st | 40 +++--- .../IceTipMergePreviewBrowser.class.st | 20 +-- .../IceTipMergeSelectingPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipMergeType.class.st | 22 +-- Iceberg-TipUI/IceTipModel.class.st | 18 +-- .../IceTipNewRepositoryPanel.class.st | 34 ++--- .../IceTipOpenNativelyCommand.class.st | 18 +-- .../IceTipOptionDialogPresenter.class.st | 36 ++--- Iceberg-TipUI/IceTipPackageCommand.class.st | 20 +-- Iceberg-TipUI/IceTipPackageModel.class.st | 36 ++--- Iceberg-TipUI/IceTipPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipPreviewBrowser.class.st | 26 ++-- Iceberg-TipUI/IceTipPullBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPullCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPullModel.class.st | 12 +- Iceberg-TipUI/IceTipPushAction.class.st | 10 +- Iceberg-TipUI/IceTipPushBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPushCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPushModel.class.st | 12 +- .../IceTipReadOnlyFormBuilder.class.st | 36 ++--- .../IceTipRefreshCommitCommand.class.st | 18 +-- ...RegisterRepositoryDialogPresenter.class.st | 26 ++-- .../IceTipReloadPackageCommand.class.st | 18 +-- .../IceTipRemoteActionBrowser.class.st | 26 ++-- .../IceTipRemoteActionCommand.class.st | 14 +- .../IceTipRemoteActionModel.class.st | 24 ++-- Iceberg-TipUI/IceTipRemoteModel.class.st | 20 +-- .../IceTipRemotesTreeCommand.class.st | 18 +-- .../IceTipRemoveCredentialCommand.class.st | 20 +-- ...emoveFromRepositoryPackageCommand.class.st | 16 ++- ...ceTipRemovePackageDialogPresenter.class.st | 34 ++--- ...ipRemoveRepositoryDialogPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipRepairAction.class.st | 38 +++--- .../IceTipRepairCheckoutBranch.class.st | 20 +-- .../IceTipRepairCheckoutNewBranch.class.st | 20 +-- .../IceTipRepairCloneRepository.class.st | 20 +-- Iceberg-TipUI/IceTipRepairCommand.class.st | 20 +-- .../IceTipRepairCreateSubdirectory.class.st | 20 +-- .../IceTipRepairDiscardAndLoad.class.st | 22 +-- .../IceTipRepairEditRepository.class.st | 20 +-- .../IceTipRepairFetchRemoteBranch.class.st | 22 +-- .../IceTipRepairLocateRepository.class.st | 24 ++-- .../IceTipRepairMergeWithBranch.class.st | 20 +-- Iceberg-TipUI/IceTipRepairProject.class.st | 20 +-- .../IceTipRepairPullRemoteBranch.class.st | 20 +-- ...ipRepairRepositoryDialogPresenter.class.st | 44 +++--- .../IceTipRepositoriesBrowser.class.st | 70 +++++----- .../IceTipRepositoriesModel.class.st | 14 +- .../IceTipRepositoryBrowser.class.st | 46 ++++--- .../IceTipRepositoryCommand.class.st | 20 +-- .../IceTipRepositoryGroupModel.class.st | 22 +-- .../IceTipRepositoryGroupPanel.class.st | 50 +++---- Iceberg-TipUI/IceTipRepositoryModel.class.st | 126 +++++++++--------- .../IceTipRepositoryTypePanel.class.st | 40 +++--- ...TipResetBranchToThisCommitCommand.class.st | 22 +-- .../IceTipRevertChangeCommand.class.st | 18 +-- Iceberg-TipUI/IceTipSaveImageAction.class.st | 10 +- .../IceTipSelectAllPackagesCommand.class.st | 18 +-- .../IceTipSelectPackagesCommand.class.st | 10 +- .../IceTipSelectRemotePresenter.class.st | 32 ++--- Iceberg-TipUI/IceTipSettingsCommand.class.st | 22 +-- Iceberg-TipUI/IceTipSpCommand.class.st | 24 ++-- Iceberg-TipUI/IceTipStandardAction.class.st | 26 ++-- Iceberg-TipUI/IceTipStatusDecorator.class.st | 12 +- .../IceTipStatusDecoratorError.class.st | 12 +- .../IceTipStatusDecoratorWarning.class.st | 10 +- Iceberg-TipUI/IceTipStyleContributor.class.st | 10 +- .../IceTipSwitchAndMergeType.class.st | 10 +- Iceberg-TipUI/IceTipTagDecorator.class.st | 12 +- Iceberg-TipUI/IceTipTagModel.class.st | 18 +-- Iceberg-TipUI/IceTipTextDecorator.class.st | 20 +-- .../IceTipTextDecoratorNone.class.st | 8 +- .../IceTipToolbarButtonStrategy.class.st | 12 +- .../IceTipToolbarPresenterBuilder.class.st | 10 +- Iceberg-TipUI/IceTipTreeBranch.class.st | 10 +- .../IceTipTreeCollapseCommand.class.st | 16 ++- .../IceTipTreeExpandCommand.class.st | 18 +-- Iceberg-TipUI/IceTipTreeGroup.class.st | 34 ++--- Iceberg-TipUI/IceTipTreeItem.class.st | 18 +-- Iceberg-TipUI/IceTipTreeNode.class.st | 40 +++--- Iceberg-TipUI/IceTipTreeRemote.class.st | 10 +- .../IceTipTreeRepositoryGroup.class.st | 8 +- Iceberg-TipUI/IceTipTreeTag.class.st | 10 +- ...eTipUnloadAndRemovePackageCommand.class.st | 18 +-- .../IceTipUnloadPackageCommand.class.st | 18 +-- .../IceTipUnselectAllPackagesCommand.class.st | 18 +-- .../IceTipVersionHistoryBrowser.class.st | 50 +++---- .../IceTipVersionHistoryModel.class.st | 18 +-- Iceberg-TipUI/IceTipVersionModel.class.st | 16 ++- .../IceTipWorkingCopyBrowser.class.st | 62 ++++----- .../IceTipWorkingCopyDiffModel.class.st | 16 ++- Iceberg-TipUI/IceTipWorkingCopyModel.class.st | 36 ++--- ...eTipWorkingCopyStatusBarPresenter.class.st | 20 +-- .../IceTokenCredentials.extension.st | 6 +- Iceberg-TipUI/IceTraitDefinition.extension.st | 4 +- Iceberg-TipUI/IceWarning.class.st | 10 +- Iceberg-TipUI/IceWorkingCopy.extension.st | 4 +- .../LGitCredentialsPlaintext.extension.st | 4 +- Iceberg-TipUI/MCAddition.extension.st | 4 +- Iceberg-TipUI/MCModification.extension.st | 4 +- Iceberg-TipUI/MCPatchOperation.extension.st | 4 +- Iceberg-TipUI/MCRemoval.extension.st | 6 +- Iceberg-TipUI/ManifestIcebergTipUI.class.st | 14 +- Iceberg-TipUI/PharoDarkTheme.extension.st | 6 +- Iceberg-TipUI/PharoShortcuts.extension.st | 4 +- .../SpToolbarButtonPresenter.extension.st | 4 +- Iceberg-TipUI/TIceCopyCommitId.trait.st | 10 +- Iceberg-TipUI/TWithBranchModel.trait.st | 16 ++- Iceberg-TipUI/Text.extension.st | 4 +- .../ToolShortcutsCategory.extension.st | 4 +- Iceberg-TipUI/UITheme.extension.st | 6 +- Iceberg-TipUI/package.st | 2 +- 287 files changed, 3159 insertions(+), 2695 deletions(-) diff --git a/Iceberg-TipUI/Clipboard.extension.st b/Iceberg-TipUI/Clipboard.extension.st index c811d6fe5c..21ac6f2c76 100644 --- a/Iceberg-TipUI/Clipboard.extension.st +++ b/Iceberg-TipUI/Clipboard.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Clipboard } +Extension { #name : 'Clipboard' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } Clipboard class >> clipboardText: aText informing: aString [ UIManager inform: aString. ^ self clipboardText: aText diff --git a/Iceberg-TipUI/CmCommandGroup.extension.st b/Iceberg-TipUI/CmCommandGroup.extension.st index 6f36bc0b04..37988d8338 100644 --- a/Iceberg-TipUI/CmCommandGroup.extension.st +++ b/Iceberg-TipUI/CmCommandGroup.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroup } +Extension { #name : 'CmCommandGroup' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroup >> commandOrGroupNamed: aString ifFound: aBlock [ ^ entries diff --git a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st index 8ef6886348..306bf40201 100644 --- a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st +++ b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroupDecorator } +Extension { #name : 'CmCommandGroupDecorator' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroupDecorator >> commandOrGroupNamed: aString ifFound: aBlock [ ^ self decoratedGroup commandOrGroupNamed: aString ifFound: aBlock diff --git a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st index f356aa3469..b0c6cb73fc 100644 --- a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st +++ b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUICommandDisplayStrategy } +Extension { #name : 'CmUICommandDisplayStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUICommandDisplayStrategy >> ifVisible: aCmSpecCommand do: aBlock [ self subclassResponsibility diff --git a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st index 7f1636c79c..a9fb4ab426 100644 --- a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIDisableWhenCantBeRun } +Extension { #name : 'CmUIDisableWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIDisableWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Always visible" diff --git a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st index ff2501af9c..aad5f38218 100644 --- a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIHideWhenCantBeRun } +Extension { #name : 'CmUIHideWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIHideWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Visible if #canBeExecuted" diff --git a/Iceberg-TipUI/FTBasicItem.extension.st b/Iceberg-TipUI/FTBasicItem.extension.st index 889a7a7367..d4e904d427 100644 --- a/Iceberg-TipUI/FTBasicItem.extension.st +++ b/Iceberg-TipUI/FTBasicItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTBasicItem } +Extension { #name : 'FTBasicItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTBasicItem >> toggle [ self isExpanded ifTrue: [ self collapseAndRefresh ] diff --git a/Iceberg-TipUI/FTRootItem.extension.st b/Iceberg-TipUI/FTRootItem.extension.st index 95874a9068..7aa97b2e24 100644 --- a/Iceberg-TipUI/FTRootItem.extension.st +++ b/Iceberg-TipUI/FTRootItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTRootItem } +Extension { #name : 'FTRootItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTRootItem >> isRoot [ ^ true ] diff --git a/Iceberg-TipUI/FTTableMorph.extension.st b/Iceberg-TipUI/FTTableMorph.extension.st index b5f26040a5..9d329d59d1 100644 --- a/Iceberg-TipUI/FTTableMorph.extension.st +++ b/Iceberg-TipUI/FTTableMorph.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTableMorph } +Extension { #name : 'FTTableMorph' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> selectFirstVisibleRow [ ^ self selectIndex: @@ -9,7 +9,7 @@ FTTableMorph >> selectFirstVisibleRow [ ifEmpty: [ 0 ]) ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> useFunction: aFilterFunctionClass do: aBlock [ function := aFilterFunctionClass table: self. aBlock cull: function cull: self diff --git a/Iceberg-TipUI/FTTreeItem.extension.st b/Iceberg-TipUI/FTTreeItem.extension.st index 252972c9d7..9f7286ecfd 100644 --- a/Iceberg-TipUI/FTTreeItem.extension.st +++ b/Iceberg-TipUI/FTTreeItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTreeItem } +Extension { #name : 'FTTreeItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTreeItem >> isRoot [ ^ false ] diff --git a/Iceberg-TipUI/IceAbstractCredentials.extension.st b/Iceberg-TipUI/IceAbstractCredentials.extension.st index 533cab5b40..c305485223 100644 --- a/Iceberg-TipUI/IceAbstractCredentials.extension.st +++ b/Iceberg-TipUI/IceAbstractCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceAbstractCredentials } +Extension { #name : 'IceAbstractCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> askForModelClass [ ^ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> editModelClass [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceAddition.extension.st b/Iceberg-TipUI/IceAddition.extension.st index 37dc983ddf..c38ab65190 100644 --- a/Iceberg-TipUI/IceAddition.extension.st +++ b/Iceberg-TipUI/IceAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceAddition } +Extension { #name : 'IceAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAddition >> icon [ ^ self iconNamed: #changeAdd diff --git a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st index 0771c4e508..d26a6bad1f 100644 --- a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAllPackages } +Extension { #name : 'IceCheckoutAllPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAllPackages class >> description [ ^ 'Checkout ALL packages in the repository' ] diff --git a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st index e08c84d409..5b4216bc8f 100644 --- a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAlreadyLoadedPackages } +Extension { #name : 'IceCheckoutAlreadyLoadedPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAlreadyLoadedPackages class >> description [ ^ 'Checkout packages ALREADY LOADED in the image' ] diff --git a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st index 0a9c967d0c..67ec10aa6a 100644 --- a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutDoNotLoadPackages } +Extension { #name : 'IceCheckoutDoNotLoadPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutDoNotLoadPackages class >> description [ ^ 'DO NOT CHECKOUT any packages, I will load them manually (for experts only)' ] diff --git a/Iceberg-TipUI/IceCheckoutStrategy.extension.st b/Iceberg-TipUI/IceCheckoutStrategy.extension.st index 51de95c72f..ac78658726 100644 --- a/Iceberg-TipUI/IceCheckoutStrategy.extension.st +++ b/Iceberg-TipUI/IceCheckoutStrategy.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceCheckoutStrategy } +Extension { #name : 'IceCheckoutStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy >> description [ ^ self class description ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy class >> description [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceClassDefinition.extension.st b/Iceberg-TipUI/IceClassDefinition.extension.st index e5be73baae..857e7aae8c 100644 --- a/Iceberg-TipUI/IceClassDefinition.extension.st +++ b/Iceberg-TipUI/IceClassDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceClassDefinition } +Extension { #name : 'IceClassDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceClassDefinition >> icon [ ^ self iconNamed: #class ] diff --git a/Iceberg-TipUI/IceConflictingOperation.extension.st b/Iceberg-TipUI/IceConflictingOperation.extension.st index 2a2670af63..fd38d1af90 100644 --- a/Iceberg-TipUI/IceConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceConflictingOperation.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceConflictingOperation } +Extension { #name : 'IceConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> operationIcon [ ^ self iconNamed: #changeUpdate ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceCreateBranchCommand.class.st b/Iceberg-TipUI/IceCreateBranchCommand.class.st index 67b297b6be..decf79bec0 100644 --- a/Iceberg-TipUI/IceCreateBranchCommand.class.st +++ b/Iceberg-TipUI/IceCreateBranchCommand.class.st @@ -3,12 +3,14 @@ I'm a command to create a new branch from a commit. this is usefull in the case of commiting changes in unsync repositories (so you open a branch and you commit there) " Class { - #name : #IceCreateBranchCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceCreateBranchCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceCreateBranchCommand >> execute [ | selection | diff --git a/Iceberg-TipUI/IceDefinition.extension.st b/Iceberg-TipUI/IceDefinition.extension.st index 8b2c9bdb7d..c453e2a0df 100644 --- a/Iceberg-TipUI/IceDefinition.extension.st +++ b/Iceberg-TipUI/IceDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDefinition } +Extension { #name : 'IceDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDefinition >> icon [ self subclassResponsibility diff --git a/Iceberg-TipUI/IceDirectoryDefinition.extension.st b/Iceberg-TipUI/IceDirectoryDefinition.extension.st index e16b919e0d..7ad08d0c15 100644 --- a/Iceberg-TipUI/IceDirectoryDefinition.extension.st +++ b/Iceberg-TipUI/IceDirectoryDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDirectoryDefinition } +Extension { #name : 'IceDirectoryDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDirectoryDefinition >> icon [ ^ self iconNamed: #emptyPackage ] diff --git a/Iceberg-TipUI/IceErrorVisitor.extension.st b/Iceberg-TipUI/IceErrorVisitor.extension.st index a0d887b790..baf0ab6cc2 100644 --- a/Iceberg-TipUI/IceErrorVisitor.extension.st +++ b/Iceberg-TipUI/IceErrorVisitor.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceErrorVisitor } +Extension { #name : 'IceErrorVisitor' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitExperimentalFeature: aWarning [ "By default experimental features are just accepted when we are not in an interactive mode". aWarning resume ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitNoCommitMessage: aWarning [ self visitGenericError: aWarning ] diff --git a/Iceberg-TipUI/IceExperimentalFeature.class.st b/Iceberg-TipUI/IceExperimentalFeature.class.st index ddcaf03e3a..db10719754 100644 --- a/Iceberg-TipUI/IceExperimentalFeature.class.st +++ b/Iceberg-TipUI/IceExperimentalFeature.class.st @@ -4,12 +4,14 @@ Everytime an user tries to use an experimental feature, maybe the UI want to sho This is useful to guarantee the correct keeping of the changes. " Class { - #name : #IceExperimentalFeature, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceExperimentalFeature', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceExperimentalFeature >> acceptError: aVisitor [ aVisitor visitExperimentalFeature: self diff --git a/Iceberg-TipUI/IceExtensionDefinition.extension.st b/Iceberg-TipUI/IceExtensionDefinition.extension.st index 25018c3c79..f16ab89a3f 100644 --- a/Iceberg-TipUI/IceExtensionDefinition.extension.st +++ b/Iceberg-TipUI/IceExtensionDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceExtensionDefinition } +Extension { #name : 'IceExtensionDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceExtensionDefinition >> icon [ ^ self iconNamed: #group ] diff --git a/Iceberg-TipUI/IceFileDefinition.extension.st b/Iceberg-TipUI/IceFileDefinition.extension.st index ec7f3d821f..9ada4d36b9 100644 --- a/Iceberg-TipUI/IceFileDefinition.extension.st +++ b/Iceberg-TipUI/IceFileDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceFileDefinition } +Extension { #name : 'IceFileDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileDefinition >> icon [ ^ self iconNamed: #book ] diff --git a/Iceberg-TipUI/IceFileSystemDefinition.extension.st b/Iceberg-TipUI/IceFileSystemDefinition.extension.st index 6d556411dc..5c26a26b36 100644 --- a/Iceberg-TipUI/IceFileSystemDefinition.extension.st +++ b/Iceberg-TipUI/IceFileSystemDefinition.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceFileSystemDefinition } +Extension { #name : 'IceFileSystemDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBeBrowsed [ "It can always be browsed through the libgit file system" ^ true ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBrowseReferences [ "We do not track file references..." diff --git a/Iceberg-TipUI/IceMergeListWrapper.class.st b/Iceberg-TipUI/IceMergeListWrapper.class.st index e8fb3896b2..3c7447bcfb 100644 --- a/Iceberg-TipUI/IceMergeListWrapper.class.st +++ b/Iceberg-TipUI/IceMergeListWrapper.class.st @@ -2,67 +2,69 @@ I am a morphic list wrapper that wraps iceberg diff tree nodes (potentially with conflicts) " Class { - #name : #IceMergeListWrapper, - #superclass : #ListItemWrapper, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceMergeListWrapper', + #superclass : 'ListItemWrapper', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> = aWrapper [ ^ self item = aWrapper item ] -{ #category : #'morphic-compatibility' } +{ #category : 'morphic-compatibility' } IceMergeListWrapper >> actualClass [ ^ self item value actualClass ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> asString [ ^item value description ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseLocal [ ^ item value selectRight ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseRemote [ ^ item value selectLeft ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> contents [ "Answer the contents of the change from the model." ^ item children collect: [ :each | IceMergeListWrapper with: each model: model ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> hash [ ^ self item hash ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> icon [ ^ item value icon ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> isConflict [ ^ item value isConflict ] -{ #category : #accessing } +{ #category : 'accessing' } IceMergeListWrapper >> preferredColor [ ^ self item value preferredColor diff --git a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st index fd1a3b7e5d..bc9b7f4006 100644 --- a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st +++ b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st @@ -2,12 +2,14 @@ I'm a command to perform a merge of current image sources with head commit. " Class { - #name : #IceMergeWorkingCopyCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceMergeWorkingCopyCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceMergeWorkingCopyCommand >> execute [ | commit | commit := self repository headCommit. diff --git a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st index bed0c4d10d..a8a94cb0b3 100644 --- a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceMethodContainerDefinition } +Extension { #name : 'IceMethodContainerDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> actualClass [ | actualClass | @@ -8,7 +8,7 @@ IceMethodContainerDefinition >> actualClass [ ^ isMeta ifTrue: [ actualClass classSide ] ifFalse: [ actualClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> browse [ | browsed | @@ -17,13 +17,13 @@ IceMethodContainerDefinition >> browse [ browsed browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBeBrowsed [ ^ Smalltalk globals includesKey: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBrowseReferences [ ^ self canBeBrowsed diff --git a/Iceberg-TipUI/IceMethodDefinition.extension.st b/Iceberg-TipUI/IceMethodDefinition.extension.st index 7f8cee63e9..48b2d71867 100644 --- a/Iceberg-TipUI/IceMethodDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodDefinition.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceMethodDefinition } +Extension { #name : 'IceMethodDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> browse [ (self contextClass >> name) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBeBrowsed [ ^ self contextClass @@ -14,13 +14,13 @@ IceMethodDefinition >> canBeBrowsed [ ifNil: [ false ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceModification.extension.st b/Iceberg-TipUI/IceModification.extension.st index 9ecdccb45c..91a3649b5f 100644 --- a/Iceberg-TipUI/IceModification.extension.st +++ b/Iceberg-TipUI/IceModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceModification } +Extension { #name : 'IceModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceModification >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceNoCommitMessage.class.st b/Iceberg-TipUI/IceNoCommitMessage.class.st index 01e8ce6729..7f5ba3de28 100644 --- a/Iceberg-TipUI/IceNoCommitMessage.class.st +++ b/Iceberg-TipUI/IceNoCommitMessage.class.st @@ -3,23 +3,25 @@ I indicate when a commit will be performed without a message comment. This is usually possible, but bad, very bad. Do not do it. " Class { - #name : #IceNoCommitMessage, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceNoCommitMessage', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage class >> defaultMessageText [ ^ 'You are trying to commit without a message! When this is possible, is not a good practice.' ] -{ #category : #visiting } +{ #category : 'visiting' } IceNoCommitMessage >> acceptError: aVisitor [ aVisitor visitNoCommitMessage: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage >> messageText [ ^ messageText ifNil: [ self class defaultMessageText ] ] diff --git a/Iceberg-TipUI/IceNoModification.extension.st b/Iceberg-TipUI/IceNoModification.extension.st index c57e45a902..a49e299b2a 100644 --- a/Iceberg-TipUI/IceNoModification.extension.st +++ b/Iceberg-TipUI/IceNoModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNoModification } +Extension { #name : 'IceNoModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNoModification >> icon [ ^ definition icon diff --git a/Iceberg-TipUI/IceNode.extension.st b/Iceberg-TipUI/IceNode.extension.st index d269a8d67e..cfba09c027 100644 --- a/Iceberg-TipUI/IceNode.extension.st +++ b/Iceberg-TipUI/IceNode.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNode } +Extension { #name : 'IceNode' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNode >> inspectorItems [ diff --git a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st index 790c80f427..a9a5fe9c83 100644 --- a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st +++ b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st @@ -3,47 +3,49 @@ I am a IceNode (containing an IceOperationMerge) visitor meant to update a SpCod with the highlighted code. " Class { - #name : #IceNodeCodeDisplayVisitor, - #superclass : #Object, + #name : 'IceNodeCodeDisplayVisitor', + #superclass : 'Object', #instVars : [ 'codePresenter' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNodeCodeDisplayVisitor class >> onCodePresenter: aSpCodePresenter [ ^ self new codePresenter: aSpCodePresenter ; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter [ ^ codePresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter: aSpCodePresenter [ codePresenter := aSpCodePresenter ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitClassDefinition: anIceClassDefinition [ codePresenter text: anIceClassDefinition contents. codePresenter behavior: nil ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitConflictingOperation: anIceConflictingOperation [ anIceConflictingOperation chosenOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ codePresenter @@ -53,13 +55,13 @@ IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ UndefinedObject ]) ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitPackage: anIcePackageDefinition [ codePresenter diff --git a/Iceberg-TipUI/IceNonConflictingOperation.extension.st b/Iceberg-TipUI/IceNonConflictingOperation.extension.st index a9d80139e9..e1735a623d 100644 --- a/Iceberg-TipUI/IceNonConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceNonConflictingOperation.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceNonConflictingOperation } +Extension { #name : 'IceNonConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> operationIcon [ ^ operation icon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceOperation.extension.st b/Iceberg-TipUI/IceOperation.extension.st index e247689488..bafe10e4da 100644 --- a/Iceberg-TipUI/IceOperation.extension.st +++ b/Iceberg-TipUI/IceOperation.extension.st @@ -1,30 +1,30 @@ -Extension { #name : #IceOperation } +Extension { #name : 'IceOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> browse [ ^ self leftDefinition browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBeBrowsed [ ^ self leftDefinition canBeBrowsed ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> icon [ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> preferredColor [ "Use the default color" diff --git a/Iceberg-TipUI/IceOperationMerge.extension.st b/Iceberg-TipUI/IceOperationMerge.extension.st index 8d9566c0cb..fa98848b61 100644 --- a/Iceberg-TipUI/IceOperationMerge.extension.st +++ b/Iceberg-TipUI/IceOperationMerge.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceOperationMerge } +Extension { #name : 'IceOperationMerge' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> icon [ self isRightChosen ifTrue: [ ^ self iconNamed: #changeBlock ]. @@ -9,7 +9,7 @@ IceOperationMerge >> icon [ ^ self operationIcon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> operationIcon [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IcePackage.extension.st b/Iceberg-TipUI/IcePackage.extension.st index b932cb71e4..d205ceaf37 100644 --- a/Iceberg-TipUI/IcePackage.extension.st +++ b/Iceberg-TipUI/IcePackage.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePackage } +Extension { #name : 'IcePackage' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackage >> browse [ (RPackageOrganizer default packageNamed: self name) browse diff --git a/Iceberg-TipUI/IcePackageDefinition.extension.st b/Iceberg-TipUI/IcePackageDefinition.extension.st index 4839af1d7a..36f9b23914 100644 --- a/Iceberg-TipUI/IcePackageDefinition.extension.st +++ b/Iceberg-TipUI/IcePackageDefinition.extension.st @@ -1,25 +1,25 @@ -Extension { #name : #IcePackageDefinition } +Extension { #name : 'IcePackageDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> browse [ "Open a browser on the package, if it exists." (self packageOrganizer packageNamed: name ifAbsent: [ ^ self ]) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBeBrowsed [ ^ self packageOrganizer hasPackage: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> icon [ ^ self iconNamed: #package ] diff --git a/Iceberg-TipUI/IcePlaintextCredentials.extension.st b/Iceberg-TipUI/IcePlaintextCredentials.extension.st index 2280cbb78b..77fc415434 100644 --- a/Iceberg-TipUI/IcePlaintextCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IcePlaintextCredentials } +Extension { #name : 'IcePlaintextCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClass [ ^ IceTipAskForPlaintextCredentialsPresenter ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClassOn: aString [ ^ (aString includesSubstring: 'github.com' caseSensitive: false) @@ -13,7 +13,7 @@ IcePlaintextCredentials >> askForModelClassOn: aString [ ifFalse: [ self askForModelClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> editModelClass [ ^ IceTipEditPlaintextCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st index c69cf7dd5e..01215e50ad 100644 --- a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextOtpCredentials } +Extension { #name : 'IcePlaintextOtpCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextOtpCredentials >> askForModelClass [ ^ IceTipAskForPlaintextOtpCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePullRemoteCommand.class.st b/Iceberg-TipUI/IcePullRemoteCommand.class.st index 35ba209da8..92f9253947 100644 --- a/Iceberg-TipUI/IcePullRemoteCommand.class.st +++ b/Iceberg-TipUI/IcePullRemoteCommand.class.st @@ -2,27 +2,29 @@ I'm a command to perform a pull from a remote. " Class { - #name : #IcePullRemoteCommand, - #superclass : #IceRepositoryCommand, + #name : 'IcePullRemoteCommand', + #superclass : 'IceRepositoryCommand', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IcePullRemoteCommand >> execute [ self repository branch pullFrom: self remote. self beSuccess ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote: anObject [ remote := anObject ] diff --git a/Iceberg-TipUI/IceRemoval.extension.st b/Iceberg-TipUI/IceRemoval.extension.st index fb9aaa8acc..9887f589e2 100644 --- a/Iceberg-TipUI/IceRemoval.extension.st +++ b/Iceberg-TipUI/IceRemoval.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRemoval } +Extension { #name : 'IceRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRemoval >> icon [ ^ self iconNamed: #changeRemove diff --git a/Iceberg-TipUI/IceRepository.extension.st b/Iceberg-TipUI/IceRepository.extension.st index ce7f0e2d32..17235036b4 100644 --- a/Iceberg-TipUI/IceRepository.extension.st +++ b/Iceberg-TipUI/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRepository >> inspectorItems [ diff --git a/Iceberg-TipUI/IceRepositoryCommand.class.st b/Iceberg-TipUI/IceRepositoryCommand.class.st index 1c769a782e..0e64b96592 100644 --- a/Iceberg-TipUI/IceRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceRepositoryCommand.class.st @@ -2,56 +2,58 @@ I'm a generic command for iceberg repositories. " Class { - #name : #IceRepositoryCommand, - #superclass : #Object, + #name : 'IceRepositoryCommand', + #superclass : 'Object', #instVars : [ 'repository', 'success', 'context' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand class >> isAbstract [ ^ self == IceRepositoryCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> beSuccess [ success := true ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> execute [ self subclassResponsibility ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> executeWithContext: aContext [ context := aContext. self execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCommand >> initialize [ super initialize. success := false ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand >> isSuccess [ ^ success ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceSavedPackageVersion.extension.st b/Iceberg-TipUI/IceSavedPackageVersion.extension.st index b699275f27..66160db0c5 100644 --- a/Iceberg-TipUI/IceSavedPackageVersion.extension.st +++ b/Iceberg-TipUI/IceSavedPackageVersion.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceSavedPackageVersion } +Extension { #name : 'IceSavedPackageVersion' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSavedPackageVersion >> description [ ^ self commit description ] diff --git a/Iceberg-TipUI/IceSortingStrategy.class.st b/Iceberg-TipUI/IceSortingStrategy.class.st index 45945aeaaa..0c9b0ea815 100644 --- a/Iceberg-TipUI/IceSortingStrategy.class.st +++ b/Iceberg-TipUI/IceSortingStrategy.class.st @@ -15,26 +15,28 @@ Internal Representation and Key Implementation Points. last: Represent the entities to display last. " Class { - #name : #IceSortingStrategy, - #superclass : #Object, + #name : 'IceSortingStrategy', + #superclass : 'Object', #instVars : [ 'first', 'last' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy class >> possibleValues [ ^ #(#none #modified #notLoaded) ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first [ ^ first ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first: anObject [ first := anObject. @@ -42,19 +44,19 @@ IceSortingStrategy >> first: anObject [ ifTrue: [ self last: #none ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceSortingStrategy >> initialize [ super initialize. first := #modified. last := #notLoaded ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last [ ^ last ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last: anObject [ last := anObject. @@ -62,7 +64,7 @@ IceSortingStrategy >> last: anObject [ ifTrue: [ self first: #none ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ aSymbol = #modified ifTrue: [ ^ aCollection select: #isModified ]. @@ -71,7 +73,7 @@ IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ self error: 'This sorting is not accepted: ' , aSymbol ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sort: aListOfPackages [ | result packages lasts | packages := aListOfPackages. @@ -85,12 +87,12 @@ IceSortingStrategy >> sort: aListOfPackages [ ^ result ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sortByName: aCollection [ ^ aCollection sorted: #packageName ascending ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> withOthers: aSymbol [ self first = aSymbol ifTrue: [ self first: nil ]. self last = aSymbol ifTrue: [ self last: nil ] diff --git a/Iceberg-TipUI/IceSshCredentials.extension.st b/Iceberg-TipUI/IceSshCredentials.extension.st index e3ad3fed5c..6c5858fbf7 100644 --- a/Iceberg-TipUI/IceSshCredentials.extension.st +++ b/Iceberg-TipUI/IceSshCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceSshCredentials } +Extension { #name : 'IceSshCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> editModelClass [ ^ IceTipEditSSHCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st index 0c1558c81a..1d47f72c91 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st @@ -2,24 +2,26 @@ I am the common class of all the commands over an specific credential. " Class { - #name : #IceTipAbstractCredentialCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> credential [ ^ self item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> store [ ^ self context model diff --git a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st index fdb3e9165c..1742f97fae 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st @@ -2,30 +2,32 @@ I am the abstract class of all the general commands in the credentials list. " Class { - #name : #IceTipAbstractCredentialStoreCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialStoreCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialStoreCommand ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialStoreCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAbstractCredentialStoreCommand >> store [ ^ self context store diff --git a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st index ec0f14565a..ff95d0bfdc 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st @@ -5,8 +5,8 @@ to ask / add / edit credentials. There are subclasses to each of the actions and the types of keys. " Class { - #name : #IceTipAbstractCredentialsPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAbstractCredentialsPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'storeCheckbox', 'credentialStore', @@ -15,10 +15,12 @@ Class { 'credentials', 'askingHostname' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAddAction [ credentials := self newCredentials. @@ -31,7 +33,7 @@ IceTipAbstractCredentialsPresenter >> acceptAddAction [ tool refresh ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAskAction [ credentials := self newCredentials. @@ -45,7 +47,7 @@ IceTipAbstractCredentialsPresenter >> acceptAskAction [ ^ credentials ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptEditAction [ self refreshCredentialsFromPresenter. @@ -55,19 +57,19 @@ IceTipAbstractCredentialsPresenter >> acceptEditAction [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> askingHostname: aString [ askingHostname := aString ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAction [ "Action to execute on cancel." ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAskAction [ accepted := true. @@ -75,43 +77,43 @@ IceTipAbstractCredentialsPresenter >> cancelAskAction [ LGitNoCredentialsProvided signal ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> closeAction [ accepted ifFalse: [ self cancelAction ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentialStore: aStore [ credentialStore := aStore ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials: anIceCredentials [ credentials := anIceCredentials. self refreshPresenterFromCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> hostnameFromInput [ "Answer the remoote hostname for the credentials." ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initialize [ super initialize. accepted := false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPresenter [ super initializeDialogWindow: aDialogWindowPresenter. @@ -121,7 +123,7 @@ IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPrese ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initializePresenters [ storeCheckbox := self newCheckBox @@ -131,27 +133,27 @@ IceTipAbstractCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> isOkEnabled [ "Determite if the user should be enabled to press on the accept button." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> newCredentials [ "Answer a new instance of the credentials using the form inputs." ^ self subclassResponsibility ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> okButton [ ^ self window buttons first ] -{ #category : #'API - opening' } +{ #category : 'API - opening' } IceTipAbstractCredentialsPresenter >> open [ self openModal. @@ -159,36 +161,36 @@ IceTipAbstractCredentialsPresenter >> open [ ^ self credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshCredentialsFromPresenter [ "Hook to update the credentials object from the presenter inputs." ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshPresenterFromCredentials [ "Hook to update the presenter input fields from the credentials object." ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> shouldStoreCredentials [ ^ storeCheckbox state ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> storeCheckbox [ ^ storeCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> tool: aBrowser [ "Set the tool that triggered this dialog, and therefore might need a #refresh after the users accepts the dialog and it produces an effect on the system." tool := aBrowser ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> updateOkButton [ self window ifNil: [ ^ self ]. diff --git a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st index 24f88809b7..654595d3ee 100644 --- a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st @@ -3,18 +3,20 @@ I implement the basic behavior of all the plaintext credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameLabel', 'usernameInput', 'passwordLabel', 'passwordInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractPlaintextCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self password isNotEmpty ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ ^ IcePlaintextCredentials new @@ -47,31 +49,31 @@ IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> password [ ^ passwordInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> passwordInput [ ^ passwordInput ] -{ #category : #private } +{ #category : 'private' } IceTipAbstractPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Password:' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> username [ ^ usernameInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> usernameInput [ ^ usernameInput diff --git a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st index d0f96fe3b3..4b529092fd 100644 --- a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st @@ -3,8 +3,8 @@ I implement the basic behavior of all the ssh credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractSSHCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractSSHCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameInput', 'usernameLabel', @@ -15,10 +15,12 @@ Class { 'publicKeyLabel', 'privateKeyLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -56,20 +58,20 @@ IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractSSHCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self publicKey isNotEmpty and: [ self privateKey isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> passphrase [ ^ passphraseInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> privateKey [ ^ privateKeyInput location @@ -77,7 +79,7 @@ IceTipAbstractSSHCredentialsPresenter >> privateKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> publicKey [ ^ publicKeyInput location @@ -85,7 +87,7 @@ IceTipAbstractSSHCredentialsPresenter >> publicKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> username [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAction.class.st b/Iceberg-TipUI/IceTipAction.class.st index c062c89d67..7f2a1337db 100644 --- a/Iceberg-TipUI/IceTipAction.class.st +++ b/Iceberg-TipUI/IceTipAction.class.st @@ -2,41 +2,43 @@ I'm like a lightweight command, used in general for apply concrete actions. " Class { - #name : #IceTipAction, - #superclass : #Object, + #name : 'IceTipAction', + #superclass : 'Object', #instVars : [ 'context', 'repository', 'successBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipAction class >> isAbstract [ ^ self == IceTipAction ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> basicExecute [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context: aContext [ context := aContext ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> execute [ | result | @@ -48,19 +50,19 @@ IceTipAction >> execute [ ^ result. ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> executeWithContext: aContext [ self context: aContext. ^ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> finishSuccess [ successBlock ifNotNil: [ successBlock value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> onSuccess: aBlock [ "Some actions need to execute something right after finish. Like a refresh of panels, etc. If a block is defined here, it will be evaluated right after the command is executed, if @@ -68,17 +70,17 @@ IceTipAction >> onSuccess: aBlock [ successBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository: anObject [ repository := anObject ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> withErrorHandlingDo: aBlock [ aBlock on: IceError, IceWarning diff --git a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st index 5604783f88..cb70097b35 100644 --- a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st @@ -2,8 +2,8 @@ I am an small dialog to ask the user to select new packages to load. New packages are packages in the commit but not in the image. " Class { - #name : #IceTipAddNewPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddNewPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'packagesList', 'selectedPackages', @@ -12,10 +12,12 @@ Class { 'checkoutModel', 'checkoutPreviewWindow' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterInstance forRoot: rootCommandGroup [ rootCommandGroup register: @@ -25,7 +27,7 @@ IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterIn yourself) ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddNewPackagesDialogPresenter >> accept [ | selectedPackageNames | @@ -42,19 +44,19 @@ IceTipAddNewPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutModel: anIceTipCheckoutModel [ checkoutModel := anIceTipCheckoutModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutPreviewWindow: anIceTipCheckoutPreviewBrowser [ checkoutPreviewWindow := anIceTipCheckoutPreviewBrowser ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddNewPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -63,13 +65,13 @@ IceTipAddNewPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ packagesList @@ -90,7 +92,7 @@ IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ contextMenu: [ (self rootCommandsGroup / 'package list commands') beRoot asMenuPresenter ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -108,49 +110,49 @@ Please select the packages if you wish to load them in the image'. self initializePackagesList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddNewPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages [ ^ selectedPackages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages: anObject [ selectedPackages := anObject ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipAddNewPackagesDialogPresenter >> setModelBeforeInitialization: somePackages [ packages := somePackages ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> titleForWindow [ ^ 'Select New Packages to Load'. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> updatePresenter [ packagesList items: packages ] -{ #category : #validation } +{ #category : 'validation' } IceTipAddNewPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPackageCommand.class.st b/Iceberg-TipUI/IceTipAddPackageCommand.class.st index b426fd154f..abb62edab1 100644 --- a/Iceberg-TipUI/IceTipAddPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPackageCommand.class.st @@ -2,24 +2,26 @@ Command that opens a dialog to add a/many package/s into the selected repository. " Class { - #name : #IceTipAddPackageCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddPackageCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultDescription [ ^ 'Adds an existing package to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultName [ ^ 'Add package' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPackageCommand >> execute [ (IceTipAddPackagesDialogPresenter @@ -30,19 +32,19 @@ IceTipAddPackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPackageCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st index 94800447f8..4b476f9977 100644 --- a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st @@ -2,18 +2,20 @@ I'm a dialog to add packages to a repository. " Class { - #name : #IceTipAddPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'packagesList', 'packageNameText', 'selectedPackages' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddPackagesDialogPresenter >> accept [ "ensure window goes away (in case accept comes from a keybinding and not the ok button)" @@ -25,7 +27,7 @@ IceTipAddPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackages [ ^ RPackageOrganizer default packages @@ -33,7 +35,7 @@ IceTipAddPackagesDialogPresenter >> allPackages [ sort: [ :a :b | a name < b name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ | currentPackagesNames | @@ -42,7 +44,7 @@ IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ currentPackagesNames includes: rPackage name ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,13 +53,13 @@ IceTipAddPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackageNameText [ packageNameText @@ -66,7 +68,7 @@ IceTipAddPackagesDialogPresenter >> initializePackageNameText [ whenTextChangedDo: [ :text | self refresh ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackagesList [ packagesList addColumn: (SpCompositeTableColumn new @@ -86,7 +88,7 @@ IceTipAddPackagesDialogPresenter >> initializePackagesList [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -97,32 +99,32 @@ IceTipAddPackagesDialogPresenter >> initializePresenters [ self initializePackageNameText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model: anObject [ model := anObject. self refresh ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packageNameText [ ^ packageNameText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> refresh [ packagesList items: (packageNameText text @@ -135,31 +137,31 @@ IceTipAddPackagesDialogPresenter >> refresh [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> titleForWindow [ ^ 'Add packages' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> updatePresenter [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st index ff725f569e..0bda874a9b 100644 --- a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st @@ -2,22 +2,24 @@ I create a new plaintext credential on the credential store. " Class { - #name : #IceTipAddPlainTextCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddPlainTextCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultDescription [ ^ 'Add a new plain text credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultName [ ^ 'Plain Text' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPlainTextCredentialCommand >> execute [ ((IceTipAddPlaintextCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st index 34e65aa27d..9d957b8259 100644 --- a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add plaintext credentials. " Class { - #name : #IceTipAddPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, + #name : 'IceTipAddPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -30,20 +32,20 @@ IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPlaintextCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -54,13 +56,13 @@ IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> isOkEnabled [ ^ super isOkEnabled and: [ self hostnameFromInput isNotEmpty ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Add new Plain Text Credential' diff --git a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st index 9664e8295b..4cf7dfdbe0 100644 --- a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st @@ -2,31 +2,33 @@ Command that opens a dialog to add a remote to a repository. " Class { - #name : #IceTipAddRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultDescription [ ^ 'Adds a remote to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultName [ ^ 'Add remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> canBeExecuted [ "Any repository can have more remotes." ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRemoteCommand >> execute [ (IceTipAddRemoteDialogPresenter @@ -37,13 +39,13 @@ IceTipAddRemoteCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st index a7e1f9eb46..a5964fae34 100644 --- a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog to add remotes to a repository. " Class { - #name : #IceTipAddRemoteDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddRemoteDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'nameLabel', @@ -12,10 +12,12 @@ Class { 'nameText', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> accept [ self validate. @@ -27,7 +29,7 @@ IceTipAddRemoteDialogPresenter >> accept [ ^ acceptBlock ifNotNil: [ acceptBlock cull: self remoteName ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddRemoteDialogPresenter >> defaultLayout [ ^ SpGridLayout new @@ -41,7 +43,7 @@ IceTipAddRemoteDialogPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -51,7 +53,7 @@ IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -70,73 +72,73 @@ IceTipAddRemoteDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameText [ ^ nameText ] -{ #category : #events } +{ #category : 'events' } IceTipAddRemoteDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteName [ ^ self nameText text trimmed ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteUrl [ ^ self urlText text trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> titleForWindow [ ^ 'Add remote' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlLabel [ ^ urlLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlText [ ^ urlText ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st index 0aa7d9688d..0ac4f307df 100644 --- a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st @@ -3,31 +3,33 @@ I register Iceberg projects. I will open a dialog to take the new possible repository (from available options) and I will register it into the IceRepository>>#registry list. " Class { - #name : #IceTipAddRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultDescription [ ^ 'Add a repository (new, local, cloned) to your managed repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultName [ ^ 'Add' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRepositoryCommand >> execute [ (IceTipRegisterRepositoryDialogPresenter newApplication: context application) @@ -36,19 +38,19 @@ IceTipAddRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st index 57f671869e..0d5ea539bb 100644 --- a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add SSH credentials. " Class { - #name : #IceTipAddSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, + #name : 'IceTipAddSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddSSHCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -31,20 +33,20 @@ IceTipAddSSHCredentialsPresenter >> defaultLayout [ add: passphraseLabel; add: passphraseInput; nextRow ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 7 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -57,7 +59,7 @@ IceTipAddSSHCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> newCredentials [ ^ IceSshCredentials new @@ -68,7 +70,7 @@ IceTipAddSSHCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> titleForWindow [ ^ 'Add SSH credential' diff --git a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st index db86f547fd..49a17d55b3 100644 --- a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st @@ -2,22 +2,24 @@ I add a new IceSshCredentials to the store " Class { - #name : #IceTipAddSshCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddSshCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultDescription [ ^ 'Add a SSH pair of credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultName [ ^ 'SSH Pair' ] -{ #category : #execution } +{ #category : 'execution' } IceTipAddSshCredentialCommand >> execute [ ((IceTipAddSSHCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st index a1570d8283..6d47533e52 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipAddTokenCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddTokenCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultDescription [ ^ 'Add a new token credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultName [ ^ 'Token' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddTokenCredentialCommand >> execute [ ((IceTipAddTokenCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st index e6b33e71f7..c4931d633d 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st @@ -2,8 +2,8 @@ I am a dialog to add token credentials. " Class { - #name : #IceTipAddTokenCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAddTokenCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'hostInput', 'tokenInput', @@ -12,16 +12,18 @@ Class { 'usernameInput', 'usernameLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddTokenCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -36,19 +38,19 @@ IceTipAddTokenCredentialsPresenter >> defaultLayout [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -80,7 +82,7 @@ IceTipAddTokenCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddTokenCredentialsPresenter >> isOkEnabled [ ^ self usernameFromInput isNotEmpty and: [ @@ -88,7 +90,7 @@ IceTipAddTokenCredentialsPresenter >> isOkEnabled [ self tokenFromInput isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> newCredentials [ ^ IceTokenCredentials new @@ -98,19 +100,19 @@ IceTipAddTokenCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> titleForWindow [ ^ 'Add token credentials' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> tokenFromInput [ ^ tokenInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> usernameFromInput [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st index 7942ae2db3..f6c3ef79f8 100644 --- a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st @@ -5,37 +5,39 @@ I won't modify the loaded code, but will calculate the differences between the loaded packages and the new commit, to mark packages as dirty. " Class { - #name : #IceTipAdoptCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAdoptCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAdoptCommitCommand class >> defaultDescription [ ^ 'Sets this commit as the commit of your working copy. It will not modify your loaded code, but it will calculate the differences between your loaded packages and the the new commit to mark packages as dirty.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> defaultNameFromContext [ ^ 'Adopt commit ' , self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipAdoptCommitCommand >> execute [ self selectedCommitish adopt. Iceberg announcer announce: (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> iconName [ ^ #recoverLostChanges ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAdoptCommitCommand >> name [ "Answer the name for the command. In order to have a specialized string for certain parameters of the context, and given the fact that sometimes the context is nil (e.g. when a context menu is calculated when the selection is empty)." @@ -45,7 +47,7 @@ IceTipAdoptCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipAnnouncement.class.st b/Iceberg-TipUI/IceTipAnnouncement.class.st index dbdedd4dc5..e41c5c55a8 100644 --- a/Iceberg-TipUI/IceTipAnnouncement.class.st +++ b/Iceberg-TipUI/IceTipAnnouncement.class.st @@ -3,7 +3,9 @@ I'm a general announcement for Tip UI events. (the announcements happened here are just for UI consumption) " Class { - #name : #IceTipAnnouncement, - #superclass : #IceAnnouncement, - #category : #'Iceberg-TipUI-Announcements' + #name : 'IceTipAnnouncement', + #superclass : 'IceAnnouncement', + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } diff --git a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st index 365540a064..07247e0c33 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st @@ -3,30 +3,32 @@ I implement the dialog to ask plaintext credentials. This dialog is used when the IceTipInteractiveCredentialsProvider needs to ask a plaintext credential. " Class { - #name : #IceTipAskForPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskForPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancel [ self cancelAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -44,13 +46,13 @@ IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (450 @ 180) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Please log in to ' , askingHostname diff --git a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st index eaa0b052c5..b288110683 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipAskForPlaintextOtpCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, + #name : 'IceTipAskForPlaintextOtpCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', #instVars : [ 'tokenLabel', 'tokenInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -26,13 +28,13 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 210) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -43,7 +45,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ ^ IcePlaintextOtpCredentials new @@ -53,7 +55,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> token [ ^ tokenInput text diff --git a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st index a9c3aba0a3..b99c95dd5d 100644 --- a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipAskGithubForPlaintextCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskGithubForPlaintextCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #private } +{ #category : 'private' } IceTipAskGithubForPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Token:' diff --git a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st index 19347ecf1f..792093d429 100644 --- a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st @@ -2,24 +2,26 @@ I am a dialog to ask for SSH credentials. " Class { - #name : #IceTipAskSSHCredentialsPresenter, - #superclass : #IceTipEditSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskSSHCredentialsPresenter', + #superclass : 'IceTipEditSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskSSHCredentialsPresenter >> newCredentials [ self refreshCredentialsFromPresenter. diff --git a/Iceberg-TipUI/IceTipBranchModel.class.st b/Iceberg-TipUI/IceTipBranchModel.class.st index b12d7e9824..bb754a13e1 100644 --- a/Iceberg-TipUI/IceTipBranchModel.class.st +++ b/Iceberg-TipUI/IceTipBranchModel.class.st @@ -2,17 +2,19 @@ I expose data of a branch. " Class { - #name : #IceTipBranchModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipBranchModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> checkoutStrategies [ ^ IceCheckoutStrategy allStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -24,12 +26,12 @@ IceTipBranchModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commits [ self shouldBeImplemented. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> description [ ^ self entity isRemote @@ -37,49 +39,49 @@ IceTipBranchModel >> description [ ifFalse: [ self name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> descriptionDecorator [ self entity isHead ifTrue: [ ^ IceTipDescriptionDecorator head ]. ^ super descriptionDecorator ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffFromHead [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffToWorkingCopy [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffToWorkingCopy ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> hasUpstream [ ^ entity hasUpstream ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isHead [ ^ self entity isHead ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isLocal [ ^ self entity isLocal ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ @@ -91,7 +93,7 @@ IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDeleteAction [ @@ -103,7 +105,7 @@ IceTipBranchModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDirectMergeAction [ @@ -115,7 +117,7 @@ IceTipBranchModel >> newDirectMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newSwitchAndMergeAction [ @@ -127,7 +129,7 @@ IceTipBranchModel >> newSwitchAndMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before @@ -137,7 +139,7 @@ IceTipBranchModel >> previewCheckout [ (IceTipCheckoutPreviewBrowser onBranch: self) open ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewMerge: aMergeType [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" @@ -147,7 +149,7 @@ IceTipBranchModel >> previewMerge: aMergeType [ open ] -{ #category : #printing } +{ #category : 'printing' } IceTipBranchModel >> printOn: aStream [ super printOn: aStream. aStream @@ -156,12 +158,12 @@ IceTipBranchModel >> printOn: aStream [ nextPut: $] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipBranchModel >> resetToCommit: anIceTipCachedModel [ entity resetToCommit: anIceTipCachedModel entity diff --git a/Iceberg-TipUI/IceTipBranchPanel.class.st b/Iceberg-TipUI/IceTipBranchPanel.class.st index bd527e9559..223476e280 100644 --- a/Iceberg-TipUI/IceTipBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipBranchPanel.class.st @@ -3,22 +3,24 @@ I'm a generic panel to checkout panels. My children will define different strategies to checkout (select an existing branch -local or remote-, or enter a new branch name) " Class { - #name : #IceTipBranchPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipBranchPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipBranchPanel class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> accept [ self validate. @@ -26,49 +28,49 @@ IceTipBranchPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> doAccept [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchPanel >> isNewBranch [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model: anObject [ model := anObject ] -{ #category : #events } +{ #category : 'events' } IceTipBranchPanel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBranchPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> validate [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipBrowseCommand.class.st b/Iceberg-TipUI/IceTipBrowseCommand.class.st index 4f1a7e77d5..0e0dcaef76 100644 --- a/Iceberg-TipUI/IceTipBrowseCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseCommand.class.st @@ -2,43 +2,45 @@ I'm a command to ""browse"" a change definition (method, class or package). " Class { - #name : #IceTipBrowseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultDescription [ ^ 'Browse the selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultName [ ^ 'Browse...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowseCommand >> canBeExecuted [ "In the case of a method removal it is not possible to browse the selected element." ^ self hasSelectedItem and: [ self item value definition canBeBrowsed ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseCommand >> execute [ self item value definition browse ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowseCommand >> iconName [ ^ #smallSystemBrowser ] -{ #category : #activation } +{ #category : 'activation' } IceTipBrowseCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st index 25f9b31ca2..421c10e49f 100644 --- a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st @@ -2,36 +2,38 @@ Command that browses the selected package as it is loaded in the image. " Class { - #name : #IceTipBrowsePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowsePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultDescription [ ^ 'Browse the selected package as it is loaded in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultName [ ^ 'Browse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowsePackageCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isPackageLoaded ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowsePackageCommand >> execute [ self packageModel browsePackage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowsePackageCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st index 47509f917b..94a27379a2 100644 --- a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st @@ -4,24 +4,26 @@ Command that opens a browser on the code of the repository. The current implementation relies on a monticello MCSnapshotBrowser " Class { - #name : #IceTipBrowseRepositoryPackageVersionCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseRepositoryPackageVersionCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultDescription [ ^ 'Browse the version in the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultName [ ^ 'Browse this version in Monticello' ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseRepositoryPackageVersionCommand >> execute [ self packageModel browseRepositoryVersion diff --git a/Iceberg-TipUI/IceTipBrowser.class.st b/Iceberg-TipUI/IceTipBrowser.class.st index dc8780dad2..1ed279f6d2 100644 --- a/Iceberg-TipUI/IceTipBrowser.class.st +++ b/Iceberg-TipUI/IceTipBrowser.class.st @@ -9,16 +9,18 @@ Some design remarks: * Browsers have a context menu on list or table items, that provide commands that are specific for the selection. " Class { - #name : #IceTipBrowser, - #superclass : #IceTipPresenter, + #name : 'IceTipBrowser', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'toolbar' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ | generalCommandGroup selectionCommandGroup selectionExtraCommandGroup | @@ -42,81 +44,81 @@ IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec. aCommandGroup register: IceFiletreeToTonelCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> generalCommandGroupName [ ^ 'General' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionCommandGroupName [ ^ 'Selection' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionExtraCommandGroupName [ ^ 'Extra' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> connectPresenters [ self mainList whenSelectionChangedDo: [ self refreshCommands ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> defaultKeyboardFocus [ ^ self mainList ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowser >> hasSelectedItem [ ^ self mainList selection isEmpty not ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> iconForWindow [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -125,31 +127,31 @@ IceTipBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> refresh [ "Update the UI elements given a possible update in the model." ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshCommands [ | rootGroup | @@ -163,7 +165,7 @@ IceTipBrowser >> refreshCommands [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ "Update context menu (for mainList)." @@ -173,7 +175,7 @@ IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ self mainList contextMenuFromCommandsGroup: subgroup ]. ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshShortcutsWith: rootGroup [ "Update shortcuts with available commands" @@ -184,7 +186,7 @@ IceTipBrowser >> refreshShortcutsWith: rootGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshToolbarWith: rootGroup [ "Update toolbar (in window)." @@ -208,31 +210,31 @@ IceTipBrowser >> refreshToolbarWith: rootGroup [ self window toolbar: toolbar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> repositoryModel [ "Answer the IceTipRepositoryModel associated to this presenter." ^ self model repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> selectedItem [ "Answer the object selected in the main list of this browser. The answer is nil when there isn't a selection." ^ self mainList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> subscribeToAnnouncements [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> toolbar [ ^ toolbar diff --git a/Iceberg-TipUI/IceTipCache.class.st b/Iceberg-TipUI/IceTipCache.class.st index 363621bbfd..cc06b437d3 100644 --- a/Iceberg-TipUI/IceTipCache.class.st +++ b/Iceberg-TipUI/IceTipCache.class.st @@ -5,70 +5,72 @@ I'm used to cache values to be used on the UI. I can be reseted (sending #reset), but responsibility of reset caches belongs to presenters who use them. " Class { - #name : #IceTipCache, - #superclass : #Object, + #name : 'IceTipCache', + #superclass : 'Object', #instVars : [ 'proxy', 'objects' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCache class >> proxy: aProxy [ ^ self new proxy: aProxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsent: anObject [ ^ objects at: aKey ifAbsent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsentPut: anObject [ ^ objects at: aKey ifAbsentPut: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifPresent: anObject [ ^ objects at: aKey ifPresent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey put: anObject [ ^ objects at: aKey put: anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> initialize [ super initialize. self reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> objects [ ^ objects ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy [ ^ proxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy: anObject [ proxy := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> reset [ objects := SmallDictionary new ] diff --git a/Iceberg-TipUI/IceTipCachedModel.class.st b/Iceberg-TipUI/IceTipCachedModel.class.st index f69b645173..b522f0299b 100644 --- a/Iceberg-TipUI/IceTipCachedModel.class.st +++ b/Iceberg-TipUI/IceTipCachedModel.class.st @@ -4,28 +4,30 @@ I take all unary messages sent to my realObject and I cache their values. I keep a cache with rules for reset it, which can be accessedon the #resetOn: family of messages. " Class { - #name : #IceTipCachedModel, - #superclass : #Object, + #name : 'IceTipCachedModel', + #superclass : 'Object', #instVars : [ 'realObject', 'cache' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCachedModel class >> for: anObject [ ^ self basicNew initializeObject: anObject ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> = aObject [ self species ~= aObject species ifTrue: [ ^ false ]. ^ self realObject = aObject realObject ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> doesNotUnderstand: aMessage [ aMessage selector isUnary ifTrue: [ @@ -42,27 +44,27 @@ IceTipCachedModel >> doesNotUnderstand: aMessage [ ^ self forwardMessage: aMessage ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> forwardMessage: aMessage [ ^ realObject perform: aMessage selector withArguments: aMessage arguments ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> hash [ ^ self realObject hash ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCachedModel >> initializeObject: anObject [ realObject := anObject. cache := IceTipCache proxy: self. self initialize ] -{ #category : #printing } +{ #category : 'printing' } IceTipCachedModel >> printOn: aStream [ super printOn: aStream. aStream nextPut: $(. @@ -70,12 +72,12 @@ IceTipCachedModel >> printOn: aStream [ aStream nextPut: $) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> realObject [ ^ realObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> reset [ cache reset ] diff --git a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st index b7408e9fe8..d188d62fe5 100644 --- a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st @@ -2,25 +2,27 @@ I'm a command that makes a working copy to recalculate the dirty packages (via #forceCalculateDirtyPackages). " Class { - #name : #IceTipCalculateDirtyPackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCalculateDirtyPackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCalculateDirtyPackagesCommand class >> defaultName [ ^ 'Recalculate dirty packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCalculateDirtyPackagesCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipCalculateDirtyPackagesCommand >> execute [ IceTipStandardAction new @@ -31,7 +33,7 @@ IceTipCalculateDirtyPackagesCommand >> execute [ executeWithContext: context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCalculateDirtyPackagesCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st index f846b99bd8..790e79a87f 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st @@ -2,36 +2,38 @@ Command that opens a dialog to checkout a (new or already existing) branch. " Class { - #name : #IceTipCheckoutBranchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutBranchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultDescription [ ^ 'Checkout a new or existing branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultToolbarItemName [ ^ 'Branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutBranchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutBranchCommand >> execute [ (IceTipCheckoutBranchDialog @@ -42,7 +44,7 @@ IceTipCheckoutBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st index 8371ddd3c5..4c0ac85745 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st @@ -4,28 +4,30 @@ I'm a dialog to perform a checkout of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipCheckoutBranchDialog, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipCheckoutBranchDialog', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutBranchDialog class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> allTypes [ ^ types ifNil: [ types := self createCheckoutBranchTypes ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ | allTypes | @@ -49,50 +51,50 @@ IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchDialog >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> model [ ^ model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> titleForWindow [ ^ 'Checkout branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withOnlyNewBranch [ types := self allTypes select: #isNewBranch. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withTypes: aCollection [ types := aCollection. typeList items: types. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withoutNewBranch [ types := self allTypes reject: #isNewBranch. typeList items: types. diff --git a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st index a03e98d39b..69d4df247d 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st @@ -2,12 +2,14 @@ I'm a panel to peform the checkout of an existing branch. " Class { - #name : #IceTipCheckoutBranchPanel, - #superclass : #IceTipExistingBranchPanel, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipCheckoutBranchPanel', + #superclass : 'IceTipExistingBranchPanel', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchPanel >> doAccept [ self selectedBranch previewCheckout diff --git a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st index 69cc6b43da..410e447df7 100644 --- a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st @@ -3,37 +3,39 @@ I checkout a specific commit from history. I will let your repository in detach mode! " Class { - #name : #IceTipCheckoutCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultDescription [ ^ 'Set the selected commit as current commit and load the code in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultName [ ^ 'Checkout' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutCommitCommand >> execute [ (IceTipCheckoutPreviewBrowser onBranch: self selectedCommit) open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> iconName [ ^ #refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> selectedCommit [ ^ self context selectedCommit diff --git a/Iceberg-TipUI/IceTipCheckoutModel.class.st b/Iceberg-TipUI/IceTipCheckoutModel.class.st index 50cdb34b4a..c1290c529e 100644 --- a/Iceberg-TipUI/IceTipCheckoutModel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipCheckoutModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipCheckoutModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'checkoutStrategy', 'checkoutStrategies' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> calculateDiff [ ^ commitish entity diffTo: self repository workingCopy ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> checkout [ checkoutStrategy @@ -24,30 +26,30 @@ IceTipCheckoutModel >> checkout [ self commitish checkout: checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategies [ ^ checkoutStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy [ ^ checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy: aStrategy [ checkoutStrategy := aStrategy ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutModel >> hasNewPackages [ ^ diffModel tree anySatisfy:[ :aNode | aNode isAddition and: [ aNode definition isPackageDefinition]] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutModel >> initialize [ super initialize. @@ -55,7 +57,7 @@ IceTipCheckoutModel >> initialize [ checkoutStrategy := checkoutStrategies first. ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> newCheckoutAction [ @@ -67,7 +69,7 @@ IceTipCheckoutModel >> newCheckoutAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> newPackages [ | packageNodes | diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st index e7fa896dcc..c1ba72ea9d 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st @@ -3,24 +3,26 @@ Action to start the creation of a new branch from the selected commit. Then checkout the selected branch. " Class { - #name : #IceTipCheckoutNewBranchCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutNewBranchCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultDescription [ ^ 'Create a new branch from the selected commit and switch to it' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultName [ ^ 'Branch...' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutNewBranchCommand >> execute [ ((IceTipCheckoutNewBranchPanel @@ -33,13 +35,13 @@ IceTipCheckoutNewBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> iconName [ ^ #branch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> selectedCommit [ ^ self item entity diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st index fc93346154..c902606842 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st @@ -2,8 +2,8 @@ I'm a panel to create a new local branch " Class { - #name : #IceTipCheckoutNewBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipCheckoutNewBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'currentBranchLabel', 'branchLabel', @@ -11,40 +11,42 @@ Class { 'branchCommitish', 'callback' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchInputText [ ^ branchInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchLabel [ ^ branchLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> branchName [ ^ self branchInputText text asString trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> commitish: anIceTipModel [ branchCommitish := anIceTipModel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> currentBranchLabel [ ^ currentBranchLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutNewBranchPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -60,7 +62,7 @@ IceTipCheckoutNewBranchPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutNewBranchPanel >> doAccept [ (self model @@ -72,26 +74,26 @@ IceTipCheckoutNewBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializeCurrentBranchLabel [ currentBranchLabel := self newLabel label: 'Current branch: ', self model branchName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -103,13 +105,13 @@ IceTipCheckoutNewBranchPanel >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutNewBranchPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> openDialog [ ^ self asDialogWindow @@ -117,13 +119,13 @@ IceTipCheckoutNewBranchPanel >> openDialog [ open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> titleForWindow [ ^ 'New branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> validate [ self @@ -134,7 +136,7 @@ IceTipCheckoutNewBranchPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCheckoutNewBranchPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st index 6757094f5f..7ce1870ee7 100644 --- a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st @@ -4,23 +4,25 @@ I preview the changes that will be introduced in the image when a checkout occur (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipCheckoutPreviewBrowser, - #superclass : #IceTipPreviewBrowser, + #name : 'IceTipCheckoutPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', #instVars : [ 'checkoutStrategyLabel', 'checkoutStrategyList', 'selectedCheckoutStrategy' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipCheckoutPreviewBrowser class >> maxBranchNameLength [ ^ 32 ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipCheckoutModel new @@ -28,19 +30,19 @@ IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ yourself) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyLabel [ ^ checkoutStrategyLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyList [ ^ checkoutStrategyList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -57,7 +59,7 @@ IceTipCheckoutPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutPreviewBrowser >> doCheckout [ (self model hasNewPackages and: [ self model checkoutStrategy isLoadAlreadyLoadedStrategy ]) @@ -69,7 +71,7 @@ IceTipCheckoutPreviewBrowser >> doCheckout [ executeWithContext: self ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ | checkoutStrategies | @@ -81,7 +83,7 @@ IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ self model checkoutStrategy: aStrategy ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -96,7 +98,7 @@ IceTipCheckoutPreviewBrowser >> initializePresenters [ self initializeCheckoutStrategyList ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutPreviewBrowser >> newActionButton [ ^ self newButton @@ -107,7 +109,7 @@ IceTipCheckoutPreviewBrowser >> newActionButton [ yourself ] -{ #category : #operations } +{ #category : 'operations' } IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ ((IceTipAddNewPackagesDialogPresenter @@ -120,13 +122,13 @@ IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutPreviewBrowser >> selectedCheckoutStrategy [ ^ selectedCheckoutStrategy ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> titleForWindow [ ^ 'Preview checkout of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st index 2dbcfef159..5e9ecbb7d4 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st @@ -2,36 +2,38 @@ Command that checks out the selected branch " Class { - #name : #IceTipCheckoutSelectedBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultDescription [ ^ 'Checkout this branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedBranchCommand >> actsOnBranch: aBranchModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedBranchCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedBranchCommand >> iconName [ ^ #branch ] diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st index c1d25d3348..4d2092de3c 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st @@ -2,35 +2,37 @@ Command that checks out the selected tag " Class { - #name : #IceTipCheckoutSelectedTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultDescription [ ^ 'Checkout this tag for this repository. Repository will then be in Detached Head state!' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultName [ ^ 'Checkout tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedTagCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedTagCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCherryPickCommand.class.st b/Iceberg-TipUI/IceTipCherryPickCommand.class.st index 373462f0e1..d93f271031 100644 --- a/Iceberg-TipUI/IceTipCherryPickCommand.class.st +++ b/Iceberg-TipUI/IceTipCherryPickCommand.class.st @@ -2,38 +2,40 @@ Generic command to cherry pick changes " Class { - #name : #IceTipCherryPickCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCherryPickCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultDescription [ ^ 'Cherrypick this commit and apply changes to the working copy' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultName [ ^ 'Cherrypick' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCherryPickCommand >> canBeExecuted [ self flag: #pharoTodo. "TODO: Still not ready" ^ false ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> execute [ (IceTipCherrypickPreviewBrowser onCommitish: self selectedCommitish) open ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> selectedCommitish [ ^ self context selectedCommit realObject entity diff --git a/Iceberg-TipUI/IceTipCherrypickModel.class.st b/Iceberg-TipUI/IceTipCherrypickModel.class.st index b3ec970b3a..125c2afe8c 100644 --- a/Iceberg-TipUI/IceTipCherrypickModel.class.st +++ b/Iceberg-TipUI/IceTipCherrypickModel.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipCherrypickModel, - #superclass : #IceTipModel, + #name : 'IceTipCherrypickModel', + #superclass : 'IceTipModel', #instVars : [ 'mergeTree', 'commitish' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickModel class >> onCommitish: aCommitish [ ^ self new @@ -16,33 +18,33 @@ IceTipCherrypickModel class >> onCommitish: aCommitish [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish [ ^commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish: aCommistish [ commitish := aCommistish. mergeTree := commitish repository cherryPickFrom: aCommistish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> diff [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> mergeTree [ ^mergeTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> repository [ ^commitish repository. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> treeToShow [ " Return the tree to display in windows " ^ self mergeTree diff --git a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st index 71727fdcec..42dd79ac32 100644 --- a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st @@ -1,39 +1,41 @@ Class { - #name : #IceTipCherrypickPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCherrypickPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'buttonBar' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickPreviewBrowser class >> onCommitish: aCommitish [ ^ self on: (IceTipCherrypickModel onCommitish: aCommitish) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> buttonBar [ ^ buttonBar ] -{ #category : #layout } +{ #category : 'layout' } IceTipCherrypickPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,13 +44,13 @@ IceTipCherrypickPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipCherrypickPreviewBrowser >> doCherryPick [ | root | @@ -58,13 +60,13 @@ IceTipCherrypickPreviewBrowser >> doCherryPick [ self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel := self @@ -76,20 +78,20 @@ IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel rightLabel: ' With Cherrypicked commit ' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickPreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCherrypickPreviewBrowser >> newActionButton [ ^ self newButton @@ -100,7 +102,7 @@ IceTipCherrypickPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> titleForWindow [ ^ 'Preview result of Cherrypick' diff --git a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st index bf24223abd..d97c3a3ad8 100644 --- a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st +++ b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st @@ -3,18 +3,20 @@ I'm a CmVisitor that in one hand, tells each command to be hidden if it can't be " Class { - #name : #IceTipCleanCommandGroupVisitor, - #superclass : #CmVisitor, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCleanCommandGroupVisitor', + #superclass : 'CmVisitor', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommand: aCmCommand [ aCmCommand beHiddenWhenCantBeRun ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommandGroup: aCmCommandsGroup [ super visitCommandGroup: aCmCommandsGroup. diff --git a/Iceberg-TipUI/IceTipCommand.class.st b/Iceberg-TipUI/IceTipCommand.class.st index 5df99320f2..bd90248921 100644 --- a/Iceberg-TipUI/IceTipCommand.class.st +++ b/Iceberg-TipUI/IceTipCommand.class.st @@ -2,31 +2,33 @@ I'm the superclass of all commands of the IceTip UI. " Class { - #name : #IceTipCommand, - #superclass : #CmCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommand', + #superclass : 'CmCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommand class >> defaultToolbarItemName [ ^ self defaultName ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand class >> isAbstract [ ^ self == IceTipCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> application [ ^ SpApplication defaultApplication ] -{ #category : #converting } +{ #category : 'converting' } IceTipCommand >> asSpecCommand [ | spCommand | @@ -45,31 +47,31 @@ IceTipCommand >> asSpecCommand [ ^ spCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> badge [ "Answer a number as extra information in the button. An answer of nil means no information." ^ nil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasRepository [ ^ self repositoryModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasSelectedItem [ ^ self context selectedItem notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasUnbornProject [ ^ self repositoryModel hasUnbornProject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> iconName [ "Answer the icon name (a Symbol) for this command." @@ -77,13 +79,13 @@ IceTipCommand >> iconName [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryDetached [ ^ self repositoryModel isNil or: [ self repositoryModel isDetached ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryMissing [ ^ self hasRepository and: [ @@ -91,32 +93,32 @@ IceTipCommand >> isRepositoryMissing [ self repositoryModel isCodeMissing ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryOperational [ ^ self isRepositoryMissing not and: [ self isRepositoryDetached not and: [ self hasUnbornProject not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommand >> item [ ^ self context selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repositoryModel [ ^ self context repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> shortcutKey [ "Answer the key combination to execute this command. Answer nil if there isn't a key combination." @@ -124,31 +126,31 @@ IceTipCommand >> shortcutKey [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> tool [ ^ self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolAnnouncer [ ^ self tool announcer ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolbarItemName [ ^ self class defaultToolbarItemName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> withErrorHandlingDo: aBlock [ aBlock diff --git a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st index 43fac26d0a..e1963c220c 100644 --- a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st +++ b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st @@ -4,18 +4,20 @@ I'm an abstract strategy to build Spec2 buttons wrapping a IceTipSpCommand. My c " Class { - #name : #IceTipCommandToPresenterBuildingStrategy, - #superclass : #Object, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipCommandToPresenterBuildingStrategy', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipCommandToPresenterBuildingStrategy >> buttonPresenterClass [ ^ self subclassResponsibility ] -{ #category : #public } +{ #category : 'public' } IceTipCommandToPresenterBuildingStrategy >> resultOn: aCommand [ ^ self buttonPresenterClass new diff --git a/Iceberg-TipUI/IceTipCommentPanel.class.st b/Iceberg-TipUI/IceTipCommentPanel.class.st index 593715e413..efad87e23a 100644 --- a/Iceberg-TipUI/IceTipCommentPanel.class.st +++ b/Iceberg-TipUI/IceTipCommentPanel.class.st @@ -3,8 +3,8 @@ I'm a comment panel. I can obtain a comment text and certain ""commit specific"" options. " Class { - #name : #IceTipCommentPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCommentPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'repositoryModel', 'commentText', @@ -15,34 +15,36 @@ Class { 'fixesLabel', 'optionsButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> clear [ commentText text: '' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commentText [ ^ commentText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commitButton [ ^ commitButton ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommentPanel >> defaultLayout [ self flag: #pharoTodo. "FIXES ISSUE NUMBER INPUT is disabled. See below. @@ -63,19 +65,19 @@ IceTipCommentPanel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesField [ ^ fixesField ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesLabel [ ^ fixesLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> initializePresenters [ | fixesHelpString | @@ -132,25 +134,25 @@ IceTipCommentPanel >> initializePresenters [ yourself) ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isPushing [ ^ IceTipCommitSettings pushOnCommit and: [ self repositoryModel branchModel hasUpstream ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isRunningCriticsOnCommit [ ^ IceTipCommitSettings critiquesOnCommit ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isSaving [ ^ IceTipCommitSettings saveImageOnCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> message [ self fixesField text isAllDigits ifFalse: [ @@ -163,7 +165,7 @@ IceTipCommentPanel >> message [ nextPutAll: self fixesField number asString ] ] -{ #category : #events } +{ #category : 'events' } IceTipCommentPanel >> onCommit: aBlock [ commitButton action: [ @@ -172,62 +174,62 @@ IceTipCommentPanel >> onCommit: aBlock [ cull: self isPushing ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> pushCheckbox [ ^ pushCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> pushOnCommit: aBoolean [ IceTipCommitSettings pushOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> refresh [ commitButton help: ('Commit your changes to {1}' format: { self repositoryName }). pushCheckbox label: ('Push changes to {1}' format: { self repositoryRemoteName }) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> repositoryModel [ ^ repositoryModel ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryRemoteName [ ^ self repositoryModel pushRemoteName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> runCriticsOnCommit: aBoolean [ IceTipCommitSettings critiquesOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> saveOnCommit: aBoolean [ IceTipCommitSettings saveImageOnCommit: aBoolean ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> setModelBeforeInitialization: aRepositoryModel [ repositoryModel := aRepositoryModel ] -{ #category : #specs } +{ #category : 'specs' } IceTipCommentPanel >> titleForWindow [ ^ 'Comment' diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index 5feb85f24f..af2aaf285c 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -2,17 +2,19 @@ I perform a commit " Class { - #name : #IceTipCommitAction, - #superclass : #IceTipAction, + #name : 'IceTipCommitAction', + #superclass : 'IceTipAction', #instVars : [ 'diff', 'items', 'message' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipCommitAction >> basicExecute [ self validateCanCommit. UIManager default @@ -25,49 +27,49 @@ IceTipCommitAction >> basicExecute [ Iceberg announcer announce: (IceCommited for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff: anObject [ diff := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items [ ^ items ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items: anObject [ items := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message: anObject [ message := anObject ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateCanCommit [ self validateMessageNotEmpty ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateChangeListNotEmpty [ "If there are no selected changed, no point on commiting :)" items ifEmpty: [ IceNothingToCommit signal ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateMessageNotEmpty [ self message ifEmpty: [ IceNoCommitMessage signal ] ] diff --git a/Iceberg-TipUI/IceTipCommitBrowser.class.st b/Iceberg-TipUI/IceTipCommitBrowser.class.st index f03933e7a0..f763966e4f 100644 --- a/Iceberg-TipUI/IceTipCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCommitBrowser.class.st @@ -4,23 +4,25 @@ I'm a browser to commit changes to a repository. (self onRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipCommitBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCommitBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'commentPanel', 'saveAction' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipRefreshCommitCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -37,31 +39,31 @@ IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCom ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCommitBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> accept [ ^ self doCommit ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel [ ^ commentPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel: aSpPresenter [ commentPanel := aSpPresenter ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommitBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,25 +73,25 @@ IceTipCommitBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel: aSpPresenter [ diffPanel := aSpPresenter ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCollapseSelection [ diffPanel doCollapseSelection ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit [ | selectedItems message isPushing isSaving commitBlock| @@ -111,7 +113,7 @@ IceTipCommitBrowser >> doCommit [ openIfCritiques ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBoolean saving: savingBoolean [ self model newCommitAction @@ -127,26 +129,26 @@ IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBo executeWithContext: self ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doExpandSelection [ diffPanel doExpandSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialize [ super initialize. saveAction := IceTipSaveImageAction new ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeAcceptShortcut [ self @@ -159,7 +161,7 @@ IceTipCommitBrowser >> initializeAcceptShortcut [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffSelectingPanel on: self model workingCopyDiff. @@ -172,27 +174,27 @@ IceTipCommitBrowser >> initializePresenters [ self initializeAcceptShortcut ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> refresh [ diffPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) @@ -201,13 +203,13 @@ IceTipCommitBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> saveAction: anAction [ saveAction := anAction ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> subscribeToAnnouncements [ self announcer @@ -216,7 +218,7 @@ IceTipCommitBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> titleForWindow [ ^ 'Commit on {1} branch {2}' format: { @@ -224,7 +226,7 @@ IceTipCommitBrowser >> titleForWindow [ self model branchName } ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> verifyNeedsRefreshOrClose [ "Verifies if there are remaining changes to commit. In case there are none, close the window." diff --git a/Iceberg-TipUI/IceTipCommitCommand.class.st b/Iceberg-TipUI/IceTipCommitCommand.class.st index 8020364cbb..2f4e759cfa 100644 --- a/Iceberg-TipUI/IceTipCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCommitCommand.class.st @@ -2,30 +2,32 @@ I open a the commit window, with all latest changes. " Class { - #name : #IceTipCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultDescription [ ^ 'Commit changes to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultName [ ^ 'Commit' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommitCommand >> execute [ (IceTipCommitBrowser @@ -34,13 +36,13 @@ IceTipCommitCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> iconName [ ^ #smallOk ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> shortcutKey [ ^ $s meta diff --git a/Iceberg-TipUI/IceTipCommitDiffModel.class.st b/Iceberg-TipUI/IceTipCommitDiffModel.class.st index c9b056036f..4265e1cb76 100644 --- a/Iceberg-TipUI/IceTipCommitDiffModel.class.st +++ b/Iceberg-TipUI/IceTipCommitDiffModel.class.st @@ -3,12 +3,14 @@ I'm a ""static"" diff. I represent a diff between two concrete commits. " Class { - #name : #IceTipCommitDiffModel, - #superclass : #IceTipDiffModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitDiffModel', + #superclass : 'IceTipDiffModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitDiffModel >> diff [ ^ self entity ] diff --git a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st index 55ac9d5b45..43aa07baaf 100644 --- a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st +++ b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st @@ -4,8 +4,8 @@ I'm a panel to show the history of a commitish (usually a branch or a tag). I di I'm usually used as part of an IceTipHistoryBrowser. " Class { - #name : #IceTipCommitInfoPresenter, - #superclass : #SpPresenter, + #name : 'IceTipCommitInfoPresenter', + #superclass : 'SpPresenter', #instVars : [ 'model', 'selectedModel', @@ -16,10 +16,12 @@ Class { 'headPage', 'ancestorPage' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #layout } +{ #category : 'layout' } IceTipCommitInfoPresenter class >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -27,21 +29,21 @@ IceTipCommitInfoPresenter class >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForCommit [ headTabContainer := IceTipHistoryDiffFromHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForMerge [ headTabContainer := IceTipHistoryDiffToHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> commitInfo [ selectedModel ifNil: [ ^ self newEmpty ]. @@ -50,28 +52,28 @@ IceTipCommitInfoPresenter >> commitInfo [ application: self application ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromAncestor [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (ancestorTabContainer diffFor: selectedModel) ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromHead [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (headTabContainer diffFor: selectedModel) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initialize [ self beForCommit. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -87,14 +89,14 @@ IceTipCommitInfoPresenter >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializePresenters [ notebookPanel := self newNotebook. self initializeCommitPanel ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newDiffPage [ ^ SpNotebookPage @@ -103,7 +105,7 @@ IceTipCommitInfoPresenter >> newDiffPage [ provider: [ "It will be overriden" ] ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newEmpty [ ^ self newLabel @@ -111,7 +113,7 @@ IceTipCommitInfoPresenter >> newEmpty [ yourself ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newInfoPage [ ^ SpNotebookPage @@ -120,7 +122,7 @@ IceTipCommitInfoPresenter >> newInfoPage [ provider: [ self commitInfo ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> refresh [ selectedModel ifNil: [ ^ self ]. @@ -130,38 +132,38 @@ IceTipCommitInfoPresenter >> refresh [ notebookPanel resetAllPageContents ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestor [ ancestorTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestorLabel [ ancestorTabContainer updateLabelOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHead [ headTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHeadLabel [ headTabContainer updateLabelOn: selectedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> selectedModel: aModel [ selectedModel := aModel. self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> setModelBeforeInitialization: anObject [ model := anObject diff --git a/Iceberg-TipUI/IceTipCommitModel.class.st b/Iceberg-TipUI/IceTipCommitModel.class.st index 661a5e0c07..dc14b81d9e 100644 --- a/Iceberg-TipUI/IceTipCommitModel.class.st +++ b/Iceberg-TipUI/IceTipCommitModel.class.st @@ -2,42 +2,44 @@ I'm a model for IceCommit entries. " Class { - #name : #IceTipCommitModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitModel', + #superclass : 'IceTipCommitishModel', #traits : 'TIceCopyCommitId', #classTraits : 'TIceCopyCommitId classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipCommitModel >> adopt [ self entity adopt ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortId [ ^ self entity ancestors first shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortIdOrOrigin [ ^ self entity ancestors ifNotEmpty: [ self ancestorShortId ] ifEmpty: [ 'Origin' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestors [ ^ self entity ancestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> author [ ^ self entity author ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> calculateDiff: aBlock [ | diff | @@ -50,18 +52,18 @@ IceTipCommitModel >> calculateDiff: aBlock [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> comment [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -73,18 +75,18 @@ IceTipCommitModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> datetime [ ^ self entity datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> description [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromFirstAncestor [ | diff ancestorCommit | @@ -97,7 +99,7 @@ IceTipCommitModel >> diffFromFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromHead [ | head diff | @@ -108,7 +110,7 @@ IceTipCommitModel >> diffFromHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToFirstAncestor [ | diff ancestorCommit | @@ -121,7 +123,7 @@ IceTipCommitModel >> diffToFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToHead [ | head diff | @@ -132,7 +134,7 @@ IceTipCommitModel >> diffToHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToWorkingCopy [ | diff | diff := self calculateDiff: [ self entity diffToWorkingCopy ]. @@ -141,18 +143,18 @@ IceTipCommitModel >> diffToWorkingCopy [ on: diff ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> hasMultipleAncestors [ ^ self entity hasMultipleAncestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> id [ ^ self entity id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> info [ ^ {('Commit:' -> ('[' , self shortId , '] ' , self id)). ('Parents:' -> (self entity ancestors collect: #shortId) asCommaString). @@ -162,12 +164,12 @@ IceTipCommitModel >> info [ ('Comment:' -> self entity comment)} ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> isMerged [ ^ self entity isMerged ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ ^ (IceTipCommitRangeModel repositoryModel: self repositoryModel @@ -176,44 +178,44 @@ IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitModel >> mergeHistoryFromSecondAncestor [ ^ self mergeHistoryFromAncestor: self entity ancestors second ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> name [ ^ self entity description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> shortId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagDecorator [ ^ IceTipTagDecorator uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagNames [ ^ self entity tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagsDescription [ ^ ', ' join: self tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> timeStamp [ ^ self entity timeStamp ] diff --git a/Iceberg-TipUI/IceTipCommitRangeModel.class.st b/Iceberg-TipUI/IceTipCommitRangeModel.class.st index 7672e2d0dd..b0c9f2c5dd 100644 --- a/Iceberg-TipUI/IceTipCommitRangeModel.class.st +++ b/Iceberg-TipUI/IceTipCommitRangeModel.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipCommitRangeModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitRangeModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'toCommit' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> commitModels [ ^ (self fromCommit newCommitWalk uptoCommit: self toCommit) commits collect: [ :each | @@ -18,24 +20,24 @@ IceTipCommitRangeModel >> commitModels [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> fromCommit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> name [ ^ 'Commits from {1} to {2}' format: { self fromCommit shortId. self toCommit shortId } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit [ ^ toCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit: anObject [ toCommit := anObject ] diff --git a/Iceberg-TipUI/IceTipCommitishModel.class.st b/Iceberg-TipUI/IceTipCommitishModel.class.st index d861e067e4..608716641e 100644 --- a/Iceberg-TipUI/IceTipCommitishModel.class.st +++ b/Iceberg-TipUI/IceTipCommitishModel.class.st @@ -3,35 +3,37 @@ I'm a base model for all commitish models to be used. I can provide #commitModels which changes depending on concrete model. " Class { - #name : #IceTipCommitishModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitishModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitId [ ^ self entity commit id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitModels [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitishModel >> isCommitish [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> shortCommitId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> tagModels [ ^ self repositoryModel tagModels diff --git a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st index 34a2e6480d..3806ee454a 100644 --- a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st +++ b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st @@ -2,36 +2,38 @@ Command that copies the selected entity short commit ID to the clipboard " Class { - #name : #IceTipCopyCommitishCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCopyCommitishCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultDescription [ ^ 'Copy the selected short commit ID (7 characters long) to the clipboard' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultName [ ^ 'Copy commitish ID' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCopyCommitishCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item commitId isNotNil ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCopyCommitishCommand >> execute [ self item copyCommitIDToClipboard ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCopyCommitishCommand >> iconName [ ^ #book diff --git a/Iceberg-TipUI/IceTipCreateTagCommand.class.st b/Iceberg-TipUI/IceTipCreateTagCommand.class.st index 025f5e7a76..9d82bf01e3 100644 --- a/Iceberg-TipUI/IceTipCreateTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCreateTagCommand.class.st @@ -2,30 +2,32 @@ I an a commander command that will be activated on any commitish or repository and ask the selected item to create a tag on itself. " Class { - #name : #IceTipCreateTagCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCreateTagCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultDescription [ ^ 'Creates a tag for the selected commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultName [ ^ 'Create tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagCommand >> canBeExecuted [ ^ self repositoryModel isNotNil ] -{ #category : #executing } +{ #category : 'executing' } IceTipCreateTagCommand >> execute [ (IceTipCreateTagPanel @@ -36,7 +38,7 @@ IceTipCreateTagCommand >> execute [ open ] -{ #category : #activation } +{ #category : 'activation' } IceTipCreateTagCommand >> iconName [ ^ #glamorousBookmark diff --git a/Iceberg-TipUI/IceTipCreateTagPanel.class.st b/Iceberg-TipUI/IceTipCreateTagPanel.class.st index 665f1d5753..4784ee9aa5 100644 --- a/Iceberg-TipUI/IceTipCreateTagPanel.class.st +++ b/Iceberg-TipUI/IceTipCreateTagPanel.class.st @@ -5,8 +5,8 @@ I have a form with a label and an input, and the commitish to tag. I'm done to be embedded in a dialog, so I implement doAccept to execute my action. " Class { - #name : #IceTipCreateTagPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCreateTagPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'callback', 'tagNameInputText', @@ -19,10 +19,12 @@ Class { 'minorButton', 'patchButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> accept [ self validate. @@ -30,25 +32,25 @@ IceTipCreateTagPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitish: anIceTipCachedModel [ commitishToTag := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitishToTag [ ^ commitishToTag ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> currentCommitishLabel [ ^ currentCommitishLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCreateTagPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -72,7 +74,7 @@ IceTipCreateTagPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCreateTagPanel >> doAccept [ self validate. @@ -85,19 +87,19 @@ IceTipCreateTagPanel >> doAccept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> existingTagsList [ ^ existingTagsList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeCurrentBranchLabel [ currentCommitishLabel := self newLabel @@ -106,7 +108,7 @@ IceTipCreateTagPanel >> initializeCurrentBranchLabel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeExistingTagsList [ existingTagsList := self newList. @@ -117,7 +119,7 @@ IceTipCreateTagPanel >> initializeExistingTagsList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeNextTagPanel [ | parts prefix nextMajor nextMinor nextPatch toString | @@ -142,7 +144,7 @@ IceTipCreateTagPanel >> initializeNextTagPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -159,18 +161,18 @@ IceTipCreateTagPanel >> initializePresenters [ self initializeExistingTagsList ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagParts [ ^ self latestTagPartsIn: (commitishToTag tagModels collect: #name) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ | prefix parts | @@ -191,17 +193,17 @@ IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ ^ parts ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> majorButton [ ^ majorButton ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> minorButton [ ^ minorButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> openDialog [ ^ self asDialogWindow @@ -209,43 +211,43 @@ IceTipCreateTagPanel >> openDialog [ open ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> patchButton [ ^ patchButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> setModelBeforeInitialization: aCommitish [ self commitish: aCommitish ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagName [ ^ self tagNameInputText text asString trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameInputText [ ^ tagNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameLabel [ ^ tagNameLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> titleForWindow [ ^ 'New tag of ' , commitishToTag name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> validate [ self @@ -256,7 +258,7 @@ IceTipCreateTagPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCreateTagPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCredentialsSettings.class.st b/Iceberg-TipUI/IceTipCredentialsSettings.class.st index 7e39ca364c..ee86be1c80 100644 --- a/Iceberg-TipUI/IceTipCredentialsSettings.class.st +++ b/Iceberg-TipUI/IceTipCredentialsSettings.class.st @@ -1,26 +1,28 @@ Class { - #name : #IceTipCredentialsSettings, - #superclass : #Object, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipCredentialsSettings', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonAction [ IceTipCredentialsStoreBrowser new open. ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonLabel [ ^ 'Edit' ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonState [ ^ true ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> settingsOn: aBuilder [ diff --git a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st index 8bfeb9a0f4..7c0ffb3388 100644 --- a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st +++ b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st @@ -2,15 +2,17 @@ I am the browser used to show a credentials store. " Class { - #name : #IceTipCredentialsStoreBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCredentialsStoreBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'credentialsList' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddPlainTextCredentialCommand. @@ -20,7 +22,7 @@ IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter f aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipEditCredentialCommand. @@ -29,19 +31,19 @@ IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> credentialsList [ ^ credentialsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCredentialsStoreBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -49,14 +51,14 @@ IceTipCredentialsStoreBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initialize [ model ifNil: [ model := IceCredentialStore current ]. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializeCredentialsList [ credentialsList @@ -78,32 +80,32 @@ IceTipCredentialsStoreBrowser >> initializeCredentialsList [ evaluated: #description) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializePresenters [ credentialsList := self newTable. self initializeCredentialsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCredentialsStoreBrowser >> mainList [ ^ credentialsList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> refresh [ credentialsList items: self model allCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> store [ ^ self model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> titleForWindow [ ^ model isCurrent @@ -111,7 +113,7 @@ IceTipCredentialsStoreBrowser >> titleForWindow [ ifFalse: [ 'Credentials of ' , model printString ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st index f96e633058..7b82ab06f0 100644 --- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st @@ -2,8 +2,8 @@ I am a dialog to be used before commit so we can check if the code to commit has critiques on it " Class { - #name : #IceTipCritiquesBeforeCommitBrowser, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipCritiquesBeforeCommitBrowser', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'commitModel', 'onAcceptAction', @@ -15,41 +15,43 @@ Class { 'browseButton', 'autofixButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> accept [ self closeWindow. onAcceptAction value ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel [ ^ commitModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel: anObject [ commitModel := anObject ] -{ #category : #layout } +{ #category : 'layout' } IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -67,7 +69,7 @@ IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ yourself ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ self withWindowDo: [ :window | @@ -77,7 +79,7 @@ IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ window buttons third label: 'Close' ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doAutofix [ critiquesList selectedItem ifNotNil: [ :aCritique | @@ -98,13 +100,13 @@ IceTipCritiquesBeforeCommitBrowser >> doAutofix [ centered ]) actOnCritic: aCritique ofEntity: aCritique entity ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doBrowse [ critiquesList selectedItem ifNotNil: [ :aCritique | aCritique entity browse ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ critiquesList := self newTable. @@ -128,7 +130,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ whenSelectionChangedDo: (MessageSend receiver: self selector: #updateSelectedCritique) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ detailPanel := self newText @@ -139,7 +141,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -161,7 +163,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ browseButton := self newButton. @@ -179,7 +181,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ self initializeDetailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeReasonPanel [ reasonPanel := self newText @@ -193,18 +195,18 @@ Select each critique to see a detailed message of each critique.'. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> onAccept: aFullBlockClosure [ onAcceptAction := aFullBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ "If the setting is disabled we just commit" @@ -220,13 +222,13 @@ IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipCritiquesBeforeCommitBrowser >> setModelBeforeInitialization: someNodes [ model := someNodes ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ ^ 'Critiques for Commit on {1} branch {2}' format: { @@ -234,7 +236,7 @@ IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ commitModel branchName } ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ super updatePresenter. @@ -250,7 +252,7 @@ IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> updateSelectedCritique [ critiquesList selectedItem diff --git a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st index e6e7553bd8..d811fc6fa2 100644 --- a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st @@ -2,36 +2,38 @@ Command that deletes the selected branch " Class { - #name : #IceTipDeleteBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultDescription [ ^ 'Delete this branch for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultName [ ^ 'Delete branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteBranchCommand >> actsOnBranch: aBranchModel [ ^ aBranchModel isLocal ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteBranchCommand >> execute [ self item newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteBranchCommand >> iconName [ ^ #delete diff --git a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st index 2ceedd53fe..72ade8f5c3 100644 --- a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected remote " Class { - #name : #IceTipDeleteRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultDescription [ ^ 'Delete this remote for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultName [ ^ 'Delete remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> execute [ self remoteModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteRemoteCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st index dbbcff7b76..33a461bf49 100644 --- a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected tag " Class { - #name : #IceTipDeleteTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultDescription [ ^ 'Delete this tag for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultName [ ^ 'Delete tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> execute [ self tagModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteTagCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> tagModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st index cb9e666a4f..7fb84e4e1e 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceTipDescriptionDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> head [ ^ IceTipDescriptionDecoratorHead uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> modified [ ^ IceTipDescriptionDecoratorModified uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> notLoaded [ ^ IceTipDescriptionDecoratorNotLoaded uniqueInstance diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st index 719dc586a1..2197e5dc20 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorHead, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorHead', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceTipDescriptionDecoratorHead >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st index 47b9c2c22d..cb74929623 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorModified, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorModified', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorModified >> color [ ^ Smalltalk ui theme successTextColor diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st index 8092e02645..47ff354917 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorNotLoaded, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorNotLoaded', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorNotLoaded >> color [ ^ Smalltalk ui theme disabledTextColor diff --git a/Iceberg-TipUI/IceTipDialogPresenter.class.st b/Iceberg-TipUI/IceTipDialogPresenter.class.st index 28f57f6119..701c18a670 100644 --- a/Iceberg-TipUI/IceTipDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipDialogPresenter.class.st @@ -3,24 +3,26 @@ I'm a general dialog. I implement a default accept method that needs to be overriden my children and some utility methods to easier build a dialog. " Class { - #name : #IceTipDialogPresenter, - #superclass : #IceTipPresenter, - #category : #'Iceberg-TipUI-View' + #name : 'IceTipDialogPresenter', + #superclass : 'IceTipPresenter', + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> accept [ "override this if you want a dialog" ] -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> cancel [ "override this if you want a dialog" self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. diff --git a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st index 8538e7c551..533808c3ad 100644 --- a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st +++ b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st @@ -4,25 +4,27 @@ I announce when an entry (a method, a class or a package) has been reverted. I'm used to refresh diff panels without recalculate everything again. " Class { - #name : #IceTipDiffEntryRemoved, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffEntryRemoved', + #superclass : 'IceTipAnnouncement', #instVars : [ 'entry' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffEntryRemoved class >> entry: anObject [ ^ self new entry: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry [ ^ entry ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry: anObject [ entry := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffModel.class.st b/Iceberg-TipUI/IceTipDiffModel.class.st index 6d62e59e96..e58cbf43a8 100644 --- a/Iceberg-TipUI/IceTipDiffModel.class.st +++ b/Iceberg-TipUI/IceTipDiffModel.class.st @@ -2,34 +2,36 @@ I'm a base model to present diffs. " Class { - #name : #IceTipDiffModel, - #superclass : #IceTipEntityModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipDiffModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> new [ ^ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> on: aDiff [ ^ self basicNew initializeEntity: aDiff; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> copyWithOnly: aCollection [ ^ self diff copyWithOnly: aCollection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> diff [ ^ self subclassResponsibility ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffModel >> reset [ UIManager default informUser: 'Refreshing changes' @@ -39,17 +41,17 @@ IceTipDiffModel >> reset [ self diff ] ] -{ #category : #private } +{ #category : 'private' } IceTipDiffModel >> resetDiff [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> tree [ ^ self diff treeToShow ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> treeRoots [ ^ self tree children ] diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st index 1a9898f73b..6a999df1f2 100644 --- a/Iceberg-TipUI/IceTipDiffPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffPanel.class.st @@ -7,23 +7,25 @@ also #elements answer should be a collection of elements that also understand el (IceTipDiffPanel onDiff: (IceRepository registry first workingCopyDiff)) openWithSpec " Class { - #name : #IceTipDiffPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipDiffPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'diffPanel', 'iceNodesTree' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffPanel class >> onDiff: aDiff [ ^ self on: (IceTipCommitDiffModel on: aDiff) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> basicRefresh [ self resetDiffContents. @@ -32,7 +34,7 @@ IceTipDiffPanel >> basicRefresh [ expandAll ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeDescriptionColumn [ ^ SpStringTableColumn new @@ -40,7 +42,7 @@ IceTipDiffPanel >> changeDescriptionColumn [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -52,7 +54,7 @@ IceTipDiffPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> collapsePath: aPath [ iceNodesTree @@ -60,7 +62,7 @@ IceTipDiffPanel >> collapsePath: aPath [ selectPath: aPath ] -{ #category : #layout } +{ #category : 'layout' } IceTipDiffPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -70,7 +72,7 @@ IceTipDiffPanel >> defaultLayout [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ diffPanel @@ -82,25 +84,25 @@ IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ rightText: rightString ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doCollapseSelection [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doExpandSelection [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> expandPath: aPath [ iceNodesTree @@ -108,38 +110,38 @@ IceTipDiffPanel >> expandPath: aPath [ selectPath: aPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowLeft [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowRight [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> iceNodesTree [ ^ iceNodesTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeDiffPanel [ diffPanel showOptions: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializePresenters [ iceNodesTree := self newTreeTable. @@ -149,7 +151,7 @@ IceTipDiffPanel >> initializePresenters [ self initializeDiffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeTree [ iceNodesTree @@ -163,19 +165,19 @@ IceTipDiffPanel >> initializeTree [ toAction: [ self handleArrowRight ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> leftLabel: aString [ diffPanel leftLabel: aString. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> refresh [ self model reset. @@ -183,25 +185,25 @@ IceTipDiffPanel >> refresh [ ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> resetDiffContents [ self diffContentsLeft: '' right: '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> rightLabel: aString [ diffPanel rightLabel: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> selectedItem [ ^ iceNodesTree selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> selectionChanged [ | itemValue | @@ -212,13 +214,13 @@ IceTipDiffPanel >> selectionChanged [ right: itemValue leftContents ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> subscribeToAnnouncements [ self announcer @@ -228,13 +230,13 @@ IceTipDiffPanel >> subscribeToAnnouncements [ ] -{ #category : #specs } +{ #category : 'specs' } IceTipDiffPanel >> titleForWindow [ ^ 'Diff' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> updatePresenter [ self basicRefresh diff --git a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st index c59d12d568..c783d8158d 100644 --- a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st +++ b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st @@ -1,31 +1,33 @@ Class { - #name : #IceTipDiffPreviewModel, - #superclass : #IceTipModel, + #name : 'IceTipDiffPreviewModel', + #superclass : 'IceTipModel', #instVars : [ 'commitish', 'diffModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> calculateDiff [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish [ ^ commitish entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish: aCommitish [ commitish := aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> diff [ ^ diffModel ifNil: [ | diff | @@ -37,19 +39,19 @@ IceTipDiffPreviewModel >> diff [ on: diff ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repository [ ^ commitish repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repositoryName [ ^ self repository name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> targetName [ ^ commitish name diff --git a/Iceberg-TipUI/IceTipDiffRefreshed.class.st b/Iceberg-TipUI/IceTipDiffRefreshed.class.st index 4be166e6fd..0f5ae0833b 100644 --- a/Iceberg-TipUI/IceTipDiffRefreshed.class.st +++ b/Iceberg-TipUI/IceTipDiffRefreshed.class.st @@ -2,25 +2,27 @@ I announce when a diff has been refreshed. " Class { - #name : #IceTipDiffRefreshed, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffRefreshed', + #superclass : 'IceTipAnnouncement', #instVars : [ 'repository' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffRefreshed class >> for: aRepository [ ^ self new repository: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st index 2d1fad7eff..ccdc9c09d8 100644 --- a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st @@ -10,15 +10,17 @@ also #elements answer should be a collection of elements that also understand el " Class { - #name : #IceTipDiffSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipDiffSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> activateItem: iceNode [ checkedIceNodes add: iceNode. @@ -31,7 +33,7 @@ IceTipDiffSelectingPanel >> activateItem: iceNode [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -49,7 +51,7 @@ IceTipDiffSelectingPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> deactivateItem: iceNode [ checkedIceNodes remove: iceNode. @@ -61,7 +63,7 @@ IceTipDiffSelectingPanel >> deactivateItem: iceNode [ self refreshCheckbox. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initialize [ super initialize. @@ -72,7 +74,7 @@ IceTipDiffSelectingPanel >> initialize [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initializeTree [ super initializeTree. @@ -81,7 +83,7 @@ IceTipDiffSelectingPanel >> initializeTree [ toAction: [ self toggleActivationItem: iceNodesTree selectedItem ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refresh [ super refresh. @@ -89,20 +91,20 @@ IceTipDiffSelectingPanel >> refresh [ root withAllChildrenDo: [ :each | checkedIceNodes add: each ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refreshCheckbox [ "Refresh after a checkbox state has changed. When a node with children changes this state, all children might change too. That's the reason of this special refresh. When a leave node changed such state, this refresh is redundant." iceNodesTree refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> toggleActivationItem: iceNode [ (checkedIceNodes includes: iceNode) diff --git a/Iceberg-TipUI/IceTipDirectMergeType.class.st b/Iceberg-TipUI/IceTipDirectMergeType.class.st index 496b7b0bef..435ef190da 100644 --- a/Iceberg-TipUI/IceTipDirectMergeType.class.st +++ b/Iceberg-TipUI/IceTipDirectMergeType.class.st @@ -7,12 +7,14 @@ I will perform a simple merge: This is the default merge mechanism (what users do most of the time) " Class { - #name : #IceTipDirectMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDirectMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipDirectMergeType >> newMergeAction: aModel [ ^ aModel newDirectMergeAction diff --git a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st index 1ce6ddf7df..dd3ef54559 100644 --- a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st +++ b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose directories. " Class { - #name : #IceTipDirectoryPresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipDirectoryPresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipDirectoryPresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st index 6c0db8b7a6..e3adc08fca 100644 --- a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDiscardAllChangesPreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDiscardAllChangesPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepository [ ^ self on: (IceTipDiscardAllModel new @@ -13,7 +15,7 @@ IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepositor yourself) ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ self model newDiscardAction @@ -21,13 +23,13 @@ IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ executeWithContext: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initialExtentForWindow [ ^ (900 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -37,7 +39,7 @@ IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ rightLabel: 'Commit to load: ', self loadCommitShortId ] -{ #category : #private } +{ #category : 'private' } IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ | shortId | @@ -47,7 +49,7 @@ IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ ifFalse: [ shortId ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ ^ self newButton @@ -58,7 +60,7 @@ IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> titleForWindow [ ^ 'Preview Changes to Discard' diff --git a/Iceberg-TipUI/IceTipDiscardAllModel.class.st b/Iceberg-TipUI/IceTipDiscardAllModel.class.st index ebba7aa80c..67acf77adc 100644 --- a/Iceberg-TipUI/IceTipDiscardAllModel.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllModel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipDiscardAllModel, - #superclass : #IceTipModel, + #name : 'IceTipDiscardAllModel', + #superclass : 'IceTipModel', #instVars : [ 'workingCopy', 'diffModel', 'repository' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> calculateDiff [ ^ workingCopy referenceCommit diffTo: workingCopy ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> diff [ ^ diffModel ifNil: [ @@ -28,13 +30,13 @@ IceTipDiscardAllModel >> diff [ on: diff ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> discardAll [ workingCopy discardChanges ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> newDiscardAction [ @@ -46,24 +48,24 @@ IceTipDiscardAllModel >> newDiscardAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository: anIceTipCachedModel [ repository := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy [ ^ workingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy: anObject [ workingCopy := anObject diff --git a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st index 187f996cb8..a6ba03553b 100644 --- a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st +++ b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st @@ -2,24 +2,26 @@ Command that discard all changes in the repository " Class { - #name : #IceTipDiscardChangesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDiscardChangesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultDescription [ ^ 'Discard all changes in this working copy.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultName [ ^ 'Discard all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> canBeExecuted [ ^ self isRepositoryMissing not and: [ @@ -28,7 +30,7 @@ IceTipDiscardChangesCommand >> canBeExecuted [ aCommit isCollection not and: [ aCommit isUnknownCommit not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipDiscardChangesCommand >> execute [ (IceTipDiscardAllChangesPreviewBrowser onRepository: self repositoryModel) @@ -37,13 +39,13 @@ IceTipDiscardChangesCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardChangesCommand >> iconName [ ^ #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st index faab93d8da..bce29f97be 100644 --- a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st @@ -4,24 +4,26 @@ I colaborate with the credential to know the specific class of the dialog model. Check #editModelClass in IceSshCredentials and IcePlaintextCredentials " Class { - #name : #IceTipEditCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultDescription [ ^ 'Edits the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultName [ ^ 'Edit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditCredentialCommand >> execute [ ((self item editModelClass newApplication: context application) @@ -33,13 +35,13 @@ IceTipEditCredentialCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> iconName [ ^ #edit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> shortcutKey [ ^ $e meta diff --git a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st index e05dfb7673..962f411b2d 100644 --- a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit plaintext credentials. " Class { - #name : #IceTipEditPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 160) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -39,14 +41,14 @@ IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ password: self password ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditPlaintextCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. passwordInput text: credentials password ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Edit credential for ' , credentials host diff --git a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st index 3694af7c87..0f08da0b7f 100644 --- a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipEditProjectDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipEditProjectDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -18,10 +18,12 @@ Class { 'removeButton', 'addButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> accept [ IceTipStandardAction new @@ -43,13 +45,13 @@ IceTipEditProjectDialogPresenter >> accept [ acceptCallback value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> acceptCallback [ ^ acceptCallback ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> addDirectory [ | newDirectoryName newDirectory previousSelection | @@ -70,7 +72,7 @@ IceTipEditProjectDialogPresenter >> addDirectory [ self expandAndSelect: previousSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> connectPresenters [ super connectPresenters. @@ -87,13 +89,13 @@ IceTipEditProjectDialogPresenter >> connectPresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> defaultFormat [ ^ defaultFormat ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditProjectDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -128,7 +130,7 @@ IceTipEditProjectDialogPresenter >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ @@ -155,25 +157,25 @@ IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatLabel [ ^ formatLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatList [ ^ formatList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> formats [ ^ formats ] -{ #category : #'format-management' } +{ #category : 'format-management' } IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ "We take as guinea pig a sub-directory to guess what format it is on. @@ -192,13 +194,13 @@ IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ ifNone: [ ^ defaultFormat ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> hasToShowWarning [ ^ model repository workingCopy packages isNotEmpty ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ^ self hasToShowWarning @@ -213,7 +215,7 @@ IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialize [ selectedDirectoryPath := RelativePath new. @@ -223,7 +225,7 @@ IceTipEditProjectDialogPresenter >> initialize [ super initialize. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ sourceDirectoryTree @@ -241,7 +243,7 @@ IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ self sourceDirectorySelectionChanged: announcement selectedPaths ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeMessagePanel [ | icon | @@ -254,7 +256,7 @@ IceTipEditProjectDialogPresenter >> initializeMessagePanel [ messageText text: self warningMessage ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -292,43 +294,43 @@ IceTipEditProjectDialogPresenter >> initializePresenters [ self initializeDirectoryTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageIcon [ ^ messageIcon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageText [ ^ messageText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> removeDirectory [ | toRemove newSelection | @@ -346,31 +348,31 @@ IceTipEditProjectDialogPresenter >> removeDirectory [ self expandAndSelect: newSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> selectedDirectoryPath [ ^ selectedDirectoryPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> selectedFileFormat [ ^ formatList selectedItem ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryLabel [ ^ sourceDirectoryLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPaths [ | selection | @@ -386,25 +388,25 @@ IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPat selectedDirectoryPath := selection relativeTo: self model fileSystem. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryTree [ ^ sourceDirectoryTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> titleForWindow [ ^ 'Edit Project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> username [ ^ self nameInput text trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> warningMessage [ ^ 'Be careful. You should choose the actual format of the current repository. diff --git a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st index c0b67c816d..10013324e4 100644 --- a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to edit a repository meta-data " Class { - #name : #IceTipEditRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipEditRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultDescription [ ^ 'Edit repository data' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultName [ ^ 'Edit...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipEditRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditRepositoryCommand >> execute [ self flag: #TODO. "Demeter's law" @@ -37,7 +39,7 @@ IceTipEditRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditRepositoryCommand >> iconName [ ^ #edit diff --git a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st index b7d805fe72..6ba89b4467 100644 --- a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit SSH credentials. " Class { - #name : #IceTipEditSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -27,13 +29,13 @@ IceTipEditSSHCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> initialExtentForWindow [ ^ (500@230) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -43,7 +45,7 @@ IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ keyPassphrase: self passphrase ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -52,7 +54,7 @@ IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ publicKeyInput location: credentials publicKey ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> titleForWindow [ ^ 'Edit SSH keys for ' , self credentials hostDescription diff --git a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st index 3d3b8c23a9..d42a7e3b60 100644 --- a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I am a dialog to edit token credentials. " Class { - #name : #IceTipEditTokenCredentialsPresenter, - #superclass : #IceTipAddTokenCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditTokenCredentialsPresenter', + #superclass : 'IceTipAddTokenCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -23,7 +25,7 @@ IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -32,7 +34,7 @@ IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditTokenCredentialsPresenter >> titleForWindow [ ^ 'Edit token credentials' diff --git a/Iceberg-TipUI/IceTipEntityModel.class.st b/Iceberg-TipUI/IceTipEntityModel.class.st index 49b9933bf4..7c9c4c177d 100644 --- a/Iceberg-TipUI/IceTipEntityModel.class.st +++ b/Iceberg-TipUI/IceTipEntityModel.class.st @@ -2,28 +2,30 @@ I'm a generic model for Iceberg entities (tipically, repositories, commits, packages, etc., etc., etc.) " Class { - #name : #IceTipEntityModel, - #superclass : #IceTipModel, + #name : 'IceTipEntityModel', + #superclass : 'IceTipModel', #instVars : [ 'entity', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> new [ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> on: anObject [ ^ self basicNew initializeEntity: anObject; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ ^ self basicNew initializeEntity: anObject; @@ -31,54 +33,54 @@ IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> description [ "A decorated description of this entity. It can return a text (in case decorations apply) or a simple string." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> descriptionDecorator [ ^ IceTipTextDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> displayString [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> entity [ ^ entity ] -{ #category : #fetching } +{ #category : 'fetching' } IceTipEntityModel >> fetch [ self entity fetch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEntityModel >> initializeEntity: anObject [ entity := anObject. self initialize ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isCommitish [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isModelOf: anObject [ ^ self entity = anObject ] -{ #category : #tagging } +{ #category : 'tagging' } IceTipEntityModel >> newCreateTagAction: aString [ @@ -90,17 +92,17 @@ IceTipEntityModel >> newCreateTagAction: aString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> shortDescription [ ^ self description asString diff --git a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st index dc2d41d517..6e52aea96d 100644 --- a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st @@ -7,24 +7,26 @@ My model is an exception that I'll freeze for further debugging. (IceTipErrorDialog on: anError) openDialogWithSpec " Class { - #name : #IceTipErrorDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipErrorDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'exception', 'errorLabel', 'iconPanel' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> accept [ self closeWindow. exception debug. ] -{ #category : #layout } +{ #category : 'layout' } IceTipErrorDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -35,31 +37,31 @@ IceTipErrorDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> errorLabel [ ^ errorLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception [ ^ exception ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception: anException [ exception := anException freeze ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -69,7 +71,7 @@ IceTipErrorDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ aWindow @@ -80,7 +82,7 @@ IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ do: [ :presenter | presenter close ]. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializePresenters [ iconPanel := self newImage. @@ -91,13 +93,13 @@ IceTipErrorDialogPresenter >> initializePresenters [ errorLabel editable: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> setModelBeforeInitialization: aDomainObject [ self exception: aDomainObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> titleForWindow [ ^ 'Error' diff --git a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st index eae8c778d0..e7254a06fa 100644 --- a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st @@ -3,29 +3,31 @@ I'm a panel (that will be part of a dialog) to perform actions on existing panel Actions themselves needs to be defined by my children. " Class { - #name : #IceTipExistingBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipExistingBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'branchesList', 'title', 'icon' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> branchModels [ ^ self model branchModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> branchesList [ ^ branchesList ] -{ #category : #layout } +{ #category : 'layout' } IceTipExistingBranchPanel >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -33,25 +35,25 @@ IceTipExistingBranchPanel >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon [ ^ icon ifNil: [ self iconNamed: #branch ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon: anIcon [ icon := anIcon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializeBranchesList [ branchesList @@ -68,32 +70,32 @@ IceTipExistingBranchPanel >> initializeBranchesList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializePresenters [ branchesList := self newTable. self initializeBranchesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> selectedBranch [ ^ self branchesList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> titleForWindow [ ^ title ifNil: [ self model name ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> titleForWindow: aString [ title := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> validate [ self selectedBranch ifNil: [ diff --git a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st index 738ba20fd4..d026f08d94 100644 --- a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st @@ -2,31 +2,33 @@ I'm a command to perform a fetch operation on all registered projects. " Class { - #name : #IceTipFetchAllProjectCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchAllProjectCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from all repositories in your list.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultName [ ^ 'Fetch all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchAllProjectCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> execute [ | repositories | @@ -47,13 +49,13 @@ IceTipFetchAllProjectCommand >> execute [ Iceberg announcer announce: IceRepositoryModified new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchAllProjectCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> isConfirmed [ ^ self application newConfirm diff --git a/Iceberg-TipUI/IceTipFetchCommand.class.st b/Iceberg-TipUI/IceTipFetchCommand.class.st index faf109579a..d878f30cc3 100644 --- a/Iceberg-TipUI/IceTipFetchCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchCommand.class.st @@ -2,24 +2,26 @@ I'm a command to perform a fetch operation on selected project. " Class { - #name : #IceTipFetchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from this repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ @@ -27,19 +29,19 @@ IceTipFetchCommand >> canBeExecuted [ self repositoryModel hasRemotes ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchCommand >> execute [ self repositoryModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> iconName [ ^ #smallUpdate ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> shortcutKey [ ^ $f meta diff --git a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st index 119d3c33b9..630fd29e06 100644 --- a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st @@ -1,29 +1,31 @@ Class { - #name : #IceTipFetchInPullCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchInPullCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultDescription [ ^ 'Fetch from the selected remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchInPullCommand >> execute [ context model remoteModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchInPullCommand >> iconName [ ^ #smallUpdate diff --git a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st index 7c1b56024b..0c722b8509 100644 --- a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that fetches from remote repositories " Class { - #name : #IceTipFetchRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultDescription [ ^ 'Fetch commits from this remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultName [ ^ 'Fetch remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> execute [ self remoteModel fetch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchRemoteCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipFilePresenter.class.st b/Iceberg-TipUI/IceTipFilePresenter.class.st index 721985a143..a0e7c32f33 100644 --- a/Iceberg-TipUI/IceTipFilePresenter.class.st +++ b/Iceberg-TipUI/IceTipFilePresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose files. " Class { - #name : #IceTipFilePresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipFilePresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipFilePresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st index bf9876ab0d..413d50a79f 100644 --- a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st @@ -3,24 +3,26 @@ I will allow the ""forget"" of a repository (remote it from list of registered r I also add the possibility of remove the repository from file system. " Class { - #name : #IceTipForgetRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipForgetRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultDescription [ ^ 'Removes this repository from the list of managed repositories (it will not remove any local repository)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultName [ ^ 'Forget repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipForgetRepositoryCommand >> execute [ (IceTipRemoveRepositoryDialogPresenter @@ -31,13 +33,13 @@ IceTipForgetRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st index 49ac8a3bc4..977e81d533 100644 --- a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st @@ -6,8 +6,8 @@ for each provider. " Class { - #name : #IceTipGitProviderRepositoryPanel, - #superclass : #IceTipGitRepositoryPanel, + #name : 'IceTipGitProviderRepositoryPanel', + #superclass : 'IceTipGitRepositoryPanel', #instVars : [ 'userNameLabel', 'userNameInputText', @@ -16,22 +16,24 @@ Class { 'protocolDropList', 'protocolLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipGitProviderRepositoryPanel class >> isAbstract [ ^ super isAbstract or: [ self = IceTipGitProviderRepositoryPanel ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitProviderRepositoryPanel >> configureBuilder: aBuilder [ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitProviderRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -45,7 +47,7 @@ IceTipGitProviderRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitProviderRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -79,7 +81,7 @@ IceTipGitProviderRepositoryPanel >> initializePresenters [ ] -{ #category : #private } +{ #category : 'private' } IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ^ (self userName isEmpty and: [ self projectName isEmpty ]) @@ -88,43 +90,43 @@ IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> projectName [ ^ self projectNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolDropList [ ^ protocolDropList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolLabel [ ^ protocolLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> providerName [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> remoteUrl [ | builder | @@ -135,31 +137,31 @@ IceTipGitProviderRepositoryPanel >> remoteUrl [ ^ builder buildUrl ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> selectedProtocol [ ^ self protocolDropList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> userName [ ^ self userNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameInputText [ ^ userNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameLabel [ ^ userNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st index 4408387fe1..fdd7ef3847 100644 --- a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st @@ -3,18 +3,20 @@ I'm a presenter to define remote repositories. Repositories needs to have a valid url (one that can be parsed by IceRemote) and a valid location (where to place the clone) " Class { - #name : #IceTipGitRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipGitRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel class >> order [ ^ 1000 "to the end" ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -26,7 +28,7 @@ IceTipGitRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipGitRepositoryPanel >> extractProjectName: aString [ ^ [ (IceGitRemote url: aString) projectName ] @@ -34,13 +36,13 @@ IceTipGitRepositoryPanel >> extractProjectName: aString [ do: [ 'invalid-url' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> iconForWindow [ ^ self iconNamed: #git ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -53,7 +55,7 @@ IceTipGitRepositoryPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> newRepository [ UIManager default @@ -66,19 +68,19 @@ IceTipGitRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> remoteUrl [ ^ self remoteInputText text asString trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> titleForWindow [ ^ 'Clone remote repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> validate [ | remoteString | diff --git a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st index 7103019d4a..17a42bdec6 100644 --- a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog for asking ""user.name"" and ""user.email"" . " Class { - #name : #IceTipGitUsernameAndEmailDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipGitUsernameAndEmailDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -13,10 +13,12 @@ Class { 'model', 'acceptCallback' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipGitUsernameAndEmailDialogPresenter >> accept [ self username isEmptyOrNil ifTrue: [ ^ self window alert: 'user.name is required.' ]. @@ -32,7 +34,7 @@ IceTipGitUsernameAndEmailDialogPresenter >> accept [ acceptCallback value ]. ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -50,36 +52,36 @@ IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> email [ ^ self emailInput text trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailInput [ ^ emailInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailLabel [ ^ emailLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> globalCheckbox [ ^ globalCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initialExtentForWindow [ ^ (400@200) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -102,43 +104,43 @@ IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipGitUsernameAndEmailDialogPresenter >> isGlobal [ ^ self globalCheckbox state ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> titleForWindow [ ^ 'Please provide Git missing properties' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> username [ ^ self nameInput text trimBoth diff --git a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st index e78130b7b5..c23045931f 100644 --- a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltComponentHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltComponentHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,13 +29,13 @@ IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeCommitList [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -62,7 +64,7 @@ IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ commitList := self newComponentList. @@ -73,13 +75,13 @@ IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ self initializeHiedraColumn ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -87,20 +89,20 @@ IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ | commitModels | @@ -111,7 +113,7 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ commitInfoTabs selectedModel: (commitModels ifNotEmpty: #first ifEmpty: [ nil ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -133,19 +135,19 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ifNotNil: #item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st index 28565664db..73df2f5bef 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,7 +29,7 @@ IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeCommitList [ commitList @@ -63,7 +65,7 @@ IceTipHiedraAltHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -92,7 +94,7 @@ IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -104,13 +106,13 @@ IceTipHiedraAltHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -118,20 +120,20 @@ IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -153,13 +155,13 @@ IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st index b4d9f6b312..e2b6ea1bc2 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st @@ -1,12 +1,14 @@ Class { - #name : #IceTipHiedraAltHistoryRowPresenter, - #superclass : #SpPresenter, + #name : 'IceTipHiedraAltHistoryRowPresenter', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ | tagNames tagLayout | @@ -30,13 +32,13 @@ IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ aLayout add: tagLayout expand: false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> form [ ^ self model first ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ self layout: (SpBoxLayout newLeftToRight @@ -51,7 +53,7 @@ IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ yourself). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> item [ ^ self model second diff --git a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st index f481a468c0..dc81c98649 100644 --- a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st @@ -2,15 +2,17 @@ I add a Hiedra column to the browser defined by my superclass. This column visualizes the relationship between commits in the history list. " Class { - #name : #IceTipHiedraHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeCommitList [ "Add the Hiedra column at the beginning. The Datasource has the logic to render it." @@ -23,7 +25,7 @@ IceTipHiedraHistoryBrowser >> initializeCommitList [ super initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -50,21 +52,21 @@ IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ cellWidth: 5.25 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializePresenters [ super initializePresenters. self initializeHiedraColumn ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refreshHiedraColumn [ | ancestorIds | diff --git a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st index 16ad2d0857..63008dd9c3 100644 --- a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st @@ -2,47 +2,49 @@ I'm a base browser for pull/push action browser. " Class { - #name : #IceTipHistoryActionBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryActionBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitsPanel', 'actionButtonBar', 'button' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> accept [ button performAction ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel [ ^ commitsPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel: aSpPresenter [ commitsPanel := aSpPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initializePresenters [ commitsPanel := self instantiate: IceTipHistoryBrowser on: self model. @@ -50,7 +52,7 @@ IceTipHistoryActionBrowser >> initializePresenters [ actionButtonBar add: (button := self newActionButton) ] -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ aRemoteModel ifNil: [ ^ self ]. @@ -61,26 +63,26 @@ IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ self updateTitle ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipHistoryActionBrowser >> newActionButton [ "Answer a new instance of SpButton to be placed at bottom, as the main action of the window." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refresh [ self refreshCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refreshCommits [ commitsPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ (self model repositoryModel isModelOf: ann repository) @@ -89,7 +91,7 @@ IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> subscribeToAnnouncements [ self announcer diff --git a/Iceberg-TipUI/IceTipHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHistoryBrowser.class.st index 3c5dfdee58..71a6d22f46 100644 --- a/Iceberg-TipUI/IceTipHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryBrowser.class.st @@ -5,22 +5,24 @@ I'm usually used as part of an IceTipRepositoryBrowser. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'commitInfoTabs' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipAdoptCommitCommand. @@ -35,7 +37,7 @@ IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCo ] -{ #category : #specs } +{ #category : 'specs' } IceTipHistoryBrowser class >> panelSpec [ ^ SpPanedLayout newTopToBottom @@ -44,25 +46,25 @@ IceTipHistoryBrowser class >> panelSpec [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> beForMerge [ self commitInfoTabs beForMerge ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitInfoTabs [ ^ commitInfoTabs ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,13 +73,13 @@ IceTipHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initialExtentForWindow [ ^ (700 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializeCommitList [ commitList @@ -102,7 +104,7 @@ IceTipHistoryBrowser >> initializeCommitList [ whenSelectionChangedDo: [ :aSelection | self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -111,27 +113,27 @@ IceTipHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refresh [ self refreshCommitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refreshCommitList [ | commitModels | @@ -141,19 +143,19 @@ IceTipHistoryBrowser >> refreshCommitList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipHistoryBrowser >> selectionChanged: anElement [ commitInfoTabs selectedModel: anElement ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> titleForWindow [ ^ self model @@ -162,13 +164,13 @@ IceTipHistoryBrowser >> titleForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> updatePresenter [ self refresh ] -{ #category : #events } +{ #category : 'events' } IceTipHistoryBrowser >> whenSelectionChangedDo: aBlock [ commitList whenSelectionChangedDo: aBlock diff --git a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st index 16b04a9a5b..06ef203e2b 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st @@ -3,17 +3,19 @@ I keep a diff from HEAD to WorkingCopy. " Class { - #name : #IceTipHistoryDiffFromHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffFromHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> diffFor: aCommitModel [ ^ aCommitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> labelFor: aCommitModel [ ^ 'HEAD to {1}' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st index d0b9344fa1..12aab5b16c 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st @@ -2,17 +2,19 @@ I keep a diff from a commit to his mail parent. " Class { - #name : #IceTipHistoryDiffToAncestor, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToAncestor', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> diffFor: aCommitModel [ ^ aCommitModel diffToFirstAncestor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> labelFor: aCommitModel [ ^ '{1} to {2}' format: { aCommitModel shortId. diff --git a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st index d1dcb6fca4..2bff338b13 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st @@ -3,17 +3,19 @@ I keep a diff from WorkingCopy to HEAD. " Class { - #name : #IceTipHistoryDiffToHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> diffFor: aCommitModel [ ^ aCommitModel diffToHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> labelFor: aCommitModel [ ^ '{1} to HEAD' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st index 0cfc0e00fc..2c33f2fa79 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st @@ -4,64 +4,66 @@ Since orders may change for different operations, I need a different approach fo " Class { - #name : #IceTipHistoryDiffUpdater, - #superclass : #Object, + #name : 'IceTipHistoryDiffUpdater', + #superclass : 'Object', #instVars : [ 'tab' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #testing } +{ #category : 'testing' } IceTipHistoryDiffUpdater class >> isAbstract [ ^ self == IceTipHistoryDiffUpdater ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipHistoryDiffUpdater class >> tab: aTab [ ^ self new tab: aTab; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> diffFor: aCommitModel [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> labelFor: aCommitModel [ ^ self subclassResponsibility ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipHistoryDiffUpdater >> newDiffPanelFor: aDiffModel [ ^ IceTipDiffPanel on: aDiffModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab [ ^ tab ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab: anObject [ tab := anObject ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateContentsOn: aCommitModel [ aCommitModel ifNil: [ ^ self ]. self tab contents: (self newDiffPanelFor: (self diffFor: aCommitModel)) build ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateLabelOn: aCommitModel [ self tab label: (self labelFor: aCommitModel) ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateOn: aCommitModel [ self updateLabelOn: aCommitModel. self updateContentsOn: aCommitModel diff --git a/Iceberg-TipUI/IceTipInspectCommand.class.st b/Iceberg-TipUI/IceTipInspectCommand.class.st index d50a4ee13d..f5ef0d83c4 100644 --- a/Iceberg-TipUI/IceTipInspectCommand.class.st +++ b/Iceberg-TipUI/IceTipInspectCommand.class.st @@ -2,42 +2,44 @@ I am a command implementing the inspect option. I have several context activations to be able to inspect different objects in Iceberg's UI " Class { - #name : #IceTipInspectCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInspectCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultDescription [ ^ 'Inspect the selected element' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultName [ ^ 'Inspect...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipInspectCommand >> canBeExecuted [ ^ self context hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipInspectCommand >> execute [ self item inspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> iconName [ ^ #glamorousInspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> item [ | maybeCachedObject | diff --git a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st index a11c718b99..fbbaad2497 100644 --- a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st @@ -3,36 +3,38 @@ Command used in the version browser, inside the code browser. This command takes the selected version and installs it (also called revert). " Class { - #name : #IceTipInstallVersionCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInstallVersionCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultDescription [ ^ 'Revert to the selected version' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultName [ ^ 'Install this version' ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> execute [ self version install ] -{ #category : #activation } +{ #category : 'activation' } IceTipInstallVersionCommand >> iconName [ ^ #smallRedo ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> version [ ^ self context selectedItem diff --git a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st index e74a3465c0..e76f8c4c84 100644 --- a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st +++ b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st @@ -2,23 +2,25 @@ I am a credential provider that requires the missing plaintext credential to the user. " Class { - #name : #IceTipInteractiveCredentialsProvider, - #superclass : #IceCredentialsProvider, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipInteractiveCredentialsProvider', + #superclass : 'IceCredentialsProvider', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceTipInteractiveCredentialsProvider class >> initialize [ self providerType: nil ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider class >> isDefault [ ^ true ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ | returnedCred | @@ -30,7 +32,7 @@ IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsToReturn [ | returnedCred | @@ -43,7 +45,7 @@ IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsT credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainSshCredentials: credentialsToReturn [ | returnedCred | diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index b345444f61..db8e6c3a2b 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -3,22 +3,24 @@ I'm a visitor to provide users with an interactive way to react to iceberg error " Class { - #name : #IceTipInteractiveErrorVisitor, - #superclass : #IceErrorVisitor, + #name : 'IceTipInteractiveErrorVisitor', + #superclass : 'IceErrorVisitor', #instVars : [ 'context', 'repository' ], - #category : #'Iceberg-TipUI-Exceptions' + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext [ ^ self newContext: aContext repository: nil ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ ^ self new @@ -27,40 +29,40 @@ IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> on: aModel [ ^ self new repository: aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context: anObject [ context := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository: anObject [ repository := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ self defaultApplication label: anError messageText; @@ -68,7 +70,7 @@ IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ self defaultApplication @@ -77,7 +79,7 @@ IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ self defaultApplication @@ -88,17 +90,17 @@ IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ - self defaultApplication + self defaultApplication newInform label: ('The clone remote {1} could not been found' format: { anError remoteUrl }); title: 'Clone action failed'; openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ | proceed | @@ -112,7 +114,7 @@ IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitGenericError: anError [ (IceTipErrorDialogPresenter @@ -123,7 +125,7 @@ IceTipInteractiveErrorVisitor >> visitGenericError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMergeAborted: anError [ self defaultApplication @@ -135,7 +137,7 @@ WARNING: If you have external files, you may need to verify the conflicts there. openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ ((IceTipGitUsernameAndEmailDialogPresenter @@ -147,7 +149,7 @@ IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ | proceed | @@ -162,7 +164,7 @@ IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoRemote: anError [ self defaultApplication @@ -172,7 +174,7 @@ Add one before continue.'; openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ self defaultApplication newInform @@ -180,7 +182,7 @@ IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ self defaultApplication newInform @@ -189,7 +191,7 @@ IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteDesynchronizedError: anError [ | continue command | @@ -222,7 +224,7 @@ You need to pull remote changes before continue and push your changes.' anError retry ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitShouldCommitBeforePullError: anError [ | continue | @@ -239,7 +241,7 @@ We recommend that you commit first and then pull incoming changes again.'; anError resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitWorkingCopyDesynchronizedError: anError [ | solveStrategy command | diff --git a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st index 577cf69282..c2d502942e 100644 --- a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that loads the current non-loaded selected package " Class { - #name : #IceTipLoadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipLoadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultDescription [ ^ 'Load selected package in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultName [ ^ 'Load' ] -{ #category : #testing } +{ #category : 'testing' } IceTipLoadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded not ] -{ #category : #executing } +{ #category : 'executing' } IceTipLoadPackageCommand >> execute [ self packageModel newLoadAction executeWithContext: self context. @@ -33,7 +35,7 @@ IceTipLoadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLoadPackageCommand >> iconName [ ^ #add diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 9e3bcd9b5d..73ba56fba6 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -3,18 +3,20 @@ I will define a repository that already exists. " Class { - #name : #IceTipLocalRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipLocalRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel class >> order [ ^ 20 ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocalRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipLocalRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallOpen ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> initialExtentForWindow [ ^ (500@( @@ -41,25 +43,25 @@ IceTipLocalRepositoryPanel >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #testing } +{ #category : 'testing' } IceTipLocalRepositoryPanel >> isLocalRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location [ ^ self projectLocation location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location: aReferenceOrString [ ^ self projectLocation location: aReferenceOrString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> newRepository [ UIManager default @@ -71,13 +73,13 @@ IceTipLocalRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> titleForWindow [ ^ 'Import from existing clone' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipLocationPresenter.class.st b/Iceberg-TipUI/IceTipLocationPresenter.class.st index b62a028a13..7278835716 100644 --- a/Iceberg-TipUI/IceTipLocationPresenter.class.st +++ b/Iceberg-TipUI/IceTipLocationPresenter.class.st @@ -3,8 +3,8 @@ I'm an abstract model to provide locations (directories or files). I need to be included in other components (search references to my children for examples) " Class { - #name : #IceTipLocationPresenter, - #superclass : #SpPresenter, + #name : 'IceTipLocationPresenter', + #superclass : 'SpPresenter', #instVars : [ 'locationInput', 'chooseButton', @@ -12,16 +12,18 @@ Class { 'chooseBlock', 'keptLocation' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipLocationPresenter class >> isAbstract [ ^ self == IceTipLocationPresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> appendPath: aString [ keptLocation ifNil: [ keptLocation := self location ]. @@ -31,13 +33,13 @@ IceTipLocationPresenter >> appendPath: aString [ ifEmpty: [ keptLocation ]). ] -{ #category : #private } +{ #category : 'private' } IceTipLocationPresenter >> basicLocation: aReference [ locationInput text: aReference pathString ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> choose [ self chooseReference ifNotNil: [ :reference | @@ -45,43 +47,43 @@ IceTipLocationPresenter >> choose [ self onChoose ifNotNil: #value ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> chooseButton [ ^ chooseButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> chooseReference [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle [ ^ chooseTitle ifNil: [ self defaultChooseDialogTitle ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle: aString [ chooseTitle := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultChooseDialogTitle [ ^ 'Choose directory' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultLabel [ ^ 'Directory' ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocationPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -93,13 +95,13 @@ IceTipLocationPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> icon [ ^ self iconNamed: #open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocationPresenter >> initializePresenters [ locationInput := self newTextInput @@ -113,7 +115,7 @@ IceTipLocationPresenter >> initializePresenters [ chooseButton action: [ self choose ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location [ "This method return the location to use in the repository If the location is relative to IceLibgitRepository >> #localRepositoriesLocation @@ -135,7 +137,7 @@ IceTipLocationPresenter >> location [ ^ IceLibgitRepository localRepositoriesLocation resolvePath: relativePath ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location: aReferenceOrString [ | ref | @@ -152,26 +154,26 @@ IceTipLocationPresenter >> location: aReferenceOrString [ self basicLocation: ref ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> locationInput [ ^ locationInput ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose [ ^ chooseBlock ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose: aBlockClosure [ "I allow to set a hook to execute when the user select a location." chooseBlock := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipLocationPresenter >> whenTextChanged: aBlockClosure [ self locationInput whenTextChangedDo: aBlockClosure diff --git a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st index 10c1f65a81..e0f99435cf 100644 --- a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st @@ -2,24 +2,26 @@ I'm a command to open the package manager browser for a project. " Class { - #name : #IceTipManagePackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManagePackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultDescription [ ^ 'Open packages manager browser for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultName [ ^ 'Packages' ] -{ #category : #executing } +{ #category : 'executing' } IceTipManagePackagesCommand >> execute [ (IceTipWorkingCopyBrowser @@ -28,13 +30,13 @@ IceTipManagePackagesCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> iconName [ ^ #package ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> shortcutKey [ ^ $p meta diff --git a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st index 25acd74669..4d0185f541 100644 --- a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st @@ -3,36 +3,38 @@ I'm a command to show the repository manager for a repository model. " Class { - #name : #IceTipManageRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManageRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultDescription [ ^ 'Open repository manager browser for this repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultName [ ^ 'Open Repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultToolbarItemName [ ^ 'Repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipManageRepositoryCommand >> execute [ (IceTipRepositoryBrowser @@ -41,19 +43,19 @@ IceTipManageRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> iconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> shortcutKey [ ^ $r meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st index fbd509f795..9a1252f105 100644 --- a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st @@ -4,34 +4,36 @@ I'm a dialog to perform a merge of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipMergeBranchDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipMergeBranchDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeBranchDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> allTypes [ ^ types ifNil: [ types := self createMergeBranchTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> beSwitchAndMerge [ self allTypes do: #beSwitchAndMerge ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ | allTypes | @@ -54,44 +56,44 @@ IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchDialogPresenter >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model: anObject [ model := anObject. self allTypes do: [ :each | each model: anObject ] ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipMergeBranchDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> titleForWindow [ ^ 'Select branch to merge into ' , (self model branchName contractTo: 45) ] -{ #category : #activation } +{ #category : 'activation' } IceTipMergeBranchDialogPresenter >> updateWindowTitle [ self window title: self titleForWindow diff --git a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st index 24bd011621..608f005030 100644 --- a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st @@ -2,21 +2,23 @@ I'm a panel to peform the merge of an existing branch. " Class { - #name : #IceTipMergeBranchPanel, - #superclass : #IceTipExistingBranchPanel, + #name : 'IceTipMergeBranchPanel', + #superclass : 'IceTipExistingBranchPanel', #instVars : [ 'mergeType' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> beSwitchAndMerge [ self mergeType: IceTipMergeType switchAndMerge ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchPanel >> doAccept [ IceTipStandardAction new @@ -27,19 +29,19 @@ IceTipMergeBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType [ ^ mergeType ifNil: [ IceTipMergeType default ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType: anObject [ mergeType := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> withoutHead [ self branchesList items: (self branchModels reject: #isHead). diff --git a/Iceberg-TipUI/IceTipMergeCommand.class.st b/Iceberg-TipUI/IceTipMergeCommand.class.st index 11c5c49cdd..b5345488ef 100644 --- a/Iceberg-TipUI/IceTipMergeCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to select a branch to merge in the current merge " Class { - #name : #IceTipMergeCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultDescription [ ^ 'Merge a given branch into your current branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultName [ ^ 'Merge to current' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeCommand >> execute [ (IceTipMergeBranchDialogPresenter @@ -36,7 +38,7 @@ IceTipMergeCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeCommand >> iconName [ ^ #merge diff --git a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st index 1d70eeb9d7..bfe81e157f 100644 --- a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st @@ -2,36 +2,38 @@ Command that opens a window showing the history of the selected merged branch. " Class { - #name : #IceTipMergeHistoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeHistoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultDescription [ ^ 'Show the merged history of the selected merge commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultName [ ^ 'Browse merge history' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeHistoryCommand >> canBeExecuted [ ^ self commitModel hasMultipleAncestors ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> commitModel [ ^ self context selectedCommit ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> execute [ (IceTipHistoryBrowser on: diff --git a/Iceberg-TipUI/IceTipMergeModel.class.st b/Iceberg-TipUI/IceTipMergeModel.class.st index 249baca4a0..3a2be87af4 100644 --- a/Iceberg-TipUI/IceTipMergeModel.class.st +++ b/Iceberg-TipUI/IceTipMergeModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipMergeModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipMergeModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'mergeType', 'mergeAction' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> calculateDiff [ ^ self mergeAction ] -{ #category : #private } +{ #category : 'private' } IceTipMergeModel >> mergeAction [ ^ mergeAction ifNil: [ @@ -24,13 +26,13 @@ IceTipMergeModel >> mergeAction [ yourself ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> mergeType: aMergeType [ mergeType := aMergeType ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newExecuteMergeAction [ @@ -42,13 +44,13 @@ IceTipMergeModel >> newExecuteMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newMergeAction [ ^ mergeType newMergeAction: commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> repositoryModel [ ^ commitish repositoryModel ] diff --git a/Iceberg-TipUI/IceTipMergeMorph.class.st b/Iceberg-TipUI/IceTipMergeMorph.class.st index f45def3de7..4dc7b9b9f2 100644 --- a/Iceberg-TipUI/IceTipMergeMorph.class.st +++ b/Iceberg-TipUI/IceTipMergeMorph.class.st @@ -2,19 +2,21 @@ I redefine PSMCMergeMorph to be able to use an IceMergePatchMorph as patch morph " Class { - #name : #IceTipMergeMorph, - #superclass : #PSMCMergeMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergeMorph', + #superclass : 'PSMCMergeMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeMorph >> conflictCount [ "Answer the number of conflicts that are unresolved." ^(self model ifNil: [^0]) unresolvedConflictCount ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeMorph >> model: aMerger [ "Set the model and update the window." @@ -26,7 +28,7 @@ IceTipMergeMorph >> model: aMerger [ self patchMorph model: aMerger ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeMorph >> newPatchMorph [ "Answer a new patch morph." diff --git a/Iceberg-TipUI/IceTipMergePatchMorph.class.st b/Iceberg-TipUI/IceTipMergePatchMorph.class.st index 534efa39a0..6a05a76fb0 100644 --- a/Iceberg-TipUI/IceTipMergePatchMorph.class.st +++ b/Iceberg-TipUI/IceTipMergePatchMorph.class.st @@ -2,19 +2,21 @@ I redefine part of monticello's PSMCMergePatchMorph to not require to rebuild a tree but use Iceberg's one directly. I also adapt the patch morph to handle files and several packages at the same time. " Class { - #name : #IceTipMergePatchMorph, - #superclass : #PSMCMergePatchMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergePatchMorph', + #superclass : 'PSMCMergePatchMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> changes [ "Answer the changes tree roots." ^ model ifNotNil: [ model mergeTree children collect: [ :each | IceMergeListWrapper with: each model: model ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ "Answer whether there are any conflicts not marked as a conflict." @@ -22,7 +24,7 @@ IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ conflict isConflict and: [ conflict isResolved ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ "Answer whether there are any conflicts not marked as incoming." @@ -31,7 +33,7 @@ IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ conflict isResolved not or: [conflict isLeftChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ "Answer whether there are any conflicts not marked as keep." @@ -40,7 +42,7 @@ IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ conflict isResolved not or: [conflict isRightChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasConflicts [ "Answer whether there are any conflicts." @@ -48,7 +50,7 @@ IceTipMergePatchMorph >> hasConflicts [ conflict isConflict ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> keepAllCurrentVersion [ "Mark all conflicts as local." @@ -58,7 +60,7 @@ IceTipMergePatchMorph >> keepAllCurrentVersion [ self updateSource ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> markAllAsConflict [ "Mark all conflicts as unresolved." @@ -68,7 +70,7 @@ IceTipMergePatchMorph >> markAllAsConflict [ self updateSource ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> markAsConflict [ "Mark the operation as unresolved conflict." @@ -77,7 +79,7 @@ IceTipMergePatchMorph >> markAsConflict [ self updateSource. ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> nextConflict [ "Answer the next (unresolved) conflict or, nil if none." @@ -92,7 +94,7 @@ IceTipMergePatchMorph >> nextConflict [ ^ IceMergeListWrapper with: node model: model. ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> notAllConflictsResolved [ "Answer whether any conflicts are unresolved." @@ -100,7 +102,7 @@ IceTipMergePatchMorph >> notAllConflictsResolved [ item isConflict and: [item isResolved not]] ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> selectNextConflict [ "Select the next conflict after the current selection, if any." @@ -109,14 +111,14 @@ IceTipMergePatchMorph >> selectNextConflict [ self changed: {#openPath}, next item path segments ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> selectedChange [ "Answer the selected change." ^(self selectedChangeWrapper ifNil: [^nil]) item value ] -{ #category : #private } +{ #category : 'private' } IceTipMergePatchMorph >> selectionHasActualClass [ "Answer whether the currently selected change has an actual class in the image." @@ -126,14 +128,14 @@ IceTipMergePatchMorph >> selectionHasActualClass [ ifNotNil: [:w | w item value contextClass notNil] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> selectionIsRemoteChosen [ self selectedChange ifNil: [ ^ false]. ^ self selectedChange isConflict and: [ self selectedChange isRightChosen ] ] -{ #category : #updating } +{ #category : 'updating' } IceTipMergePatchMorph >> updateSource [ "Update the source difference morph." @@ -159,7 +161,7 @@ IceTipMergePatchMorph >> updateSource [ ifFalse: [self diffMorph indicateSrc] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> useAllIncomingVersion [ "Mark all conflicts as remote." diff --git a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st index 5d9d18d743..83535956d8 100644 --- a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st @@ -4,12 +4,14 @@ I preview the changes that will be introduced in the image when a merge occurs. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipMergePreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipMergePreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergePreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipMergeModel new commitish: aBranch; @@ -17,14 +19,14 @@ IceTipMergePreviewBrowser class >> onBranch: aBranch [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePreviewBrowser >> doMerge [ self model newExecuteMergeAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipMergePreviewBrowser >> initializePresenters [ diffPanel rightLabel: 'Merge with ', model targetName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergePreviewBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipMergePreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> titleForWindow [ ^ 'Preview merge of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st index 3f8a4eec31..fdfc258341 100644 --- a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipMergeSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipMergeSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'codePanel', 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> basicRefresh [ super basicRefresh. self refreshCodePanel. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -46,13 +48,13 @@ IceTipMergeSelectingPanel >> changeListColumn [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> codePanel [ ^ codePanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipMergeSelectingPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -66,7 +68,7 @@ IceTipMergeSelectingPanel >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initialize [ super initialize. @@ -77,7 +79,7 @@ IceTipMergeSelectingPanel >> initialize [ child value isConflict ifTrue: [ child value selectLeft ] ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initializePresenters [ codePanel := self newCode. @@ -87,7 +89,7 @@ IceTipMergeSelectingPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> refresh [ super refresh. @@ -96,7 +98,7 @@ IceTipMergeSelectingPanel >> refresh [ self refreshCodePanel ] -{ #category : #private } +{ #category : 'private' } IceTipMergeSelectingPanel >> refreshCodePanel [ | visitor mergeNode | @@ -107,13 +109,13 @@ IceTipMergeSelectingPanel >> refreshCodePanel [ ifNotNil: [ mergeNode accept: visitor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipMergeSelectingPanel >> selectionChanged [ super selectionChanged. diff --git a/Iceberg-TipUI/IceTipMergeType.class.st b/Iceberg-TipUI/IceTipMergeType.class.st index 3fa3830c87..6d96c48bec 100644 --- a/Iceberg-TipUI/IceTipMergeType.class.st +++ b/Iceberg-TipUI/IceTipMergeType.class.st @@ -5,47 +5,49 @@ My children define strategies of how to merge two commitish. " Class { - #name : #IceTipMergeType, - #superclass : #Object, + #name : 'IceTipMergeType', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> default [ ^ self direct ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> direct [ ^ IceTipDirectMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> switchAndMerge [ ^ IceTipSwitchAndMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> uniqueInstance [ self = IceTipMergeType ifTrue: [ self error: 'I''m an abstract type. Use one of my children' ]. ^ uniqueInstance ifNil: [ uniqueInstance := self basicNew initialize ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> mergeOn: aModel then: aBlock [ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> newMergeAction: aModel [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st index dd81696941..0639cde03a 100644 --- a/Iceberg-TipUI/IceTipModel.class.st +++ b/Iceberg-TipUI/IceTipModel.class.st @@ -4,35 +4,37 @@ Each tip component refers to one (and just one) model, which will provide model Models can be cached using #beCached. " Class { - #name : #IceTipModel, - #superclass : #Object, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipModel', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #converting } +{ #category : 'converting' } IceTipModel >> beCached [ ^ IceTipCachedModel for: self ] -{ #category : #private } +{ #category : 'private' } IceTipModel >> colorForError [ ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipModel >> matches: aString [ "Override this if you want to make this model discoverable" ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> repositoryModel [ "this model does not provides a repository model" ^ nil ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> reset [ "to provide polymorphism with cached version" ] diff --git a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st index 8d00759a46..e5d2698279 100644 --- a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st @@ -5,24 +5,26 @@ Usually, I'm part of an IceTipRegisterProjectPresenter. I will define location, name and source subdirectory and I will use that to create a #newRepository. " Class { - #name : #IceTipNewRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, + #name : 'IceTipNewRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', #instVars : [ 'projectNameLabel', 'projectNameInputText', 'subdirectoryLabel', 'subdirectoryInputText' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel class >> order [ ^ 10 ] -{ #category : #layout } +{ #category : 'layout' } IceTipNewRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -35,13 +37,13 @@ IceTipNewRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -58,7 +60,7 @@ IceTipNewRepositoryPanel >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializeSourceDirectory [ subdirectoryLabel := self newLabel @@ -72,13 +74,13 @@ IceTipNewRepositoryPanel >> initializeSourceDirectory [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipNewRepositoryPanel >> isNewRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> newRepository [ | repositoryName location subdirectory | @@ -96,37 +98,37 @@ IceTipNewRepositoryPanel >> newRepository [ createNewRepositoryNamed: repositoryName ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryInputText [ ^ subdirectoryInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryLabel [ ^ subdirectoryLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> titleForWindow [ ^ 'New repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st index 046c3d4e94..51f0260a57 100644 --- a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st +++ b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st @@ -2,24 +2,26 @@ I am a command that, once executed, will open the native file browser on the directory containing the local repository of the git project. " Class { - #name : #IceTipOpenNativelyCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipOpenNativelyCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultDescription [ ^ 'Open the native file browser on the local repository of this project.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultName [ ^ 'Open in native file browser' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenNativelyCommand >> canBeExecuted [ | location | @@ -28,13 +30,13 @@ IceTipOpenNativelyCommand >> canBeExecuted [ ^ location isNotNil and: [ location exists ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenNativelyCommand >> execute [ self item location openInOSFileBrowser ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenNativelyCommand >> iconName [ ^ #smallWindow diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st index 2f6133367c..c63a4618b6 100644 --- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st @@ -7,17 +7,19 @@ I'm kind of a ""tabbed"" dialog, but my options are ""mac style"": lateral and n This is useful to keep a variable number of options. " Class { - #name : #IceTipOptionDialogPresenter, - #superclass : #IceTipPresenter, + #name : 'IceTipOptionDialogPresenter', + #superclass : 'IceTipPresenter', #instVars : [ 'typeList', 'type', 'contentLayout' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> accept [ [ @@ -28,19 +30,19 @@ IceTipOptionDialogPresenter >> accept [ e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> allTypes [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> contextSelection [ ^ type ] -{ #category : #layout } +{ #category : 'layout' } IceTipOptionDialogPresenter >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -50,19 +52,19 @@ IceTipOptionDialogPresenter >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> doAccept [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter @@ -72,14 +74,14 @@ IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter whenOpenedDo: [ self typeList selectIndex: 1 ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializePresenters [ contentLayout := SpBoxLayout newTopToBottom. self initializeTypeList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeTypeList [ (typeList := self newList) @@ -90,7 +92,7 @@ IceTipOptionDialogPresenter >> initializeTypeList [ self selectionChanged: selection selectedItem ] ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> replacePanelWith: aType [ contentLayout @@ -98,13 +100,13 @@ IceTipOptionDialogPresenter >> replacePanelWith: aType [ add: aType ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> selectedType [ ^ type ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> selectionChanged: aType [ type := aType. @@ -113,13 +115,13 @@ IceTipOptionDialogPresenter >> selectionChanged: aType [ self replacePanelWith: type ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipOptionDialogPresenter >> typeList [ ^ typeList ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> updateWindowTitle [ self window title: type titleForWindow diff --git a/Iceberg-TipUI/IceTipPackageCommand.class.st b/Iceberg-TipUI/IceTipPackageCommand.class.st index 2f48f71553..72c5cc9e02 100644 --- a/Iceberg-TipUI/IceTipPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipPackageCommand.class.st @@ -2,45 +2,47 @@ Abstract class representing commands to be applied on top of packages. " Class { - #name : #IceTipPackageCommand, - #superclass : #IceTipCommand, + #name : 'IceTipPackageCommand', + #superclass : 'IceTipCommand', #instVars : [ 'packageModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand class >> isAbstract [ ^ self == IceTipPackageCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> hasPackageModel [ ^ self packageModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> isPackageLoaded [ ^ self hasPackageModel and: [ self packageModel isLoaded ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> package [ ^ self packageModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel [ ^ packageModel ifNil: [self context packageModel] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel: anIceTipPackageModel [ packageModel := anIceTipPackageModel diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index 769de7dc50..a71afe257c 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -2,19 +2,21 @@ I'm a model for IcePackage entries. " Class { - #name : #IceTipPackageModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPackageModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browsePackage [ self entity browse ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browseRepositoryVersion [ | snapshot | @@ -24,7 +26,7 @@ IceTipPackageModel >> browseRepositoryVersion [ showLabelled: 'Snapshot for ', self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> description [ | text | @@ -34,7 +36,7 @@ IceTipPackageModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> descriptionDecorator [ self entity isModified @@ -45,22 +47,22 @@ IceTipPackageModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isLoaded [ ^ self entity isLoaded ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isModified [ ^ self entity isModified ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> newLoadAction [ @@ -75,12 +77,12 @@ IceTipPackageModel >> newLoadAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> packageName [ ^ self entity packageName ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> reload [ @@ -94,7 +96,7 @@ IceTipPackageModel >> reload [ while: [ self entity reload ] ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> remove [ @@ -108,7 +110,7 @@ IceTipPackageModel >> remove [ while: [ self entity remove ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> status [ "entity could be a repository or a package" [ @@ -120,7 +122,7 @@ IceTipPackageModel >> status [ ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> statusDecorator [ self entity isLoaded @@ -128,7 +130,7 @@ IceTipPackageModel >> statusDecorator [ ^ super statusDecorator ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> unload [ diff --git a/Iceberg-TipUI/IceTipPresenter.class.st b/Iceberg-TipUI/IceTipPresenter.class.st index bd03d7bd41..e6fa418d83 100644 --- a/Iceberg-TipUI/IceTipPresenter.class.st +++ b/Iceberg-TipUI/IceTipPresenter.class.st @@ -2,54 +2,56 @@ I'm a SpPresenter that is prepared to be wrapped in a window (or a dialog). The way it is prepared is through a system of hooks (template method pattern), but also providing some convenience API. " Class { - #name : #IceTipPresenter, - #superclass : #SpPresenter, + #name : 'IceTipPresenter', + #superclass : 'SpPresenter', #instVars : [ 'decorations' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #decorating } +{ #category : 'decorating' } IceTipPresenter class >> buildDecorations [ ^ (Pragma allNamed: #extensionDecorators in: self class) flatCollect: [ :pragma | self perform: pragma methodSelector ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter class >> currentApplication [ ^ StPresenter currentApplication ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPresenter class >> new [ ^ self newApplication: self currentApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter >> closeWindow [ "Close the window of this presenter" self window close ] -{ #category : #private } +{ #category : 'private' } IceTipPresenter >> decorations [ ^ decorations ifNil: [ decorations := self class buildDecorations ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> iconForWindow [ "Answer a Form to be used during initialization when opening in a SpWindowPresenter." ^ self iconNamed: #smallWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initialExtentForWindow [ "Answer either nil or a Point representing the initial extent of this presenter. It is used during initialization if this presenter is opened inside a SpWindowPresenter. @@ -58,7 +60,7 @@ IceTipPresenter >> initialExtentForWindow [ ^ nil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -70,25 +72,25 @@ IceTipPresenter >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setInitialExtentTo: aSpWindowPresenter [ aSpWindowPresenter initialExtent: self initialExtentForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setTitleTo: aSpWindowPresenter [ aSpWindowPresenter title: self titleForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setWindowIconTo: aSpWindowPresenter [ aSpWindowPresenter windowIcon: self iconForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> titleForWindow [ "Answer the title to use during initialization when this presenter is being opened in a SpWindowPresenter." @@ -97,7 +99,7 @@ IceTipPresenter >> titleForWindow [ ] -{ #category : #extensions } +{ #category : 'extensions' } IceTipPresenter >> updateTitle [ self withWindowDo: [ :aWindow | aWindow title: self titleForWindow ] diff --git a/Iceberg-TipUI/IceTipPreviewBrowser.class.st b/Iceberg-TipUI/IceTipPreviewBrowser.class.st index 7623877b11..50cb8b30d1 100644 --- a/Iceberg-TipUI/IceTipPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipPreviewBrowser.class.st @@ -3,35 +3,37 @@ I'm a browser to show a preview of an operation that can be made right after. Tipically, I'm using through my chldren, to do a checkout or merge. " Class { - #name : #IceTipPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'actionPanel', 'button' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> actionPanel [ ^ actionPanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,19 +44,19 @@ IceTipPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffPanel on: self model diff. @@ -62,14 +64,14 @@ IceTipPreviewBrowser >> initializePresenters [ actionPanel add: (button := self newActionButton) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPreviewBrowser >> newActionButton [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipPullBrowser.class.st b/Iceberg-TipUI/IceTipPullBrowser.class.st index 8337cf3717..2f61669678 100644 --- a/Iceberg-TipUI/IceTipPullBrowser.class.st +++ b/Iceberg-TipUI/IceTipPullBrowser.class.st @@ -3,18 +3,20 @@ I perform a pull of incoming commits. " Class { - #name : #IceTipPullBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPullBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPullBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipFetchInPullCommand forSpec ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPullBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPullModel @@ -24,20 +26,20 @@ IceTipPullBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullBrowser >> doPull [ self model newPullAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> labelForRemotePanel [ ^ 'Pull from remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPullBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipPullBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> titleForWindow [ ^ 'Pull {1}/{2} from {3}' format: { diff --git a/Iceberg-TipUI/IceTipPullCommand.class.st b/Iceberg-TipUI/IceTipPullCommand.class.st index 52249626c8..f51c0503b4 100644 --- a/Iceberg-TipUI/IceTipPullCommand.class.st +++ b/Iceberg-TipUI/IceTipPullCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a pull of incomming commits. I open a pull view window. " Class { - #name : #IceTipPullCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPullCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultDescription [ ^ 'Pulls into image all commits from your version to the origin remote HEAD' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultName [ ^ 'Pull' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> badge [ | result | @@ -33,7 +35,7 @@ IceTipPullCommand >> badge [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPullCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullCommand >> iconName [ ^ #down diff --git a/Iceberg-TipUI/IceTipPullModel.class.st b/Iceberg-TipUI/IceTipPullModel.class.st index 1dc3fc02fc..a539dc84d4 100644 --- a/Iceberg-TipUI/IceTipPullModel.class.st +++ b/Iceberg-TipUI/IceTipPullModel.class.st @@ -2,12 +2,14 @@ I'm a model to present pull commits and operations. " Class { - #name : #IceTipPullModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPullModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullModel >> commitModels [ ^ (self entity branch incomingCommitsFrom: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPullModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullModel >> newPullAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipPushAction.class.st b/Iceberg-TipUI/IceTipPushAction.class.st index 25ab9149af..63e2530b17 100644 --- a/Iceberg-TipUI/IceTipPushAction.class.st +++ b/Iceberg-TipUI/IceTipPushAction.class.st @@ -2,12 +2,14 @@ I perform a push. " Class { - #name : #IceTipPushAction, - #superclass : #IceTipAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushAction', + #superclass : 'IceTipAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipPushAction >> basicExecute [ UIManager default diff --git a/Iceberg-TipUI/IceTipPushBrowser.class.st b/Iceberg-TipUI/IceTipPushBrowser.class.st index 9947a1bdbc..a9fd2695c0 100644 --- a/Iceberg-TipUI/IceTipPushBrowser.class.st +++ b/Iceberg-TipUI/IceTipPushBrowser.class.st @@ -3,18 +3,20 @@ I perform a push of outgoing commits. " Class { - #name : #IceTipPushBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPushBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPushBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "No commands to add." ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPushBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPushModel @@ -24,21 +26,21 @@ IceTipPushBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushBrowser >> doPush [ self model newPushAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> labelForRemotePanel [ ^ 'Push to remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPushBrowser >> newActionButton [ ^ self newButton @@ -50,7 +52,7 @@ IceTipPushBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> titleForWindow [ ^ 'Push {1}/{2} to {3}' format: { diff --git a/Iceberg-TipUI/IceTipPushCommand.class.st b/Iceberg-TipUI/IceTipPushCommand.class.st index 282cc6f6e2..4c8aebefd0 100644 --- a/Iceberg-TipUI/IceTipPushCommand.class.st +++ b/Iceberg-TipUI/IceTipPushCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a push of outgoing commits. I open a push view window. " Class { - #name : #IceTipPushCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultDescription [ ^ 'Pushes pending commits to the origin repository (in current branch)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultName [ ^ 'Push' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> badge [ | result | @@ -34,7 +36,7 @@ IceTipPushCommand >> badge [ ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPushCommand >> execute [ (IceTipPushBrowser onRepositoryModel: self repositoryModel) open ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushCommand >> iconName [ ^ #up diff --git a/Iceberg-TipUI/IceTipPushModel.class.st b/Iceberg-TipUI/IceTipPushModel.class.st index 888cfbeccf..c41a476ead 100644 --- a/Iceberg-TipUI/IceTipPushModel.class.st +++ b/Iceberg-TipUI/IceTipPushModel.class.st @@ -2,12 +2,14 @@ I'm a model to present push commits and operations. " Class { - #name : #IceTipPushModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPushModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushModel >> commitModels [ ^ (self entity outgoingCommitsTo: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPushModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushModel >> newPushAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st index c0ff3c884f..a5791aa76d 100644 --- a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st +++ b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st @@ -15,8 +15,8 @@ IceTipReadOnlyForm new " Class { - #name : #IceTipReadOnlyFormBuilder, - #superclass : #Object, + #name : 'IceTipReadOnlyFormBuilder', + #superclass : 'Object', #instVars : [ 'labelColor', 'labelWidth', @@ -25,10 +25,12 @@ Class { 'spApplication', 'presenter' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpApplication [ "If you want to keep order, just send an OrderedDictionary" @@ -39,13 +41,13 @@ IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpAppl build ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> application: aSpApplication [ spApplication := aSpApplication ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> build [ presenter := spApplication newPresenter: SpPresenter. @@ -53,7 +55,7 @@ IceTipReadOnlyFormBuilder >> build [ ^ presenter ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> buildLayout [ | lastLabel fieldPresenter | lastLabel := items associations last key. @@ -84,26 +86,26 @@ IceTipReadOnlyFormBuilder >> buildLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultLabelWidth [ ^ 100 * self currentWorld displayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultRowHeight [ ^ 30 * self currentWorld displayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipReadOnlyFormBuilder >> initialize [ items := OrderedDictionary new. super initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> items: aDictionary [ items removeAll. @@ -111,37 +113,37 @@ IceTipReadOnlyFormBuilder >> items: aDictionary [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor [ ^ labelColor ifNil: [ labelColor := Smalltalk ui theme textColor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor: aColor [ ^ labelColor := aColor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth [ ^ labelWidth ifNil: [ self defaultLabelWidth ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth: aNumber [ ^ labelWidth := aNumber ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight [ ^ rowHeight ifNil: [ rowHeight := self defaultRowHeight ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight: aNumber [ rowHeight := aNumber diff --git a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st index 5ac1bb6832..d96de2a584 100644 --- a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st @@ -2,24 +2,26 @@ Command that launches a refresh of the commit tree during commit " Class { - #name : #IceTipRefreshCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRefreshCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultDescription [ ^ 'Refresh this change tree' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultName [ ^ 'Refresh' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRefreshCommitCommand >> execute [ self repositoryModel reset. @@ -28,13 +30,13 @@ IceTipRefreshCommitCommand >> execute [ self toolAnnouncer announce: (IceTipDiffRefreshed for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> iconName [ ^ #glamorousRefresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st index b93531803d..2388a31c59 100644 --- a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st @@ -7,23 +7,25 @@ self new openDialogWithSpec " Class { - #name : #IceTipRegisterRepositoryDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipRegisterRepositoryDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'types', 'repository', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> allTypes [ ^ types ifNil: [ types := IceTipRepositoryTypePanel allTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ self withoutNewRepository. @@ -31,7 +33,7 @@ IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ repository := aRepository ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doAccept [ | newRepository | @@ -42,7 +44,7 @@ IceTipRegisterRepositoryDialogPresenter >> doAccept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ repository @@ -50,32 +52,32 @@ IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ subdirectory: aRepository subdirectory ] -{ #category : #testing } +{ #category : 'testing' } IceTipRegisterRepositoryDialogPresenter >> isEditing [ ^ repository isNotNil ] -{ #category : #events } +{ #category : 'events' } IceTipRegisterRepositoryDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRegisterRepositoryDialogPresenter >> titleForWindow [ ^ 'Register project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutLocalRepository [ types := self allTypes reject: #isLocalRepository. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutNewRepository [ types := self allTypes reject: #isNewRepository. diff --git a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st index 197067b52f..e09b6bdb88 100644 --- a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that reloads the code of an already loaded package, discarding all changes done in the meantime that were not committed. " Class { - #name : #IceTipReloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipReloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultDescription [ ^ 'Reload selected package, discarding all changes.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultName [ ^ 'Reload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipReloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipReloadPackageCommand >> execute [ self packageModel reload. @@ -33,7 +35,7 @@ IceTipReloadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReloadPackageCommand >> iconName [ ^ #refresh diff --git a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st index 34937c7b68..ae2706a1ef 100644 --- a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st @@ -1,25 +1,27 @@ Class { - #name : #IceTipRemoteActionBrowser, - #superclass : #IceTipHistoryActionBrowser, + #name : 'IceTipRemoteActionBrowser', + #superclass : 'IceTipHistoryActionBrowser', #instVars : [ 'remotePanel', 'remoteLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRemoteActionBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "No commands to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRemoteActionBrowser class >> onRepositoryModel: aRepository [ ^ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoteActionBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -36,7 +38,7 @@ IceTipRemoteActionBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializePresenters [ super initializePresenters. @@ -51,7 +53,7 @@ IceTipRemoteActionBrowser >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. @@ -59,25 +61,25 @@ IceTipRemoteActionBrowser >> initializeWindow: aWindow [ aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> labelForRemotePanel [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> mainList [ ^ commitsPanel commitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel [ ^ remotePanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel: aSpPresenter [ remotePanel := aSpPresenter diff --git a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st index 88a28a1881..db2bb3ddd6 100644 --- a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st @@ -2,24 +2,26 @@ I'm a the abstract superclass of commands that act on remotes. " Class { - #name : #IceTipRemoteActionCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoteActionCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand class >> isAbstract [ ^ self == IceTipRemoteActionCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand >> canBeExecuted [ ^ self isRepositoryOperational and: [ self repositoryModel hasRemotes ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipRemoteActionCommand >> validateRemotesPresent [ self repositoryModel hasRemotes diff --git a/Iceberg-TipUI/IceTipRemoteActionModel.class.st b/Iceberg-TipUI/IceTipRemoteActionModel.class.st index 20b9262471..bac204af2f 100644 --- a/Iceberg-TipUI/IceTipRemoteActionModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionModel.class.st @@ -1,24 +1,26 @@ Class { - #name : #IceTipRemoteActionModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipRemoteActionModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> branchName [ ^ entity branchName ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionModel >> isRepositoryDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remote [ ^ remote ifNil: [ | head | head := self repositoryModel entity head. @@ -27,27 +29,27 @@ IceTipRemoteActionModel >> remote [ ifFalse: [ self remoteModels first entity ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModel [ ^ repositoryModel remoteModels detect: [ :e | e entity = self remote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModels [ ^ self repositoryModel remoteModels ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteName [ ^ self remote name, '/', self entity branch name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> useRemote: aRemoteModel [ remote := aRemoteModel entity. ] diff --git a/Iceberg-TipUI/IceTipRemoteModel.class.st b/Iceberg-TipUI/IceTipRemoteModel.class.st index 88688143f4..520a10d1cd 100644 --- a/Iceberg-TipUI/IceTipRemoteModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteModel.class.st @@ -2,14 +2,16 @@ I'm a model for IceRemote entries. " Class { - #name : #IceTipRemoteModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRemoteModel', + #superclass : 'IceTipEntityModel', #traits : 'TWithBranchModel', #classTraits : 'TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #comparing } +{ #category : 'comparing' } IceTipRemoteModel >> = anotherModel [ self species = anotherModel species ifFalse: [ ^ false ]. @@ -17,23 +19,23 @@ IceTipRemoteModel >> = anotherModel [ ^ entity = anotherModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> branches [ ^ self entity branches ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> description [ ^ '{1} <{2}>' format: { self name. self entity url } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newDeleteAction [ @@ -45,7 +47,7 @@ IceTipRemoteModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newFetchAction [ diff --git a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st index 8007441af0..67ab450880 100644 --- a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st +++ b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st @@ -2,36 +2,38 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRemotesTreeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemotesTreeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand class >> isAbstract [ ^ self == IceTipRemotesTreeCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item canActivateCommand: self ] diff --git a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st index e2b78de9dc..fbf5514850 100644 --- a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st @@ -2,43 +2,45 @@ I remove a credential from the credential store. " Class { - #name : #IceTipRemoveCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipRemoveCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultDescription [ ^ 'Removes the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultName [ ^ 'Remove' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoveCredentialCommand >> canBeExecuted [ ^ self item isDefault not ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveCredentialCommand >> execute [ self store removeCredential: self item. self tool refresh. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st index be305dcb9b..371f2f2475 100644 --- a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st @@ -2,30 +2,32 @@ Command that removes a package from the repository, without removing it from the system. " Class { - #name : #IceTipRemoveFromRepositoryPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoveFromRepositoryPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultDescription [ ^ 'Removes the current repository from the repository, without removing it from the system' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultName [ ^ 'Remove from repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveFromRepositoryPackageCommand >> execute [ self packageModel remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveFromRepositoryPackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st index c1872aeb06..23317b3c2b 100644 --- a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRemovePackageDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemovePackageDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', @@ -8,10 +8,12 @@ Class { 'removeFromRepositoryCheckbox', 'unloadFromImageCheckbox' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemovePackageDialogPresenter >> accept [ self removeFromRepositoryCheckbox state @@ -20,19 +22,19 @@ IceTipRemovePackageDialogPresenter >> accept [ ifTrue: [ self model unload ]. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove package {1}?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemovePackageDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -48,13 +50,13 @@ IceTipRemovePackageDialogPresenter >> defaultLayout [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ ^ (500 @@ -62,7 +64,7 @@ IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ scaledByDisplayScaleFactor "Yes, a magic number" ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -81,37 +83,37 @@ IceTipRemovePackageDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> removeFromRepositoryCheckbox [ ^ removeFromRepositoryCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> titleForWindow [ ^ 'Remove Package' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> unloadFromImageCheckbox [ ^ unloadFromImageCheckbox diff --git a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st index 448a16e9ed..71fe70061b 100644 --- a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRemoveRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemoveRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', 'confirmLabel', 'removeFileSystemCheckbox' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemoveRepositoryDialogPresenter >> accept [ (self removeFileSystemCheckbox state @@ -19,18 +21,18 @@ IceTipRemoveRepositoryDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove your repository {1} from your image?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -44,13 +46,13 @@ IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -60,7 +62,7 @@ IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -74,36 +76,36 @@ IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> removeFileSystemCheckbox [ ^ removeFileSystemCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> removeMessage [ ^ 'Also remove repository from file system' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> titleForWindow [ ^ 'Remove repository' diff --git a/Iceberg-TipUI/IceTipRepairAction.class.st b/Iceberg-TipUI/IceTipRepairAction.class.st index 32ed347aa6..787abea3ae 100644 --- a/Iceberg-TipUI/IceTipRepairAction.class.st +++ b/Iceberg-TipUI/IceTipRepairAction.class.st @@ -3,15 +3,17 @@ I'm a repair option. Repositories can be broken in several ways. My children will describe them and take the actions needed to perform the re-alignment of an image with its repository. " Class { - #name : #IceTipRepairAction, - #superclass : #IceTipAction, + #name : 'IceTipRepairAction', + #superclass : 'IceTipAction', #instVars : [ 'repositoryModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> allAvailableFor: aRepository [ ^ ((self allSubclasses select: [ :each | each isAvailableFor: aRepository ]) @@ -19,38 +21,38 @@ IceTipRepairAction class >> allAvailableFor: aRepository [ collect: #new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> help [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAbstract [ ^ self == IceTipRepairAction ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAvailableFor: aRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> order [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> title [ ^ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self context: aContext. @@ -58,7 +60,7 @@ IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> fetchAllRemotes [ | remotes | remotes := self repository remotes. @@ -72,32 +74,32 @@ IceTipRepairAction >> fetchAllRemotes [ self repository fetchFrom: each ] ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> help [ ^ self class help ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> icon [ ^ self class icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repositoryModel [ ^ repositoryModel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> title [ ^ self class title ] diff --git a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st index dd5395e074..cb040b7b29 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> help [ ^ 'Discard all changes in your image and checkout an existing branch. This action will checkout the branch in the repository and synchronize your image with your repository. @@ -23,12 +25,12 @@ This action opens a preview window before doing any change. This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> icon [ ^ self iconNamed: #branch ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -38,17 +40,17 @@ IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ and: [ aRepository project isUnborn or: [ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> title [ ^ 'Checkout an existing branch discarding image changes' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st index fa85dd2b84..f843cc3782 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st @@ -7,12 +7,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutNewBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutNewBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> help [ ^ 'It creates a new branch from the commit your image is pointing to. This will not lose any change in the image. @@ -22,12 +24,12 @@ This situation happens because the code loaded in your image does not correspond This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> title [ ^ 'Create a new branch pointing to your image commit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutNewBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st index 2bbf694e4d..229ce41e08 100644 --- a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairCloneRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCloneRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> help [ ^ 'Clone again the repository into a new location. @@ -23,29 +25,29 @@ So, this action will very probably let you in a detached status. You will need to re-synchronize your repository with another repair action.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> icon [ ^ self iconNamed: #smallAdd ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCloneRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> title [ ^ 'Clone again this repository in a new location' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCloneRepository >> basicExecute [ ((IceTipRegisterRepositoryDialogPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipRepairCommand.class.st b/Iceberg-TipUI/IceTipRepairCommand.class.st index ad3f612190..1ea3fd269e 100644 --- a/Iceberg-TipUI/IceTipRepairCommand.class.st +++ b/Iceberg-TipUI/IceTipRepairCommand.class.st @@ -2,36 +2,38 @@ Command that opens the repair window on a repository " Class { - #name : #IceTipRepairCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultDescription [ ^ 'Helps you to repair your repository when it is detached.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultName [ ^ 'Repair repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultToolbarItemName [ ^ 'Repair' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCommand >> execute [ ((IceTipRepairRepositoryDialogPresenter @@ -42,7 +44,7 @@ IceTipRepairCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st index 71012bf783..a0d2a6921c 100644 --- a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st +++ b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairCreateSubdirectory, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCreateSubdirectory', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> help [ ^ 'Create a new subdirectory for the code. @@ -20,28 +22,28 @@ It is possible that the directory has been deleted or never commited after creat This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCreateSubdirectory class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> title [ ^ 'Create code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCreateSubdirectory >> basicExecute [ self repositoryModel createSourceDirectory. diff --git a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st index 6a06d6a430..3fc00951ed 100644 --- a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st +++ b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairDiscardAndLoad, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairDiscardAndLoad', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> help [ ^ 'Discard all changes in your image and checkout the current commit (HEAD) in the repository. @@ -24,12 +26,12 @@ This situation happens because loaded code in your image is from a different com Opens a preview window with the incoming changes before doing any change.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> icon [ ^ self iconNamed: #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ and: [ aRepository head isDetached not ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> order [ ^ 40 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> title [ ^ 'Discard image changes and load repository version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairDiscardAndLoad >> basicExecute [ (IceTipCheckoutPreviewBrowser onBranch: self repositoryModel branchModel) @@ -58,7 +60,7 @@ IceTipRepairDiscardAndLoad >> basicExecute [ open ] -{ #category : #private } +{ #category : 'private' } IceTipRepairDiscardAndLoad >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairEditRepository.class.st b/Iceberg-TipUI/IceTipRepairEditRepository.class.st index 8850faf7bf..44a93839e4 100644 --- a/Iceberg-TipUI/IceTipRepairEditRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairEditRepository.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairEditRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairEditRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> help [ ^ 'You can edit the repository to inform another subdirectory name. Once the new subdirectory is updated, the packages in the repository are available. @@ -20,28 +22,28 @@ This happens because the source code directory has been moved or renamed. ' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> icon [ ^ self iconNamed: #edit ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairEditRepository class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> title [ ^ 'Edit the repository to select the correct code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairEditRepository >> basicExecute [ (IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st index c12b889730..74e0a17e52 100644 --- a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st @@ -6,12 +6,14 @@ matches if: " Class { - #name : #IceTipRepairFetchRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairFetchRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> help [ ^ 'You can fetch commits from a remote to find your image commit in your repository. This will not lose any change in the image or the repository. @@ -23,12 +25,12 @@ After doing the fetch, it is required to create a new branch to commit into the A second repair action will help you.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> icon [ ^ self iconNamed: #smallUpdate ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy referenceCommit isUnknownCommit" @@ -37,24 +39,24 @@ IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy referenceCommit isUnknownCommit ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> order [ ^ 15 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> title [ ^ 'Fetch remote commits including the commits of the image version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" self fetchAllRemotes ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st index 232abefec4..985b9b5f55 100644 --- a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairLocateRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairLocateRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> help [ ^ 'Locate this repository in your file system. @@ -23,29 +25,29 @@ You will need to re-synchronize your repository with another repair action. This happens if the repository has been removed from the disk or the image was pointing to a repository in another machine (For example, when sharing images with other machines / people).' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> icon [ ^ self iconNamed: #glamorousFolder ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairLocateRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> title [ ^ 'Locate this repository in your file system' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> basicExecute [ | dialog | @@ -61,12 +63,12 @@ IceTipRepairLocateRepository >> basicExecute [ open. ] -{ #category : #private } +{ #category : 'private' } IceTipRepairLocateRepository >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] diff --git a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st index 3ee897f53c..0f258921e7 100644 --- a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairMergeWithBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairMergeWithBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> help [ ^ 'This action checkouts an existing branch and loads the code in your image without discarding any change. This will not lose any change in the image but may lead to conflicts. If there are conflicts it opens a merge view. @@ -21,12 +23,12 @@ This situation happens because loaded code in your image is from a different com This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-commited changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> icon [ ^ self iconNamed: #merge ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -39,17 +41,17 @@ IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ aRepository head isDetached not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> title [ ^ 'Checkout an existing branch and merge the changes into the image (without discarding image changes)' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairMergeWithBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairProject.class.st b/Iceberg-TipUI/IceTipRepairProject.class.st index ce164f63e0..92caae1ec9 100644 --- a/Iceberg-TipUI/IceTipRepairProject.class.st +++ b/Iceberg-TipUI/IceTipRepairProject.class.st @@ -2,12 +2,14 @@ I'm an action to repair a project, which is useful when it answers true to #isUnborn. " Class { - #name : #IceTipRepairProject, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairProject', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> help [ ^ 'Edit the repository to add project meta-data. This action will create a .project file in the root of your repository adding meta information such as source code directory, project name, format and so on. @@ -15,12 +17,12 @@ This action will create a .project file in the root of your repository adding me This situation happens because your project does not have project meta-data and Iceberg does not know how to correctly interpret its data.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> icon [ ^ self iconNamed: #config ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairProject class >> isAvailableFor: aRepository [ "matches if: - workingCopy is atached @@ -32,17 +34,17 @@ IceTipRepairProject class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy project isUnborn ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> title [ ^ 'Create project meta-data' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairProject >> basicExecute [ ((IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st index 65432e1357..8ace58c44b 100644 --- a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st @@ -5,12 +5,14 @@ matches if: - workingCopy is detached AND there is no commit in the current available commits " Class { - #name : #IceTipRepairPullRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairPullRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> help [ ^ 'You can pull commits from a remote to put your image and your repository in sync. This will not lose any change in the image. @@ -20,12 +22,12 @@ This situation happens because the code loaded in your image is not in the branc This operation will modify the state of your working copy in disk. All non-commited changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> icon [ ^ self iconNamed: #down ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached AND there is no commit in the current available commits" @@ -37,17 +39,17 @@ IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ (aRepository includesCommit: aRepository workingCopy referenceCommit) not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> title [ ^ 'Pull remote commits to put your repository in sync' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairPullRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st index 9284c8ae2d..c67813e158 100644 --- a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRepairRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRepairRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'optionsList', 'detailPanel', @@ -8,16 +8,18 @@ Class { 'selectedOption', 'reasonPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepairRepositoryDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepairRepositoryDialogPresenter >> accept [ self closeWindow. @@ -26,13 +28,13 @@ IceTipRepairRepositoryDialogPresenter >> accept [ model: self model ] -{ #category : #'api - focus' } +{ #category : 'api - focus' } IceTipRepairRepositoryDialogPresenter >> defaultKeyboardFocus [ ^ optionsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepairRepositoryDialogPresenter >> defaultLayout [ self flag: #TODO. "Replace the fixed height with a correct style" @@ -44,19 +46,19 @@ IceTipRepairRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> detailPanel [ ^ detailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -70,7 +72,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ optionsList @@ -89,7 +91,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ whenActivatedDo: [ :selection | selection ifNotNil: [ self accept ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializePresenters [ reasonPanel := self newText @@ -108,31 +110,31 @@ IceTipRepairRepositoryDialogPresenter >> initializePresenters [ self initializeOptionsList ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> initializeReasonPanel [ reasonPanel text: self model longStatus ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> optionsList [ ^ optionsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> reasonPanel [ ^ reasonPanel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ selectedOption ifNotNil: [ @@ -141,14 +143,14 @@ IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> refreshDialogButtons [ self window ifNotNil: [ :aWindow | aWindow buttons first enabled: (selectedOption isNotNil) ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ selectedOption := selectedItem. @@ -157,13 +159,13 @@ IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> titleForWindow [ ^ 'Repair repository' diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 0bf3a8bff7..f10f85f4ff 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -5,17 +5,19 @@ I define basic actions and an entry point to manage each repository individually IceTipRepositoriesBrowser new open. " Class { - #name : #IceTipRepositoriesBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoriesBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'currentGroupPanel', 'repositoryNotebook', 'notifyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipFetchAllProjectCommand. @@ -26,7 +28,7 @@ IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -47,7 +49,7 @@ IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ super buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup. @@ -60,13 +62,13 @@ IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presente ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser class >> iconForWorldMenu [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #'world menu' } +{ #category : 'world menu' } IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ "Add a custom menu item to the world menu" @@ -80,13 +82,13 @@ IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ action: [ self new open ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> new [ ^ self newOnRepositoryProvider: IceRepository ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ | application | @@ -104,7 +106,7 @@ IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ notifyPanel layout add: (notifyPanel newLabel @@ -112,7 +114,7 @@ IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> connectPresenters [ repositoryNotebook whenSelectedPageChangedDo: [ :newPage | @@ -120,19 +122,19 @@ IceTipRepositoriesBrowser >> connectPresenters [ aPresenter updatePresenter ] ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> currentGroupPanel [ ^ currentGroupPanel ifNil: [ currentGroupPanel := self layout children first ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> defaultKeyboardFocus [ ^ repositoryNotebook ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoriesBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -141,7 +143,7 @@ IceTipRepositoriesBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> hasSelectedItem [ ^ repositoryNotebook selectedPage @@ -150,19 +152,19 @@ IceTipRepositoriesBrowser >> hasSelectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> iconForWindow [ ^ self class iconForWorldMenu ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initialExtentForWindow [ ^ (600 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initializePresenters [ notifyPanel := self newPresenter. @@ -172,14 +174,14 @@ IceTipRepositoriesBrowser >> initializePresenters [ repositoryNotebook := self newNotebook ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> mainList [ "should not arrive here" ^ nil ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -187,20 +189,20 @@ IceTipRepositoriesBrowser >> openManagePackagesWindow [ execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanel [ "this method is using exclusively for testing." ^ repositoryNotebook pages first activePresenter ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelIsShowingRepository: anIceLibgitRepository [ ^ self projectsPanel isShowingRepository: anIceLibgitRepository ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ "this method is using exclusively for testing. it will answer the repository list form the projects page" @@ -208,21 +210,21 @@ IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ ^ self projectsPanel repositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryModels [ "this method is used exclusively for testing" ^ self projectsPanelRepositoryList items ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> refresh [ repositoryNotebook selectedPage ifNil: [ ^ self ]. repositoryNotebook selectedPage activePresenter updatePresenter ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> refreshCommands [ | rootGroup | @@ -233,13 +235,13 @@ IceTipRepositoriesBrowser >> refreshCommands [ refreshToolbarWith: rootGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> selectedItem [ ^ repositoryNotebook selectedPage @@ -247,7 +249,7 @@ IceTipRepositoriesBrowser >> selectedItem [ ifNil: [ nil ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -255,7 +257,7 @@ IceTipRepositoriesBrowser >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -264,13 +266,13 @@ IceTipRepositoriesBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> titleForWindow [ ^ 'Repositories' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> updatePresenter [ LGitLibrary uniqueInstance isAvailable @@ -287,7 +289,7 @@ IceTipRepositoriesBrowser >> updatePresenter [ self refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoriesModel.class.st b/Iceberg-TipUI/IceTipRepositoriesModel.class.st index 363bd7ed9a..8d3cf107d6 100644 --- a/Iceberg-TipUI/IceTipRepositoriesModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesModel.class.st @@ -2,21 +2,23 @@ I'm a model to provide access to all repositories registered. " Class { - #name : #IceTipRepositoriesModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoriesModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositories [ ^ repositoryProvider repositories collect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryGroups [ | sortGroup groups | @@ -46,7 +48,7 @@ IceTipRepositoriesModel >> repositoryGroups [ group: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st index 3932c52a2d..d4c3e05009 100644 --- a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st @@ -3,16 +3,18 @@ I'm a browser to show the internals of a repository. I will show remotes, branches, tags and all possible operations in low level repository (pull, push, branch. But all edit remotes, etc.) " Class { - #name : #IceTipRepositoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'sidebarTree', 'historyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddRemoteCommand. @@ -24,7 +26,7 @@ IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aC aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ | aGroup | @@ -50,30 +52,30 @@ IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> new [ self error: 'Use #onRepository:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepositoryNamed: aString [ ^ self onRepository: (IceRepository registry detect: [ :each | each name = aString ]) ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipRepositoryBrowser >> commitishSelected: ann [ historyPanel model: ann ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryBrowser >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -83,19 +85,19 @@ IceTipRepositoryBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> historyPanel [ ^ historyPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initialExtentForWindow [ ^ (1000 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializePresenters [ sidebarTree := self newTreeTable. @@ -109,7 +111,7 @@ IceTipRepositoryBrowser >> initializePresenters [ self initializeSidebarTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializeSidebarTree [ sidebarTree @@ -129,14 +131,14 @@ IceTipRepositoryBrowser >> initializeSidebarTree [ ifTrue: [ self commitishSelected: selection selectedItem ] ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ sidebarTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryBrowser >> refresh [ self refreshCommands. @@ -145,7 +147,7 @@ IceTipRepositoryBrowser >> refresh [ self selectCurrentBranch ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) ifFalse: [ ^ self ]. @@ -153,7 +155,7 @@ IceTipRepositoryBrowser >> refreshWhenRepository: ann [ self updatePresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> selectCurrentBranch [ | branch | @@ -166,13 +168,13 @@ IceTipRepositoryBrowser >> selectCurrentBranch [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> sidebarTree [ ^ sidebarTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -181,13 +183,13 @@ IceTipRepositoryBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> titleForWindow [ ^ 'Repository of ' , self model name ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipRepositoryCommand.class.st b/Iceberg-TipUI/IceTipRepositoryCommand.class.st index 31cfa04b4c..42a298249b 100644 --- a/Iceberg-TipUI/IceTipRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipRepositoryCommand.class.st @@ -2,42 +2,44 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRepositoryCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepositoryCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand class >> isAbstract [ ^ self == IceTipRepositoryCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryCommand >> announcer [ ^ self context toolAnnouncer ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> canBeExecuted [ ^ self repositoryModel isNotNil diff --git a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st index d8aec6c69b..a31676a85a 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st @@ -4,23 +4,25 @@ Repository groups are taken from tags added to the repository metadata (usually NOTICE: first tag will be taken as the group. " Class { - #name : #IceTipRepositoryGroupModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoryGroupModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider', 'repositories', 'group' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel class >> defaultLabel [ ^ 'Projects' ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryGroupModel >> containsRepository: aRepository [ (self group isEmpty and: [ aRepository project tags isEmpty ]) @@ -29,19 +31,19 @@ IceTipRepositoryGroupModel >> containsRepository: aRepository [ ^ aRepository project tags includes: self group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group [ ^ group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group: aGroup [ group := aGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> label [ ^ self group @@ -49,7 +51,7 @@ IceTipRepositoryGroupModel >> label [ ifEmpty: [ self class defaultLabel ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositories [ ^ repositories := repositoryProvider repositories @@ -57,7 +59,7 @@ IceTipRepositoryGroupModel >> repositories [ thenCollect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st index 783b0f3295..fd61359ed0 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRepositoryGroupPanel, - #superclass : #SpPresenter, + #name : 'IceTipRepositoryGroupPanel', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', #instVars : [ 'repositoryList', 'repositoryFilter' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ self flag: #HACK. "I extracted this panel from IceTipRepositoriesBrowser, @@ -21,7 +23,7 @@ IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: a forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ | rootCommandGroup | @@ -36,13 +38,13 @@ IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ ^ rootCommandGroup ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> allListItems [ ^ self model repositories ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryGroupPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,26 +53,26 @@ IceTipRepositoryGroupPanel >> defaultLayout [ yourself ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> defaultOutputPort [ ^ self outputSelectionPort ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryGroupPanel >> hasSelectedItem [ ^ repositoryList selectedItem notNil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializePresenters [ repositoryList := self newTable. @@ -78,7 +80,7 @@ IceTipRepositoryGroupPanel >> initializePresenters [ self initializeRepositoryFilter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ repositoryFilter := self newTextInput. @@ -88,7 +90,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryList [ repositoryList @@ -122,7 +124,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryList [ whenActivatedDo: [ self openManagePackagesWindow ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ "this method is using just for test" @@ -130,7 +132,7 @@ IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ aRepositoryModel entity = anIceLibgitRepository ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ^ self rootCommandsGroup @@ -138,7 +140,7 @@ IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ifNone: [ nil ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryGroupPanel >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -146,7 +148,7 @@ IceTipRepositoryGroupPanel >> openManagePackagesWindow [ execute ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> outputSelectionPort [ ^ (SpSelectionPort newPresenter: self) @@ -154,7 +156,7 @@ IceTipRepositoryGroupPanel >> outputSelectionPort [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> refreshRepositoryList [ repositoryList updateItemsKeepingSelection: (repositoryFilter text @@ -163,25 +165,25 @@ IceTipRepositoryGroupPanel >> refreshRepositoryList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryList [ ^ repositoryList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> selectedItem [ ^ repositoryList selectedItem ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -189,13 +191,13 @@ IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> updatePresenter [ self refreshRepositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st index 5d75754d1b..a9dab849ef 100644 --- a/Iceberg-TipUI/IceTipRepositoryModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryModel.class.st @@ -2,26 +2,28 @@ I'm a model for IceRepository entries. " Class { - #name : #IceTipRepositoryModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRepositoryModel', + #superclass : 'IceTipEntityModel', #traits : 'TIceCopyCommitId + TWithBranchModel', #classTraits : 'TIceCopyCommitId classTrait + TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel class >> unknownBranchLabel [ ^ 'Unknown' ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> = other [ ^ self species = other species and: [ self entity = other entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> allBranchModels [ ^ self entity allBranches collect: [ :each | @@ -31,14 +33,14 @@ IceTipRepositoryModel >> allBranchModels [ beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> availableRepairOptions [ ^ IceTipRepairAction allAvailableFor: self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModel [ ^ (IceTipBranchModel @@ -47,7 +49,7 @@ IceTipRepositoryModel >> branchModel [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModelFor: aBranch [ ^ (IceTipBranchModel repositoryModel: self @@ -55,7 +57,7 @@ IceTipRepositoryModel >> branchModelFor: aBranch [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchName [ (self isLibGitAvailable not or: [ self entity isMissing ]) @@ -64,36 +66,36 @@ IceTipRepositoryModel >> branchName [ ^ self entity head description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchNamed: aString [ ^ self entity branchNamed: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branches [ ^ self entity localBranches ] -{ #category : #checking } +{ #category : 'checking' } IceTipRepositoryModel >> checkMissing [ self isMissing ifTrue: [ IceError signal: ('You have no repository attached to project "{1}"' format: { self name }) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commit [ ^ self entity workingCopy referenceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitId [ ^ [ self entity headCommit id ] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitModelFor: aCommit [ ^ (IceTipCommitModel repositoryModel: self @@ -101,13 +103,13 @@ IceTipRepositoryModel >> commitModelFor: aCommit [ beCached ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> createSourceDirectory [ entity createSourceDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> description [ | text | @@ -117,7 +119,7 @@ IceTipRepositoryModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> descriptionDecorator [ (self isLibGitAvailable and: [ self entity isModified ]) @@ -125,24 +127,24 @@ IceTipRepositoryModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasRemotes [ ^ self entity remotes notEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasUnbornProject [ ^ self entity workingCopy project isUnborn ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> hash [ ^ self species hash bitXor: self entity hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> headModel [ | head | @@ -152,12 +154,12 @@ IceTipRepositoryModel >> headModel [ ifFalse: [ self commitModelFor: head ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> incomingCommits [ ^ self entity incomingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> info [ ^ { 'Branch' -> self entity branch name. @@ -166,46 +168,46 @@ IceTipRepositoryModel >> info [ } ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isCodeMissing [ ^ entity isCodeMissing ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLibGitAvailable [ ^ LGitLibrary uniqueInstance isAvailable ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLoaded [ ^ self entity loadedPackages notEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isMissing [ ^ self entity isMissing ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> localRepositoryMissing [ ^ 'Local repository missing' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> location [ ^ entity location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> longStatus [ (entity isMissing and: [ entity location isNil ]) @@ -229,17 +231,17 @@ IceTipRepositoryModel >> longStatus [ ^ 'Your repository seems ok. Please report a ticket in Iceberg''s issue tracker. If you can, please send us a backup of your image in this state for debugging.' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> matches: aString [ ^ self entity name matchesRegexIgnoringCase: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddPackagesAction: aCollection [ @@ -253,7 +255,7 @@ IceTipRepositoryModel >> newAddPackagesAction: aCollection [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ @@ -268,7 +270,7 @@ IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ @@ -279,7 +281,7 @@ IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ action: [ self entity createBranch: aString inCommit: aCommit ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCommitAction [ ^ IceTipCommitAction new @@ -287,7 +289,7 @@ IceTipRepositoryModel >> newCommitAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDeleteAction [ @@ -298,7 +300,7 @@ IceTipRepositoryModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDiscardChangesAction [ @@ -312,7 +314,7 @@ IceTipRepositoryModel >> newDiscardChangesAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newFetchAction [ @@ -324,7 +326,7 @@ IceTipRepositoryModel >> newFetchAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newForgetAction [ @@ -335,12 +337,12 @@ IceTipRepositoryModel >> newForgetAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfIncomingCommits [ ^ self incomingCommits size ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfOutgoingCommits [ ^ [ | size | self entity branch hasUpstream ifFalse: [ ^ '*' ]. @@ -351,40 +353,40 @@ IceTipRepositoryModel >> numberOfOutgoingCommits [ on: IceNotInBranch do: [ :e | '0' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> outgoingCommits [ ^ self entity outgoingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> packages [ ^ self entity workingCopy packages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> pushRemoteName [ ^ self entity branch upstream name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remoteModels [ ^ self entity remotes collect: [ :each | (IceTipRemoteModel repositoryModel: self on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remotes [ ^ entity remotes ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModel [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModelsByGroup [ | branches tags | branches := self allBranchModels. @@ -422,12 +424,12 @@ IceTipRepositoryModel >> repositoryModelsByGroup [ } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> shortCommitId [ ^ [self entity headCommit shortId] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> status [ [ | status incoming outgoing | @@ -465,7 +467,7 @@ IceTipRepositoryModel >> status [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusDecorator [ [ @@ -488,7 +490,7 @@ IceTipRepositoryModel >> statusDecorator [ ^ IceTipStatusDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusString [ [ | status incoming outgoing | @@ -525,13 +527,13 @@ IceTipRepositoryModel >> statusString [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> subdirectory [ ^ self entity subdirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> tagModels [ ^ self entity tags @@ -542,7 +544,7 @@ IceTipRepositoryModel >> tagModels [ beCached ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> updateLocation: aReference [ "change location" @@ -552,18 +554,18 @@ IceTipRepositoryModel >> updateLocation: aReference [ Iceberg announcer announce: (IceRepositoryModified for: self entity) ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> verifyDirectoryStructureIfMissing: aBlock [ self entity isMissing ifTrue: [ ^ aBlock value: self localRepositoryMissing ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopy [ ^ IceTipWorkingCopyModel on: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopyDiff [ diff --git a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st index 5d7d48dc7e..a5bff37e31 100644 --- a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st @@ -3,8 +3,8 @@ I'm a generic repository type panel. I'm used as part of the creation dialog and to edit repository properties. " Class { - #name : #IceTipRepositoryTypePanel, - #superclass : #IceTipPresenter, + #name : 'IceTipRepositoryTypePanel', + #superclass : 'IceTipPresenter', #instVars : [ 'projectLocationLabel', 'projectLocation', @@ -12,10 +12,12 @@ Class { 'remoteInputText', 'repository' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> allTypes [ ^ ((self allSubclasses reject: #isAbstract) @@ -23,37 +25,37 @@ IceTipRepositoryTypePanel class >> allTypes [ collect: #new ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel class >> isAbstract [ ^ self = IceTipRepositoryTypePanel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> order [ ^ 0 ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryTypePanel >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation pathString ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializePresenters [ self initializeProjectLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeProjectLocation [ projectLocationLabel := self newLabel label: 'Local directory'. @@ -63,7 +65,7 @@ IceTipRepositoryTypePanel >> initializeProjectLocation [ location: self defaultLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeRemoteURL [ remoteLabel := self newLabel label: 'Remote URL'; yourself. @@ -73,50 +75,50 @@ IceTipRepositoryTypePanel >> initializeRemoteURL [ yourself. ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isLocalRepository [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isNewRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> newRepository [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> projectLocation [ ^ projectLocation ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteInputText [ ^ remoteInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteLabel [ ^ remoteLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> repository: aRepository [ "Used if editing an existing repository" repository := aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> validate [ ^ self subclassResponsibility diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index a92054e657..fe4979489e 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -2,37 +2,39 @@ I'm a command to reset the selected branch to the selected commit. It does not modify the working copy. " Class { - #name : #IceTipResetBranchToThisCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipResetBranchToThisCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipResetBranchToThisCommitCommand class >> defaultDescription [ ^ 'Resets the selected branch to the selected commit. It does not modify the working copy (!!).' ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [ ^ 'Reset ', self selectedBranch name, ' to commit ', self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> execute [ self selectedBranch resetToCommit: self selectedCommitish. Iceberg announcer announce: (IceRepositoryModified for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> iconName [ ^ #bottom ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipResetBranchToThisCommitCommand >> name [ ^ self context @@ -40,13 +42,13 @@ IceTipResetBranchToThisCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedBranch [ ^ self context model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st index 2a35d1e302..32620f7057 100644 --- a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st +++ b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st @@ -3,24 +3,26 @@ I'm a command to install a chunk of code from a commit (shown in a diff) into th ""chunk"" can be a package, class or single method. " Class { - #name : #IceTipRevertChangeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRevertChangeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultDescription [ ^ 'Revert selected change in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultName [ ^ 'Revert change' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> execute [ UIManager default @@ -33,13 +35,13 @@ IceTipRevertChangeCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRevertChangeCommand >> iconName [ ^ #smallUndo ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> tool [ "We consider the diffPanel of the context as our tool. This is important because we have to announce in the same Announcer instance that is subscribed for our news." diff --git a/Iceberg-TipUI/IceTipSaveImageAction.class.st b/Iceberg-TipUI/IceTipSaveImageAction.class.st index a60893f771..0dc8f6057b 100644 --- a/Iceberg-TipUI/IceTipSaveImageAction.class.st +++ b/Iceberg-TipUI/IceTipSaveImageAction.class.st @@ -4,12 +4,14 @@ I implement the action of saving the image. I'm used by the presenter that prepares the commit. " Class { - #name : #IceTipSaveImageAction, - #superclass : #Object, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSaveImageAction', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execution } +{ #category : 'execution' } IceTipSaveImageAction >> execute [ Smalltalk saveSession. diff --git a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st index 69334d31e0..4b30645958 100644 --- a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st @@ -3,24 +3,26 @@ Implements the select all option behavior in the ""Select New Packages to Load"" " Class { - #name : #IceTipSelectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultName [ ^ 'Select all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSelectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display and they are not all selected " @@ -30,7 +32,7 @@ IceTipSelectAllPackagesCommand >> canBeExecuted [ ^ pkgList items notEmpty and: [ pkgList items size ~= pkgList selectedItems size ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipSelectAllPackagesCommand >> execute [ " Private - Select all the receiver's packages " @@ -38,7 +40,7 @@ IceTipSelectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectAllPackagesCommand >> iconName [ ^ #checkboxSelected diff --git a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st index c8218a5b92..25f6293bb2 100644 --- a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st @@ -2,12 +2,14 @@ Provides common behavior to accesing the packages list presenters in its context. " Class { - #name : #IceTipSelectPackagesCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectPackagesCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipSelectPackagesCommand >> packagesList [ " Answer a including the receiver's packages " diff --git a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st index 51ece93142..9ed3ec2535 100644 --- a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st +++ b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipSelectRemotePresenter, - #superclass : #SpPresenter, + #name : 'IceTipSelectRemotePresenter', + #superclass : 'SpPresenter', #instVars : [ 'remoteList', 'addButton', 'model' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> addButton [ ^ addButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipSelectRemotePresenter >> addRemote [ ((IceTipAddRemoteDialogPresenter @@ -30,7 +32,7 @@ IceTipSelectRemotePresenter >> addRemote [ open ] -{ #category : #layout } +{ #category : 'layout' } IceTipSelectRemotePresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -40,13 +42,13 @@ IceTipSelectRemotePresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> icon [ ^ self iconNamed: #add ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> initializePresenters [ remoteList := self newDropList @@ -60,44 +62,44 @@ IceTipSelectRemotePresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> label: aString [ self remoteLabel label: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> refresh [ remoteList items: self model remoteModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> remoteList [ ^ remoteList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> selectRemoteNamed: aString [ remoteList selectItem: (self model remoteModels detect: [ :each | each name = aString ]) ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipSelectRemotePresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> updatePresenter [ self refresh. diff --git a/Iceberg-TipUI/IceTipSettingsCommand.class.st b/Iceberg-TipUI/IceTipSettingsCommand.class.st index 7fd84a78c0..487cfeffdc 100644 --- a/Iceberg-TipUI/IceTipSettingsCommand.class.st +++ b/Iceberg-TipUI/IceTipSettingsCommand.class.st @@ -2,31 +2,33 @@ Command that opens the settings on a repository " Class { - #name : #IceTipSettingsCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSettingsCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultDescription [ ^ 'Open settings browser to configure Iceberg' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultName [ ^ 'Settings' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSettingsCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipSettingsCommand >> execute [ | browser window path | @@ -41,19 +43,19 @@ IceTipSettingsCommand >> execute [ browser expandNodePath: path first contents first contents first path. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> iconName [ ^ #configuration ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shortcutKey [ ^ $n meta ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipSpCommand.class.st b/Iceberg-TipUI/IceTipSpCommand.class.st index 41ad221c73..02907cc53e 100644 --- a/Iceberg-TipUI/IceTipSpCommand.class.st +++ b/Iceberg-TipUI/IceTipSpCommand.class.st @@ -4,27 +4,29 @@ I am a CmUICommand that is specialized for Iceberg UI. In particular, I'm used to wrap instances of IceTipCommand in a IceTipBrowser. " Class { - #name : #IceTipSpCommand, - #superclass : #CmUICommand, + #name : 'IceTipSpCommand', + #superclass : 'CmUICommand', #instVars : [ 'presenterBuildingStrategy' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> buildPresenter [ ^ self presenterBuildingStrategy resultOn: self ] -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> configureAsToolbarButton [ self presenterBuildingStrategy: IceTipToolbarButtonStrategy new ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ self displayStrategy @@ -33,30 +35,30 @@ IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ do: aBlock ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> ifVisible: aBlock [ self displayStrategy ifVisible: self do: aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSpCommand >> initialize [ super initialize. self configureAsToolbarButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy [ ^ presenterBuildingStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy: aStrategy [ presenterBuildingStrategy := aStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> toolbarItemName [ ^ self decoratedCommand toolbarItemName diff --git a/Iceberg-TipUI/IceTipStandardAction.class.st b/Iceberg-TipUI/IceTipStandardAction.class.st index 6d97da6496..205c3bf83c 100644 --- a/Iceberg-TipUI/IceTipStandardAction.class.st +++ b/Iceberg-TipUI/IceTipStandardAction.class.st @@ -4,27 +4,29 @@ I will perform an action by informing user what's happening. I will also check for errors happening while performing the task and try to recover from them. " Class { - #name : #IceTipStandardAction, - #superclass : #IceTipAction, + #name : 'IceTipStandardAction', + #superclass : 'IceTipAction', #instVars : [ 'message', 'successAnnounceBlock', 'actionBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action [ ^ actionBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action: aBlock [ actionBlock := aBlock ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> basicExecute [ | result | @@ -38,35 +40,35 @@ IceTipStandardAction >> basicExecute [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> do: aBlock [ self action: aBlock. self execute ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> execute: aBlock [ self action: aBlock. self execute ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message: anObject [ message := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessAnnounce: aValuable [ successAnnounceBlock := aValuable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessRepositoryModified [ ^ self onSuccessAnnounce: [ IceRepositoryModified for: self repository ] ] diff --git a/Iceberg-TipUI/IceTipStatusDecorator.class.st b/Iceberg-TipUI/IceTipStatusDecorator.class.st index ba1f418e96..47bd5ea718 100644 --- a/Iceberg-TipUI/IceTipStatusDecorator.class.st +++ b/Iceberg-TipUI/IceTipStatusDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> error [ ^ IceTipStatusDecoratorError uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> warning [ ^ IceTipStatusDecoratorWarning uniqueInstance diff --git a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st index c68d74a199..b17b0b0531 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecoratorError, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorError', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorError >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipStatusDecoratorError >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st index 4ab0410f00..27b044612c 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipStatusDecoratorWarning, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorWarning', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorWarning >> color [ ^ Smalltalk ui theme warningTextColor diff --git a/Iceberg-TipUI/IceTipStyleContributor.class.st b/Iceberg-TipUI/IceTipStyleContributor.class.st index 57fadcd53a..85cad5d70c 100644 --- a/Iceberg-TipUI/IceTipStyleContributor.class.st +++ b/Iceberg-TipUI/IceTipStyleContributor.class.st @@ -4,12 +4,14 @@ This class is call by Spec2 to extend the default stylesheet. Check its superclass to understand the way of working. " Class { - #name : #IceTipStyleContributor, - #superclass : #StPharoStyleContributor, - #category : #'Iceberg-TipUI-Styles' + #name : 'IceTipStyleContributor', + #superclass : 'StPharoStyleContributor', + #category : 'Iceberg-TipUI-Styles', + #package : 'Iceberg-TipUI', + #tag : 'Styles' } -{ #category : #styles } +{ #category : 'styles' } IceTipStyleContributor >> styleSheetContribution [ ^ SpStyle newApplication diff --git a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st index 20245a7b30..2cf032c786 100644 --- a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st +++ b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st @@ -8,12 +8,14 @@ I will switch first to the new branch, and then I will perform a merge with curr This strategy is used to re-attach image when it is detached from current development branch. " Class { - #name : #IceTipSwitchAndMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipSwitchAndMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipSwitchAndMergeType >> newMergeAction: aModel [ ^ aModel newSwitchAndMergeAction diff --git a/Iceberg-TipUI/IceTipTagDecorator.class.st b/Iceberg-TipUI/IceTipTagDecorator.class.st index 695df71986..52aafff355 100644 --- a/Iceberg-TipUI/IceTipTagDecorator.class.st +++ b/Iceberg-TipUI/IceTipTagDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipTagDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagDecorator >> color [ ^ Smalltalk ui theme disabledColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTagDecorator >> isItalic [ ^ true diff --git a/Iceberg-TipUI/IceTipTagModel.class.st b/Iceberg-TipUI/IceTipTagModel.class.st index cfd67df83a..cc72af64a0 100644 --- a/Iceberg-TipUI/IceTipTagModel.class.st +++ b/Iceberg-TipUI/IceTipTagModel.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTagModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> commitModels [ | commits | @@ -17,7 +19,7 @@ IceTipTagModel >> commitModels [ ^ commits ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> delete [ @@ -28,19 +30,19 @@ IceTipTagModel >> delete [ do: [ self repositoryModel entity removeTag: self entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> description [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" diff --git a/Iceberg-TipUI/IceTipTextDecorator.class.st b/Iceberg-TipUI/IceTipTextDecorator.class.st index 879c33d06a..0530538c8a 100644 --- a/Iceberg-TipUI/IceTipTextDecorator.class.st +++ b/Iceberg-TipUI/IceTipTextDecorator.class.st @@ -1,44 +1,46 @@ Class { - #name : #IceTipTextDecorator, - #superclass : #Object, + #name : 'IceTipTextDecorator', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator class >> none [ ^ IceTipTextDecoratorNone uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> uniqueInstance [ self = IceTipTextDecorator ifTrue: [ ^ self error: 'I''m abstract, use one of my children.' ]. ^ uniqueInstance ifNil: [ uniqueInstance := super new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme textColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isBold [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isItalic [ ^ false diff --git a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st index 5bfcdfb1db..79c406d278 100644 --- a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st +++ b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTextDecoratorNone, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTextDecoratorNone', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } diff --git a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st index 610e84556c..ceb50f8d8a 100644 --- a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st +++ b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st @@ -3,18 +3,20 @@ I'm a strategy to build Spec2 buttons foro a toolar wrapping a IceTipSpCommand. " Class { - #name : #IceTipToolbarButtonStrategy, - #superclass : #IceTipCommandToPresenterBuildingStrategy, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarButtonStrategy', + #superclass : 'IceTipCommandToPresenterBuildingStrategy', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipToolbarButtonStrategy >> buttonPresenterClass [ ^ SpToolbarButtonPresenter ] -{ #category : #public } +{ #category : 'public' } IceTipToolbarButtonStrategy >> resultOn: aCommand [ | aButtonPresenter | diff --git a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st index 67f6838fb7..91cc8f7fce 100644 --- a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st +++ b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st @@ -3,12 +3,14 @@ I'm a SpToolbarPresenterBuilder that delegates to the command the decision to ac " Class { - #name : #IceTipToolbarPresenterBuilder, - #superclass : #SpToolbarPresenterBuilder, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarPresenterBuilder', + #superclass : 'SpToolbarPresenterBuilder', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipToolbarPresenterBuilder >> visitCommand: anEntry [ anEntry ifVisible: [ super visitCommand: anEntry ] diff --git a/Iceberg-TipUI/IceTipTreeBranch.class.st b/Iceberg-TipUI/IceTipTreeBranch.class.st index 2c2c76c0ba..048ef0aeb2 100644 --- a/Iceberg-TipUI/IceTipTreeBranch.class.st +++ b/Iceberg-TipUI/IceTipTreeBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeBranch, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeBranch', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeBranch >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnBranch: self ] diff --git a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st index abe4c6c3f2..6d6c8e77c2 100644 --- a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st @@ -3,31 +3,33 @@ A generic command to collapse a tree. It sends `doCollapseSelection` message to its context. " Class { - #name : #IceTipTreeCollapseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeCollapseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultDescription [ ^ 'Collapse selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultName [ ^ 'Collapse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeCollapseCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeCollapseCommand >> execute [ self context doCollapseSelection diff --git a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st index b3e6aab770..c7ff5ac195 100644 --- a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st @@ -2,37 +2,39 @@ A generic command to expand tree items within a tree. " Class { - #name : #IceTipTreeExpandCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeExpandCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultDescription [ ^ 'Expand selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultName [ ^ 'Expand' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeExpandCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeExpandCommand >> execute [ self context doExpandSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeExpandCommand >> iconName [ ^ nil diff --git a/Iceberg-TipUI/IceTipTreeGroup.class.st b/Iceberg-TipUI/IceTipTreeGroup.class.st index bf0b91e110..3de0ec917c 100644 --- a/Iceberg-TipUI/IceTipTreeGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeGroup.class.st @@ -4,16 +4,18 @@ I keep groups with elements. I can provide also a contexts for menu operations and other kind of options to be associated with group. " Class { - #name : #IceTipTreeGroup, - #superclass : #IceTipTreeNode, + #name : 'IceTipTreeGroup', + #superclass : 'IceTipTreeNode', #instVars : [ 'name', 'children' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName children: aCollection [ ^ self new name: aName; @@ -21,7 +23,7 @@ IceTipTreeGroup class >> name: aName children: aCollection [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ ^ self new name: aName; @@ -30,7 +32,7 @@ IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> addChild: anObject [ children ifNil: [ children := OrderedCollection new ]. children add: anObject. @@ -38,23 +40,23 @@ IceTipTreeGroup >> addChild: anObject [ ^ anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children [ ^ children ifNil: [ #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children: aCollection [ children := aCollection. children do: [ :each | each parent: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> ensurePath: aPath [ | first next | @@ -67,34 +69,34 @@ IceTipTreeGroup >> ensurePath: aPath [ ifEmpty: [ next ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isGroup [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isSameAs: aNode [ ^ aNode species = self species and: [ self name = aNode name and: [ aNode name notNil ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name: anObject [ name := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock [ ^ self traversingDo: aBlock parents: #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray. self children do: [ :each | diff --git a/Iceberg-TipUI/IceTipTreeItem.class.st b/Iceberg-TipUI/IceTipTreeItem.class.st index bea3c80b69..62ce9f9737 100644 --- a/Iceberg-TipUI/IceTipTreeItem.class.st +++ b/Iceberg-TipUI/IceTipTreeItem.class.st @@ -2,36 +2,38 @@ I'm a leaf element of a tree. " Class { - #name : #IceTipTreeItem, - #superclass : #IceTipTreeNode, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeItem', + #superclass : 'IceTipTreeNode', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> description [ ^ self model description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> descriptionDecorator [ ^ self model descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeItem >> isSameAs: aNode [ ^ aNode species = self species and: [ self model = aNode model ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> shortDescription [ ^ self model shortDescription ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray diff --git a/Iceberg-TipUI/IceTipTreeNode.class.st b/Iceberg-TipUI/IceTipTreeNode.class.st index 43b31c752c..932a612b46 100644 --- a/Iceberg-TipUI/IceTipTreeNode.class.st +++ b/Iceberg-TipUI/IceTipTreeNode.class.st @@ -5,38 +5,40 @@ I understand - icon " Class { - #name : #IceTipTreeNode, - #superclass : #Object, + #name : 'IceTipTreeNode', + #superclass : 'Object', #instVars : [ 'model', 'parent', 'icon' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeNode class >> on: aModel [ ^ self new model: aModel ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> canActivateCommand: aCommandClass [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> children [ ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> description [ ^ self subclassResponsibility ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipTreeNode >> doesNotUnderstand: aMessage [ "redirect to model to provide polymorphism." self flag: #pharoTodo. "I'm not sure this is good practice... we'll see how it works" @@ -44,59 +46,59 @@ IceTipTreeNode >> doesNotUnderstand: aMessage [ ^ aMessage sendTo: self model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon [ ^ icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon: anIcon [ icon := anIcon ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isGroup [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isLeaf [ ^ self isGroup not ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isSameAs: aNode [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent [ ^ parent ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent: anObject [ parent := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> path [ ^ self parent ifNotNil: [ :p | p path, { self } ] ifNil: [ { self } ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> traversingDo: aBlock parents: anArray [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipTreeRemote.class.st b/Iceberg-TipUI/IceTipTreeRemote.class.st index ca4a7d6761..df832c0592 100644 --- a/Iceberg-TipUI/IceTipTreeRemote.class.st +++ b/Iceberg-TipUI/IceTipTreeRemote.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeRemote, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRemote', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeRemote >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnRemote: self ] diff --git a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st index 641cdf415b..34b4cacef9 100644 --- a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTreeRepositoryGroup, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRepositoryGroup', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } diff --git a/Iceberg-TipUI/IceTipTreeTag.class.st b/Iceberg-TipUI/IceTipTreeTag.class.st index 1f930e5759..5369001c4b 100644 --- a/Iceberg-TipUI/IceTipTreeTag.class.st +++ b/Iceberg-TipUI/IceTipTreeTag.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeTag, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeTag', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeTag >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnTag: self ] diff --git a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st index 799a7e886a..95664d05d8 100644 --- a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st @@ -7,30 +7,32 @@ It gives the user with two checkboxes to choose: Right now this is only shown for loaded packages. " Class { - #name : #IceTipUnloadAndRemovePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadAndRemovePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultDescription [ ^ 'Opens a dialog to choose between unloading from system and/or removing a package from the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultName [ ^ 'Unload and/or remove from repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadAndRemovePackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadAndRemovePackageCommand >> execute [ (IceTipRemovePackageDialogPresenter @@ -41,7 +43,7 @@ IceTipUnloadAndRemovePackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadAndRemovePackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st index 6ca10d560f..ba89f54d03 100644 --- a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st @@ -2,36 +2,38 @@ Command to unload a package from the system, keeping it in the repository " Class { - #name : #IceTipUnloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultDescription [ ^ 'Unload selected package from the system, but keep it in the repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultName [ ^ 'Unload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadPackageCommand >> execute [ self packageModel unload ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadPackageCommand >> iconName [ ^ #smallCancel diff --git a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st index 9527d0f50e..f2b6ae1931 100644 --- a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st @@ -3,24 +3,26 @@ Implements the unselect all option behavior in the ""Select New Packages to Load " Class { - #name : #IceTipUnselectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnselectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnselectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipUnselectAllPackagesCommand class >> defaultName [ ^ 'Unselect all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnselectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display " @@ -30,7 +32,7 @@ IceTipUnselectAllPackagesCommand >> canBeExecuted [ ^ pkgList items notEmpty ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnselectAllPackagesCommand >> execute [ " Private - Unselect all the receiver's packages " @@ -38,7 +40,7 @@ IceTipUnselectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnselectAllPackagesCommand >> iconName [ ^ #checkboxUnselected diff --git a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st index c21462781d..57a7aa7cd3 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st @@ -8,8 +8,8 @@ For versions, I show the same commands of a regular history browser, but add som " Class { - #name : #IceTipVersionHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipVersionHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'selectedModel', @@ -17,16 +17,18 @@ Class { 'diffPage', 'commitPanel' ], - #category : #'Iceberg-TipUI-View-Versions' + #category : 'Iceberg-TipUI-View-Versions', + #package : 'Iceberg-TipUI', + #tag : 'View-Versions' } -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipInstallVersionCommand } @@ -35,7 +37,7 @@ IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter f ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ ^ self on: (IceTipVersionHistoryModel @@ -44,13 +46,13 @@ IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipVersionHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -59,13 +61,13 @@ IceTipVersionHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initialExtentForWindow [ ^ (700@700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitList [ commitList @@ -94,7 +96,7 @@ IceTipVersionHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -106,7 +108,7 @@ IceTipVersionHistoryBrowser >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -116,21 +118,21 @@ IceTipVersionHistoryBrowser >> initializePresenters [ self initializeCommitPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipVersionHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPage [ ^ SpNotebookPage @@ -139,7 +141,7 @@ IceTipVersionHistoryBrowser >> newDiffPage [ provider: [ self newDiffPresenter ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ ^ (self instantiate: SpDiffPresenter) @@ -148,7 +150,7 @@ IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ showOptions: false ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newDiffPresenter [ selectedModel ifNil: [ ^ self ]. @@ -159,7 +161,7 @@ IceTipVersionHistoryBrowser >> newDiffPresenter [ right: selectedModel source ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newInfoPage [ ^ SpNotebookPage @@ -169,14 +171,14 @@ IceTipVersionHistoryBrowser >> newInfoPage [ ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newVersionInfoPresenter [ selectedModel ifNil: [ ^ self ]. ^ IceTipReadOnlyFormBuilder newBuiltFor: selectedModel info application: self application ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> refresh [ commitList items: self model commitModels. @@ -186,7 +188,7 @@ IceTipVersionHistoryBrowser >> refresh [ self refreshCommitTabPanel ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ selectedModel ifNil: [ ^ self ]. @@ -198,14 +200,14 @@ IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ commitPanel resetAllPageContents ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipVersionHistoryBrowser >> selectionChanged: aSelectedItem [ selectedModel := aSelectedItem. self refreshCommitTabPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> titleForWindow [ ^ self model @@ -213,7 +215,7 @@ IceTipVersionHistoryBrowser >> titleForWindow [ ifNil: [ 'Versions' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st index 59bfc94f75..b5fd22c176 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st @@ -2,22 +2,24 @@ I'm a model to provide the history of a method. " Class { - #name : #IceTipVersionHistoryModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipVersionHistoryModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'commitModels' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModelAfter: aModel [ ^ self commitModels after: aModel ifAbsent: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModels [ ^ commitModels ifNil: [ commitModels := self retrieveHistory collect: [ :each | @@ -27,18 +29,18 @@ IceTipVersionHistoryModel >> commitModels [ beCached ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> name [ ^ '{1}>>{2}' format: { self entity origin name. self entity selector } ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryModel >> retrieveHistory [ self repositoryModel checkMissing. diff --git a/Iceberg-TipUI/IceTipVersionModel.class.st b/Iceberg-TipUI/IceTipVersionModel.class.st index a416351dc2..4382df60ce 100644 --- a/Iceberg-TipUI/IceTipVersionModel.class.st +++ b/Iceberg-TipUI/IceTipVersionModel.class.st @@ -5,12 +5,14 @@ I'm a model for IceLogVersion entries. - I can install a certain method version. " Class { - #name : #IceTipVersionModel, - #superclass : #IceTipCommitModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipVersionModel', + #superclass : 'IceTipCommitModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #private } +{ #category : 'private' } IceTipVersionModel >> basicInstall [ | definition | @@ -20,12 +22,12 @@ IceTipVersionModel >> basicInstall [ classified: definition category ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> commit [ ^ self entity commit ] -{ #category : #actions } +{ #category : 'actions' } IceTipVersionModel >> install [ @@ -36,7 +38,7 @@ IceTipVersionModel >> install [ execute: [ self basicInstall ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> source [ ^ self entity source ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st index ebf9dd35c6..e9379df0ba 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st @@ -5,17 +5,19 @@ I show the packages managed by this repository and a series of actions to proper (IceTipPackagesBrowser forRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipWorkingCopyBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipWorkingCopyBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'statusBar', 'packagesTable', 'filterInput' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipRepairCommand. @@ -33,7 +35,7 @@ IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: a ] -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipBrowsePackageCommand. @@ -47,19 +49,19 @@ IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> allListItems [ ^ self model packageModels ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ | commandClass | @@ -72,7 +74,7 @@ IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> connectPresenters [ super connectPresenters. @@ -82,7 +84,7 @@ IceTipWorkingCopyBrowser >> connectPresenters [ ] -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -91,20 +93,20 @@ IceTipWorkingCopyBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> filterInput [ ^ filterInput ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> iconFor: aPackage [ self decorations do: [ :each | @@ -114,13 +116,13 @@ IceTipWorkingCopyBrowser >> iconFor: aPackage [ ^ self iconNamed: #package ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePackagesTable [ packagesTable @@ -147,7 +149,7 @@ IceTipWorkingCopyBrowser >> initializePackagesTable [ whenActivatedDo: [ :selection | self browsePackage: selection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePresenters [ filterInput := self newTextInput. @@ -156,7 +158,7 @@ IceTipWorkingCopyBrowser >> initializePresenters [ statusBar := self instantiate: IceTipWorkingCopyStatusBarPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -165,25 +167,25 @@ IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> mainList [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> packageModel [ ^ packagesTable selectedItem ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> packagesTable [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> refresh [ self refreshCommands. @@ -191,7 +193,7 @@ IceTipWorkingCopyBrowser >> refresh [ self refreshPackagesTable ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshPackagesTable [ packagesTable items: (filterInput text @@ -200,13 +202,13 @@ IceTipWorkingCopyBrowser >> refreshPackagesTable [ ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshStatusBar [ statusBar model: self model ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ (ann repository isNil or: [ @@ -217,25 +219,25 @@ IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipWorkingCopyBrowser >> setModelBeforeInitialization: aRepositoryModel [ self model: ( IceTipWorkingCopyModel on: aRepositoryModel ) ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyBrowser >> showsPackageNamed: aString [ ^ packagesTable items anySatisfy: [ :packageModel | packageModel name = aString ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> statusBar [ ^ statusBar ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -244,13 +246,13 @@ IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> titleForWindow [ ^ 'Working copy of ', self model repositoryName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st index e116fd4bcb..507b1e2c59 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st @@ -2,30 +2,32 @@ I'm a diff model that represents a diff between the HEAD commit and the image working copy. " Class { - #name : #IceTipWorkingCopyDiffModel, - #superclass : #IceTipDiffModel, + #name : 'IceTipWorkingCopyDiffModel', + #superclass : 'IceTipDiffModel', #instVars : [ 'diff' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyDiffModel >> diff [ ^ diff ifNil: [ diff := self newDiff ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyDiffModel >> isEmpty [ ^ self diff isEmpty ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipWorkingCopyDiffModel >> newDiff [ ^ self entity workingCopyDiff ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyDiffModel >> resetDiff [ diff := nil ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st index 21b5734be7..201e8943a9 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st @@ -2,51 +2,53 @@ I'm a model to for IceWorkingCopy entries. " Class { - #name : #IceTipWorkingCopyModel, - #superclass : #IceTipModel, + #name : 'IceTipWorkingCopyModel', + #superclass : 'IceTipModel', #instVars : [ 'sortingStrategy', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> new [ self error: 'use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> on: aRepositoryModel [ ^ self basicNew initializeRepositoryModel: aRepositoryModel; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> branchName [ ^ self repositoryModel branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> commitId [ ^ repositoryModel commitId ] -{ #category : #operations } +{ #category : 'operations' } IceTipWorkingCopyModel >> copyCommitIDToClipboard [ repositoryModel copyCommitIDToClipboard ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyModel >> initializeRepositoryModel: aRepositoryModel [ repositoryModel := aRepositoryModel. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> packageModels [ ^ self sortingStrategy sort: (self repositoryModel entity workingCopy packages collect: [ :each | @@ -56,37 +58,37 @@ IceTipWorkingCopyModel >> packageModels [ beCached ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> reset [ self repositoryModel reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> shortCommitId [ ^ repositoryModel shortCommitId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> sortingStrategy [ ^ sortingStrategy ifNil: [ sortingStrategy := IceSortingStrategy new first: #modified ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> status [ ^ self repositoryModel status ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> statusDecorator [ ^ self repositoryModel statusDecorator diff --git a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st index 03e34062ab..8cbcf3dfce 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st @@ -2,17 +2,19 @@ I'm the status bar for a IceTipWorkingCopyBrowser. " Class { - #name : #IceTipWorkingCopyStatusBarPresenter, - #superclass : #SpPresenter, + #name : 'IceTipWorkingCopyStatusBarPresenter', + #superclass : 'SpPresenter', #instVars : [ 'branchLabel', 'commitLink', 'statusLabel' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -25,20 +27,20 @@ IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyStatusBarPresenter >> canTakeKeyboardFocus [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyStatusBarPresenter >> initializePresenters [ branchLabel := self newLabel. statusLabel := self newLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> model: aModel [ "Fill labels from a IceTipWorkingCopyModel." @@ -52,7 +54,7 @@ IceTipWorkingCopyStatusBarPresenter >> model: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ branchLabel label: ('{1} at ' format: { aModel branchName }). @@ -64,7 +66,7 @@ IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithoutCommitId: aModel [ branchLabel label: aModel branchName. diff --git a/Iceberg-TipUI/IceTokenCredentials.extension.st b/Iceberg-TipUI/IceTokenCredentials.extension.st index 5b476eeb69..7164335fb8 100644 --- a/Iceberg-TipUI/IceTokenCredentials.extension.st +++ b/Iceberg-TipUI/IceTokenCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceTokenCredentials } +Extension { #name : 'IceTokenCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> editModelClass [ ^ IceTipEditTokenCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTraitDefinition.extension.st b/Iceberg-TipUI/IceTraitDefinition.extension.st index d072826557..03b023e483 100644 --- a/Iceberg-TipUI/IceTraitDefinition.extension.st +++ b/Iceberg-TipUI/IceTraitDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTraitDefinition } +Extension { #name : 'IceTraitDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTraitDefinition >> icon [ ^ self iconNamed: #trait ] diff --git a/Iceberg-TipUI/IceWarning.class.st b/Iceberg-TipUI/IceWarning.class.st index 2015f64db3..9b64da1319 100644 --- a/Iceberg-TipUI/IceWarning.class.st +++ b/Iceberg-TipUI/IceWarning.class.st @@ -2,12 +2,14 @@ I'm a general warning in the context of iceberg UI. " Class { - #name : #IceWarning, - #superclass : #Warning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceWarning', + #superclass : 'Warning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceWarning >> acceptError: aVisitor [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceWorkingCopy.extension.st b/Iceberg-TipUI/IceWorkingCopy.extension.st index 77e8f52665..c95aa1cc69 100644 --- a/Iceberg-TipUI/IceWorkingCopy.extension.st +++ b/Iceberg-TipUI/IceWorkingCopy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceWorkingCopy } +Extension { #name : 'IceWorkingCopy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceWorkingCopy >> description [ ^ self workingCopyState description diff --git a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st index 6806b57051..13901f838c 100644 --- a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st +++ b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitCredentialsPlaintext } +Extension { #name : 'LGitCredentialsPlaintext' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } LGitCredentialsPlaintext >> askForModelClassOn: aString [ ^ IceTipAskForPlaintextCredentialsPresenter diff --git a/Iceberg-TipUI/MCAddition.extension.st b/Iceberg-TipUI/MCAddition.extension.st index 86d577821e..eb93d60d68 100644 --- a/Iceberg-TipUI/MCAddition.extension.st +++ b/Iceberg-TipUI/MCAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCAddition } +Extension { #name : 'MCAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCAddition >> icon [ ^ self iconNamed: #changeAdd ] diff --git a/Iceberg-TipUI/MCModification.extension.st b/Iceberg-TipUI/MCModification.extension.st index e38d6d6886..2e6b693643 100644 --- a/Iceberg-TipUI/MCModification.extension.st +++ b/Iceberg-TipUI/MCModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCModification } +Extension { #name : 'MCModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCModification >> icon [ ^ self iconNamed: #changeUpdate ] diff --git a/Iceberg-TipUI/MCPatchOperation.extension.st b/Iceberg-TipUI/MCPatchOperation.extension.st index 8c55a52b83..e1f00ea122 100644 --- a/Iceberg-TipUI/MCPatchOperation.extension.st +++ b/Iceberg-TipUI/MCPatchOperation.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCPatchOperation } +Extension { #name : 'MCPatchOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCPatchOperation >> canBeBrowsed [ ^ true ] diff --git a/Iceberg-TipUI/MCRemoval.extension.st b/Iceberg-TipUI/MCRemoval.extension.st index 0eb55e9bd1..64ad429fed 100644 --- a/Iceberg-TipUI/MCRemoval.extension.st +++ b/Iceberg-TipUI/MCRemoval.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #MCRemoval } +Extension { #name : 'MCRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> canBeBrowsed [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> icon [ ^ self iconNamed: #changeRemove ] diff --git a/Iceberg-TipUI/ManifestIcebergTipUI.class.st b/Iceberg-TipUI/ManifestIcebergTipUI.class.st index a47a98479d..22b6f421f0 100644 --- a/Iceberg-TipUI/ManifestIcebergTipUI.class.st +++ b/Iceberg-TipUI/ManifestIcebergTipUI.class.st @@ -2,22 +2,24 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergTipUI, - #superclass : #PackageManifest, - #category : #'Iceberg-TipUI-Manifest' + #name : 'ManifestIcebergTipUI', + #superclass : 'PackageManifest', + #category : 'Iceberg-TipUI-Manifest', + #package : 'Iceberg-TipUI', + #tag : 'Manifest' } -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleAnySatisfyRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #guessFormatFromDirectory: #false)) #'2021-01-05T16:19:22.932793-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleNotEliminationRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipBrowser #hasSelectedItem #false)) #'2020-12-17T18:54:45.342746-03:00') #(#(#RGMethodDefinition #(#IceTipRepositoryBrowser #initializeSidebarTree #false)) #'2021-01-05T16:19:22.920159-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleReGuardClauseRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #initializeMessagePanel #false)) #'2021-01-05T16:19:22.928248-03:00') ) ] diff --git a/Iceberg-TipUI/PharoDarkTheme.extension.st b/Iceberg-TipUI/PharoDarkTheme.extension.st index 197cd482cc..25b3e1736e 100644 --- a/Iceberg-TipUI/PharoDarkTheme.extension.st +++ b/Iceberg-TipUI/PharoDarkTheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #PharoDarkTheme } +Extension { #name : 'PharoDarkTheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeColor [ ^ Color red alpha: 0.5 ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeTextColor [ ^ self textColor ] diff --git a/Iceberg-TipUI/PharoShortcuts.extension.st b/Iceberg-TipUI/PharoShortcuts.extension.st index df7e450e6d..fa394b6cfb 100644 --- a/Iceberg-TipUI/PharoShortcuts.extension.st +++ b/Iceberg-TipUI/PharoShortcuts.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #PharoShortcuts } +Extension { #name : 'PharoShortcuts' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoShortcuts >> openIcebergShortcut [ ^ $o meta, $i meta ] diff --git a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st index d61a72635f..2f13adf7b3 100644 --- a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st +++ b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #SpToolbarButtonPresenter } +Extension { #name : 'SpToolbarButtonPresenter' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } SpToolbarButtonPresenter >> hasBadge [ ^ badge isNotNil ] diff --git a/Iceberg-TipUI/TIceCopyCommitId.trait.st b/Iceberg-TipUI/TIceCopyCommitId.trait.st index 66a989ae08..ad1849ee58 100644 --- a/Iceberg-TipUI/TIceCopyCommitId.trait.st +++ b/Iceberg-TipUI/TIceCopyCommitId.trait.st @@ -5,17 +5,19 @@ Description I am a simple Trait allowing to copy a commit ID to the clipboard without duplicating the code in Iceberg. " Trait { - #name : #TIceCopyCommitId, - #category : #'Iceberg-TipUI-Model' + #name : 'TIceCopyCommitId', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyCommitIDToClipboard [ self copyToClipboardId: self commitId ] -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyToClipboardId: id [ Clipboard clipboardText: id informing: ('Commitish ID copied to clipboard ({1})' format: {id}) ] diff --git a/Iceberg-TipUI/TWithBranchModel.trait.st b/Iceberg-TipUI/TWithBranchModel.trait.st index 9b2a646f4a..836a8e7053 100644 --- a/Iceberg-TipUI/TWithBranchModel.trait.st +++ b/Iceberg-TipUI/TWithBranchModel.trait.st @@ -1,19 +1,21 @@ Trait { - #name : #TWithBranchModel, - #category : #'Iceberg-TipUI-Model' + #name : 'TWithBranchModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branchModels [ ^ self branches collect: [ :each | (IceTipBranchModel repositoryModel: self repositoryModel on: each) beCached ] ] -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branches [ ^ self explicitRequirement ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> defaultBranchSelection [ ^ self branchModels detect: #isHead @@ -21,12 +23,12 @@ TWithBranchModel >> defaultBranchSelection [ ifTrue: [ self branchModels ifNotEmpty: #anyOne ] ] ] -{ #category : #testing } +{ #category : 'testing' } TWithBranchModel >> hasBranches [ ^ self branches isNotEmpty ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> repositoryModel [ ^ self explicitRequirement ] diff --git a/Iceberg-TipUI/Text.extension.st b/Iceberg-TipUI/Text.extension.st index 74d7bfde6c..0ae90973d7 100644 --- a/Iceberg-TipUI/Text.extension.st +++ b/Iceberg-TipUI/Text.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Text } +Extension { #name : 'Text' } -{ #category : #'*Iceberg-TipUI-Spec' } +{ #category : '*Iceberg-TipUI-Spec' } Text >> threeWayCompareTo: anotherText [ ^ self asString threeWayCompareTo: anotherText asString diff --git a/Iceberg-TipUI/ToolShortcutsCategory.extension.st b/Iceberg-TipUI/ToolShortcutsCategory.extension.st index 39e8ed6bf0..22fbb318cc 100644 --- a/Iceberg-TipUI/ToolShortcutsCategory.extension.st +++ b/Iceberg-TipUI/ToolShortcutsCategory.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #ToolShortcutsCategory } +Extension { #name : 'ToolShortcutsCategory' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } ToolShortcutsCategory >> openIceberg [ diff --git a/Iceberg-TipUI/UITheme.extension.st b/Iceberg-TipUI/UITheme.extension.st index 45eef9230e..b1aee015ae 100644 --- a/Iceberg-TipUI/UITheme.extension.st +++ b/Iceberg-TipUI/UITheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #UITheme } +Extension { #name : 'UITheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeColor [ ^ Color red ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeTextColor [ ^ Color white ] diff --git a/Iceberg-TipUI/package.st b/Iceberg-TipUI/package.st index 34a4b630d6..c1b5ad7667 100644 --- a/Iceberg-TipUI/package.st +++ b/Iceberg-TipUI/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-TipUI' } +Package { #name : 'Iceberg-TipUI' } From 452f3c24055343d30c3bdd9dcf9355dd993933b4 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Thu, 19 Oct 2023 14:24:55 +0200 Subject: [PATCH 34/83] using hide/show --- Iceberg-TipUI/Clipboard.extension.st | 4 +- Iceberg-TipUI/CmCommandGroup.extension.st | 4 +- .../CmCommandGroupDecorator.extension.st | 4 +- .../CmUICommandDisplayStrategy.extension.st | 4 +- .../CmUIDisableWhenCantBeRun.extension.st | 4 +- .../CmUIHideWhenCantBeRun.extension.st | 4 +- Iceberg-TipUI/FTBasicItem.extension.st | 4 +- Iceberg-TipUI/FTRootItem.extension.st | 4 +- Iceberg-TipUI/FTTableMorph.extension.st | 6 +- Iceberg-TipUI/FTTreeItem.extension.st | 4 +- .../IceAbstractCredentials.extension.st | 6 +- Iceberg-TipUI/IceAddition.extension.st | 4 +- .../IceCheckoutAllPackages.extension.st | 4 +- ...CheckoutAlreadyLoadedPackages.extension.st | 4 +- .../IceCheckoutDoNotLoadPackages.extension.st | 4 +- .../IceCheckoutStrategy.extension.st | 6 +- Iceberg-TipUI/IceClassDefinition.extension.st | 4 +- .../IceConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceCreateBranchCommand.class.st | 10 +- Iceberg-TipUI/IceDefinition.extension.st | 4 +- .../IceDirectoryDefinition.extension.st | 4 +- Iceberg-TipUI/IceErrorVisitor.extension.st | 6 +- Iceberg-TipUI/IceExperimentalFeature.class.st | 10 +- .../IceExtensionDefinition.extension.st | 4 +- Iceberg-TipUI/IceFileDefinition.extension.st | 4 +- .../IceFileSystemDefinition.extension.st | 6 +- Iceberg-TipUI/IceMergeListWrapper.class.st | 28 ++-- .../IceMergeWorkingCopyCommand.class.st | 10 +- .../IceMethodContainerDefinition.extension.st | 10 +- .../IceMethodDefinition.extension.st | 10 +- Iceberg-TipUI/IceModification.extension.st | 4 +- Iceberg-TipUI/IceNoCommitMessage.class.st | 14 +- Iceberg-TipUI/IceNoModification.extension.st | 4 +- Iceberg-TipUI/IceNode.extension.st | 4 +- .../IceNodeCodeDisplayVisitor.class.st | 24 ++-- .../IceNonConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceOperation.extension.st | 12 +- Iceberg-TipUI/IceOperationMerge.extension.st | 6 +- Iceberg-TipUI/IcePackage.extension.st | 4 +- .../IcePackageDefinition.extension.st | 10 +- .../IcePlaintextCredentials.extension.st | 8 +- .../IcePlaintextOtpCredentials.extension.st | 4 +- Iceberg-TipUI/IcePullRemoteCommand.class.st | 14 +- Iceberg-TipUI/IceRemoval.extension.st | 4 +- Iceberg-TipUI/IceRepository.extension.st | 4 +- Iceberg-TipUI/IceRepositoryCommand.class.st | 24 ++-- .../IceSavedPackageVersion.extension.st | 4 +- Iceberg-TipUI/IceSortingStrategy.class.st | 28 ++-- Iceberg-TipUI/IceSshCredentials.extension.st | 6 +- .../IceTipAbstractCredentialCommand.class.st | 14 +- ...TipAbstractCredentialStoreCommand.class.st | 16 ++- ...ceTipAbstractCredentialsPresenter.class.st | 56 ++++---- ...ractPlaintextCredentialsPresenter.class.st | 24 ++-- ...ipAbstractSSHCredentialsPresenter.class.st | 20 +-- Iceberg-TipUI/IceTipAction.class.st | 30 +++-- ...eTipAddNewPackagesDialogPresenter.class.st | 40 +++--- .../IceTipAddPackageCommand.class.st | 20 +-- .../IceTipAddPackagesDialogPresenter.class.st | 44 +++--- ...eTipAddPlainTextCredentialCommand.class.st | 14 +- ...pAddPlaintextCredentialsPresenter.class.st | 22 +-- Iceberg-TipUI/IceTipAddRemoteCommand.class.st | 20 +-- .../IceTipAddRemoteDialogPresenter.class.st | 40 +++--- .../IceTipAddRepositoryCommand.class.st | 22 +-- .../IceTipAddSSHCredentialsPresenter.class.st | 22 +-- .../IceTipAddSshCredentialCommand.class.st | 14 +- .../IceTipAddTokenCredentialCommand.class.st | 14 +- ...ceTipAddTokenCredentialsPresenter.class.st | 28 ++-- .../IceTipAdoptCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipAnnouncement.class.st | 8 +- ...kForPlaintextCredentialsPresenter.class.st | 20 +-- ...rPlaintextOtpCredentialsPresenter.class.st | 18 +-- ...bForPlaintextCredentialsPresenter.class.st | 10 +- .../IceTipAskSSHCredentialsPresenter.class.st | 14 +- Iceberg-TipUI/IceTipBranchModel.class.st | 48 +++---- Iceberg-TipUI/IceTipBranchPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipBrowseCommand.class.st | 20 +-- .../IceTipBrowsePackageCommand.class.st | 18 +-- ...seRepositoryPackageVersionCommand.class.st | 14 +- Iceberg-TipUI/IceTipBrowser.class.st | 62 ++++----- Iceberg-TipUI/IceTipCache.class.st | 28 ++-- Iceberg-TipUI/IceTipCachedModel.class.st | 26 ++-- ...eTipCalculateDirtyPackagesCommand.class.st | 16 ++- .../IceTipCheckoutBranchCommand.class.st | 20 +-- .../IceTipCheckoutBranchDialog.class.st | 30 +++-- .../IceTipCheckoutBranchPanel.class.st | 10 +- .../IceTipCheckoutCommitCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCheckoutModel.class.st | 26 ++-- .../IceTipCheckoutNewBranchCommand.class.st | 18 +-- .../IceTipCheckoutNewBranchPanel.class.st | 40 +++--- .../IceTipCheckoutPreviewBrowser.class.st | 32 ++--- ...eTipCheckoutSelectedBranchCommand.class.st | 18 +-- .../IceTipCheckoutSelectedTagCommand.class.st | 18 +-- .../IceTipCherryPickCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCherrypickModel.class.st | 22 +-- .../IceTipCherrypickPreviewBrowser.class.st | 34 ++--- .../IceTipCleanCommandGroupVisitor.class.st | 12 +- Iceberg-TipUI/IceTipCommand.class.st | 50 +++---- ...ommandToPresenterBuildingStrategy.class.st | 12 +- Iceberg-TipUI/IceTipCommentPanel.class.st | 54 ++++---- Iceberg-TipUI/IceTipCommitAction.class.st | 28 ++-- Iceberg-TipUI/IceTipCommitBrowser.class.st | 58 ++++---- Iceberg-TipUI/IceTipCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipCommitDiffModel.class.st | 10 +- .../IceTipCommitInfoPresenter.class.st | 46 ++++--- Iceberg-TipUI/IceTipCommitModel.class.st | 64 ++++----- Iceberg-TipUI/IceTipCommitRangeModel.class.st | 18 +-- Iceberg-TipUI/IceTipCommitishModel.class.st | 18 +-- .../IceTipCopyCommitishCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagPanel.class.st | 60 +++++---- .../IceTipCredentialsSettings.class.st | 16 ++- .../IceTipCredentialsStoreBrowser.class.st | 34 ++--- ...ceTipCritiquesBeforeCommitBrowser.class.st | 50 +++---- .../IceTipDeleteBranchCommand.class.st | 18 +-- .../IceTipDeleteRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipDeleteTagCommand.class.st | 20 +-- .../IceTipDescriptionDecorator.class.st | 14 +- .../IceTipDescriptionDecoratorHead.class.st | 10 +- ...ceTipDescriptionDecoratorModified.class.st | 10 +- ...eTipDescriptionDecoratorNotLoaded.class.st | 10 +- Iceberg-TipUI/IceTipDialogPresenter.class.st | 14 +- Iceberg-TipUI/IceTipDiffEntryRemoved.class.st | 14 +- Iceberg-TipUI/IceTipDiffModel.class.st | 24 ++-- Iceberg-TipUI/IceTipDiffPanel.class.st | 66 ++++----- Iceberg-TipUI/IceTipDiffPreviewModel.class.st | 22 +-- Iceberg-TipUI/IceTipDiffRefreshed.class.st | 14 +- .../IceTipDiffSelectingPanel.class.st | 26 ++-- Iceberg-TipUI/IceTipDirectMergeType.class.st | 10 +- .../IceTipDirectoryPresenter.class.st | 10 +- ...ipDiscardAllChangesPreviewBrowser.class.st | 22 +-- Iceberg-TipUI/IceTipDiscardAllModel.class.st | 24 ++-- .../IceTipDiscardChangesCommand.class.st | 20 +-- .../IceTipEditCredentialCommand.class.st | 18 +-- ...EditPlaintextCredentialsPresenter.class.st | 20 +-- .../IceTipEditProjectDialogPresenter.class.st | 74 +++++----- .../IceTipEditRepositoryCommand.class.st | 18 +-- ...IceTipEditSSHCredentialsPresenter.class.st | 20 +-- ...eTipEditTokenCredentialsPresenter.class.st | 16 ++- Iceberg-TipUI/IceTipEntityModel.class.st | 38 +++--- .../IceTipErrorDialogPresenter.class.st | 30 +++-- .../IceTipExistingBranchPanel.class.st | 32 ++--- .../IceTipFetchAllProjectCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFetchCommand.class.st | 20 +-- .../IceTipFetchInPullCommand.class.st | 16 ++- .../IceTipFetchRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFilePresenter.class.st | 10 +- .../IceTipForgetRepositoryCommand.class.st | 18 +-- .../IceTipGitProviderRepositoryPanel.class.st | 42 +++--- .../IceTipGitRepositoryPanel.class.st | 26 ++-- ...itUsernameAndEmailDialogPresenter.class.st | 38 +++--- ...pHiedraAltComponentHistoryBrowser.class.st | 36 ++--- .../IceTipHiedraAltHistoryBrowser.class.st | 32 ++--- ...ceTipHiedraAltHistoryRowPresenter.class.st | 16 ++- .../IceTipHiedraHistoryBrowser.class.st | 18 +-- .../IceTipHistoryActionBrowser.class.st | 32 ++--- Iceberg-TipUI/IceTipHistoryBrowser.class.st | 46 ++++--- .../IceTipHistoryDiffFromHead.class.st | 12 +- .../IceTipHistoryDiffToAncestor.class.st | 12 +- .../IceTipHistoryDiffToHead.class.st | 12 +- .../IceTipHistoryDiffUpdater.class.st | 28 ++-- Iceberg-TipUI/IceTipInspectCommand.class.st | 20 +-- .../IceTipInstallVersionCommand.class.st | 18 +-- ...TipInteractiveCredentialsProvider.class.st | 18 +-- .../IceTipInteractiveErrorVisitor.class.st | 54 ++++---- .../IceTipLoadPackageCommand.class.st | 18 +-- .../IceTipLocalRepositoryPanel.class.st | 28 ++-- .../IceTipLocationPresenter.class.st | 46 ++++--- .../IceTipManagePackagesCommand.class.st | 18 +-- .../IceTipManageRepositoryCommand.class.st | 24 ++-- .../IceTipMergeBranchDialogPresenter.class.st | 30 +++-- Iceberg-TipUI/IceTipMergeBranchPanel.class.st | 18 +-- Iceberg-TipUI/IceTipMergeCommand.class.st | 18 +-- .../IceTipMergeHistoryCommand.class.st | 18 +-- Iceberg-TipUI/IceTipMergeModel.class.st | 20 +-- Iceberg-TipUI/IceTipMergeMorph.class.st | 14 +- Iceberg-TipUI/IceTipMergePatchMorph.class.st | 40 +++--- .../IceTipMergePreviewBrowser.class.st | 20 +-- .../IceTipMergeSelectingPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipMergeType.class.st | 22 +-- Iceberg-TipUI/IceTipModel.class.st | 18 +-- .../IceTipNewRepositoryPanel.class.st | 34 ++--- .../IceTipOpenNativelyCommand.class.st | 18 +-- .../IceTipOptionDialogPresenter.class.st | 36 ++--- Iceberg-TipUI/IceTipPackageCommand.class.st | 20 +-- Iceberg-TipUI/IceTipPackageModel.class.st | 36 ++--- Iceberg-TipUI/IceTipPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipPreviewBrowser.class.st | 26 ++-- Iceberg-TipUI/IceTipPullBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPullCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPullModel.class.st | 12 +- Iceberg-TipUI/IceTipPushAction.class.st | 10 +- Iceberg-TipUI/IceTipPushBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPushCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPushModel.class.st | 12 +- .../IceTipReadOnlyFormBuilder.class.st | 36 ++--- .../IceTipRefreshCommitCommand.class.st | 18 +-- ...RegisterRepositoryDialogPresenter.class.st | 26 ++-- .../IceTipReloadPackageCommand.class.st | 18 +-- .../IceTipRemoteActionBrowser.class.st | 26 ++-- .../IceTipRemoteActionCommand.class.st | 14 +- .../IceTipRemoteActionModel.class.st | 24 ++-- Iceberg-TipUI/IceTipRemoteModel.class.st | 20 +-- .../IceTipRemotesTreeCommand.class.st | 18 +-- .../IceTipRemoveCredentialCommand.class.st | 20 +-- ...emoveFromRepositoryPackageCommand.class.st | 16 ++- ...ceTipRemovePackageDialogPresenter.class.st | 34 ++--- ...ipRemoveRepositoryDialogPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipRepairAction.class.st | 38 +++--- .../IceTipRepairCheckoutBranch.class.st | 20 +-- .../IceTipRepairCheckoutNewBranch.class.st | 20 +-- .../IceTipRepairCloneRepository.class.st | 20 +-- Iceberg-TipUI/IceTipRepairCommand.class.st | 20 +-- .../IceTipRepairCreateSubdirectory.class.st | 20 +-- .../IceTipRepairDiscardAndLoad.class.st | 22 +-- .../IceTipRepairEditRepository.class.st | 20 +-- .../IceTipRepairFetchRemoteBranch.class.st | 22 +-- .../IceTipRepairLocateRepository.class.st | 24 ++-- .../IceTipRepairMergeWithBranch.class.st | 20 +-- Iceberg-TipUI/IceTipRepairProject.class.st | 20 +-- .../IceTipRepairPullRemoteBranch.class.st | 20 +-- ...ipRepairRepositoryDialogPresenter.class.st | 44 +++--- .../IceTipRepositoriesBrowser.class.st | 74 +++++----- .../IceTipRepositoriesModel.class.st | 14 +- .../IceTipRepositoryBrowser.class.st | 46 ++++--- .../IceTipRepositoryCommand.class.st | 20 +-- .../IceTipRepositoryGroupModel.class.st | 22 +-- .../IceTipRepositoryGroupPanel.class.st | 50 +++---- Iceberg-TipUI/IceTipRepositoryModel.class.st | 126 +++++++++--------- .../IceTipRepositoryTypePanel.class.st | 40 +++--- ...TipResetBranchToThisCommitCommand.class.st | 22 +-- .../IceTipRevertChangeCommand.class.st | 18 +-- Iceberg-TipUI/IceTipSaveImageAction.class.st | 10 +- .../IceTipSelectAllPackagesCommand.class.st | 18 +-- .../IceTipSelectPackagesCommand.class.st | 10 +- .../IceTipSelectRemotePresenter.class.st | 32 ++--- Iceberg-TipUI/IceTipSettingsCommand.class.st | 22 +-- Iceberg-TipUI/IceTipSpCommand.class.st | 24 ++-- Iceberg-TipUI/IceTipStandardAction.class.st | 26 ++-- Iceberg-TipUI/IceTipStatusDecorator.class.st | 12 +- .../IceTipStatusDecoratorError.class.st | 12 +- .../IceTipStatusDecoratorWarning.class.st | 10 +- Iceberg-TipUI/IceTipStyleContributor.class.st | 10 +- .../IceTipSwitchAndMergeType.class.st | 10 +- Iceberg-TipUI/IceTipTagDecorator.class.st | 12 +- Iceberg-TipUI/IceTipTagModel.class.st | 18 +-- Iceberg-TipUI/IceTipTextDecorator.class.st | 20 +-- .../IceTipTextDecoratorNone.class.st | 8 +- .../IceTipToolbarButtonStrategy.class.st | 12 +- .../IceTipToolbarPresenterBuilder.class.st | 10 +- Iceberg-TipUI/IceTipTreeBranch.class.st | 10 +- .../IceTipTreeCollapseCommand.class.st | 16 ++- .../IceTipTreeExpandCommand.class.st | 18 +-- Iceberg-TipUI/IceTipTreeGroup.class.st | 34 ++--- Iceberg-TipUI/IceTipTreeItem.class.st | 18 +-- Iceberg-TipUI/IceTipTreeNode.class.st | 40 +++--- Iceberg-TipUI/IceTipTreeRemote.class.st | 10 +- .../IceTipTreeRepositoryGroup.class.st | 8 +- Iceberg-TipUI/IceTipTreeTag.class.st | 10 +- ...eTipUnloadAndRemovePackageCommand.class.st | 18 +-- .../IceTipUnloadPackageCommand.class.st | 18 +-- .../IceTipUnselectAllPackagesCommand.class.st | 18 +-- .../IceTipVersionHistoryBrowser.class.st | 50 +++---- .../IceTipVersionHistoryModel.class.st | 18 +-- Iceberg-TipUI/IceTipVersionModel.class.st | 16 ++- .../IceTipWorkingCopyBrowser.class.st | 62 ++++----- .../IceTipWorkingCopyDiffModel.class.st | 16 ++- Iceberg-TipUI/IceTipWorkingCopyModel.class.st | 36 ++--- ...eTipWorkingCopyStatusBarPresenter.class.st | 20 +-- .../IceTokenCredentials.extension.st | 6 +- Iceberg-TipUI/IceTraitDefinition.extension.st | 4 +- Iceberg-TipUI/IceWarning.class.st | 10 +- Iceberg-TipUI/IceWorkingCopy.extension.st | 4 +- .../LGitCredentialsPlaintext.extension.st | 4 +- Iceberg-TipUI/MCAddition.extension.st | 4 +- Iceberg-TipUI/MCModification.extension.st | 4 +- Iceberg-TipUI/MCPatchOperation.extension.st | 4 +- Iceberg-TipUI/MCRemoval.extension.st | 6 +- Iceberg-TipUI/ManifestIcebergTipUI.class.st | 14 +- Iceberg-TipUI/PharoDarkTheme.extension.st | 6 +- Iceberg-TipUI/PharoShortcuts.extension.st | 4 +- .../SpToolbarButtonPresenter.extension.st | 4 +- Iceberg-TipUI/TIceCopyCommitId.trait.st | 10 +- Iceberg-TipUI/TWithBranchModel.trait.st | 16 ++- Iceberg-TipUI/Text.extension.st | 4 +- .../ToolShortcutsCategory.extension.st | 4 +- Iceberg-TipUI/UITheme.extension.st | 6 +- Iceberg-TipUI/package.st | 2 +- 287 files changed, 3161 insertions(+), 2695 deletions(-) diff --git a/Iceberg-TipUI/Clipboard.extension.st b/Iceberg-TipUI/Clipboard.extension.st index c811d6fe5c..21ac6f2c76 100644 --- a/Iceberg-TipUI/Clipboard.extension.st +++ b/Iceberg-TipUI/Clipboard.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Clipboard } +Extension { #name : 'Clipboard' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } Clipboard class >> clipboardText: aText informing: aString [ UIManager inform: aString. ^ self clipboardText: aText diff --git a/Iceberg-TipUI/CmCommandGroup.extension.st b/Iceberg-TipUI/CmCommandGroup.extension.st index 6f36bc0b04..37988d8338 100644 --- a/Iceberg-TipUI/CmCommandGroup.extension.st +++ b/Iceberg-TipUI/CmCommandGroup.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroup } +Extension { #name : 'CmCommandGroup' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroup >> commandOrGroupNamed: aString ifFound: aBlock [ ^ entries diff --git a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st index 8ef6886348..306bf40201 100644 --- a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st +++ b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroupDecorator } +Extension { #name : 'CmCommandGroupDecorator' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroupDecorator >> commandOrGroupNamed: aString ifFound: aBlock [ ^ self decoratedGroup commandOrGroupNamed: aString ifFound: aBlock diff --git a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st index f356aa3469..b0c6cb73fc 100644 --- a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st +++ b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUICommandDisplayStrategy } +Extension { #name : 'CmUICommandDisplayStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUICommandDisplayStrategy >> ifVisible: aCmSpecCommand do: aBlock [ self subclassResponsibility diff --git a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st index 7f1636c79c..a9fb4ab426 100644 --- a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIDisableWhenCantBeRun } +Extension { #name : 'CmUIDisableWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIDisableWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Always visible" diff --git a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st index ff2501af9c..aad5f38218 100644 --- a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIHideWhenCantBeRun } +Extension { #name : 'CmUIHideWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIHideWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Visible if #canBeExecuted" diff --git a/Iceberg-TipUI/FTBasicItem.extension.st b/Iceberg-TipUI/FTBasicItem.extension.st index 889a7a7367..d4e904d427 100644 --- a/Iceberg-TipUI/FTBasicItem.extension.st +++ b/Iceberg-TipUI/FTBasicItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTBasicItem } +Extension { #name : 'FTBasicItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTBasicItem >> toggle [ self isExpanded ifTrue: [ self collapseAndRefresh ] diff --git a/Iceberg-TipUI/FTRootItem.extension.st b/Iceberg-TipUI/FTRootItem.extension.st index 95874a9068..7aa97b2e24 100644 --- a/Iceberg-TipUI/FTRootItem.extension.st +++ b/Iceberg-TipUI/FTRootItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTRootItem } +Extension { #name : 'FTRootItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTRootItem >> isRoot [ ^ true ] diff --git a/Iceberg-TipUI/FTTableMorph.extension.st b/Iceberg-TipUI/FTTableMorph.extension.st index b5f26040a5..9d329d59d1 100644 --- a/Iceberg-TipUI/FTTableMorph.extension.st +++ b/Iceberg-TipUI/FTTableMorph.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTableMorph } +Extension { #name : 'FTTableMorph' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> selectFirstVisibleRow [ ^ self selectIndex: @@ -9,7 +9,7 @@ FTTableMorph >> selectFirstVisibleRow [ ifEmpty: [ 0 ]) ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> useFunction: aFilterFunctionClass do: aBlock [ function := aFilterFunctionClass table: self. aBlock cull: function cull: self diff --git a/Iceberg-TipUI/FTTreeItem.extension.st b/Iceberg-TipUI/FTTreeItem.extension.st index 252972c9d7..9f7286ecfd 100644 --- a/Iceberg-TipUI/FTTreeItem.extension.st +++ b/Iceberg-TipUI/FTTreeItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTreeItem } +Extension { #name : 'FTTreeItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTreeItem >> isRoot [ ^ false ] diff --git a/Iceberg-TipUI/IceAbstractCredentials.extension.st b/Iceberg-TipUI/IceAbstractCredentials.extension.st index 533cab5b40..c305485223 100644 --- a/Iceberg-TipUI/IceAbstractCredentials.extension.st +++ b/Iceberg-TipUI/IceAbstractCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceAbstractCredentials } +Extension { #name : 'IceAbstractCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> askForModelClass [ ^ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> editModelClass [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceAddition.extension.st b/Iceberg-TipUI/IceAddition.extension.st index 37dc983ddf..c38ab65190 100644 --- a/Iceberg-TipUI/IceAddition.extension.st +++ b/Iceberg-TipUI/IceAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceAddition } +Extension { #name : 'IceAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAddition >> icon [ ^ self iconNamed: #changeAdd diff --git a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st index 0771c4e508..d26a6bad1f 100644 --- a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAllPackages } +Extension { #name : 'IceCheckoutAllPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAllPackages class >> description [ ^ 'Checkout ALL packages in the repository' ] diff --git a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st index e08c84d409..5b4216bc8f 100644 --- a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAlreadyLoadedPackages } +Extension { #name : 'IceCheckoutAlreadyLoadedPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAlreadyLoadedPackages class >> description [ ^ 'Checkout packages ALREADY LOADED in the image' ] diff --git a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st index 0a9c967d0c..67ec10aa6a 100644 --- a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutDoNotLoadPackages } +Extension { #name : 'IceCheckoutDoNotLoadPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutDoNotLoadPackages class >> description [ ^ 'DO NOT CHECKOUT any packages, I will load them manually (for experts only)' ] diff --git a/Iceberg-TipUI/IceCheckoutStrategy.extension.st b/Iceberg-TipUI/IceCheckoutStrategy.extension.st index 51de95c72f..ac78658726 100644 --- a/Iceberg-TipUI/IceCheckoutStrategy.extension.st +++ b/Iceberg-TipUI/IceCheckoutStrategy.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceCheckoutStrategy } +Extension { #name : 'IceCheckoutStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy >> description [ ^ self class description ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy class >> description [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceClassDefinition.extension.st b/Iceberg-TipUI/IceClassDefinition.extension.st index e5be73baae..857e7aae8c 100644 --- a/Iceberg-TipUI/IceClassDefinition.extension.st +++ b/Iceberg-TipUI/IceClassDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceClassDefinition } +Extension { #name : 'IceClassDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceClassDefinition >> icon [ ^ self iconNamed: #class ] diff --git a/Iceberg-TipUI/IceConflictingOperation.extension.st b/Iceberg-TipUI/IceConflictingOperation.extension.st index 2a2670af63..fd38d1af90 100644 --- a/Iceberg-TipUI/IceConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceConflictingOperation.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceConflictingOperation } +Extension { #name : 'IceConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> operationIcon [ ^ self iconNamed: #changeUpdate ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceCreateBranchCommand.class.st b/Iceberg-TipUI/IceCreateBranchCommand.class.st index 67b297b6be..decf79bec0 100644 --- a/Iceberg-TipUI/IceCreateBranchCommand.class.st +++ b/Iceberg-TipUI/IceCreateBranchCommand.class.st @@ -3,12 +3,14 @@ I'm a command to create a new branch from a commit. this is usefull in the case of commiting changes in unsync repositories (so you open a branch and you commit there) " Class { - #name : #IceCreateBranchCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceCreateBranchCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceCreateBranchCommand >> execute [ | selection | diff --git a/Iceberg-TipUI/IceDefinition.extension.st b/Iceberg-TipUI/IceDefinition.extension.st index 8b2c9bdb7d..c453e2a0df 100644 --- a/Iceberg-TipUI/IceDefinition.extension.st +++ b/Iceberg-TipUI/IceDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDefinition } +Extension { #name : 'IceDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDefinition >> icon [ self subclassResponsibility diff --git a/Iceberg-TipUI/IceDirectoryDefinition.extension.st b/Iceberg-TipUI/IceDirectoryDefinition.extension.st index e16b919e0d..7ad08d0c15 100644 --- a/Iceberg-TipUI/IceDirectoryDefinition.extension.st +++ b/Iceberg-TipUI/IceDirectoryDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDirectoryDefinition } +Extension { #name : 'IceDirectoryDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDirectoryDefinition >> icon [ ^ self iconNamed: #emptyPackage ] diff --git a/Iceberg-TipUI/IceErrorVisitor.extension.st b/Iceberg-TipUI/IceErrorVisitor.extension.st index a0d887b790..baf0ab6cc2 100644 --- a/Iceberg-TipUI/IceErrorVisitor.extension.st +++ b/Iceberg-TipUI/IceErrorVisitor.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceErrorVisitor } +Extension { #name : 'IceErrorVisitor' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitExperimentalFeature: aWarning [ "By default experimental features are just accepted when we are not in an interactive mode". aWarning resume ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitNoCommitMessage: aWarning [ self visitGenericError: aWarning ] diff --git a/Iceberg-TipUI/IceExperimentalFeature.class.st b/Iceberg-TipUI/IceExperimentalFeature.class.st index ddcaf03e3a..db10719754 100644 --- a/Iceberg-TipUI/IceExperimentalFeature.class.st +++ b/Iceberg-TipUI/IceExperimentalFeature.class.st @@ -4,12 +4,14 @@ Everytime an user tries to use an experimental feature, maybe the UI want to sho This is useful to guarantee the correct keeping of the changes. " Class { - #name : #IceExperimentalFeature, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceExperimentalFeature', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceExperimentalFeature >> acceptError: aVisitor [ aVisitor visitExperimentalFeature: self diff --git a/Iceberg-TipUI/IceExtensionDefinition.extension.st b/Iceberg-TipUI/IceExtensionDefinition.extension.st index 25018c3c79..f16ab89a3f 100644 --- a/Iceberg-TipUI/IceExtensionDefinition.extension.st +++ b/Iceberg-TipUI/IceExtensionDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceExtensionDefinition } +Extension { #name : 'IceExtensionDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceExtensionDefinition >> icon [ ^ self iconNamed: #group ] diff --git a/Iceberg-TipUI/IceFileDefinition.extension.st b/Iceberg-TipUI/IceFileDefinition.extension.st index ec7f3d821f..9ada4d36b9 100644 --- a/Iceberg-TipUI/IceFileDefinition.extension.st +++ b/Iceberg-TipUI/IceFileDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceFileDefinition } +Extension { #name : 'IceFileDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileDefinition >> icon [ ^ self iconNamed: #book ] diff --git a/Iceberg-TipUI/IceFileSystemDefinition.extension.st b/Iceberg-TipUI/IceFileSystemDefinition.extension.st index 6d556411dc..5c26a26b36 100644 --- a/Iceberg-TipUI/IceFileSystemDefinition.extension.st +++ b/Iceberg-TipUI/IceFileSystemDefinition.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceFileSystemDefinition } +Extension { #name : 'IceFileSystemDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBeBrowsed [ "It can always be browsed through the libgit file system" ^ true ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBrowseReferences [ "We do not track file references..." diff --git a/Iceberg-TipUI/IceMergeListWrapper.class.st b/Iceberg-TipUI/IceMergeListWrapper.class.st index e8fb3896b2..3c7447bcfb 100644 --- a/Iceberg-TipUI/IceMergeListWrapper.class.st +++ b/Iceberg-TipUI/IceMergeListWrapper.class.st @@ -2,67 +2,69 @@ I am a morphic list wrapper that wraps iceberg diff tree nodes (potentially with conflicts) " Class { - #name : #IceMergeListWrapper, - #superclass : #ListItemWrapper, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceMergeListWrapper', + #superclass : 'ListItemWrapper', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> = aWrapper [ ^ self item = aWrapper item ] -{ #category : #'morphic-compatibility' } +{ #category : 'morphic-compatibility' } IceMergeListWrapper >> actualClass [ ^ self item value actualClass ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> asString [ ^item value description ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseLocal [ ^ item value selectRight ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseRemote [ ^ item value selectLeft ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> contents [ "Answer the contents of the change from the model." ^ item children collect: [ :each | IceMergeListWrapper with: each model: model ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> hash [ ^ self item hash ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> icon [ ^ item value icon ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> isConflict [ ^ item value isConflict ] -{ #category : #accessing } +{ #category : 'accessing' } IceMergeListWrapper >> preferredColor [ ^ self item value preferredColor diff --git a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st index fd1a3b7e5d..bc9b7f4006 100644 --- a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st +++ b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st @@ -2,12 +2,14 @@ I'm a command to perform a merge of current image sources with head commit. " Class { - #name : #IceMergeWorkingCopyCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceMergeWorkingCopyCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceMergeWorkingCopyCommand >> execute [ | commit | commit := self repository headCommit. diff --git a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st index bed0c4d10d..a8a94cb0b3 100644 --- a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceMethodContainerDefinition } +Extension { #name : 'IceMethodContainerDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> actualClass [ | actualClass | @@ -8,7 +8,7 @@ IceMethodContainerDefinition >> actualClass [ ^ isMeta ifTrue: [ actualClass classSide ] ifFalse: [ actualClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> browse [ | browsed | @@ -17,13 +17,13 @@ IceMethodContainerDefinition >> browse [ browsed browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBeBrowsed [ ^ Smalltalk globals includesKey: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBrowseReferences [ ^ self canBeBrowsed diff --git a/Iceberg-TipUI/IceMethodDefinition.extension.st b/Iceberg-TipUI/IceMethodDefinition.extension.st index 7f8cee63e9..48b2d71867 100644 --- a/Iceberg-TipUI/IceMethodDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodDefinition.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceMethodDefinition } +Extension { #name : 'IceMethodDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> browse [ (self contextClass >> name) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBeBrowsed [ ^ self contextClass @@ -14,13 +14,13 @@ IceMethodDefinition >> canBeBrowsed [ ifNil: [ false ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceModification.extension.st b/Iceberg-TipUI/IceModification.extension.st index 9ecdccb45c..91a3649b5f 100644 --- a/Iceberg-TipUI/IceModification.extension.st +++ b/Iceberg-TipUI/IceModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceModification } +Extension { #name : 'IceModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceModification >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceNoCommitMessage.class.st b/Iceberg-TipUI/IceNoCommitMessage.class.st index 01e8ce6729..7f5ba3de28 100644 --- a/Iceberg-TipUI/IceNoCommitMessage.class.st +++ b/Iceberg-TipUI/IceNoCommitMessage.class.st @@ -3,23 +3,25 @@ I indicate when a commit will be performed without a message comment. This is usually possible, but bad, very bad. Do not do it. " Class { - #name : #IceNoCommitMessage, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceNoCommitMessage', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage class >> defaultMessageText [ ^ 'You are trying to commit without a message! When this is possible, is not a good practice.' ] -{ #category : #visiting } +{ #category : 'visiting' } IceNoCommitMessage >> acceptError: aVisitor [ aVisitor visitNoCommitMessage: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage >> messageText [ ^ messageText ifNil: [ self class defaultMessageText ] ] diff --git a/Iceberg-TipUI/IceNoModification.extension.st b/Iceberg-TipUI/IceNoModification.extension.st index c57e45a902..a49e299b2a 100644 --- a/Iceberg-TipUI/IceNoModification.extension.st +++ b/Iceberg-TipUI/IceNoModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNoModification } +Extension { #name : 'IceNoModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNoModification >> icon [ ^ definition icon diff --git a/Iceberg-TipUI/IceNode.extension.st b/Iceberg-TipUI/IceNode.extension.st index d269a8d67e..cfba09c027 100644 --- a/Iceberg-TipUI/IceNode.extension.st +++ b/Iceberg-TipUI/IceNode.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNode } +Extension { #name : 'IceNode' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNode >> inspectorItems [ diff --git a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st index 790c80f427..a9a5fe9c83 100644 --- a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st +++ b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st @@ -3,47 +3,49 @@ I am a IceNode (containing an IceOperationMerge) visitor meant to update a SpCod with the highlighted code. " Class { - #name : #IceNodeCodeDisplayVisitor, - #superclass : #Object, + #name : 'IceNodeCodeDisplayVisitor', + #superclass : 'Object', #instVars : [ 'codePresenter' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNodeCodeDisplayVisitor class >> onCodePresenter: aSpCodePresenter [ ^ self new codePresenter: aSpCodePresenter ; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter [ ^ codePresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter: aSpCodePresenter [ codePresenter := aSpCodePresenter ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitClassDefinition: anIceClassDefinition [ codePresenter text: anIceClassDefinition contents. codePresenter behavior: nil ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitConflictingOperation: anIceConflictingOperation [ anIceConflictingOperation chosenOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ codePresenter @@ -53,13 +55,13 @@ IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ UndefinedObject ]) ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitPackage: anIcePackageDefinition [ codePresenter diff --git a/Iceberg-TipUI/IceNonConflictingOperation.extension.st b/Iceberg-TipUI/IceNonConflictingOperation.extension.st index a9d80139e9..e1735a623d 100644 --- a/Iceberg-TipUI/IceNonConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceNonConflictingOperation.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceNonConflictingOperation } +Extension { #name : 'IceNonConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> operationIcon [ ^ operation icon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceOperation.extension.st b/Iceberg-TipUI/IceOperation.extension.st index e247689488..bafe10e4da 100644 --- a/Iceberg-TipUI/IceOperation.extension.st +++ b/Iceberg-TipUI/IceOperation.extension.st @@ -1,30 +1,30 @@ -Extension { #name : #IceOperation } +Extension { #name : 'IceOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> browse [ ^ self leftDefinition browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBeBrowsed [ ^ self leftDefinition canBeBrowsed ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> icon [ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> preferredColor [ "Use the default color" diff --git a/Iceberg-TipUI/IceOperationMerge.extension.st b/Iceberg-TipUI/IceOperationMerge.extension.st index 8d9566c0cb..fa98848b61 100644 --- a/Iceberg-TipUI/IceOperationMerge.extension.st +++ b/Iceberg-TipUI/IceOperationMerge.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceOperationMerge } +Extension { #name : 'IceOperationMerge' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> icon [ self isRightChosen ifTrue: [ ^ self iconNamed: #changeBlock ]. @@ -9,7 +9,7 @@ IceOperationMerge >> icon [ ^ self operationIcon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> operationIcon [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IcePackage.extension.st b/Iceberg-TipUI/IcePackage.extension.st index b932cb71e4..d205ceaf37 100644 --- a/Iceberg-TipUI/IcePackage.extension.st +++ b/Iceberg-TipUI/IcePackage.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePackage } +Extension { #name : 'IcePackage' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackage >> browse [ (RPackageOrganizer default packageNamed: self name) browse diff --git a/Iceberg-TipUI/IcePackageDefinition.extension.st b/Iceberg-TipUI/IcePackageDefinition.extension.st index 4839af1d7a..36f9b23914 100644 --- a/Iceberg-TipUI/IcePackageDefinition.extension.st +++ b/Iceberg-TipUI/IcePackageDefinition.extension.st @@ -1,25 +1,25 @@ -Extension { #name : #IcePackageDefinition } +Extension { #name : 'IcePackageDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> browse [ "Open a browser on the package, if it exists." (self packageOrganizer packageNamed: name ifAbsent: [ ^ self ]) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBeBrowsed [ ^ self packageOrganizer hasPackage: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> icon [ ^ self iconNamed: #package ] diff --git a/Iceberg-TipUI/IcePlaintextCredentials.extension.st b/Iceberg-TipUI/IcePlaintextCredentials.extension.st index 2280cbb78b..77fc415434 100644 --- a/Iceberg-TipUI/IcePlaintextCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IcePlaintextCredentials } +Extension { #name : 'IcePlaintextCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClass [ ^ IceTipAskForPlaintextCredentialsPresenter ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClassOn: aString [ ^ (aString includesSubstring: 'github.com' caseSensitive: false) @@ -13,7 +13,7 @@ IcePlaintextCredentials >> askForModelClassOn: aString [ ifFalse: [ self askForModelClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> editModelClass [ ^ IceTipEditPlaintextCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st index c69cf7dd5e..01215e50ad 100644 --- a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextOtpCredentials } +Extension { #name : 'IcePlaintextOtpCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextOtpCredentials >> askForModelClass [ ^ IceTipAskForPlaintextOtpCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePullRemoteCommand.class.st b/Iceberg-TipUI/IcePullRemoteCommand.class.st index 35ba209da8..92f9253947 100644 --- a/Iceberg-TipUI/IcePullRemoteCommand.class.st +++ b/Iceberg-TipUI/IcePullRemoteCommand.class.st @@ -2,27 +2,29 @@ I'm a command to perform a pull from a remote. " Class { - #name : #IcePullRemoteCommand, - #superclass : #IceRepositoryCommand, + #name : 'IcePullRemoteCommand', + #superclass : 'IceRepositoryCommand', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IcePullRemoteCommand >> execute [ self repository branch pullFrom: self remote. self beSuccess ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote: anObject [ remote := anObject ] diff --git a/Iceberg-TipUI/IceRemoval.extension.st b/Iceberg-TipUI/IceRemoval.extension.st index fb9aaa8acc..9887f589e2 100644 --- a/Iceberg-TipUI/IceRemoval.extension.st +++ b/Iceberg-TipUI/IceRemoval.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRemoval } +Extension { #name : 'IceRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRemoval >> icon [ ^ self iconNamed: #changeRemove diff --git a/Iceberg-TipUI/IceRepository.extension.st b/Iceberg-TipUI/IceRepository.extension.st index ce7f0e2d32..17235036b4 100644 --- a/Iceberg-TipUI/IceRepository.extension.st +++ b/Iceberg-TipUI/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRepository >> inspectorItems [ diff --git a/Iceberg-TipUI/IceRepositoryCommand.class.st b/Iceberg-TipUI/IceRepositoryCommand.class.st index 1c769a782e..0e64b96592 100644 --- a/Iceberg-TipUI/IceRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceRepositoryCommand.class.st @@ -2,56 +2,58 @@ I'm a generic command for iceberg repositories. " Class { - #name : #IceRepositoryCommand, - #superclass : #Object, + #name : 'IceRepositoryCommand', + #superclass : 'Object', #instVars : [ 'repository', 'success', 'context' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand class >> isAbstract [ ^ self == IceRepositoryCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> beSuccess [ success := true ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> execute [ self subclassResponsibility ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> executeWithContext: aContext [ context := aContext. self execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCommand >> initialize [ super initialize. success := false ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand >> isSuccess [ ^ success ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceSavedPackageVersion.extension.st b/Iceberg-TipUI/IceSavedPackageVersion.extension.st index b699275f27..66160db0c5 100644 --- a/Iceberg-TipUI/IceSavedPackageVersion.extension.st +++ b/Iceberg-TipUI/IceSavedPackageVersion.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceSavedPackageVersion } +Extension { #name : 'IceSavedPackageVersion' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSavedPackageVersion >> description [ ^ self commit description ] diff --git a/Iceberg-TipUI/IceSortingStrategy.class.st b/Iceberg-TipUI/IceSortingStrategy.class.st index 45945aeaaa..0c9b0ea815 100644 --- a/Iceberg-TipUI/IceSortingStrategy.class.st +++ b/Iceberg-TipUI/IceSortingStrategy.class.st @@ -15,26 +15,28 @@ Internal Representation and Key Implementation Points. last: Represent the entities to display last. " Class { - #name : #IceSortingStrategy, - #superclass : #Object, + #name : 'IceSortingStrategy', + #superclass : 'Object', #instVars : [ 'first', 'last' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy class >> possibleValues [ ^ #(#none #modified #notLoaded) ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first [ ^ first ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first: anObject [ first := anObject. @@ -42,19 +44,19 @@ IceSortingStrategy >> first: anObject [ ifTrue: [ self last: #none ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceSortingStrategy >> initialize [ super initialize. first := #modified. last := #notLoaded ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last [ ^ last ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last: anObject [ last := anObject. @@ -62,7 +64,7 @@ IceSortingStrategy >> last: anObject [ ifTrue: [ self first: #none ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ aSymbol = #modified ifTrue: [ ^ aCollection select: #isModified ]. @@ -71,7 +73,7 @@ IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ self error: 'This sorting is not accepted: ' , aSymbol ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sort: aListOfPackages [ | result packages lasts | packages := aListOfPackages. @@ -85,12 +87,12 @@ IceSortingStrategy >> sort: aListOfPackages [ ^ result ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sortByName: aCollection [ ^ aCollection sorted: #packageName ascending ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> withOthers: aSymbol [ self first = aSymbol ifTrue: [ self first: nil ]. self last = aSymbol ifTrue: [ self last: nil ] diff --git a/Iceberg-TipUI/IceSshCredentials.extension.st b/Iceberg-TipUI/IceSshCredentials.extension.st index e3ad3fed5c..6c5858fbf7 100644 --- a/Iceberg-TipUI/IceSshCredentials.extension.st +++ b/Iceberg-TipUI/IceSshCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceSshCredentials } +Extension { #name : 'IceSshCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> editModelClass [ ^ IceTipEditSSHCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st index 0c1558c81a..1d47f72c91 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st @@ -2,24 +2,26 @@ I am the common class of all the commands over an specific credential. " Class { - #name : #IceTipAbstractCredentialCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> credential [ ^ self item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> store [ ^ self context model diff --git a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st index fdb3e9165c..1742f97fae 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st @@ -2,30 +2,32 @@ I am the abstract class of all the general commands in the credentials list. " Class { - #name : #IceTipAbstractCredentialStoreCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialStoreCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialStoreCommand ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialStoreCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAbstractCredentialStoreCommand >> store [ ^ self context store diff --git a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st index ec0f14565a..ff95d0bfdc 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st @@ -5,8 +5,8 @@ to ask / add / edit credentials. There are subclasses to each of the actions and the types of keys. " Class { - #name : #IceTipAbstractCredentialsPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAbstractCredentialsPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'storeCheckbox', 'credentialStore', @@ -15,10 +15,12 @@ Class { 'credentials', 'askingHostname' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAddAction [ credentials := self newCredentials. @@ -31,7 +33,7 @@ IceTipAbstractCredentialsPresenter >> acceptAddAction [ tool refresh ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAskAction [ credentials := self newCredentials. @@ -45,7 +47,7 @@ IceTipAbstractCredentialsPresenter >> acceptAskAction [ ^ credentials ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptEditAction [ self refreshCredentialsFromPresenter. @@ -55,19 +57,19 @@ IceTipAbstractCredentialsPresenter >> acceptEditAction [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> askingHostname: aString [ askingHostname := aString ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAction [ "Action to execute on cancel." ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAskAction [ accepted := true. @@ -75,43 +77,43 @@ IceTipAbstractCredentialsPresenter >> cancelAskAction [ LGitNoCredentialsProvided signal ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> closeAction [ accepted ifFalse: [ self cancelAction ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentialStore: aStore [ credentialStore := aStore ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials: anIceCredentials [ credentials := anIceCredentials. self refreshPresenterFromCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> hostnameFromInput [ "Answer the remoote hostname for the credentials." ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initialize [ super initialize. accepted := false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPresenter [ super initializeDialogWindow: aDialogWindowPresenter. @@ -121,7 +123,7 @@ IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPrese ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initializePresenters [ storeCheckbox := self newCheckBox @@ -131,27 +133,27 @@ IceTipAbstractCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> isOkEnabled [ "Determite if the user should be enabled to press on the accept button." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> newCredentials [ "Answer a new instance of the credentials using the form inputs." ^ self subclassResponsibility ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> okButton [ ^ self window buttons first ] -{ #category : #'API - opening' } +{ #category : 'API - opening' } IceTipAbstractCredentialsPresenter >> open [ self openModal. @@ -159,36 +161,36 @@ IceTipAbstractCredentialsPresenter >> open [ ^ self credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshCredentialsFromPresenter [ "Hook to update the credentials object from the presenter inputs." ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshPresenterFromCredentials [ "Hook to update the presenter input fields from the credentials object." ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> shouldStoreCredentials [ ^ storeCheckbox state ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> storeCheckbox [ ^ storeCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> tool: aBrowser [ "Set the tool that triggered this dialog, and therefore might need a #refresh after the users accepts the dialog and it produces an effect on the system." tool := aBrowser ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> updateOkButton [ self window ifNil: [ ^ self ]. diff --git a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st index 24f88809b7..654595d3ee 100644 --- a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st @@ -3,18 +3,20 @@ I implement the basic behavior of all the plaintext credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameLabel', 'usernameInput', 'passwordLabel', 'passwordInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractPlaintextCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self password isNotEmpty ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ ^ IcePlaintextCredentials new @@ -47,31 +49,31 @@ IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> password [ ^ passwordInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> passwordInput [ ^ passwordInput ] -{ #category : #private } +{ #category : 'private' } IceTipAbstractPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Password:' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> username [ ^ usernameInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> usernameInput [ ^ usernameInput diff --git a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st index d0f96fe3b3..4b529092fd 100644 --- a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st @@ -3,8 +3,8 @@ I implement the basic behavior of all the ssh credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractSSHCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractSSHCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameInput', 'usernameLabel', @@ -15,10 +15,12 @@ Class { 'publicKeyLabel', 'privateKeyLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -56,20 +58,20 @@ IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractSSHCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self publicKey isNotEmpty and: [ self privateKey isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> passphrase [ ^ passphraseInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> privateKey [ ^ privateKeyInput location @@ -77,7 +79,7 @@ IceTipAbstractSSHCredentialsPresenter >> privateKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> publicKey [ ^ publicKeyInput location @@ -85,7 +87,7 @@ IceTipAbstractSSHCredentialsPresenter >> publicKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> username [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAction.class.st b/Iceberg-TipUI/IceTipAction.class.st index c062c89d67..7f2a1337db 100644 --- a/Iceberg-TipUI/IceTipAction.class.st +++ b/Iceberg-TipUI/IceTipAction.class.st @@ -2,41 +2,43 @@ I'm like a lightweight command, used in general for apply concrete actions. " Class { - #name : #IceTipAction, - #superclass : #Object, + #name : 'IceTipAction', + #superclass : 'Object', #instVars : [ 'context', 'repository', 'successBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipAction class >> isAbstract [ ^ self == IceTipAction ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> basicExecute [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context: aContext [ context := aContext ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> execute [ | result | @@ -48,19 +50,19 @@ IceTipAction >> execute [ ^ result. ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> executeWithContext: aContext [ self context: aContext. ^ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> finishSuccess [ successBlock ifNotNil: [ successBlock value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> onSuccess: aBlock [ "Some actions need to execute something right after finish. Like a refresh of panels, etc. If a block is defined here, it will be evaluated right after the command is executed, if @@ -68,17 +70,17 @@ IceTipAction >> onSuccess: aBlock [ successBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository: anObject [ repository := anObject ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> withErrorHandlingDo: aBlock [ aBlock on: IceError, IceWarning diff --git a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st index 5604783f88..cb70097b35 100644 --- a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st @@ -2,8 +2,8 @@ I am an small dialog to ask the user to select new packages to load. New packages are packages in the commit but not in the image. " Class { - #name : #IceTipAddNewPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddNewPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'packagesList', 'selectedPackages', @@ -12,10 +12,12 @@ Class { 'checkoutModel', 'checkoutPreviewWindow' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterInstance forRoot: rootCommandGroup [ rootCommandGroup register: @@ -25,7 +27,7 @@ IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterIn yourself) ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddNewPackagesDialogPresenter >> accept [ | selectedPackageNames | @@ -42,19 +44,19 @@ IceTipAddNewPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutModel: anIceTipCheckoutModel [ checkoutModel := anIceTipCheckoutModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutPreviewWindow: anIceTipCheckoutPreviewBrowser [ checkoutPreviewWindow := anIceTipCheckoutPreviewBrowser ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddNewPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -63,13 +65,13 @@ IceTipAddNewPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ packagesList @@ -90,7 +92,7 @@ IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ contextMenu: [ (self rootCommandsGroup / 'package list commands') beRoot asMenuPresenter ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -108,49 +110,49 @@ Please select the packages if you wish to load them in the image'. self initializePackagesList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddNewPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages [ ^ selectedPackages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages: anObject [ selectedPackages := anObject ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipAddNewPackagesDialogPresenter >> setModelBeforeInitialization: somePackages [ packages := somePackages ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> titleForWindow [ ^ 'Select New Packages to Load'. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> updatePresenter [ packagesList items: packages ] -{ #category : #validation } +{ #category : 'validation' } IceTipAddNewPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPackageCommand.class.st b/Iceberg-TipUI/IceTipAddPackageCommand.class.st index b426fd154f..abb62edab1 100644 --- a/Iceberg-TipUI/IceTipAddPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPackageCommand.class.st @@ -2,24 +2,26 @@ Command that opens a dialog to add a/many package/s into the selected repository. " Class { - #name : #IceTipAddPackageCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddPackageCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultDescription [ ^ 'Adds an existing package to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultName [ ^ 'Add package' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPackageCommand >> execute [ (IceTipAddPackagesDialogPresenter @@ -30,19 +32,19 @@ IceTipAddPackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPackageCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st index 94800447f8..4b476f9977 100644 --- a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st @@ -2,18 +2,20 @@ I'm a dialog to add packages to a repository. " Class { - #name : #IceTipAddPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'packagesList', 'packageNameText', 'selectedPackages' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddPackagesDialogPresenter >> accept [ "ensure window goes away (in case accept comes from a keybinding and not the ok button)" @@ -25,7 +27,7 @@ IceTipAddPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackages [ ^ RPackageOrganizer default packages @@ -33,7 +35,7 @@ IceTipAddPackagesDialogPresenter >> allPackages [ sort: [ :a :b | a name < b name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ | currentPackagesNames | @@ -42,7 +44,7 @@ IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ currentPackagesNames includes: rPackage name ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,13 +53,13 @@ IceTipAddPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackageNameText [ packageNameText @@ -66,7 +68,7 @@ IceTipAddPackagesDialogPresenter >> initializePackageNameText [ whenTextChangedDo: [ :text | self refresh ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackagesList [ packagesList addColumn: (SpCompositeTableColumn new @@ -86,7 +88,7 @@ IceTipAddPackagesDialogPresenter >> initializePackagesList [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -97,32 +99,32 @@ IceTipAddPackagesDialogPresenter >> initializePresenters [ self initializePackageNameText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model: anObject [ model := anObject. self refresh ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packageNameText [ ^ packageNameText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> refresh [ packagesList items: (packageNameText text @@ -135,31 +137,31 @@ IceTipAddPackagesDialogPresenter >> refresh [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> titleForWindow [ ^ 'Add packages' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> updatePresenter [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st index ff725f569e..0bda874a9b 100644 --- a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st @@ -2,22 +2,24 @@ I create a new plaintext credential on the credential store. " Class { - #name : #IceTipAddPlainTextCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddPlainTextCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultDescription [ ^ 'Add a new plain text credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultName [ ^ 'Plain Text' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPlainTextCredentialCommand >> execute [ ((IceTipAddPlaintextCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st index 34e65aa27d..9d957b8259 100644 --- a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add plaintext credentials. " Class { - #name : #IceTipAddPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, + #name : 'IceTipAddPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -30,20 +32,20 @@ IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPlaintextCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -54,13 +56,13 @@ IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> isOkEnabled [ ^ super isOkEnabled and: [ self hostnameFromInput isNotEmpty ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Add new Plain Text Credential' diff --git a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st index 9664e8295b..4cf7dfdbe0 100644 --- a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st @@ -2,31 +2,33 @@ Command that opens a dialog to add a remote to a repository. " Class { - #name : #IceTipAddRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultDescription [ ^ 'Adds a remote to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultName [ ^ 'Add remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> canBeExecuted [ "Any repository can have more remotes." ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRemoteCommand >> execute [ (IceTipAddRemoteDialogPresenter @@ -37,13 +39,13 @@ IceTipAddRemoteCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st index a7e1f9eb46..a5964fae34 100644 --- a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog to add remotes to a repository. " Class { - #name : #IceTipAddRemoteDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddRemoteDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'nameLabel', @@ -12,10 +12,12 @@ Class { 'nameText', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> accept [ self validate. @@ -27,7 +29,7 @@ IceTipAddRemoteDialogPresenter >> accept [ ^ acceptBlock ifNotNil: [ acceptBlock cull: self remoteName ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddRemoteDialogPresenter >> defaultLayout [ ^ SpGridLayout new @@ -41,7 +43,7 @@ IceTipAddRemoteDialogPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -51,7 +53,7 @@ IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -70,73 +72,73 @@ IceTipAddRemoteDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameText [ ^ nameText ] -{ #category : #events } +{ #category : 'events' } IceTipAddRemoteDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteName [ ^ self nameText text trimmed ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteUrl [ ^ self urlText text trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> titleForWindow [ ^ 'Add remote' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlLabel [ ^ urlLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlText [ ^ urlText ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st index 0aa7d9688d..0ac4f307df 100644 --- a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st @@ -3,31 +3,33 @@ I register Iceberg projects. I will open a dialog to take the new possible repository (from available options) and I will register it into the IceRepository>>#registry list. " Class { - #name : #IceTipAddRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultDescription [ ^ 'Add a repository (new, local, cloned) to your managed repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultName [ ^ 'Add' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRepositoryCommand >> execute [ (IceTipRegisterRepositoryDialogPresenter newApplication: context application) @@ -36,19 +38,19 @@ IceTipAddRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st index 57f671869e..0d5ea539bb 100644 --- a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add SSH credentials. " Class { - #name : #IceTipAddSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, + #name : 'IceTipAddSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddSSHCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -31,20 +33,20 @@ IceTipAddSSHCredentialsPresenter >> defaultLayout [ add: passphraseLabel; add: passphraseInput; nextRow ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 7 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -57,7 +59,7 @@ IceTipAddSSHCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> newCredentials [ ^ IceSshCredentials new @@ -68,7 +70,7 @@ IceTipAddSSHCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> titleForWindow [ ^ 'Add SSH credential' diff --git a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st index db86f547fd..49a17d55b3 100644 --- a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st @@ -2,22 +2,24 @@ I add a new IceSshCredentials to the store " Class { - #name : #IceTipAddSshCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddSshCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultDescription [ ^ 'Add a SSH pair of credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultName [ ^ 'SSH Pair' ] -{ #category : #execution } +{ #category : 'execution' } IceTipAddSshCredentialCommand >> execute [ ((IceTipAddSSHCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st index a1570d8283..6d47533e52 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipAddTokenCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddTokenCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultDescription [ ^ 'Add a new token credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultName [ ^ 'Token' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddTokenCredentialCommand >> execute [ ((IceTipAddTokenCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st index e6b33e71f7..c4931d633d 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st @@ -2,8 +2,8 @@ I am a dialog to add token credentials. " Class { - #name : #IceTipAddTokenCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAddTokenCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'hostInput', 'tokenInput', @@ -12,16 +12,18 @@ Class { 'usernameInput', 'usernameLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddTokenCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -36,19 +38,19 @@ IceTipAddTokenCredentialsPresenter >> defaultLayout [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -80,7 +82,7 @@ IceTipAddTokenCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddTokenCredentialsPresenter >> isOkEnabled [ ^ self usernameFromInput isNotEmpty and: [ @@ -88,7 +90,7 @@ IceTipAddTokenCredentialsPresenter >> isOkEnabled [ self tokenFromInput isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> newCredentials [ ^ IceTokenCredentials new @@ -98,19 +100,19 @@ IceTipAddTokenCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> titleForWindow [ ^ 'Add token credentials' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> tokenFromInput [ ^ tokenInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> usernameFromInput [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st index 7942ae2db3..f6c3ef79f8 100644 --- a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st @@ -5,37 +5,39 @@ I won't modify the loaded code, but will calculate the differences between the loaded packages and the new commit, to mark packages as dirty. " Class { - #name : #IceTipAdoptCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAdoptCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAdoptCommitCommand class >> defaultDescription [ ^ 'Sets this commit as the commit of your working copy. It will not modify your loaded code, but it will calculate the differences between your loaded packages and the the new commit to mark packages as dirty.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> defaultNameFromContext [ ^ 'Adopt commit ' , self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipAdoptCommitCommand >> execute [ self selectedCommitish adopt. Iceberg announcer announce: (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> iconName [ ^ #recoverLostChanges ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAdoptCommitCommand >> name [ "Answer the name for the command. In order to have a specialized string for certain parameters of the context, and given the fact that sometimes the context is nil (e.g. when a context menu is calculated when the selection is empty)." @@ -45,7 +47,7 @@ IceTipAdoptCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipAnnouncement.class.st b/Iceberg-TipUI/IceTipAnnouncement.class.st index dbdedd4dc5..e41c5c55a8 100644 --- a/Iceberg-TipUI/IceTipAnnouncement.class.st +++ b/Iceberg-TipUI/IceTipAnnouncement.class.st @@ -3,7 +3,9 @@ I'm a general announcement for Tip UI events. (the announcements happened here are just for UI consumption) " Class { - #name : #IceTipAnnouncement, - #superclass : #IceAnnouncement, - #category : #'Iceberg-TipUI-Announcements' + #name : 'IceTipAnnouncement', + #superclass : 'IceAnnouncement', + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } diff --git a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st index 365540a064..07247e0c33 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st @@ -3,30 +3,32 @@ I implement the dialog to ask plaintext credentials. This dialog is used when the IceTipInteractiveCredentialsProvider needs to ask a plaintext credential. " Class { - #name : #IceTipAskForPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskForPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancel [ self cancelAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -44,13 +46,13 @@ IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (450 @ 180) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Please log in to ' , askingHostname diff --git a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st index eaa0b052c5..b288110683 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipAskForPlaintextOtpCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, + #name : 'IceTipAskForPlaintextOtpCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', #instVars : [ 'tokenLabel', 'tokenInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -26,13 +28,13 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 210) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -43,7 +45,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ ^ IcePlaintextOtpCredentials new @@ -53,7 +55,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> token [ ^ tokenInput text diff --git a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st index a9c3aba0a3..b99c95dd5d 100644 --- a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipAskGithubForPlaintextCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskGithubForPlaintextCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #private } +{ #category : 'private' } IceTipAskGithubForPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Token:' diff --git a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st index 19347ecf1f..792093d429 100644 --- a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st @@ -2,24 +2,26 @@ I am a dialog to ask for SSH credentials. " Class { - #name : #IceTipAskSSHCredentialsPresenter, - #superclass : #IceTipEditSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskSSHCredentialsPresenter', + #superclass : 'IceTipEditSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskSSHCredentialsPresenter >> newCredentials [ self refreshCredentialsFromPresenter. diff --git a/Iceberg-TipUI/IceTipBranchModel.class.st b/Iceberg-TipUI/IceTipBranchModel.class.st index b12d7e9824..bb754a13e1 100644 --- a/Iceberg-TipUI/IceTipBranchModel.class.st +++ b/Iceberg-TipUI/IceTipBranchModel.class.st @@ -2,17 +2,19 @@ I expose data of a branch. " Class { - #name : #IceTipBranchModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipBranchModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> checkoutStrategies [ ^ IceCheckoutStrategy allStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -24,12 +26,12 @@ IceTipBranchModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commits [ self shouldBeImplemented. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> description [ ^ self entity isRemote @@ -37,49 +39,49 @@ IceTipBranchModel >> description [ ifFalse: [ self name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> descriptionDecorator [ self entity isHead ifTrue: [ ^ IceTipDescriptionDecorator head ]. ^ super descriptionDecorator ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffFromHead [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffToWorkingCopy [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffToWorkingCopy ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> hasUpstream [ ^ entity hasUpstream ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isHead [ ^ self entity isHead ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isLocal [ ^ self entity isLocal ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ @@ -91,7 +93,7 @@ IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDeleteAction [ @@ -103,7 +105,7 @@ IceTipBranchModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDirectMergeAction [ @@ -115,7 +117,7 @@ IceTipBranchModel >> newDirectMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newSwitchAndMergeAction [ @@ -127,7 +129,7 @@ IceTipBranchModel >> newSwitchAndMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before @@ -137,7 +139,7 @@ IceTipBranchModel >> previewCheckout [ (IceTipCheckoutPreviewBrowser onBranch: self) open ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewMerge: aMergeType [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" @@ -147,7 +149,7 @@ IceTipBranchModel >> previewMerge: aMergeType [ open ] -{ #category : #printing } +{ #category : 'printing' } IceTipBranchModel >> printOn: aStream [ super printOn: aStream. aStream @@ -156,12 +158,12 @@ IceTipBranchModel >> printOn: aStream [ nextPut: $] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipBranchModel >> resetToCommit: anIceTipCachedModel [ entity resetToCommit: anIceTipCachedModel entity diff --git a/Iceberg-TipUI/IceTipBranchPanel.class.st b/Iceberg-TipUI/IceTipBranchPanel.class.st index bd527e9559..223476e280 100644 --- a/Iceberg-TipUI/IceTipBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipBranchPanel.class.st @@ -3,22 +3,24 @@ I'm a generic panel to checkout panels. My children will define different strategies to checkout (select an existing branch -local or remote-, or enter a new branch name) " Class { - #name : #IceTipBranchPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipBranchPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipBranchPanel class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> accept [ self validate. @@ -26,49 +28,49 @@ IceTipBranchPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> doAccept [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchPanel >> isNewBranch [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model: anObject [ model := anObject ] -{ #category : #events } +{ #category : 'events' } IceTipBranchPanel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBranchPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> validate [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipBrowseCommand.class.st b/Iceberg-TipUI/IceTipBrowseCommand.class.st index 4f1a7e77d5..0e0dcaef76 100644 --- a/Iceberg-TipUI/IceTipBrowseCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseCommand.class.st @@ -2,43 +2,45 @@ I'm a command to ""browse"" a change definition (method, class or package). " Class { - #name : #IceTipBrowseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultDescription [ ^ 'Browse the selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultName [ ^ 'Browse...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowseCommand >> canBeExecuted [ "In the case of a method removal it is not possible to browse the selected element." ^ self hasSelectedItem and: [ self item value definition canBeBrowsed ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseCommand >> execute [ self item value definition browse ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowseCommand >> iconName [ ^ #smallSystemBrowser ] -{ #category : #activation } +{ #category : 'activation' } IceTipBrowseCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st index 25f9b31ca2..421c10e49f 100644 --- a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st @@ -2,36 +2,38 @@ Command that browses the selected package as it is loaded in the image. " Class { - #name : #IceTipBrowsePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowsePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultDescription [ ^ 'Browse the selected package as it is loaded in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultName [ ^ 'Browse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowsePackageCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isPackageLoaded ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowsePackageCommand >> execute [ self packageModel browsePackage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowsePackageCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st index 47509f917b..94a27379a2 100644 --- a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st @@ -4,24 +4,26 @@ Command that opens a browser on the code of the repository. The current implementation relies on a monticello MCSnapshotBrowser " Class { - #name : #IceTipBrowseRepositoryPackageVersionCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseRepositoryPackageVersionCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultDescription [ ^ 'Browse the version in the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultName [ ^ 'Browse this version in Monticello' ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseRepositoryPackageVersionCommand >> execute [ self packageModel browseRepositoryVersion diff --git a/Iceberg-TipUI/IceTipBrowser.class.st b/Iceberg-TipUI/IceTipBrowser.class.st index dc8780dad2..1ed279f6d2 100644 --- a/Iceberg-TipUI/IceTipBrowser.class.st +++ b/Iceberg-TipUI/IceTipBrowser.class.st @@ -9,16 +9,18 @@ Some design remarks: * Browsers have a context menu on list or table items, that provide commands that are specific for the selection. " Class { - #name : #IceTipBrowser, - #superclass : #IceTipPresenter, + #name : 'IceTipBrowser', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'toolbar' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ | generalCommandGroup selectionCommandGroup selectionExtraCommandGroup | @@ -42,81 +44,81 @@ IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec. aCommandGroup register: IceFiletreeToTonelCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> generalCommandGroupName [ ^ 'General' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionCommandGroupName [ ^ 'Selection' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionExtraCommandGroupName [ ^ 'Extra' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> connectPresenters [ self mainList whenSelectionChangedDo: [ self refreshCommands ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> defaultKeyboardFocus [ ^ self mainList ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowser >> hasSelectedItem [ ^ self mainList selection isEmpty not ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> iconForWindow [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -125,31 +127,31 @@ IceTipBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> refresh [ "Update the UI elements given a possible update in the model." ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshCommands [ | rootGroup | @@ -163,7 +165,7 @@ IceTipBrowser >> refreshCommands [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ "Update context menu (for mainList)." @@ -173,7 +175,7 @@ IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ self mainList contextMenuFromCommandsGroup: subgroup ]. ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshShortcutsWith: rootGroup [ "Update shortcuts with available commands" @@ -184,7 +186,7 @@ IceTipBrowser >> refreshShortcutsWith: rootGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshToolbarWith: rootGroup [ "Update toolbar (in window)." @@ -208,31 +210,31 @@ IceTipBrowser >> refreshToolbarWith: rootGroup [ self window toolbar: toolbar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> repositoryModel [ "Answer the IceTipRepositoryModel associated to this presenter." ^ self model repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> selectedItem [ "Answer the object selected in the main list of this browser. The answer is nil when there isn't a selection." ^ self mainList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> subscribeToAnnouncements [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> toolbar [ ^ toolbar diff --git a/Iceberg-TipUI/IceTipCache.class.st b/Iceberg-TipUI/IceTipCache.class.st index 363621bbfd..cc06b437d3 100644 --- a/Iceberg-TipUI/IceTipCache.class.st +++ b/Iceberg-TipUI/IceTipCache.class.st @@ -5,70 +5,72 @@ I'm used to cache values to be used on the UI. I can be reseted (sending #reset), but responsibility of reset caches belongs to presenters who use them. " Class { - #name : #IceTipCache, - #superclass : #Object, + #name : 'IceTipCache', + #superclass : 'Object', #instVars : [ 'proxy', 'objects' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCache class >> proxy: aProxy [ ^ self new proxy: aProxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsent: anObject [ ^ objects at: aKey ifAbsent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsentPut: anObject [ ^ objects at: aKey ifAbsentPut: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifPresent: anObject [ ^ objects at: aKey ifPresent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey put: anObject [ ^ objects at: aKey put: anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> initialize [ super initialize. self reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> objects [ ^ objects ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy [ ^ proxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy: anObject [ proxy := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> reset [ objects := SmallDictionary new ] diff --git a/Iceberg-TipUI/IceTipCachedModel.class.st b/Iceberg-TipUI/IceTipCachedModel.class.st index f69b645173..b522f0299b 100644 --- a/Iceberg-TipUI/IceTipCachedModel.class.st +++ b/Iceberg-TipUI/IceTipCachedModel.class.st @@ -4,28 +4,30 @@ I take all unary messages sent to my realObject and I cache their values. I keep a cache with rules for reset it, which can be accessedon the #resetOn: family of messages. " Class { - #name : #IceTipCachedModel, - #superclass : #Object, + #name : 'IceTipCachedModel', + #superclass : 'Object', #instVars : [ 'realObject', 'cache' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCachedModel class >> for: anObject [ ^ self basicNew initializeObject: anObject ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> = aObject [ self species ~= aObject species ifTrue: [ ^ false ]. ^ self realObject = aObject realObject ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> doesNotUnderstand: aMessage [ aMessage selector isUnary ifTrue: [ @@ -42,27 +44,27 @@ IceTipCachedModel >> doesNotUnderstand: aMessage [ ^ self forwardMessage: aMessage ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> forwardMessage: aMessage [ ^ realObject perform: aMessage selector withArguments: aMessage arguments ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> hash [ ^ self realObject hash ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCachedModel >> initializeObject: anObject [ realObject := anObject. cache := IceTipCache proxy: self. self initialize ] -{ #category : #printing } +{ #category : 'printing' } IceTipCachedModel >> printOn: aStream [ super printOn: aStream. aStream nextPut: $(. @@ -70,12 +72,12 @@ IceTipCachedModel >> printOn: aStream [ aStream nextPut: $) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> realObject [ ^ realObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> reset [ cache reset ] diff --git a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st index b7408e9fe8..d188d62fe5 100644 --- a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st @@ -2,25 +2,27 @@ I'm a command that makes a working copy to recalculate the dirty packages (via #forceCalculateDirtyPackages). " Class { - #name : #IceTipCalculateDirtyPackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCalculateDirtyPackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCalculateDirtyPackagesCommand class >> defaultName [ ^ 'Recalculate dirty packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCalculateDirtyPackagesCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipCalculateDirtyPackagesCommand >> execute [ IceTipStandardAction new @@ -31,7 +33,7 @@ IceTipCalculateDirtyPackagesCommand >> execute [ executeWithContext: context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCalculateDirtyPackagesCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st index f846b99bd8..790e79a87f 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st @@ -2,36 +2,38 @@ Command that opens a dialog to checkout a (new or already existing) branch. " Class { - #name : #IceTipCheckoutBranchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutBranchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultDescription [ ^ 'Checkout a new or existing branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultToolbarItemName [ ^ 'Branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutBranchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutBranchCommand >> execute [ (IceTipCheckoutBranchDialog @@ -42,7 +44,7 @@ IceTipCheckoutBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st index 8371ddd3c5..4c0ac85745 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st @@ -4,28 +4,30 @@ I'm a dialog to perform a checkout of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipCheckoutBranchDialog, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipCheckoutBranchDialog', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutBranchDialog class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> allTypes [ ^ types ifNil: [ types := self createCheckoutBranchTypes ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ | allTypes | @@ -49,50 +51,50 @@ IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchDialog >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> model [ ^ model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> titleForWindow [ ^ 'Checkout branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withOnlyNewBranch [ types := self allTypes select: #isNewBranch. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withTypes: aCollection [ types := aCollection. typeList items: types. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withoutNewBranch [ types := self allTypes reject: #isNewBranch. typeList items: types. diff --git a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st index a03e98d39b..69d4df247d 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st @@ -2,12 +2,14 @@ I'm a panel to peform the checkout of an existing branch. " Class { - #name : #IceTipCheckoutBranchPanel, - #superclass : #IceTipExistingBranchPanel, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipCheckoutBranchPanel', + #superclass : 'IceTipExistingBranchPanel', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchPanel >> doAccept [ self selectedBranch previewCheckout diff --git a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st index 69cc6b43da..410e447df7 100644 --- a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st @@ -3,37 +3,39 @@ I checkout a specific commit from history. I will let your repository in detach mode! " Class { - #name : #IceTipCheckoutCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultDescription [ ^ 'Set the selected commit as current commit and load the code in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultName [ ^ 'Checkout' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutCommitCommand >> execute [ (IceTipCheckoutPreviewBrowser onBranch: self selectedCommit) open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> iconName [ ^ #refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> selectedCommit [ ^ self context selectedCommit diff --git a/Iceberg-TipUI/IceTipCheckoutModel.class.st b/Iceberg-TipUI/IceTipCheckoutModel.class.st index 50cdb34b4a..c1290c529e 100644 --- a/Iceberg-TipUI/IceTipCheckoutModel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipCheckoutModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipCheckoutModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'checkoutStrategy', 'checkoutStrategies' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> calculateDiff [ ^ commitish entity diffTo: self repository workingCopy ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> checkout [ checkoutStrategy @@ -24,30 +26,30 @@ IceTipCheckoutModel >> checkout [ self commitish checkout: checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategies [ ^ checkoutStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy [ ^ checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy: aStrategy [ checkoutStrategy := aStrategy ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutModel >> hasNewPackages [ ^ diffModel tree anySatisfy:[ :aNode | aNode isAddition and: [ aNode definition isPackageDefinition]] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutModel >> initialize [ super initialize. @@ -55,7 +57,7 @@ IceTipCheckoutModel >> initialize [ checkoutStrategy := checkoutStrategies first. ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> newCheckoutAction [ @@ -67,7 +69,7 @@ IceTipCheckoutModel >> newCheckoutAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> newPackages [ | packageNodes | diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st index e7fa896dcc..c1ba72ea9d 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st @@ -3,24 +3,26 @@ Action to start the creation of a new branch from the selected commit. Then checkout the selected branch. " Class { - #name : #IceTipCheckoutNewBranchCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutNewBranchCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultDescription [ ^ 'Create a new branch from the selected commit and switch to it' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultName [ ^ 'Branch...' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutNewBranchCommand >> execute [ ((IceTipCheckoutNewBranchPanel @@ -33,13 +35,13 @@ IceTipCheckoutNewBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> iconName [ ^ #branch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> selectedCommit [ ^ self item entity diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st index fc93346154..c902606842 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st @@ -2,8 +2,8 @@ I'm a panel to create a new local branch " Class { - #name : #IceTipCheckoutNewBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipCheckoutNewBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'currentBranchLabel', 'branchLabel', @@ -11,40 +11,42 @@ Class { 'branchCommitish', 'callback' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchInputText [ ^ branchInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchLabel [ ^ branchLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> branchName [ ^ self branchInputText text asString trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> commitish: anIceTipModel [ branchCommitish := anIceTipModel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> currentBranchLabel [ ^ currentBranchLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutNewBranchPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -60,7 +62,7 @@ IceTipCheckoutNewBranchPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutNewBranchPanel >> doAccept [ (self model @@ -72,26 +74,26 @@ IceTipCheckoutNewBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializeCurrentBranchLabel [ currentBranchLabel := self newLabel label: 'Current branch: ', self model branchName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -103,13 +105,13 @@ IceTipCheckoutNewBranchPanel >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutNewBranchPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> openDialog [ ^ self asDialogWindow @@ -117,13 +119,13 @@ IceTipCheckoutNewBranchPanel >> openDialog [ open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> titleForWindow [ ^ 'New branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> validate [ self @@ -134,7 +136,7 @@ IceTipCheckoutNewBranchPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCheckoutNewBranchPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st index 6757094f5f..7ce1870ee7 100644 --- a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st @@ -4,23 +4,25 @@ I preview the changes that will be introduced in the image when a checkout occur (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipCheckoutPreviewBrowser, - #superclass : #IceTipPreviewBrowser, + #name : 'IceTipCheckoutPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', #instVars : [ 'checkoutStrategyLabel', 'checkoutStrategyList', 'selectedCheckoutStrategy' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipCheckoutPreviewBrowser class >> maxBranchNameLength [ ^ 32 ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipCheckoutModel new @@ -28,19 +30,19 @@ IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ yourself) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyLabel [ ^ checkoutStrategyLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyList [ ^ checkoutStrategyList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -57,7 +59,7 @@ IceTipCheckoutPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutPreviewBrowser >> doCheckout [ (self model hasNewPackages and: [ self model checkoutStrategy isLoadAlreadyLoadedStrategy ]) @@ -69,7 +71,7 @@ IceTipCheckoutPreviewBrowser >> doCheckout [ executeWithContext: self ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ | checkoutStrategies | @@ -81,7 +83,7 @@ IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ self model checkoutStrategy: aStrategy ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -96,7 +98,7 @@ IceTipCheckoutPreviewBrowser >> initializePresenters [ self initializeCheckoutStrategyList ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutPreviewBrowser >> newActionButton [ ^ self newButton @@ -107,7 +109,7 @@ IceTipCheckoutPreviewBrowser >> newActionButton [ yourself ] -{ #category : #operations } +{ #category : 'operations' } IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ ((IceTipAddNewPackagesDialogPresenter @@ -120,13 +122,13 @@ IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutPreviewBrowser >> selectedCheckoutStrategy [ ^ selectedCheckoutStrategy ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> titleForWindow [ ^ 'Preview checkout of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st index 2dbcfef159..5e9ecbb7d4 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st @@ -2,36 +2,38 @@ Command that checks out the selected branch " Class { - #name : #IceTipCheckoutSelectedBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultDescription [ ^ 'Checkout this branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedBranchCommand >> actsOnBranch: aBranchModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedBranchCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedBranchCommand >> iconName [ ^ #branch ] diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st index c1d25d3348..4d2092de3c 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st @@ -2,35 +2,37 @@ Command that checks out the selected tag " Class { - #name : #IceTipCheckoutSelectedTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultDescription [ ^ 'Checkout this tag for this repository. Repository will then be in Detached Head state!' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultName [ ^ 'Checkout tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedTagCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedTagCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCherryPickCommand.class.st b/Iceberg-TipUI/IceTipCherryPickCommand.class.st index 373462f0e1..d93f271031 100644 --- a/Iceberg-TipUI/IceTipCherryPickCommand.class.st +++ b/Iceberg-TipUI/IceTipCherryPickCommand.class.st @@ -2,38 +2,40 @@ Generic command to cherry pick changes " Class { - #name : #IceTipCherryPickCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCherryPickCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultDescription [ ^ 'Cherrypick this commit and apply changes to the working copy' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultName [ ^ 'Cherrypick' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCherryPickCommand >> canBeExecuted [ self flag: #pharoTodo. "TODO: Still not ready" ^ false ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> execute [ (IceTipCherrypickPreviewBrowser onCommitish: self selectedCommitish) open ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> selectedCommitish [ ^ self context selectedCommit realObject entity diff --git a/Iceberg-TipUI/IceTipCherrypickModel.class.st b/Iceberg-TipUI/IceTipCherrypickModel.class.st index b3ec970b3a..125c2afe8c 100644 --- a/Iceberg-TipUI/IceTipCherrypickModel.class.st +++ b/Iceberg-TipUI/IceTipCherrypickModel.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipCherrypickModel, - #superclass : #IceTipModel, + #name : 'IceTipCherrypickModel', + #superclass : 'IceTipModel', #instVars : [ 'mergeTree', 'commitish' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickModel class >> onCommitish: aCommitish [ ^ self new @@ -16,33 +18,33 @@ IceTipCherrypickModel class >> onCommitish: aCommitish [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish [ ^commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish: aCommistish [ commitish := aCommistish. mergeTree := commitish repository cherryPickFrom: aCommistish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> diff [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> mergeTree [ ^mergeTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> repository [ ^commitish repository. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> treeToShow [ " Return the tree to display in windows " ^ self mergeTree diff --git a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st index 71727fdcec..42dd79ac32 100644 --- a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st @@ -1,39 +1,41 @@ Class { - #name : #IceTipCherrypickPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCherrypickPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'buttonBar' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickPreviewBrowser class >> onCommitish: aCommitish [ ^ self on: (IceTipCherrypickModel onCommitish: aCommitish) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> buttonBar [ ^ buttonBar ] -{ #category : #layout } +{ #category : 'layout' } IceTipCherrypickPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,13 +44,13 @@ IceTipCherrypickPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipCherrypickPreviewBrowser >> doCherryPick [ | root | @@ -58,13 +60,13 @@ IceTipCherrypickPreviewBrowser >> doCherryPick [ self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel := self @@ -76,20 +78,20 @@ IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel rightLabel: ' With Cherrypicked commit ' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickPreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCherrypickPreviewBrowser >> newActionButton [ ^ self newButton @@ -100,7 +102,7 @@ IceTipCherrypickPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> titleForWindow [ ^ 'Preview result of Cherrypick' diff --git a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st index bf24223abd..d97c3a3ad8 100644 --- a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st +++ b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st @@ -3,18 +3,20 @@ I'm a CmVisitor that in one hand, tells each command to be hidden if it can't be " Class { - #name : #IceTipCleanCommandGroupVisitor, - #superclass : #CmVisitor, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCleanCommandGroupVisitor', + #superclass : 'CmVisitor', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommand: aCmCommand [ aCmCommand beHiddenWhenCantBeRun ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommandGroup: aCmCommandsGroup [ super visitCommandGroup: aCmCommandsGroup. diff --git a/Iceberg-TipUI/IceTipCommand.class.st b/Iceberg-TipUI/IceTipCommand.class.st index 5df99320f2..bd90248921 100644 --- a/Iceberg-TipUI/IceTipCommand.class.st +++ b/Iceberg-TipUI/IceTipCommand.class.st @@ -2,31 +2,33 @@ I'm the superclass of all commands of the IceTip UI. " Class { - #name : #IceTipCommand, - #superclass : #CmCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommand', + #superclass : 'CmCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommand class >> defaultToolbarItemName [ ^ self defaultName ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand class >> isAbstract [ ^ self == IceTipCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> application [ ^ SpApplication defaultApplication ] -{ #category : #converting } +{ #category : 'converting' } IceTipCommand >> asSpecCommand [ | spCommand | @@ -45,31 +47,31 @@ IceTipCommand >> asSpecCommand [ ^ spCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> badge [ "Answer a number as extra information in the button. An answer of nil means no information." ^ nil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasRepository [ ^ self repositoryModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasSelectedItem [ ^ self context selectedItem notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasUnbornProject [ ^ self repositoryModel hasUnbornProject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> iconName [ "Answer the icon name (a Symbol) for this command." @@ -77,13 +79,13 @@ IceTipCommand >> iconName [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryDetached [ ^ self repositoryModel isNil or: [ self repositoryModel isDetached ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryMissing [ ^ self hasRepository and: [ @@ -91,32 +93,32 @@ IceTipCommand >> isRepositoryMissing [ self repositoryModel isCodeMissing ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryOperational [ ^ self isRepositoryMissing not and: [ self isRepositoryDetached not and: [ self hasUnbornProject not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommand >> item [ ^ self context selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repositoryModel [ ^ self context repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> shortcutKey [ "Answer the key combination to execute this command. Answer nil if there isn't a key combination." @@ -124,31 +126,31 @@ IceTipCommand >> shortcutKey [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> tool [ ^ self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolAnnouncer [ ^ self tool announcer ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolbarItemName [ ^ self class defaultToolbarItemName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> withErrorHandlingDo: aBlock [ aBlock diff --git a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st index 43fac26d0a..e1963c220c 100644 --- a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st +++ b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st @@ -4,18 +4,20 @@ I'm an abstract strategy to build Spec2 buttons wrapping a IceTipSpCommand. My c " Class { - #name : #IceTipCommandToPresenterBuildingStrategy, - #superclass : #Object, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipCommandToPresenterBuildingStrategy', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipCommandToPresenterBuildingStrategy >> buttonPresenterClass [ ^ self subclassResponsibility ] -{ #category : #public } +{ #category : 'public' } IceTipCommandToPresenterBuildingStrategy >> resultOn: aCommand [ ^ self buttonPresenterClass new diff --git a/Iceberg-TipUI/IceTipCommentPanel.class.st b/Iceberg-TipUI/IceTipCommentPanel.class.st index 593715e413..efad87e23a 100644 --- a/Iceberg-TipUI/IceTipCommentPanel.class.st +++ b/Iceberg-TipUI/IceTipCommentPanel.class.st @@ -3,8 +3,8 @@ I'm a comment panel. I can obtain a comment text and certain ""commit specific"" options. " Class { - #name : #IceTipCommentPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCommentPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'repositoryModel', 'commentText', @@ -15,34 +15,36 @@ Class { 'fixesLabel', 'optionsButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> clear [ commentText text: '' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commentText [ ^ commentText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commitButton [ ^ commitButton ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommentPanel >> defaultLayout [ self flag: #pharoTodo. "FIXES ISSUE NUMBER INPUT is disabled. See below. @@ -63,19 +65,19 @@ IceTipCommentPanel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesField [ ^ fixesField ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesLabel [ ^ fixesLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> initializePresenters [ | fixesHelpString | @@ -132,25 +134,25 @@ IceTipCommentPanel >> initializePresenters [ yourself) ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isPushing [ ^ IceTipCommitSettings pushOnCommit and: [ self repositoryModel branchModel hasUpstream ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isRunningCriticsOnCommit [ ^ IceTipCommitSettings critiquesOnCommit ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isSaving [ ^ IceTipCommitSettings saveImageOnCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> message [ self fixesField text isAllDigits ifFalse: [ @@ -163,7 +165,7 @@ IceTipCommentPanel >> message [ nextPutAll: self fixesField number asString ] ] -{ #category : #events } +{ #category : 'events' } IceTipCommentPanel >> onCommit: aBlock [ commitButton action: [ @@ -172,62 +174,62 @@ IceTipCommentPanel >> onCommit: aBlock [ cull: self isPushing ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> pushCheckbox [ ^ pushCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> pushOnCommit: aBoolean [ IceTipCommitSettings pushOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> refresh [ commitButton help: ('Commit your changes to {1}' format: { self repositoryName }). pushCheckbox label: ('Push changes to {1}' format: { self repositoryRemoteName }) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> repositoryModel [ ^ repositoryModel ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryRemoteName [ ^ self repositoryModel pushRemoteName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> runCriticsOnCommit: aBoolean [ IceTipCommitSettings critiquesOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> saveOnCommit: aBoolean [ IceTipCommitSettings saveImageOnCommit: aBoolean ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> setModelBeforeInitialization: aRepositoryModel [ repositoryModel := aRepositoryModel ] -{ #category : #specs } +{ #category : 'specs' } IceTipCommentPanel >> titleForWindow [ ^ 'Comment' diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index 5feb85f24f..af2aaf285c 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -2,17 +2,19 @@ I perform a commit " Class { - #name : #IceTipCommitAction, - #superclass : #IceTipAction, + #name : 'IceTipCommitAction', + #superclass : 'IceTipAction', #instVars : [ 'diff', 'items', 'message' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipCommitAction >> basicExecute [ self validateCanCommit. UIManager default @@ -25,49 +27,49 @@ IceTipCommitAction >> basicExecute [ Iceberg announcer announce: (IceCommited for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff: anObject [ diff := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items [ ^ items ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items: anObject [ items := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message: anObject [ message := anObject ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateCanCommit [ self validateMessageNotEmpty ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateChangeListNotEmpty [ "If there are no selected changed, no point on commiting :)" items ifEmpty: [ IceNothingToCommit signal ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateMessageNotEmpty [ self message ifEmpty: [ IceNoCommitMessage signal ] ] diff --git a/Iceberg-TipUI/IceTipCommitBrowser.class.st b/Iceberg-TipUI/IceTipCommitBrowser.class.st index f03933e7a0..f763966e4f 100644 --- a/Iceberg-TipUI/IceTipCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCommitBrowser.class.st @@ -4,23 +4,25 @@ I'm a browser to commit changes to a repository. (self onRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipCommitBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCommitBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'commentPanel', 'saveAction' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipRefreshCommitCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -37,31 +39,31 @@ IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCom ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCommitBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> accept [ ^ self doCommit ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel [ ^ commentPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel: aSpPresenter [ commentPanel := aSpPresenter ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommitBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,25 +73,25 @@ IceTipCommitBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel: aSpPresenter [ diffPanel := aSpPresenter ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCollapseSelection [ diffPanel doCollapseSelection ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit [ | selectedItems message isPushing isSaving commitBlock| @@ -111,7 +113,7 @@ IceTipCommitBrowser >> doCommit [ openIfCritiques ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBoolean saving: savingBoolean [ self model newCommitAction @@ -127,26 +129,26 @@ IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBo executeWithContext: self ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doExpandSelection [ diffPanel doExpandSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialize [ super initialize. saveAction := IceTipSaveImageAction new ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeAcceptShortcut [ self @@ -159,7 +161,7 @@ IceTipCommitBrowser >> initializeAcceptShortcut [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffSelectingPanel on: self model workingCopyDiff. @@ -172,27 +174,27 @@ IceTipCommitBrowser >> initializePresenters [ self initializeAcceptShortcut ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> refresh [ diffPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) @@ -201,13 +203,13 @@ IceTipCommitBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> saveAction: anAction [ saveAction := anAction ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> subscribeToAnnouncements [ self announcer @@ -216,7 +218,7 @@ IceTipCommitBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> titleForWindow [ ^ 'Commit on {1} branch {2}' format: { @@ -224,7 +226,7 @@ IceTipCommitBrowser >> titleForWindow [ self model branchName } ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> verifyNeedsRefreshOrClose [ "Verifies if there are remaining changes to commit. In case there are none, close the window." diff --git a/Iceberg-TipUI/IceTipCommitCommand.class.st b/Iceberg-TipUI/IceTipCommitCommand.class.st index 8020364cbb..2f4e759cfa 100644 --- a/Iceberg-TipUI/IceTipCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCommitCommand.class.st @@ -2,30 +2,32 @@ I open a the commit window, with all latest changes. " Class { - #name : #IceTipCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultDescription [ ^ 'Commit changes to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultName [ ^ 'Commit' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommitCommand >> execute [ (IceTipCommitBrowser @@ -34,13 +36,13 @@ IceTipCommitCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> iconName [ ^ #smallOk ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> shortcutKey [ ^ $s meta diff --git a/Iceberg-TipUI/IceTipCommitDiffModel.class.st b/Iceberg-TipUI/IceTipCommitDiffModel.class.st index c9b056036f..4265e1cb76 100644 --- a/Iceberg-TipUI/IceTipCommitDiffModel.class.st +++ b/Iceberg-TipUI/IceTipCommitDiffModel.class.st @@ -3,12 +3,14 @@ I'm a ""static"" diff. I represent a diff between two concrete commits. " Class { - #name : #IceTipCommitDiffModel, - #superclass : #IceTipDiffModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitDiffModel', + #superclass : 'IceTipDiffModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitDiffModel >> diff [ ^ self entity ] diff --git a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st index 55ac9d5b45..43aa07baaf 100644 --- a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st +++ b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st @@ -4,8 +4,8 @@ I'm a panel to show the history of a commitish (usually a branch or a tag). I di I'm usually used as part of an IceTipHistoryBrowser. " Class { - #name : #IceTipCommitInfoPresenter, - #superclass : #SpPresenter, + #name : 'IceTipCommitInfoPresenter', + #superclass : 'SpPresenter', #instVars : [ 'model', 'selectedModel', @@ -16,10 +16,12 @@ Class { 'headPage', 'ancestorPage' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #layout } +{ #category : 'layout' } IceTipCommitInfoPresenter class >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -27,21 +29,21 @@ IceTipCommitInfoPresenter class >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForCommit [ headTabContainer := IceTipHistoryDiffFromHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForMerge [ headTabContainer := IceTipHistoryDiffToHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> commitInfo [ selectedModel ifNil: [ ^ self newEmpty ]. @@ -50,28 +52,28 @@ IceTipCommitInfoPresenter >> commitInfo [ application: self application ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromAncestor [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (ancestorTabContainer diffFor: selectedModel) ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromHead [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (headTabContainer diffFor: selectedModel) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initialize [ self beForCommit. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -87,14 +89,14 @@ IceTipCommitInfoPresenter >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializePresenters [ notebookPanel := self newNotebook. self initializeCommitPanel ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newDiffPage [ ^ SpNotebookPage @@ -103,7 +105,7 @@ IceTipCommitInfoPresenter >> newDiffPage [ provider: [ "It will be overriden" ] ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newEmpty [ ^ self newLabel @@ -111,7 +113,7 @@ IceTipCommitInfoPresenter >> newEmpty [ yourself ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newInfoPage [ ^ SpNotebookPage @@ -120,7 +122,7 @@ IceTipCommitInfoPresenter >> newInfoPage [ provider: [ self commitInfo ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> refresh [ selectedModel ifNil: [ ^ self ]. @@ -130,38 +132,38 @@ IceTipCommitInfoPresenter >> refresh [ notebookPanel resetAllPageContents ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestor [ ancestorTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestorLabel [ ancestorTabContainer updateLabelOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHead [ headTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHeadLabel [ headTabContainer updateLabelOn: selectedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> selectedModel: aModel [ selectedModel := aModel. self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> setModelBeforeInitialization: anObject [ model := anObject diff --git a/Iceberg-TipUI/IceTipCommitModel.class.st b/Iceberg-TipUI/IceTipCommitModel.class.st index 661a5e0c07..dc14b81d9e 100644 --- a/Iceberg-TipUI/IceTipCommitModel.class.st +++ b/Iceberg-TipUI/IceTipCommitModel.class.st @@ -2,42 +2,44 @@ I'm a model for IceCommit entries. " Class { - #name : #IceTipCommitModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitModel', + #superclass : 'IceTipCommitishModel', #traits : 'TIceCopyCommitId', #classTraits : 'TIceCopyCommitId classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipCommitModel >> adopt [ self entity adopt ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortId [ ^ self entity ancestors first shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortIdOrOrigin [ ^ self entity ancestors ifNotEmpty: [ self ancestorShortId ] ifEmpty: [ 'Origin' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestors [ ^ self entity ancestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> author [ ^ self entity author ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> calculateDiff: aBlock [ | diff | @@ -50,18 +52,18 @@ IceTipCommitModel >> calculateDiff: aBlock [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> comment [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -73,18 +75,18 @@ IceTipCommitModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> datetime [ ^ self entity datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> description [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromFirstAncestor [ | diff ancestorCommit | @@ -97,7 +99,7 @@ IceTipCommitModel >> diffFromFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromHead [ | head diff | @@ -108,7 +110,7 @@ IceTipCommitModel >> diffFromHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToFirstAncestor [ | diff ancestorCommit | @@ -121,7 +123,7 @@ IceTipCommitModel >> diffToFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToHead [ | head diff | @@ -132,7 +134,7 @@ IceTipCommitModel >> diffToHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToWorkingCopy [ | diff | diff := self calculateDiff: [ self entity diffToWorkingCopy ]. @@ -141,18 +143,18 @@ IceTipCommitModel >> diffToWorkingCopy [ on: diff ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> hasMultipleAncestors [ ^ self entity hasMultipleAncestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> id [ ^ self entity id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> info [ ^ {('Commit:' -> ('[' , self shortId , '] ' , self id)). ('Parents:' -> (self entity ancestors collect: #shortId) asCommaString). @@ -162,12 +164,12 @@ IceTipCommitModel >> info [ ('Comment:' -> self entity comment)} ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> isMerged [ ^ self entity isMerged ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ ^ (IceTipCommitRangeModel repositoryModel: self repositoryModel @@ -176,44 +178,44 @@ IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitModel >> mergeHistoryFromSecondAncestor [ ^ self mergeHistoryFromAncestor: self entity ancestors second ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> name [ ^ self entity description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> shortId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagDecorator [ ^ IceTipTagDecorator uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagNames [ ^ self entity tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagsDescription [ ^ ', ' join: self tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> timeStamp [ ^ self entity timeStamp ] diff --git a/Iceberg-TipUI/IceTipCommitRangeModel.class.st b/Iceberg-TipUI/IceTipCommitRangeModel.class.st index 7672e2d0dd..b0c9f2c5dd 100644 --- a/Iceberg-TipUI/IceTipCommitRangeModel.class.st +++ b/Iceberg-TipUI/IceTipCommitRangeModel.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipCommitRangeModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitRangeModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'toCommit' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> commitModels [ ^ (self fromCommit newCommitWalk uptoCommit: self toCommit) commits collect: [ :each | @@ -18,24 +20,24 @@ IceTipCommitRangeModel >> commitModels [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> fromCommit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> name [ ^ 'Commits from {1} to {2}' format: { self fromCommit shortId. self toCommit shortId } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit [ ^ toCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit: anObject [ toCommit := anObject ] diff --git a/Iceberg-TipUI/IceTipCommitishModel.class.st b/Iceberg-TipUI/IceTipCommitishModel.class.st index d861e067e4..608716641e 100644 --- a/Iceberg-TipUI/IceTipCommitishModel.class.st +++ b/Iceberg-TipUI/IceTipCommitishModel.class.st @@ -3,35 +3,37 @@ I'm a base model for all commitish models to be used. I can provide #commitModels which changes depending on concrete model. " Class { - #name : #IceTipCommitishModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitishModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitId [ ^ self entity commit id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitModels [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitishModel >> isCommitish [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> shortCommitId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> tagModels [ ^ self repositoryModel tagModels diff --git a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st index 34a2e6480d..3806ee454a 100644 --- a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st +++ b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st @@ -2,36 +2,38 @@ Command that copies the selected entity short commit ID to the clipboard " Class { - #name : #IceTipCopyCommitishCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCopyCommitishCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultDescription [ ^ 'Copy the selected short commit ID (7 characters long) to the clipboard' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultName [ ^ 'Copy commitish ID' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCopyCommitishCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item commitId isNotNil ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCopyCommitishCommand >> execute [ self item copyCommitIDToClipboard ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCopyCommitishCommand >> iconName [ ^ #book diff --git a/Iceberg-TipUI/IceTipCreateTagCommand.class.st b/Iceberg-TipUI/IceTipCreateTagCommand.class.st index 025f5e7a76..9d82bf01e3 100644 --- a/Iceberg-TipUI/IceTipCreateTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCreateTagCommand.class.st @@ -2,30 +2,32 @@ I an a commander command that will be activated on any commitish or repository and ask the selected item to create a tag on itself. " Class { - #name : #IceTipCreateTagCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCreateTagCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultDescription [ ^ 'Creates a tag for the selected commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultName [ ^ 'Create tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagCommand >> canBeExecuted [ ^ self repositoryModel isNotNil ] -{ #category : #executing } +{ #category : 'executing' } IceTipCreateTagCommand >> execute [ (IceTipCreateTagPanel @@ -36,7 +38,7 @@ IceTipCreateTagCommand >> execute [ open ] -{ #category : #activation } +{ #category : 'activation' } IceTipCreateTagCommand >> iconName [ ^ #glamorousBookmark diff --git a/Iceberg-TipUI/IceTipCreateTagPanel.class.st b/Iceberg-TipUI/IceTipCreateTagPanel.class.st index 665f1d5753..4784ee9aa5 100644 --- a/Iceberg-TipUI/IceTipCreateTagPanel.class.st +++ b/Iceberg-TipUI/IceTipCreateTagPanel.class.st @@ -5,8 +5,8 @@ I have a form with a label and an input, and the commitish to tag. I'm done to be embedded in a dialog, so I implement doAccept to execute my action. " Class { - #name : #IceTipCreateTagPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCreateTagPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'callback', 'tagNameInputText', @@ -19,10 +19,12 @@ Class { 'minorButton', 'patchButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> accept [ self validate. @@ -30,25 +32,25 @@ IceTipCreateTagPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitish: anIceTipCachedModel [ commitishToTag := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitishToTag [ ^ commitishToTag ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> currentCommitishLabel [ ^ currentCommitishLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCreateTagPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -72,7 +74,7 @@ IceTipCreateTagPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCreateTagPanel >> doAccept [ self validate. @@ -85,19 +87,19 @@ IceTipCreateTagPanel >> doAccept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> existingTagsList [ ^ existingTagsList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeCurrentBranchLabel [ currentCommitishLabel := self newLabel @@ -106,7 +108,7 @@ IceTipCreateTagPanel >> initializeCurrentBranchLabel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeExistingTagsList [ existingTagsList := self newList. @@ -117,7 +119,7 @@ IceTipCreateTagPanel >> initializeExistingTagsList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeNextTagPanel [ | parts prefix nextMajor nextMinor nextPatch toString | @@ -142,7 +144,7 @@ IceTipCreateTagPanel >> initializeNextTagPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -159,18 +161,18 @@ IceTipCreateTagPanel >> initializePresenters [ self initializeExistingTagsList ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagParts [ ^ self latestTagPartsIn: (commitishToTag tagModels collect: #name) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ | prefix parts | @@ -191,17 +193,17 @@ IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ ^ parts ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> majorButton [ ^ majorButton ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> minorButton [ ^ minorButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> openDialog [ ^ self asDialogWindow @@ -209,43 +211,43 @@ IceTipCreateTagPanel >> openDialog [ open ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> patchButton [ ^ patchButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> setModelBeforeInitialization: aCommitish [ self commitish: aCommitish ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagName [ ^ self tagNameInputText text asString trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameInputText [ ^ tagNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameLabel [ ^ tagNameLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> titleForWindow [ ^ 'New tag of ' , commitishToTag name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> validate [ self @@ -256,7 +258,7 @@ IceTipCreateTagPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCreateTagPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCredentialsSettings.class.st b/Iceberg-TipUI/IceTipCredentialsSettings.class.st index 7e39ca364c..ee86be1c80 100644 --- a/Iceberg-TipUI/IceTipCredentialsSettings.class.st +++ b/Iceberg-TipUI/IceTipCredentialsSettings.class.st @@ -1,26 +1,28 @@ Class { - #name : #IceTipCredentialsSettings, - #superclass : #Object, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipCredentialsSettings', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonAction [ IceTipCredentialsStoreBrowser new open. ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonLabel [ ^ 'Edit' ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonState [ ^ true ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> settingsOn: aBuilder [ diff --git a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st index 8bfeb9a0f4..7c0ffb3388 100644 --- a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st +++ b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st @@ -2,15 +2,17 @@ I am the browser used to show a credentials store. " Class { - #name : #IceTipCredentialsStoreBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCredentialsStoreBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'credentialsList' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddPlainTextCredentialCommand. @@ -20,7 +22,7 @@ IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter f aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipEditCredentialCommand. @@ -29,19 +31,19 @@ IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> credentialsList [ ^ credentialsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCredentialsStoreBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -49,14 +51,14 @@ IceTipCredentialsStoreBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initialize [ model ifNil: [ model := IceCredentialStore current ]. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializeCredentialsList [ credentialsList @@ -78,32 +80,32 @@ IceTipCredentialsStoreBrowser >> initializeCredentialsList [ evaluated: #description) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializePresenters [ credentialsList := self newTable. self initializeCredentialsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCredentialsStoreBrowser >> mainList [ ^ credentialsList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> refresh [ credentialsList items: self model allCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> store [ ^ self model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> titleForWindow [ ^ model isCurrent @@ -111,7 +113,7 @@ IceTipCredentialsStoreBrowser >> titleForWindow [ ifFalse: [ 'Credentials of ' , model printString ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st index f96e633058..7b82ab06f0 100644 --- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st @@ -2,8 +2,8 @@ I am a dialog to be used before commit so we can check if the code to commit has critiques on it " Class { - #name : #IceTipCritiquesBeforeCommitBrowser, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipCritiquesBeforeCommitBrowser', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'commitModel', 'onAcceptAction', @@ -15,41 +15,43 @@ Class { 'browseButton', 'autofixButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> accept [ self closeWindow. onAcceptAction value ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel [ ^ commitModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel: anObject [ commitModel := anObject ] -{ #category : #layout } +{ #category : 'layout' } IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -67,7 +69,7 @@ IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ yourself ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ self withWindowDo: [ :window | @@ -77,7 +79,7 @@ IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ window buttons third label: 'Close' ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doAutofix [ critiquesList selectedItem ifNotNil: [ :aCritique | @@ -98,13 +100,13 @@ IceTipCritiquesBeforeCommitBrowser >> doAutofix [ centered ]) actOnCritic: aCritique ofEntity: aCritique entity ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doBrowse [ critiquesList selectedItem ifNotNil: [ :aCritique | aCritique entity browse ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ critiquesList := self newTable. @@ -128,7 +130,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ whenSelectionChangedDo: (MessageSend receiver: self selector: #updateSelectedCritique) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ detailPanel := self newText @@ -139,7 +141,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -161,7 +163,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ browseButton := self newButton. @@ -179,7 +181,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ self initializeDetailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeReasonPanel [ reasonPanel := self newText @@ -193,18 +195,18 @@ Select each critique to see a detailed message of each critique.'. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> onAccept: aFullBlockClosure [ onAcceptAction := aFullBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ "If the setting is disabled we just commit" @@ -220,13 +222,13 @@ IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipCritiquesBeforeCommitBrowser >> setModelBeforeInitialization: someNodes [ model := someNodes ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ ^ 'Critiques for Commit on {1} branch {2}' format: { @@ -234,7 +236,7 @@ IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ commitModel branchName } ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ super updatePresenter. @@ -250,7 +252,7 @@ IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> updateSelectedCritique [ critiquesList selectedItem diff --git a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st index e6e7553bd8..d811fc6fa2 100644 --- a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st @@ -2,36 +2,38 @@ Command that deletes the selected branch " Class { - #name : #IceTipDeleteBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultDescription [ ^ 'Delete this branch for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultName [ ^ 'Delete branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteBranchCommand >> actsOnBranch: aBranchModel [ ^ aBranchModel isLocal ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteBranchCommand >> execute [ self item newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteBranchCommand >> iconName [ ^ #delete diff --git a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st index 2ceedd53fe..72ade8f5c3 100644 --- a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected remote " Class { - #name : #IceTipDeleteRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultDescription [ ^ 'Delete this remote for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultName [ ^ 'Delete remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> execute [ self remoteModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteRemoteCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st index dbbcff7b76..33a461bf49 100644 --- a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected tag " Class { - #name : #IceTipDeleteTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultDescription [ ^ 'Delete this tag for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultName [ ^ 'Delete tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> execute [ self tagModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteTagCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> tagModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st index cb9e666a4f..7fb84e4e1e 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceTipDescriptionDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> head [ ^ IceTipDescriptionDecoratorHead uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> modified [ ^ IceTipDescriptionDecoratorModified uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> notLoaded [ ^ IceTipDescriptionDecoratorNotLoaded uniqueInstance diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st index 719dc586a1..2197e5dc20 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorHead, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorHead', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceTipDescriptionDecoratorHead >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st index 47b9c2c22d..cb74929623 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorModified, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorModified', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorModified >> color [ ^ Smalltalk ui theme successTextColor diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st index 8092e02645..47ff354917 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorNotLoaded, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorNotLoaded', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorNotLoaded >> color [ ^ Smalltalk ui theme disabledTextColor diff --git a/Iceberg-TipUI/IceTipDialogPresenter.class.st b/Iceberg-TipUI/IceTipDialogPresenter.class.st index 28f57f6119..701c18a670 100644 --- a/Iceberg-TipUI/IceTipDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipDialogPresenter.class.st @@ -3,24 +3,26 @@ I'm a general dialog. I implement a default accept method that needs to be overriden my children and some utility methods to easier build a dialog. " Class { - #name : #IceTipDialogPresenter, - #superclass : #IceTipPresenter, - #category : #'Iceberg-TipUI-View' + #name : 'IceTipDialogPresenter', + #superclass : 'IceTipPresenter', + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> accept [ "override this if you want a dialog" ] -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> cancel [ "override this if you want a dialog" self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. diff --git a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st index 8538e7c551..533808c3ad 100644 --- a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st +++ b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st @@ -4,25 +4,27 @@ I announce when an entry (a method, a class or a package) has been reverted. I'm used to refresh diff panels without recalculate everything again. " Class { - #name : #IceTipDiffEntryRemoved, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffEntryRemoved', + #superclass : 'IceTipAnnouncement', #instVars : [ 'entry' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffEntryRemoved class >> entry: anObject [ ^ self new entry: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry [ ^ entry ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry: anObject [ entry := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffModel.class.st b/Iceberg-TipUI/IceTipDiffModel.class.st index 6d62e59e96..e58cbf43a8 100644 --- a/Iceberg-TipUI/IceTipDiffModel.class.st +++ b/Iceberg-TipUI/IceTipDiffModel.class.st @@ -2,34 +2,36 @@ I'm a base model to present diffs. " Class { - #name : #IceTipDiffModel, - #superclass : #IceTipEntityModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipDiffModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> new [ ^ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> on: aDiff [ ^ self basicNew initializeEntity: aDiff; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> copyWithOnly: aCollection [ ^ self diff copyWithOnly: aCollection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> diff [ ^ self subclassResponsibility ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffModel >> reset [ UIManager default informUser: 'Refreshing changes' @@ -39,17 +41,17 @@ IceTipDiffModel >> reset [ self diff ] ] -{ #category : #private } +{ #category : 'private' } IceTipDiffModel >> resetDiff [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> tree [ ^ self diff treeToShow ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> treeRoots [ ^ self tree children ] diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st index 1a9898f73b..6a999df1f2 100644 --- a/Iceberg-TipUI/IceTipDiffPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffPanel.class.st @@ -7,23 +7,25 @@ also #elements answer should be a collection of elements that also understand el (IceTipDiffPanel onDiff: (IceRepository registry first workingCopyDiff)) openWithSpec " Class { - #name : #IceTipDiffPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipDiffPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'diffPanel', 'iceNodesTree' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffPanel class >> onDiff: aDiff [ ^ self on: (IceTipCommitDiffModel on: aDiff) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> basicRefresh [ self resetDiffContents. @@ -32,7 +34,7 @@ IceTipDiffPanel >> basicRefresh [ expandAll ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeDescriptionColumn [ ^ SpStringTableColumn new @@ -40,7 +42,7 @@ IceTipDiffPanel >> changeDescriptionColumn [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -52,7 +54,7 @@ IceTipDiffPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> collapsePath: aPath [ iceNodesTree @@ -60,7 +62,7 @@ IceTipDiffPanel >> collapsePath: aPath [ selectPath: aPath ] -{ #category : #layout } +{ #category : 'layout' } IceTipDiffPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -70,7 +72,7 @@ IceTipDiffPanel >> defaultLayout [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ diffPanel @@ -82,25 +84,25 @@ IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ rightText: rightString ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doCollapseSelection [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doExpandSelection [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> expandPath: aPath [ iceNodesTree @@ -108,38 +110,38 @@ IceTipDiffPanel >> expandPath: aPath [ selectPath: aPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowLeft [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowRight [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> iceNodesTree [ ^ iceNodesTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeDiffPanel [ diffPanel showOptions: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializePresenters [ iceNodesTree := self newTreeTable. @@ -149,7 +151,7 @@ IceTipDiffPanel >> initializePresenters [ self initializeDiffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeTree [ iceNodesTree @@ -163,19 +165,19 @@ IceTipDiffPanel >> initializeTree [ toAction: [ self handleArrowRight ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> leftLabel: aString [ diffPanel leftLabel: aString. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> refresh [ self model reset. @@ -183,25 +185,25 @@ IceTipDiffPanel >> refresh [ ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> resetDiffContents [ self diffContentsLeft: '' right: '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> rightLabel: aString [ diffPanel rightLabel: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> selectedItem [ ^ iceNodesTree selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> selectionChanged [ | itemValue | @@ -212,13 +214,13 @@ IceTipDiffPanel >> selectionChanged [ right: itemValue leftContents ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> subscribeToAnnouncements [ self announcer @@ -228,13 +230,13 @@ IceTipDiffPanel >> subscribeToAnnouncements [ ] -{ #category : #specs } +{ #category : 'specs' } IceTipDiffPanel >> titleForWindow [ ^ 'Diff' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> updatePresenter [ self basicRefresh diff --git a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st index c59d12d568..c783d8158d 100644 --- a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st +++ b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st @@ -1,31 +1,33 @@ Class { - #name : #IceTipDiffPreviewModel, - #superclass : #IceTipModel, + #name : 'IceTipDiffPreviewModel', + #superclass : 'IceTipModel', #instVars : [ 'commitish', 'diffModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> calculateDiff [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish [ ^ commitish entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish: aCommitish [ commitish := aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> diff [ ^ diffModel ifNil: [ | diff | @@ -37,19 +39,19 @@ IceTipDiffPreviewModel >> diff [ on: diff ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repository [ ^ commitish repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repositoryName [ ^ self repository name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> targetName [ ^ commitish name diff --git a/Iceberg-TipUI/IceTipDiffRefreshed.class.st b/Iceberg-TipUI/IceTipDiffRefreshed.class.st index 4be166e6fd..0f5ae0833b 100644 --- a/Iceberg-TipUI/IceTipDiffRefreshed.class.st +++ b/Iceberg-TipUI/IceTipDiffRefreshed.class.st @@ -2,25 +2,27 @@ I announce when a diff has been refreshed. " Class { - #name : #IceTipDiffRefreshed, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffRefreshed', + #superclass : 'IceTipAnnouncement', #instVars : [ 'repository' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffRefreshed class >> for: aRepository [ ^ self new repository: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st index 2d1fad7eff..ccdc9c09d8 100644 --- a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st @@ -10,15 +10,17 @@ also #elements answer should be a collection of elements that also understand el " Class { - #name : #IceTipDiffSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipDiffSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> activateItem: iceNode [ checkedIceNodes add: iceNode. @@ -31,7 +33,7 @@ IceTipDiffSelectingPanel >> activateItem: iceNode [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -49,7 +51,7 @@ IceTipDiffSelectingPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> deactivateItem: iceNode [ checkedIceNodes remove: iceNode. @@ -61,7 +63,7 @@ IceTipDiffSelectingPanel >> deactivateItem: iceNode [ self refreshCheckbox. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initialize [ super initialize. @@ -72,7 +74,7 @@ IceTipDiffSelectingPanel >> initialize [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initializeTree [ super initializeTree. @@ -81,7 +83,7 @@ IceTipDiffSelectingPanel >> initializeTree [ toAction: [ self toggleActivationItem: iceNodesTree selectedItem ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refresh [ super refresh. @@ -89,20 +91,20 @@ IceTipDiffSelectingPanel >> refresh [ root withAllChildrenDo: [ :each | checkedIceNodes add: each ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refreshCheckbox [ "Refresh after a checkbox state has changed. When a node with children changes this state, all children might change too. That's the reason of this special refresh. When a leave node changed such state, this refresh is redundant." iceNodesTree refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> toggleActivationItem: iceNode [ (checkedIceNodes includes: iceNode) diff --git a/Iceberg-TipUI/IceTipDirectMergeType.class.st b/Iceberg-TipUI/IceTipDirectMergeType.class.st index 496b7b0bef..435ef190da 100644 --- a/Iceberg-TipUI/IceTipDirectMergeType.class.st +++ b/Iceberg-TipUI/IceTipDirectMergeType.class.st @@ -7,12 +7,14 @@ I will perform a simple merge: This is the default merge mechanism (what users do most of the time) " Class { - #name : #IceTipDirectMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDirectMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipDirectMergeType >> newMergeAction: aModel [ ^ aModel newDirectMergeAction diff --git a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st index 1ce6ddf7df..dd3ef54559 100644 --- a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st +++ b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose directories. " Class { - #name : #IceTipDirectoryPresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipDirectoryPresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipDirectoryPresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st index 6c0db8b7a6..e3adc08fca 100644 --- a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDiscardAllChangesPreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDiscardAllChangesPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepository [ ^ self on: (IceTipDiscardAllModel new @@ -13,7 +15,7 @@ IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepositor yourself) ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ self model newDiscardAction @@ -21,13 +23,13 @@ IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ executeWithContext: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initialExtentForWindow [ ^ (900 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -37,7 +39,7 @@ IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ rightLabel: 'Commit to load: ', self loadCommitShortId ] -{ #category : #private } +{ #category : 'private' } IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ | shortId | @@ -47,7 +49,7 @@ IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ ifFalse: [ shortId ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ ^ self newButton @@ -58,7 +60,7 @@ IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> titleForWindow [ ^ 'Preview Changes to Discard' diff --git a/Iceberg-TipUI/IceTipDiscardAllModel.class.st b/Iceberg-TipUI/IceTipDiscardAllModel.class.st index ebba7aa80c..67acf77adc 100644 --- a/Iceberg-TipUI/IceTipDiscardAllModel.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllModel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipDiscardAllModel, - #superclass : #IceTipModel, + #name : 'IceTipDiscardAllModel', + #superclass : 'IceTipModel', #instVars : [ 'workingCopy', 'diffModel', 'repository' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> calculateDiff [ ^ workingCopy referenceCommit diffTo: workingCopy ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> diff [ ^ diffModel ifNil: [ @@ -28,13 +30,13 @@ IceTipDiscardAllModel >> diff [ on: diff ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> discardAll [ workingCopy discardChanges ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> newDiscardAction [ @@ -46,24 +48,24 @@ IceTipDiscardAllModel >> newDiscardAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository: anIceTipCachedModel [ repository := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy [ ^ workingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy: anObject [ workingCopy := anObject diff --git a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st index 187f996cb8..a6ba03553b 100644 --- a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st +++ b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st @@ -2,24 +2,26 @@ Command that discard all changes in the repository " Class { - #name : #IceTipDiscardChangesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDiscardChangesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultDescription [ ^ 'Discard all changes in this working copy.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultName [ ^ 'Discard all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> canBeExecuted [ ^ self isRepositoryMissing not and: [ @@ -28,7 +30,7 @@ IceTipDiscardChangesCommand >> canBeExecuted [ aCommit isCollection not and: [ aCommit isUnknownCommit not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipDiscardChangesCommand >> execute [ (IceTipDiscardAllChangesPreviewBrowser onRepository: self repositoryModel) @@ -37,13 +39,13 @@ IceTipDiscardChangesCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardChangesCommand >> iconName [ ^ #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st index faab93d8da..bce29f97be 100644 --- a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st @@ -4,24 +4,26 @@ I colaborate with the credential to know the specific class of the dialog model. Check #editModelClass in IceSshCredentials and IcePlaintextCredentials " Class { - #name : #IceTipEditCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultDescription [ ^ 'Edits the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultName [ ^ 'Edit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditCredentialCommand >> execute [ ((self item editModelClass newApplication: context application) @@ -33,13 +35,13 @@ IceTipEditCredentialCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> iconName [ ^ #edit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> shortcutKey [ ^ $e meta diff --git a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st index e05dfb7673..962f411b2d 100644 --- a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit plaintext credentials. " Class { - #name : #IceTipEditPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 160) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -39,14 +41,14 @@ IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ password: self password ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditPlaintextCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. passwordInput text: credentials password ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Edit credential for ' , credentials host diff --git a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st index 3694af7c87..0f08da0b7f 100644 --- a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipEditProjectDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipEditProjectDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -18,10 +18,12 @@ Class { 'removeButton', 'addButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> accept [ IceTipStandardAction new @@ -43,13 +45,13 @@ IceTipEditProjectDialogPresenter >> accept [ acceptCallback value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> acceptCallback [ ^ acceptCallback ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> addDirectory [ | newDirectoryName newDirectory previousSelection | @@ -70,7 +72,7 @@ IceTipEditProjectDialogPresenter >> addDirectory [ self expandAndSelect: previousSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> connectPresenters [ super connectPresenters. @@ -87,13 +89,13 @@ IceTipEditProjectDialogPresenter >> connectPresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> defaultFormat [ ^ defaultFormat ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditProjectDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -128,7 +130,7 @@ IceTipEditProjectDialogPresenter >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ @@ -155,25 +157,25 @@ IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatLabel [ ^ formatLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatList [ ^ formatList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> formats [ ^ formats ] -{ #category : #'format-management' } +{ #category : 'format-management' } IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ "We take as guinea pig a sub-directory to guess what format it is on. @@ -192,13 +194,13 @@ IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ ifNone: [ ^ defaultFormat ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> hasToShowWarning [ ^ model repository workingCopy packages isNotEmpty ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ^ self hasToShowWarning @@ -213,7 +215,7 @@ IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialize [ selectedDirectoryPath := RelativePath new. @@ -223,7 +225,7 @@ IceTipEditProjectDialogPresenter >> initialize [ super initialize. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ sourceDirectoryTree @@ -241,7 +243,7 @@ IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ self sourceDirectorySelectionChanged: announcement selectedPaths ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeMessagePanel [ | icon | @@ -254,7 +256,7 @@ IceTipEditProjectDialogPresenter >> initializeMessagePanel [ messageText text: self warningMessage ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -292,43 +294,43 @@ IceTipEditProjectDialogPresenter >> initializePresenters [ self initializeDirectoryTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageIcon [ ^ messageIcon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageText [ ^ messageText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> removeDirectory [ | toRemove newSelection | @@ -346,31 +348,31 @@ IceTipEditProjectDialogPresenter >> removeDirectory [ self expandAndSelect: newSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> selectedDirectoryPath [ ^ selectedDirectoryPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> selectedFileFormat [ ^ formatList selectedItem ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryLabel [ ^ sourceDirectoryLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPaths [ | selection | @@ -386,25 +388,25 @@ IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPat selectedDirectoryPath := selection relativeTo: self model fileSystem. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryTree [ ^ sourceDirectoryTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> titleForWindow [ ^ 'Edit Project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> username [ ^ self nameInput text trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> warningMessage [ ^ 'Be careful. You should choose the actual format of the current repository. diff --git a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st index c0b67c816d..10013324e4 100644 --- a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to edit a repository meta-data " Class { - #name : #IceTipEditRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipEditRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultDescription [ ^ 'Edit repository data' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultName [ ^ 'Edit...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipEditRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditRepositoryCommand >> execute [ self flag: #TODO. "Demeter's law" @@ -37,7 +39,7 @@ IceTipEditRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditRepositoryCommand >> iconName [ ^ #edit diff --git a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st index b7d805fe72..6ba89b4467 100644 --- a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit SSH credentials. " Class { - #name : #IceTipEditSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -27,13 +29,13 @@ IceTipEditSSHCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> initialExtentForWindow [ ^ (500@230) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -43,7 +45,7 @@ IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ keyPassphrase: self passphrase ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -52,7 +54,7 @@ IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ publicKeyInput location: credentials publicKey ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> titleForWindow [ ^ 'Edit SSH keys for ' , self credentials hostDescription diff --git a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st index 3d3b8c23a9..d42a7e3b60 100644 --- a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I am a dialog to edit token credentials. " Class { - #name : #IceTipEditTokenCredentialsPresenter, - #superclass : #IceTipAddTokenCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditTokenCredentialsPresenter', + #superclass : 'IceTipAddTokenCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -23,7 +25,7 @@ IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -32,7 +34,7 @@ IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditTokenCredentialsPresenter >> titleForWindow [ ^ 'Edit token credentials' diff --git a/Iceberg-TipUI/IceTipEntityModel.class.st b/Iceberg-TipUI/IceTipEntityModel.class.st index 49b9933bf4..7c9c4c177d 100644 --- a/Iceberg-TipUI/IceTipEntityModel.class.st +++ b/Iceberg-TipUI/IceTipEntityModel.class.st @@ -2,28 +2,30 @@ I'm a generic model for Iceberg entities (tipically, repositories, commits, packages, etc., etc., etc.) " Class { - #name : #IceTipEntityModel, - #superclass : #IceTipModel, + #name : 'IceTipEntityModel', + #superclass : 'IceTipModel', #instVars : [ 'entity', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> new [ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> on: anObject [ ^ self basicNew initializeEntity: anObject; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ ^ self basicNew initializeEntity: anObject; @@ -31,54 +33,54 @@ IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> description [ "A decorated description of this entity. It can return a text (in case decorations apply) or a simple string." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> descriptionDecorator [ ^ IceTipTextDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> displayString [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> entity [ ^ entity ] -{ #category : #fetching } +{ #category : 'fetching' } IceTipEntityModel >> fetch [ self entity fetch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEntityModel >> initializeEntity: anObject [ entity := anObject. self initialize ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isCommitish [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isModelOf: anObject [ ^ self entity = anObject ] -{ #category : #tagging } +{ #category : 'tagging' } IceTipEntityModel >> newCreateTagAction: aString [ @@ -90,17 +92,17 @@ IceTipEntityModel >> newCreateTagAction: aString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> shortDescription [ ^ self description asString diff --git a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st index dc2d41d517..6e52aea96d 100644 --- a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st @@ -7,24 +7,26 @@ My model is an exception that I'll freeze for further debugging. (IceTipErrorDialog on: anError) openDialogWithSpec " Class { - #name : #IceTipErrorDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipErrorDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'exception', 'errorLabel', 'iconPanel' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> accept [ self closeWindow. exception debug. ] -{ #category : #layout } +{ #category : 'layout' } IceTipErrorDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -35,31 +37,31 @@ IceTipErrorDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> errorLabel [ ^ errorLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception [ ^ exception ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception: anException [ exception := anException freeze ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -69,7 +71,7 @@ IceTipErrorDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ aWindow @@ -80,7 +82,7 @@ IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ do: [ :presenter | presenter close ]. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializePresenters [ iconPanel := self newImage. @@ -91,13 +93,13 @@ IceTipErrorDialogPresenter >> initializePresenters [ errorLabel editable: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> setModelBeforeInitialization: aDomainObject [ self exception: aDomainObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> titleForWindow [ ^ 'Error' diff --git a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st index eae8c778d0..e7254a06fa 100644 --- a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st @@ -3,29 +3,31 @@ I'm a panel (that will be part of a dialog) to perform actions on existing panel Actions themselves needs to be defined by my children. " Class { - #name : #IceTipExistingBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipExistingBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'branchesList', 'title', 'icon' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> branchModels [ ^ self model branchModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> branchesList [ ^ branchesList ] -{ #category : #layout } +{ #category : 'layout' } IceTipExistingBranchPanel >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -33,25 +35,25 @@ IceTipExistingBranchPanel >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon [ ^ icon ifNil: [ self iconNamed: #branch ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon: anIcon [ icon := anIcon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializeBranchesList [ branchesList @@ -68,32 +70,32 @@ IceTipExistingBranchPanel >> initializeBranchesList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializePresenters [ branchesList := self newTable. self initializeBranchesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> selectedBranch [ ^ self branchesList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> titleForWindow [ ^ title ifNil: [ self model name ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> titleForWindow: aString [ title := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> validate [ self selectedBranch ifNil: [ diff --git a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st index 738ba20fd4..d026f08d94 100644 --- a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st @@ -2,31 +2,33 @@ I'm a command to perform a fetch operation on all registered projects. " Class { - #name : #IceTipFetchAllProjectCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchAllProjectCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from all repositories in your list.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultName [ ^ 'Fetch all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchAllProjectCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> execute [ | repositories | @@ -47,13 +49,13 @@ IceTipFetchAllProjectCommand >> execute [ Iceberg announcer announce: IceRepositoryModified new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchAllProjectCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> isConfirmed [ ^ self application newConfirm diff --git a/Iceberg-TipUI/IceTipFetchCommand.class.st b/Iceberg-TipUI/IceTipFetchCommand.class.st index faf109579a..d878f30cc3 100644 --- a/Iceberg-TipUI/IceTipFetchCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchCommand.class.st @@ -2,24 +2,26 @@ I'm a command to perform a fetch operation on selected project. " Class { - #name : #IceTipFetchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from this repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ @@ -27,19 +29,19 @@ IceTipFetchCommand >> canBeExecuted [ self repositoryModel hasRemotes ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchCommand >> execute [ self repositoryModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> iconName [ ^ #smallUpdate ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> shortcutKey [ ^ $f meta diff --git a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st index 119d3c33b9..630fd29e06 100644 --- a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st @@ -1,29 +1,31 @@ Class { - #name : #IceTipFetchInPullCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchInPullCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultDescription [ ^ 'Fetch from the selected remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchInPullCommand >> execute [ context model remoteModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchInPullCommand >> iconName [ ^ #smallUpdate diff --git a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st index 7c1b56024b..0c722b8509 100644 --- a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that fetches from remote repositories " Class { - #name : #IceTipFetchRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultDescription [ ^ 'Fetch commits from this remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultName [ ^ 'Fetch remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> execute [ self remoteModel fetch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchRemoteCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipFilePresenter.class.st b/Iceberg-TipUI/IceTipFilePresenter.class.st index 721985a143..a0e7c32f33 100644 --- a/Iceberg-TipUI/IceTipFilePresenter.class.st +++ b/Iceberg-TipUI/IceTipFilePresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose files. " Class { - #name : #IceTipFilePresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipFilePresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipFilePresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st index bf9876ab0d..413d50a79f 100644 --- a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st @@ -3,24 +3,26 @@ I will allow the ""forget"" of a repository (remote it from list of registered r I also add the possibility of remove the repository from file system. " Class { - #name : #IceTipForgetRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipForgetRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultDescription [ ^ 'Removes this repository from the list of managed repositories (it will not remove any local repository)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultName [ ^ 'Forget repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipForgetRepositoryCommand >> execute [ (IceTipRemoveRepositoryDialogPresenter @@ -31,13 +33,13 @@ IceTipForgetRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st index 49ac8a3bc4..977e81d533 100644 --- a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st @@ -6,8 +6,8 @@ for each provider. " Class { - #name : #IceTipGitProviderRepositoryPanel, - #superclass : #IceTipGitRepositoryPanel, + #name : 'IceTipGitProviderRepositoryPanel', + #superclass : 'IceTipGitRepositoryPanel', #instVars : [ 'userNameLabel', 'userNameInputText', @@ -16,22 +16,24 @@ Class { 'protocolDropList', 'protocolLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipGitProviderRepositoryPanel class >> isAbstract [ ^ super isAbstract or: [ self = IceTipGitProviderRepositoryPanel ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitProviderRepositoryPanel >> configureBuilder: aBuilder [ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitProviderRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -45,7 +47,7 @@ IceTipGitProviderRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitProviderRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -79,7 +81,7 @@ IceTipGitProviderRepositoryPanel >> initializePresenters [ ] -{ #category : #private } +{ #category : 'private' } IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ^ (self userName isEmpty and: [ self projectName isEmpty ]) @@ -88,43 +90,43 @@ IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> projectName [ ^ self projectNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolDropList [ ^ protocolDropList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolLabel [ ^ protocolLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> providerName [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> remoteUrl [ | builder | @@ -135,31 +137,31 @@ IceTipGitProviderRepositoryPanel >> remoteUrl [ ^ builder buildUrl ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> selectedProtocol [ ^ self protocolDropList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> userName [ ^ self userNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameInputText [ ^ userNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameLabel [ ^ userNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st index 4408387fe1..fdd7ef3847 100644 --- a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st @@ -3,18 +3,20 @@ I'm a presenter to define remote repositories. Repositories needs to have a valid url (one that can be parsed by IceRemote) and a valid location (where to place the clone) " Class { - #name : #IceTipGitRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipGitRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel class >> order [ ^ 1000 "to the end" ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -26,7 +28,7 @@ IceTipGitRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipGitRepositoryPanel >> extractProjectName: aString [ ^ [ (IceGitRemote url: aString) projectName ] @@ -34,13 +36,13 @@ IceTipGitRepositoryPanel >> extractProjectName: aString [ do: [ 'invalid-url' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> iconForWindow [ ^ self iconNamed: #git ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -53,7 +55,7 @@ IceTipGitRepositoryPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> newRepository [ UIManager default @@ -66,19 +68,19 @@ IceTipGitRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> remoteUrl [ ^ self remoteInputText text asString trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> titleForWindow [ ^ 'Clone remote repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> validate [ | remoteString | diff --git a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st index 7103019d4a..17a42bdec6 100644 --- a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog for asking ""user.name"" and ""user.email"" . " Class { - #name : #IceTipGitUsernameAndEmailDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipGitUsernameAndEmailDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -13,10 +13,12 @@ Class { 'model', 'acceptCallback' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipGitUsernameAndEmailDialogPresenter >> accept [ self username isEmptyOrNil ifTrue: [ ^ self window alert: 'user.name is required.' ]. @@ -32,7 +34,7 @@ IceTipGitUsernameAndEmailDialogPresenter >> accept [ acceptCallback value ]. ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -50,36 +52,36 @@ IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> email [ ^ self emailInput text trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailInput [ ^ emailInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailLabel [ ^ emailLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> globalCheckbox [ ^ globalCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initialExtentForWindow [ ^ (400@200) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -102,43 +104,43 @@ IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipGitUsernameAndEmailDialogPresenter >> isGlobal [ ^ self globalCheckbox state ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> titleForWindow [ ^ 'Please provide Git missing properties' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> username [ ^ self nameInput text trimBoth diff --git a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st index e78130b7b5..c23045931f 100644 --- a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltComponentHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltComponentHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,13 +29,13 @@ IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeCommitList [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -62,7 +64,7 @@ IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ commitList := self newComponentList. @@ -73,13 +75,13 @@ IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ self initializeHiedraColumn ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -87,20 +89,20 @@ IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ | commitModels | @@ -111,7 +113,7 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ commitInfoTabs selectedModel: (commitModels ifNotEmpty: #first ifEmpty: [ nil ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -133,19 +135,19 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ifNotNil: #item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st index 28565664db..73df2f5bef 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,7 +29,7 @@ IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeCommitList [ commitList @@ -63,7 +65,7 @@ IceTipHiedraAltHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -92,7 +94,7 @@ IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -104,13 +106,13 @@ IceTipHiedraAltHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -118,20 +120,20 @@ IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -153,13 +155,13 @@ IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st index b4d9f6b312..e2b6ea1bc2 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st @@ -1,12 +1,14 @@ Class { - #name : #IceTipHiedraAltHistoryRowPresenter, - #superclass : #SpPresenter, + #name : 'IceTipHiedraAltHistoryRowPresenter', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ | tagNames tagLayout | @@ -30,13 +32,13 @@ IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ aLayout add: tagLayout expand: false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> form [ ^ self model first ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ self layout: (SpBoxLayout newLeftToRight @@ -51,7 +53,7 @@ IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ yourself). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> item [ ^ self model second diff --git a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st index f481a468c0..dc81c98649 100644 --- a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st @@ -2,15 +2,17 @@ I add a Hiedra column to the browser defined by my superclass. This column visualizes the relationship between commits in the history list. " Class { - #name : #IceTipHiedraHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeCommitList [ "Add the Hiedra column at the beginning. The Datasource has the logic to render it." @@ -23,7 +25,7 @@ IceTipHiedraHistoryBrowser >> initializeCommitList [ super initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -50,21 +52,21 @@ IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ cellWidth: 5.25 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializePresenters [ super initializePresenters. self initializeHiedraColumn ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refreshHiedraColumn [ | ancestorIds | diff --git a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st index 16ad2d0857..63008dd9c3 100644 --- a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st @@ -2,47 +2,49 @@ I'm a base browser for pull/push action browser. " Class { - #name : #IceTipHistoryActionBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryActionBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitsPanel', 'actionButtonBar', 'button' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> accept [ button performAction ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel [ ^ commitsPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel: aSpPresenter [ commitsPanel := aSpPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initializePresenters [ commitsPanel := self instantiate: IceTipHistoryBrowser on: self model. @@ -50,7 +52,7 @@ IceTipHistoryActionBrowser >> initializePresenters [ actionButtonBar add: (button := self newActionButton) ] -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ aRemoteModel ifNil: [ ^ self ]. @@ -61,26 +63,26 @@ IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ self updateTitle ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipHistoryActionBrowser >> newActionButton [ "Answer a new instance of SpButton to be placed at bottom, as the main action of the window." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refresh [ self refreshCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refreshCommits [ commitsPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ (self model repositoryModel isModelOf: ann repository) @@ -89,7 +91,7 @@ IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> subscribeToAnnouncements [ self announcer diff --git a/Iceberg-TipUI/IceTipHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHistoryBrowser.class.st index 3c5dfdee58..71a6d22f46 100644 --- a/Iceberg-TipUI/IceTipHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryBrowser.class.st @@ -5,22 +5,24 @@ I'm usually used as part of an IceTipRepositoryBrowser. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'commitInfoTabs' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipAdoptCommitCommand. @@ -35,7 +37,7 @@ IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCo ] -{ #category : #specs } +{ #category : 'specs' } IceTipHistoryBrowser class >> panelSpec [ ^ SpPanedLayout newTopToBottom @@ -44,25 +46,25 @@ IceTipHistoryBrowser class >> panelSpec [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> beForMerge [ self commitInfoTabs beForMerge ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitInfoTabs [ ^ commitInfoTabs ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,13 +73,13 @@ IceTipHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initialExtentForWindow [ ^ (700 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializeCommitList [ commitList @@ -102,7 +104,7 @@ IceTipHistoryBrowser >> initializeCommitList [ whenSelectionChangedDo: [ :aSelection | self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -111,27 +113,27 @@ IceTipHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refresh [ self refreshCommitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refreshCommitList [ | commitModels | @@ -141,19 +143,19 @@ IceTipHistoryBrowser >> refreshCommitList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipHistoryBrowser >> selectionChanged: anElement [ commitInfoTabs selectedModel: anElement ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> titleForWindow [ ^ self model @@ -162,13 +164,13 @@ IceTipHistoryBrowser >> titleForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> updatePresenter [ self refresh ] -{ #category : #events } +{ #category : 'events' } IceTipHistoryBrowser >> whenSelectionChangedDo: aBlock [ commitList whenSelectionChangedDo: aBlock diff --git a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st index 16b04a9a5b..06ef203e2b 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st @@ -3,17 +3,19 @@ I keep a diff from HEAD to WorkingCopy. " Class { - #name : #IceTipHistoryDiffFromHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffFromHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> diffFor: aCommitModel [ ^ aCommitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> labelFor: aCommitModel [ ^ 'HEAD to {1}' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st index d0b9344fa1..12aab5b16c 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st @@ -2,17 +2,19 @@ I keep a diff from a commit to his mail parent. " Class { - #name : #IceTipHistoryDiffToAncestor, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToAncestor', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> diffFor: aCommitModel [ ^ aCommitModel diffToFirstAncestor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> labelFor: aCommitModel [ ^ '{1} to {2}' format: { aCommitModel shortId. diff --git a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st index d1dcb6fca4..2bff338b13 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st @@ -3,17 +3,19 @@ I keep a diff from WorkingCopy to HEAD. " Class { - #name : #IceTipHistoryDiffToHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> diffFor: aCommitModel [ ^ aCommitModel diffToHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> labelFor: aCommitModel [ ^ '{1} to HEAD' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st index 0cfc0e00fc..2c33f2fa79 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st @@ -4,64 +4,66 @@ Since orders may change for different operations, I need a different approach fo " Class { - #name : #IceTipHistoryDiffUpdater, - #superclass : #Object, + #name : 'IceTipHistoryDiffUpdater', + #superclass : 'Object', #instVars : [ 'tab' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #testing } +{ #category : 'testing' } IceTipHistoryDiffUpdater class >> isAbstract [ ^ self == IceTipHistoryDiffUpdater ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipHistoryDiffUpdater class >> tab: aTab [ ^ self new tab: aTab; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> diffFor: aCommitModel [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> labelFor: aCommitModel [ ^ self subclassResponsibility ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipHistoryDiffUpdater >> newDiffPanelFor: aDiffModel [ ^ IceTipDiffPanel on: aDiffModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab [ ^ tab ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab: anObject [ tab := anObject ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateContentsOn: aCommitModel [ aCommitModel ifNil: [ ^ self ]. self tab contents: (self newDiffPanelFor: (self diffFor: aCommitModel)) build ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateLabelOn: aCommitModel [ self tab label: (self labelFor: aCommitModel) ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateOn: aCommitModel [ self updateLabelOn: aCommitModel. self updateContentsOn: aCommitModel diff --git a/Iceberg-TipUI/IceTipInspectCommand.class.st b/Iceberg-TipUI/IceTipInspectCommand.class.st index d50a4ee13d..f5ef0d83c4 100644 --- a/Iceberg-TipUI/IceTipInspectCommand.class.st +++ b/Iceberg-TipUI/IceTipInspectCommand.class.st @@ -2,42 +2,44 @@ I am a command implementing the inspect option. I have several context activations to be able to inspect different objects in Iceberg's UI " Class { - #name : #IceTipInspectCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInspectCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultDescription [ ^ 'Inspect the selected element' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultName [ ^ 'Inspect...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipInspectCommand >> canBeExecuted [ ^ self context hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipInspectCommand >> execute [ self item inspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> iconName [ ^ #glamorousInspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> item [ | maybeCachedObject | diff --git a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st index a11c718b99..fbbaad2497 100644 --- a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st @@ -3,36 +3,38 @@ Command used in the version browser, inside the code browser. This command takes the selected version and installs it (also called revert). " Class { - #name : #IceTipInstallVersionCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInstallVersionCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultDescription [ ^ 'Revert to the selected version' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultName [ ^ 'Install this version' ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> execute [ self version install ] -{ #category : #activation } +{ #category : 'activation' } IceTipInstallVersionCommand >> iconName [ ^ #smallRedo ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> version [ ^ self context selectedItem diff --git a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st index e74a3465c0..e76f8c4c84 100644 --- a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st +++ b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st @@ -2,23 +2,25 @@ I am a credential provider that requires the missing plaintext credential to the user. " Class { - #name : #IceTipInteractiveCredentialsProvider, - #superclass : #IceCredentialsProvider, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipInteractiveCredentialsProvider', + #superclass : 'IceCredentialsProvider', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceTipInteractiveCredentialsProvider class >> initialize [ self providerType: nil ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider class >> isDefault [ ^ true ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ | returnedCred | @@ -30,7 +32,7 @@ IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsToReturn [ | returnedCred | @@ -43,7 +45,7 @@ IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsT credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainSshCredentials: credentialsToReturn [ | returnedCred | diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index b345444f61..1fe0a37770 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -3,22 +3,24 @@ I'm a visitor to provide users with an interactive way to react to iceberg error " Class { - #name : #IceTipInteractiveErrorVisitor, - #superclass : #IceErrorVisitor, + #name : 'IceTipInteractiveErrorVisitor', + #superclass : 'IceErrorVisitor', #instVars : [ 'context', 'repository' ], - #category : #'Iceberg-TipUI-Exceptions' + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext [ ^ self newContext: aContext repository: nil ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ ^ self new @@ -27,40 +29,40 @@ IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> on: aModel [ ^ self new repository: aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context: anObject [ context := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository: anObject [ repository := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ self defaultApplication label: anError messageText; @@ -68,7 +70,7 @@ IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ self defaultApplication @@ -77,7 +79,7 @@ IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ self defaultApplication @@ -88,7 +90,7 @@ IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ self defaultApplication @@ -98,7 +100,7 @@ IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ | proceed | @@ -112,7 +114,7 @@ IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitGenericError: anError [ (IceTipErrorDialogPresenter @@ -123,7 +125,7 @@ IceTipInteractiveErrorVisitor >> visitGenericError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMergeAborted: anError [ self defaultApplication @@ -135,7 +137,7 @@ WARNING: If you have external files, you may need to verify the conflicts there. openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ ((IceTipGitUsernameAndEmailDialogPresenter @@ -147,7 +149,7 @@ IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ | proceed | @@ -162,7 +164,7 @@ IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoRemote: anError [ self defaultApplication @@ -172,7 +174,7 @@ Add one before continue.'; openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ self defaultApplication newInform @@ -180,7 +182,7 @@ IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ self defaultApplication newInform @@ -189,7 +191,7 @@ IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteDesynchronizedError: anError [ | continue command | @@ -222,7 +224,7 @@ You need to pull remote changes before continue and push your changes.' anError retry ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitShouldCommitBeforePullError: anError [ | continue | @@ -239,7 +241,7 @@ We recommend that you commit first and then pull incoming changes again.'; anError resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitWorkingCopyDesynchronizedError: anError [ | solveStrategy command | diff --git a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st index 577cf69282..c2d502942e 100644 --- a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that loads the current non-loaded selected package " Class { - #name : #IceTipLoadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipLoadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultDescription [ ^ 'Load selected package in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultName [ ^ 'Load' ] -{ #category : #testing } +{ #category : 'testing' } IceTipLoadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded not ] -{ #category : #executing } +{ #category : 'executing' } IceTipLoadPackageCommand >> execute [ self packageModel newLoadAction executeWithContext: self context. @@ -33,7 +35,7 @@ IceTipLoadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLoadPackageCommand >> iconName [ ^ #add diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 9e3bcd9b5d..73ba56fba6 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -3,18 +3,20 @@ I will define a repository that already exists. " Class { - #name : #IceTipLocalRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipLocalRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel class >> order [ ^ 20 ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocalRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipLocalRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallOpen ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> initialExtentForWindow [ ^ (500@( @@ -41,25 +43,25 @@ IceTipLocalRepositoryPanel >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #testing } +{ #category : 'testing' } IceTipLocalRepositoryPanel >> isLocalRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location [ ^ self projectLocation location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location: aReferenceOrString [ ^ self projectLocation location: aReferenceOrString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> newRepository [ UIManager default @@ -71,13 +73,13 @@ IceTipLocalRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> titleForWindow [ ^ 'Import from existing clone' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipLocationPresenter.class.st b/Iceberg-TipUI/IceTipLocationPresenter.class.st index b62a028a13..7278835716 100644 --- a/Iceberg-TipUI/IceTipLocationPresenter.class.st +++ b/Iceberg-TipUI/IceTipLocationPresenter.class.st @@ -3,8 +3,8 @@ I'm an abstract model to provide locations (directories or files). I need to be included in other components (search references to my children for examples) " Class { - #name : #IceTipLocationPresenter, - #superclass : #SpPresenter, + #name : 'IceTipLocationPresenter', + #superclass : 'SpPresenter', #instVars : [ 'locationInput', 'chooseButton', @@ -12,16 +12,18 @@ Class { 'chooseBlock', 'keptLocation' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipLocationPresenter class >> isAbstract [ ^ self == IceTipLocationPresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> appendPath: aString [ keptLocation ifNil: [ keptLocation := self location ]. @@ -31,13 +33,13 @@ IceTipLocationPresenter >> appendPath: aString [ ifEmpty: [ keptLocation ]). ] -{ #category : #private } +{ #category : 'private' } IceTipLocationPresenter >> basicLocation: aReference [ locationInput text: aReference pathString ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> choose [ self chooseReference ifNotNil: [ :reference | @@ -45,43 +47,43 @@ IceTipLocationPresenter >> choose [ self onChoose ifNotNil: #value ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> chooseButton [ ^ chooseButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> chooseReference [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle [ ^ chooseTitle ifNil: [ self defaultChooseDialogTitle ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle: aString [ chooseTitle := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultChooseDialogTitle [ ^ 'Choose directory' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultLabel [ ^ 'Directory' ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocationPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -93,13 +95,13 @@ IceTipLocationPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> icon [ ^ self iconNamed: #open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocationPresenter >> initializePresenters [ locationInput := self newTextInput @@ -113,7 +115,7 @@ IceTipLocationPresenter >> initializePresenters [ chooseButton action: [ self choose ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location [ "This method return the location to use in the repository If the location is relative to IceLibgitRepository >> #localRepositoriesLocation @@ -135,7 +137,7 @@ IceTipLocationPresenter >> location [ ^ IceLibgitRepository localRepositoriesLocation resolvePath: relativePath ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location: aReferenceOrString [ | ref | @@ -152,26 +154,26 @@ IceTipLocationPresenter >> location: aReferenceOrString [ self basicLocation: ref ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> locationInput [ ^ locationInput ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose [ ^ chooseBlock ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose: aBlockClosure [ "I allow to set a hook to execute when the user select a location." chooseBlock := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipLocationPresenter >> whenTextChanged: aBlockClosure [ self locationInput whenTextChangedDo: aBlockClosure diff --git a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st index 10c1f65a81..e0f99435cf 100644 --- a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st @@ -2,24 +2,26 @@ I'm a command to open the package manager browser for a project. " Class { - #name : #IceTipManagePackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManagePackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultDescription [ ^ 'Open packages manager browser for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultName [ ^ 'Packages' ] -{ #category : #executing } +{ #category : 'executing' } IceTipManagePackagesCommand >> execute [ (IceTipWorkingCopyBrowser @@ -28,13 +30,13 @@ IceTipManagePackagesCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> iconName [ ^ #package ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> shortcutKey [ ^ $p meta diff --git a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st index 25acd74669..4d0185f541 100644 --- a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st @@ -3,36 +3,38 @@ I'm a command to show the repository manager for a repository model. " Class { - #name : #IceTipManageRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManageRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultDescription [ ^ 'Open repository manager browser for this repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultName [ ^ 'Open Repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultToolbarItemName [ ^ 'Repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipManageRepositoryCommand >> execute [ (IceTipRepositoryBrowser @@ -41,19 +43,19 @@ IceTipManageRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> iconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> shortcutKey [ ^ $r meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st index fbd509f795..9a1252f105 100644 --- a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st @@ -4,34 +4,36 @@ I'm a dialog to perform a merge of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipMergeBranchDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipMergeBranchDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeBranchDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> allTypes [ ^ types ifNil: [ types := self createMergeBranchTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> beSwitchAndMerge [ self allTypes do: #beSwitchAndMerge ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ | allTypes | @@ -54,44 +56,44 @@ IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchDialogPresenter >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model: anObject [ model := anObject. self allTypes do: [ :each | each model: anObject ] ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipMergeBranchDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> titleForWindow [ ^ 'Select branch to merge into ' , (self model branchName contractTo: 45) ] -{ #category : #activation } +{ #category : 'activation' } IceTipMergeBranchDialogPresenter >> updateWindowTitle [ self window title: self titleForWindow diff --git a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st index 24bd011621..608f005030 100644 --- a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st @@ -2,21 +2,23 @@ I'm a panel to peform the merge of an existing branch. " Class { - #name : #IceTipMergeBranchPanel, - #superclass : #IceTipExistingBranchPanel, + #name : 'IceTipMergeBranchPanel', + #superclass : 'IceTipExistingBranchPanel', #instVars : [ 'mergeType' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> beSwitchAndMerge [ self mergeType: IceTipMergeType switchAndMerge ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchPanel >> doAccept [ IceTipStandardAction new @@ -27,19 +29,19 @@ IceTipMergeBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType [ ^ mergeType ifNil: [ IceTipMergeType default ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType: anObject [ mergeType := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> withoutHead [ self branchesList items: (self branchModels reject: #isHead). diff --git a/Iceberg-TipUI/IceTipMergeCommand.class.st b/Iceberg-TipUI/IceTipMergeCommand.class.st index 11c5c49cdd..b5345488ef 100644 --- a/Iceberg-TipUI/IceTipMergeCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to select a branch to merge in the current merge " Class { - #name : #IceTipMergeCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultDescription [ ^ 'Merge a given branch into your current branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultName [ ^ 'Merge to current' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeCommand >> execute [ (IceTipMergeBranchDialogPresenter @@ -36,7 +38,7 @@ IceTipMergeCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeCommand >> iconName [ ^ #merge diff --git a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st index 1d70eeb9d7..bfe81e157f 100644 --- a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st @@ -2,36 +2,38 @@ Command that opens a window showing the history of the selected merged branch. " Class { - #name : #IceTipMergeHistoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeHistoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultDescription [ ^ 'Show the merged history of the selected merge commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultName [ ^ 'Browse merge history' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeHistoryCommand >> canBeExecuted [ ^ self commitModel hasMultipleAncestors ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> commitModel [ ^ self context selectedCommit ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> execute [ (IceTipHistoryBrowser on: diff --git a/Iceberg-TipUI/IceTipMergeModel.class.st b/Iceberg-TipUI/IceTipMergeModel.class.st index 249baca4a0..3a2be87af4 100644 --- a/Iceberg-TipUI/IceTipMergeModel.class.st +++ b/Iceberg-TipUI/IceTipMergeModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipMergeModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipMergeModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'mergeType', 'mergeAction' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> calculateDiff [ ^ self mergeAction ] -{ #category : #private } +{ #category : 'private' } IceTipMergeModel >> mergeAction [ ^ mergeAction ifNil: [ @@ -24,13 +26,13 @@ IceTipMergeModel >> mergeAction [ yourself ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> mergeType: aMergeType [ mergeType := aMergeType ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newExecuteMergeAction [ @@ -42,13 +44,13 @@ IceTipMergeModel >> newExecuteMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newMergeAction [ ^ mergeType newMergeAction: commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> repositoryModel [ ^ commitish repositoryModel ] diff --git a/Iceberg-TipUI/IceTipMergeMorph.class.st b/Iceberg-TipUI/IceTipMergeMorph.class.st index f45def3de7..4dc7b9b9f2 100644 --- a/Iceberg-TipUI/IceTipMergeMorph.class.st +++ b/Iceberg-TipUI/IceTipMergeMorph.class.st @@ -2,19 +2,21 @@ I redefine PSMCMergeMorph to be able to use an IceMergePatchMorph as patch morph " Class { - #name : #IceTipMergeMorph, - #superclass : #PSMCMergeMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergeMorph', + #superclass : 'PSMCMergeMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeMorph >> conflictCount [ "Answer the number of conflicts that are unresolved." ^(self model ifNil: [^0]) unresolvedConflictCount ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeMorph >> model: aMerger [ "Set the model and update the window." @@ -26,7 +28,7 @@ IceTipMergeMorph >> model: aMerger [ self patchMorph model: aMerger ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeMorph >> newPatchMorph [ "Answer a new patch morph." diff --git a/Iceberg-TipUI/IceTipMergePatchMorph.class.st b/Iceberg-TipUI/IceTipMergePatchMorph.class.st index 534efa39a0..6a05a76fb0 100644 --- a/Iceberg-TipUI/IceTipMergePatchMorph.class.st +++ b/Iceberg-TipUI/IceTipMergePatchMorph.class.st @@ -2,19 +2,21 @@ I redefine part of monticello's PSMCMergePatchMorph to not require to rebuild a tree but use Iceberg's one directly. I also adapt the patch morph to handle files and several packages at the same time. " Class { - #name : #IceTipMergePatchMorph, - #superclass : #PSMCMergePatchMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergePatchMorph', + #superclass : 'PSMCMergePatchMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> changes [ "Answer the changes tree roots." ^ model ifNotNil: [ model mergeTree children collect: [ :each | IceMergeListWrapper with: each model: model ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ "Answer whether there are any conflicts not marked as a conflict." @@ -22,7 +24,7 @@ IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ conflict isConflict and: [ conflict isResolved ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ "Answer whether there are any conflicts not marked as incoming." @@ -31,7 +33,7 @@ IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ conflict isResolved not or: [conflict isLeftChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ "Answer whether there are any conflicts not marked as keep." @@ -40,7 +42,7 @@ IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ conflict isResolved not or: [conflict isRightChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasConflicts [ "Answer whether there are any conflicts." @@ -48,7 +50,7 @@ IceTipMergePatchMorph >> hasConflicts [ conflict isConflict ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> keepAllCurrentVersion [ "Mark all conflicts as local." @@ -58,7 +60,7 @@ IceTipMergePatchMorph >> keepAllCurrentVersion [ self updateSource ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> markAllAsConflict [ "Mark all conflicts as unresolved." @@ -68,7 +70,7 @@ IceTipMergePatchMorph >> markAllAsConflict [ self updateSource ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> markAsConflict [ "Mark the operation as unresolved conflict." @@ -77,7 +79,7 @@ IceTipMergePatchMorph >> markAsConflict [ self updateSource. ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> nextConflict [ "Answer the next (unresolved) conflict or, nil if none." @@ -92,7 +94,7 @@ IceTipMergePatchMorph >> nextConflict [ ^ IceMergeListWrapper with: node model: model. ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> notAllConflictsResolved [ "Answer whether any conflicts are unresolved." @@ -100,7 +102,7 @@ IceTipMergePatchMorph >> notAllConflictsResolved [ item isConflict and: [item isResolved not]] ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> selectNextConflict [ "Select the next conflict after the current selection, if any." @@ -109,14 +111,14 @@ IceTipMergePatchMorph >> selectNextConflict [ self changed: {#openPath}, next item path segments ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> selectedChange [ "Answer the selected change." ^(self selectedChangeWrapper ifNil: [^nil]) item value ] -{ #category : #private } +{ #category : 'private' } IceTipMergePatchMorph >> selectionHasActualClass [ "Answer whether the currently selected change has an actual class in the image." @@ -126,14 +128,14 @@ IceTipMergePatchMorph >> selectionHasActualClass [ ifNotNil: [:w | w item value contextClass notNil] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> selectionIsRemoteChosen [ self selectedChange ifNil: [ ^ false]. ^ self selectedChange isConflict and: [ self selectedChange isRightChosen ] ] -{ #category : #updating } +{ #category : 'updating' } IceTipMergePatchMorph >> updateSource [ "Update the source difference morph." @@ -159,7 +161,7 @@ IceTipMergePatchMorph >> updateSource [ ifFalse: [self diffMorph indicateSrc] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> useAllIncomingVersion [ "Mark all conflicts as remote." diff --git a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st index 5d9d18d743..83535956d8 100644 --- a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st @@ -4,12 +4,14 @@ I preview the changes that will be introduced in the image when a merge occurs. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipMergePreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipMergePreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergePreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipMergeModel new commitish: aBranch; @@ -17,14 +19,14 @@ IceTipMergePreviewBrowser class >> onBranch: aBranch [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePreviewBrowser >> doMerge [ self model newExecuteMergeAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipMergePreviewBrowser >> initializePresenters [ diffPanel rightLabel: 'Merge with ', model targetName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergePreviewBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipMergePreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> titleForWindow [ ^ 'Preview merge of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st index 3f8a4eec31..fdfc258341 100644 --- a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipMergeSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipMergeSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'codePanel', 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> basicRefresh [ super basicRefresh. self refreshCodePanel. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -46,13 +48,13 @@ IceTipMergeSelectingPanel >> changeListColumn [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> codePanel [ ^ codePanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipMergeSelectingPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -66,7 +68,7 @@ IceTipMergeSelectingPanel >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initialize [ super initialize. @@ -77,7 +79,7 @@ IceTipMergeSelectingPanel >> initialize [ child value isConflict ifTrue: [ child value selectLeft ] ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initializePresenters [ codePanel := self newCode. @@ -87,7 +89,7 @@ IceTipMergeSelectingPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> refresh [ super refresh. @@ -96,7 +98,7 @@ IceTipMergeSelectingPanel >> refresh [ self refreshCodePanel ] -{ #category : #private } +{ #category : 'private' } IceTipMergeSelectingPanel >> refreshCodePanel [ | visitor mergeNode | @@ -107,13 +109,13 @@ IceTipMergeSelectingPanel >> refreshCodePanel [ ifNotNil: [ mergeNode accept: visitor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipMergeSelectingPanel >> selectionChanged [ super selectionChanged. diff --git a/Iceberg-TipUI/IceTipMergeType.class.st b/Iceberg-TipUI/IceTipMergeType.class.st index 3fa3830c87..6d96c48bec 100644 --- a/Iceberg-TipUI/IceTipMergeType.class.st +++ b/Iceberg-TipUI/IceTipMergeType.class.st @@ -5,47 +5,49 @@ My children define strategies of how to merge two commitish. " Class { - #name : #IceTipMergeType, - #superclass : #Object, + #name : 'IceTipMergeType', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> default [ ^ self direct ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> direct [ ^ IceTipDirectMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> switchAndMerge [ ^ IceTipSwitchAndMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> uniqueInstance [ self = IceTipMergeType ifTrue: [ self error: 'I''m an abstract type. Use one of my children' ]. ^ uniqueInstance ifNil: [ uniqueInstance := self basicNew initialize ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> mergeOn: aModel then: aBlock [ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> newMergeAction: aModel [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st index dd81696941..0639cde03a 100644 --- a/Iceberg-TipUI/IceTipModel.class.st +++ b/Iceberg-TipUI/IceTipModel.class.st @@ -4,35 +4,37 @@ Each tip component refers to one (and just one) model, which will provide model Models can be cached using #beCached. " Class { - #name : #IceTipModel, - #superclass : #Object, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipModel', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #converting } +{ #category : 'converting' } IceTipModel >> beCached [ ^ IceTipCachedModel for: self ] -{ #category : #private } +{ #category : 'private' } IceTipModel >> colorForError [ ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipModel >> matches: aString [ "Override this if you want to make this model discoverable" ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> repositoryModel [ "this model does not provides a repository model" ^ nil ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> reset [ "to provide polymorphism with cached version" ] diff --git a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st index 8d00759a46..e5d2698279 100644 --- a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st @@ -5,24 +5,26 @@ Usually, I'm part of an IceTipRegisterProjectPresenter. I will define location, name and source subdirectory and I will use that to create a #newRepository. " Class { - #name : #IceTipNewRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, + #name : 'IceTipNewRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', #instVars : [ 'projectNameLabel', 'projectNameInputText', 'subdirectoryLabel', 'subdirectoryInputText' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel class >> order [ ^ 10 ] -{ #category : #layout } +{ #category : 'layout' } IceTipNewRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -35,13 +37,13 @@ IceTipNewRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -58,7 +60,7 @@ IceTipNewRepositoryPanel >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializeSourceDirectory [ subdirectoryLabel := self newLabel @@ -72,13 +74,13 @@ IceTipNewRepositoryPanel >> initializeSourceDirectory [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipNewRepositoryPanel >> isNewRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> newRepository [ | repositoryName location subdirectory | @@ -96,37 +98,37 @@ IceTipNewRepositoryPanel >> newRepository [ createNewRepositoryNamed: repositoryName ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryInputText [ ^ subdirectoryInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryLabel [ ^ subdirectoryLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> titleForWindow [ ^ 'New repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st index 046c3d4e94..51f0260a57 100644 --- a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st +++ b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st @@ -2,24 +2,26 @@ I am a command that, once executed, will open the native file browser on the directory containing the local repository of the git project. " Class { - #name : #IceTipOpenNativelyCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipOpenNativelyCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultDescription [ ^ 'Open the native file browser on the local repository of this project.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultName [ ^ 'Open in native file browser' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenNativelyCommand >> canBeExecuted [ | location | @@ -28,13 +30,13 @@ IceTipOpenNativelyCommand >> canBeExecuted [ ^ location isNotNil and: [ location exists ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenNativelyCommand >> execute [ self item location openInOSFileBrowser ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenNativelyCommand >> iconName [ ^ #smallWindow diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st index 2f6133367c..c63a4618b6 100644 --- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st @@ -7,17 +7,19 @@ I'm kind of a ""tabbed"" dialog, but my options are ""mac style"": lateral and n This is useful to keep a variable number of options. " Class { - #name : #IceTipOptionDialogPresenter, - #superclass : #IceTipPresenter, + #name : 'IceTipOptionDialogPresenter', + #superclass : 'IceTipPresenter', #instVars : [ 'typeList', 'type', 'contentLayout' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> accept [ [ @@ -28,19 +30,19 @@ IceTipOptionDialogPresenter >> accept [ e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> allTypes [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> contextSelection [ ^ type ] -{ #category : #layout } +{ #category : 'layout' } IceTipOptionDialogPresenter >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -50,19 +52,19 @@ IceTipOptionDialogPresenter >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> doAccept [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter @@ -72,14 +74,14 @@ IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter whenOpenedDo: [ self typeList selectIndex: 1 ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializePresenters [ contentLayout := SpBoxLayout newTopToBottom. self initializeTypeList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeTypeList [ (typeList := self newList) @@ -90,7 +92,7 @@ IceTipOptionDialogPresenter >> initializeTypeList [ self selectionChanged: selection selectedItem ] ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> replacePanelWith: aType [ contentLayout @@ -98,13 +100,13 @@ IceTipOptionDialogPresenter >> replacePanelWith: aType [ add: aType ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> selectedType [ ^ type ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> selectionChanged: aType [ type := aType. @@ -113,13 +115,13 @@ IceTipOptionDialogPresenter >> selectionChanged: aType [ self replacePanelWith: type ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipOptionDialogPresenter >> typeList [ ^ typeList ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> updateWindowTitle [ self window title: type titleForWindow diff --git a/Iceberg-TipUI/IceTipPackageCommand.class.st b/Iceberg-TipUI/IceTipPackageCommand.class.st index 2f48f71553..72c5cc9e02 100644 --- a/Iceberg-TipUI/IceTipPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipPackageCommand.class.st @@ -2,45 +2,47 @@ Abstract class representing commands to be applied on top of packages. " Class { - #name : #IceTipPackageCommand, - #superclass : #IceTipCommand, + #name : 'IceTipPackageCommand', + #superclass : 'IceTipCommand', #instVars : [ 'packageModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand class >> isAbstract [ ^ self == IceTipPackageCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> hasPackageModel [ ^ self packageModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> isPackageLoaded [ ^ self hasPackageModel and: [ self packageModel isLoaded ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> package [ ^ self packageModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel [ ^ packageModel ifNil: [self context packageModel] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel: anIceTipPackageModel [ packageModel := anIceTipPackageModel diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index 769de7dc50..a71afe257c 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -2,19 +2,21 @@ I'm a model for IcePackage entries. " Class { - #name : #IceTipPackageModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPackageModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browsePackage [ self entity browse ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browseRepositoryVersion [ | snapshot | @@ -24,7 +26,7 @@ IceTipPackageModel >> browseRepositoryVersion [ showLabelled: 'Snapshot for ', self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> description [ | text | @@ -34,7 +36,7 @@ IceTipPackageModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> descriptionDecorator [ self entity isModified @@ -45,22 +47,22 @@ IceTipPackageModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isLoaded [ ^ self entity isLoaded ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isModified [ ^ self entity isModified ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> newLoadAction [ @@ -75,12 +77,12 @@ IceTipPackageModel >> newLoadAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> packageName [ ^ self entity packageName ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> reload [ @@ -94,7 +96,7 @@ IceTipPackageModel >> reload [ while: [ self entity reload ] ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> remove [ @@ -108,7 +110,7 @@ IceTipPackageModel >> remove [ while: [ self entity remove ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> status [ "entity could be a repository or a package" [ @@ -120,7 +122,7 @@ IceTipPackageModel >> status [ ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> statusDecorator [ self entity isLoaded @@ -128,7 +130,7 @@ IceTipPackageModel >> statusDecorator [ ^ super statusDecorator ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> unload [ diff --git a/Iceberg-TipUI/IceTipPresenter.class.st b/Iceberg-TipUI/IceTipPresenter.class.st index bd03d7bd41..e6fa418d83 100644 --- a/Iceberg-TipUI/IceTipPresenter.class.st +++ b/Iceberg-TipUI/IceTipPresenter.class.st @@ -2,54 +2,56 @@ I'm a SpPresenter that is prepared to be wrapped in a window (or a dialog). The way it is prepared is through a system of hooks (template method pattern), but also providing some convenience API. " Class { - #name : #IceTipPresenter, - #superclass : #SpPresenter, + #name : 'IceTipPresenter', + #superclass : 'SpPresenter', #instVars : [ 'decorations' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #decorating } +{ #category : 'decorating' } IceTipPresenter class >> buildDecorations [ ^ (Pragma allNamed: #extensionDecorators in: self class) flatCollect: [ :pragma | self perform: pragma methodSelector ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter class >> currentApplication [ ^ StPresenter currentApplication ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPresenter class >> new [ ^ self newApplication: self currentApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter >> closeWindow [ "Close the window of this presenter" self window close ] -{ #category : #private } +{ #category : 'private' } IceTipPresenter >> decorations [ ^ decorations ifNil: [ decorations := self class buildDecorations ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> iconForWindow [ "Answer a Form to be used during initialization when opening in a SpWindowPresenter." ^ self iconNamed: #smallWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initialExtentForWindow [ "Answer either nil or a Point representing the initial extent of this presenter. It is used during initialization if this presenter is opened inside a SpWindowPresenter. @@ -58,7 +60,7 @@ IceTipPresenter >> initialExtentForWindow [ ^ nil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -70,25 +72,25 @@ IceTipPresenter >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setInitialExtentTo: aSpWindowPresenter [ aSpWindowPresenter initialExtent: self initialExtentForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setTitleTo: aSpWindowPresenter [ aSpWindowPresenter title: self titleForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setWindowIconTo: aSpWindowPresenter [ aSpWindowPresenter windowIcon: self iconForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> titleForWindow [ "Answer the title to use during initialization when this presenter is being opened in a SpWindowPresenter." @@ -97,7 +99,7 @@ IceTipPresenter >> titleForWindow [ ] -{ #category : #extensions } +{ #category : 'extensions' } IceTipPresenter >> updateTitle [ self withWindowDo: [ :aWindow | aWindow title: self titleForWindow ] diff --git a/Iceberg-TipUI/IceTipPreviewBrowser.class.st b/Iceberg-TipUI/IceTipPreviewBrowser.class.st index 7623877b11..50cb8b30d1 100644 --- a/Iceberg-TipUI/IceTipPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipPreviewBrowser.class.st @@ -3,35 +3,37 @@ I'm a browser to show a preview of an operation that can be made right after. Tipically, I'm using through my chldren, to do a checkout or merge. " Class { - #name : #IceTipPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'actionPanel', 'button' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> actionPanel [ ^ actionPanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,19 +44,19 @@ IceTipPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffPanel on: self model diff. @@ -62,14 +64,14 @@ IceTipPreviewBrowser >> initializePresenters [ actionPanel add: (button := self newActionButton) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPreviewBrowser >> newActionButton [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipPullBrowser.class.st b/Iceberg-TipUI/IceTipPullBrowser.class.st index 8337cf3717..2f61669678 100644 --- a/Iceberg-TipUI/IceTipPullBrowser.class.st +++ b/Iceberg-TipUI/IceTipPullBrowser.class.st @@ -3,18 +3,20 @@ I perform a pull of incoming commits. " Class { - #name : #IceTipPullBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPullBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPullBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipFetchInPullCommand forSpec ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPullBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPullModel @@ -24,20 +26,20 @@ IceTipPullBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullBrowser >> doPull [ self model newPullAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> labelForRemotePanel [ ^ 'Pull from remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPullBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipPullBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> titleForWindow [ ^ 'Pull {1}/{2} from {3}' format: { diff --git a/Iceberg-TipUI/IceTipPullCommand.class.st b/Iceberg-TipUI/IceTipPullCommand.class.st index 52249626c8..f51c0503b4 100644 --- a/Iceberg-TipUI/IceTipPullCommand.class.st +++ b/Iceberg-TipUI/IceTipPullCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a pull of incomming commits. I open a pull view window. " Class { - #name : #IceTipPullCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPullCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultDescription [ ^ 'Pulls into image all commits from your version to the origin remote HEAD' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultName [ ^ 'Pull' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> badge [ | result | @@ -33,7 +35,7 @@ IceTipPullCommand >> badge [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPullCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullCommand >> iconName [ ^ #down diff --git a/Iceberg-TipUI/IceTipPullModel.class.st b/Iceberg-TipUI/IceTipPullModel.class.st index 1dc3fc02fc..a539dc84d4 100644 --- a/Iceberg-TipUI/IceTipPullModel.class.st +++ b/Iceberg-TipUI/IceTipPullModel.class.st @@ -2,12 +2,14 @@ I'm a model to present pull commits and operations. " Class { - #name : #IceTipPullModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPullModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullModel >> commitModels [ ^ (self entity branch incomingCommitsFrom: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPullModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullModel >> newPullAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipPushAction.class.st b/Iceberg-TipUI/IceTipPushAction.class.st index 25ab9149af..63e2530b17 100644 --- a/Iceberg-TipUI/IceTipPushAction.class.st +++ b/Iceberg-TipUI/IceTipPushAction.class.st @@ -2,12 +2,14 @@ I perform a push. " Class { - #name : #IceTipPushAction, - #superclass : #IceTipAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushAction', + #superclass : 'IceTipAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipPushAction >> basicExecute [ UIManager default diff --git a/Iceberg-TipUI/IceTipPushBrowser.class.st b/Iceberg-TipUI/IceTipPushBrowser.class.st index 9947a1bdbc..a9fd2695c0 100644 --- a/Iceberg-TipUI/IceTipPushBrowser.class.st +++ b/Iceberg-TipUI/IceTipPushBrowser.class.st @@ -3,18 +3,20 @@ I perform a push of outgoing commits. " Class { - #name : #IceTipPushBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPushBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPushBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "No commands to add." ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPushBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPushModel @@ -24,21 +26,21 @@ IceTipPushBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushBrowser >> doPush [ self model newPushAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> labelForRemotePanel [ ^ 'Push to remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPushBrowser >> newActionButton [ ^ self newButton @@ -50,7 +52,7 @@ IceTipPushBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> titleForWindow [ ^ 'Push {1}/{2} to {3}' format: { diff --git a/Iceberg-TipUI/IceTipPushCommand.class.st b/Iceberg-TipUI/IceTipPushCommand.class.st index 282cc6f6e2..4c8aebefd0 100644 --- a/Iceberg-TipUI/IceTipPushCommand.class.st +++ b/Iceberg-TipUI/IceTipPushCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a push of outgoing commits. I open a push view window. " Class { - #name : #IceTipPushCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultDescription [ ^ 'Pushes pending commits to the origin repository (in current branch)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultName [ ^ 'Push' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> badge [ | result | @@ -34,7 +36,7 @@ IceTipPushCommand >> badge [ ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPushCommand >> execute [ (IceTipPushBrowser onRepositoryModel: self repositoryModel) open ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushCommand >> iconName [ ^ #up diff --git a/Iceberg-TipUI/IceTipPushModel.class.st b/Iceberg-TipUI/IceTipPushModel.class.st index 888cfbeccf..c41a476ead 100644 --- a/Iceberg-TipUI/IceTipPushModel.class.st +++ b/Iceberg-TipUI/IceTipPushModel.class.st @@ -2,12 +2,14 @@ I'm a model to present push commits and operations. " Class { - #name : #IceTipPushModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPushModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushModel >> commitModels [ ^ (self entity outgoingCommitsTo: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPushModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushModel >> newPushAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st index c0ff3c884f..a5791aa76d 100644 --- a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st +++ b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st @@ -15,8 +15,8 @@ IceTipReadOnlyForm new " Class { - #name : #IceTipReadOnlyFormBuilder, - #superclass : #Object, + #name : 'IceTipReadOnlyFormBuilder', + #superclass : 'Object', #instVars : [ 'labelColor', 'labelWidth', @@ -25,10 +25,12 @@ Class { 'spApplication', 'presenter' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpApplication [ "If you want to keep order, just send an OrderedDictionary" @@ -39,13 +41,13 @@ IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpAppl build ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> application: aSpApplication [ spApplication := aSpApplication ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> build [ presenter := spApplication newPresenter: SpPresenter. @@ -53,7 +55,7 @@ IceTipReadOnlyFormBuilder >> build [ ^ presenter ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> buildLayout [ | lastLabel fieldPresenter | lastLabel := items associations last key. @@ -84,26 +86,26 @@ IceTipReadOnlyFormBuilder >> buildLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultLabelWidth [ ^ 100 * self currentWorld displayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultRowHeight [ ^ 30 * self currentWorld displayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipReadOnlyFormBuilder >> initialize [ items := OrderedDictionary new. super initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> items: aDictionary [ items removeAll. @@ -111,37 +113,37 @@ IceTipReadOnlyFormBuilder >> items: aDictionary [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor [ ^ labelColor ifNil: [ labelColor := Smalltalk ui theme textColor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor: aColor [ ^ labelColor := aColor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth [ ^ labelWidth ifNil: [ self defaultLabelWidth ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth: aNumber [ ^ labelWidth := aNumber ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight [ ^ rowHeight ifNil: [ rowHeight := self defaultRowHeight ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight: aNumber [ rowHeight := aNumber diff --git a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st index 5ac1bb6832..d96de2a584 100644 --- a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st @@ -2,24 +2,26 @@ Command that launches a refresh of the commit tree during commit " Class { - #name : #IceTipRefreshCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRefreshCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultDescription [ ^ 'Refresh this change tree' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultName [ ^ 'Refresh' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRefreshCommitCommand >> execute [ self repositoryModel reset. @@ -28,13 +30,13 @@ IceTipRefreshCommitCommand >> execute [ self toolAnnouncer announce: (IceTipDiffRefreshed for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> iconName [ ^ #glamorousRefresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st index b93531803d..2388a31c59 100644 --- a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st @@ -7,23 +7,25 @@ self new openDialogWithSpec " Class { - #name : #IceTipRegisterRepositoryDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipRegisterRepositoryDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'types', 'repository', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> allTypes [ ^ types ifNil: [ types := IceTipRepositoryTypePanel allTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ self withoutNewRepository. @@ -31,7 +33,7 @@ IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ repository := aRepository ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doAccept [ | newRepository | @@ -42,7 +44,7 @@ IceTipRegisterRepositoryDialogPresenter >> doAccept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ repository @@ -50,32 +52,32 @@ IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ subdirectory: aRepository subdirectory ] -{ #category : #testing } +{ #category : 'testing' } IceTipRegisterRepositoryDialogPresenter >> isEditing [ ^ repository isNotNil ] -{ #category : #events } +{ #category : 'events' } IceTipRegisterRepositoryDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRegisterRepositoryDialogPresenter >> titleForWindow [ ^ 'Register project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutLocalRepository [ types := self allTypes reject: #isLocalRepository. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutNewRepository [ types := self allTypes reject: #isNewRepository. diff --git a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st index 197067b52f..e09b6bdb88 100644 --- a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that reloads the code of an already loaded package, discarding all changes done in the meantime that were not committed. " Class { - #name : #IceTipReloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipReloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultDescription [ ^ 'Reload selected package, discarding all changes.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultName [ ^ 'Reload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipReloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipReloadPackageCommand >> execute [ self packageModel reload. @@ -33,7 +35,7 @@ IceTipReloadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReloadPackageCommand >> iconName [ ^ #refresh diff --git a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st index 34937c7b68..ae2706a1ef 100644 --- a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st @@ -1,25 +1,27 @@ Class { - #name : #IceTipRemoteActionBrowser, - #superclass : #IceTipHistoryActionBrowser, + #name : 'IceTipRemoteActionBrowser', + #superclass : 'IceTipHistoryActionBrowser', #instVars : [ 'remotePanel', 'remoteLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRemoteActionBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "No commands to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRemoteActionBrowser class >> onRepositoryModel: aRepository [ ^ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoteActionBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -36,7 +38,7 @@ IceTipRemoteActionBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializePresenters [ super initializePresenters. @@ -51,7 +53,7 @@ IceTipRemoteActionBrowser >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. @@ -59,25 +61,25 @@ IceTipRemoteActionBrowser >> initializeWindow: aWindow [ aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> labelForRemotePanel [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> mainList [ ^ commitsPanel commitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel [ ^ remotePanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel: aSpPresenter [ remotePanel := aSpPresenter diff --git a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st index 88a28a1881..db2bb3ddd6 100644 --- a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st @@ -2,24 +2,26 @@ I'm a the abstract superclass of commands that act on remotes. " Class { - #name : #IceTipRemoteActionCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoteActionCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand class >> isAbstract [ ^ self == IceTipRemoteActionCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand >> canBeExecuted [ ^ self isRepositoryOperational and: [ self repositoryModel hasRemotes ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipRemoteActionCommand >> validateRemotesPresent [ self repositoryModel hasRemotes diff --git a/Iceberg-TipUI/IceTipRemoteActionModel.class.st b/Iceberg-TipUI/IceTipRemoteActionModel.class.st index 20b9262471..bac204af2f 100644 --- a/Iceberg-TipUI/IceTipRemoteActionModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionModel.class.st @@ -1,24 +1,26 @@ Class { - #name : #IceTipRemoteActionModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipRemoteActionModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> branchName [ ^ entity branchName ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionModel >> isRepositoryDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remote [ ^ remote ifNil: [ | head | head := self repositoryModel entity head. @@ -27,27 +29,27 @@ IceTipRemoteActionModel >> remote [ ifFalse: [ self remoteModels first entity ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModel [ ^ repositoryModel remoteModels detect: [ :e | e entity = self remote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModels [ ^ self repositoryModel remoteModels ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteName [ ^ self remote name, '/', self entity branch name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> useRemote: aRemoteModel [ remote := aRemoteModel entity. ] diff --git a/Iceberg-TipUI/IceTipRemoteModel.class.st b/Iceberg-TipUI/IceTipRemoteModel.class.st index 88688143f4..520a10d1cd 100644 --- a/Iceberg-TipUI/IceTipRemoteModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteModel.class.st @@ -2,14 +2,16 @@ I'm a model for IceRemote entries. " Class { - #name : #IceTipRemoteModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRemoteModel', + #superclass : 'IceTipEntityModel', #traits : 'TWithBranchModel', #classTraits : 'TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #comparing } +{ #category : 'comparing' } IceTipRemoteModel >> = anotherModel [ self species = anotherModel species ifFalse: [ ^ false ]. @@ -17,23 +19,23 @@ IceTipRemoteModel >> = anotherModel [ ^ entity = anotherModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> branches [ ^ self entity branches ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> description [ ^ '{1} <{2}>' format: { self name. self entity url } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newDeleteAction [ @@ -45,7 +47,7 @@ IceTipRemoteModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newFetchAction [ diff --git a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st index 8007441af0..67ab450880 100644 --- a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st +++ b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st @@ -2,36 +2,38 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRemotesTreeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemotesTreeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand class >> isAbstract [ ^ self == IceTipRemotesTreeCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item canActivateCommand: self ] diff --git a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st index e2b78de9dc..fbf5514850 100644 --- a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st @@ -2,43 +2,45 @@ I remove a credential from the credential store. " Class { - #name : #IceTipRemoveCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipRemoveCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultDescription [ ^ 'Removes the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultName [ ^ 'Remove' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoveCredentialCommand >> canBeExecuted [ ^ self item isDefault not ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveCredentialCommand >> execute [ self store removeCredential: self item. self tool refresh. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st index be305dcb9b..371f2f2475 100644 --- a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st @@ -2,30 +2,32 @@ Command that removes a package from the repository, without removing it from the system. " Class { - #name : #IceTipRemoveFromRepositoryPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoveFromRepositoryPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultDescription [ ^ 'Removes the current repository from the repository, without removing it from the system' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultName [ ^ 'Remove from repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveFromRepositoryPackageCommand >> execute [ self packageModel remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveFromRepositoryPackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st index c1872aeb06..23317b3c2b 100644 --- a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRemovePackageDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemovePackageDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', @@ -8,10 +8,12 @@ Class { 'removeFromRepositoryCheckbox', 'unloadFromImageCheckbox' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemovePackageDialogPresenter >> accept [ self removeFromRepositoryCheckbox state @@ -20,19 +22,19 @@ IceTipRemovePackageDialogPresenter >> accept [ ifTrue: [ self model unload ]. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove package {1}?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemovePackageDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -48,13 +50,13 @@ IceTipRemovePackageDialogPresenter >> defaultLayout [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ ^ (500 @@ -62,7 +64,7 @@ IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ scaledByDisplayScaleFactor "Yes, a magic number" ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -81,37 +83,37 @@ IceTipRemovePackageDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> removeFromRepositoryCheckbox [ ^ removeFromRepositoryCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> titleForWindow [ ^ 'Remove Package' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> unloadFromImageCheckbox [ ^ unloadFromImageCheckbox diff --git a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st index 448a16e9ed..71fe70061b 100644 --- a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRemoveRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemoveRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', 'confirmLabel', 'removeFileSystemCheckbox' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemoveRepositoryDialogPresenter >> accept [ (self removeFileSystemCheckbox state @@ -19,18 +21,18 @@ IceTipRemoveRepositoryDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove your repository {1} from your image?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -44,13 +46,13 @@ IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -60,7 +62,7 @@ IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -74,36 +76,36 @@ IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> removeFileSystemCheckbox [ ^ removeFileSystemCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> removeMessage [ ^ 'Also remove repository from file system' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> titleForWindow [ ^ 'Remove repository' diff --git a/Iceberg-TipUI/IceTipRepairAction.class.st b/Iceberg-TipUI/IceTipRepairAction.class.st index 32ed347aa6..787abea3ae 100644 --- a/Iceberg-TipUI/IceTipRepairAction.class.st +++ b/Iceberg-TipUI/IceTipRepairAction.class.st @@ -3,15 +3,17 @@ I'm a repair option. Repositories can be broken in several ways. My children will describe them and take the actions needed to perform the re-alignment of an image with its repository. " Class { - #name : #IceTipRepairAction, - #superclass : #IceTipAction, + #name : 'IceTipRepairAction', + #superclass : 'IceTipAction', #instVars : [ 'repositoryModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> allAvailableFor: aRepository [ ^ ((self allSubclasses select: [ :each | each isAvailableFor: aRepository ]) @@ -19,38 +21,38 @@ IceTipRepairAction class >> allAvailableFor: aRepository [ collect: #new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> help [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAbstract [ ^ self == IceTipRepairAction ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAvailableFor: aRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> order [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> title [ ^ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self context: aContext. @@ -58,7 +60,7 @@ IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> fetchAllRemotes [ | remotes | remotes := self repository remotes. @@ -72,32 +74,32 @@ IceTipRepairAction >> fetchAllRemotes [ self repository fetchFrom: each ] ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> help [ ^ self class help ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> icon [ ^ self class icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repositoryModel [ ^ repositoryModel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> title [ ^ self class title ] diff --git a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st index dd5395e074..cb040b7b29 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> help [ ^ 'Discard all changes in your image and checkout an existing branch. This action will checkout the branch in the repository and synchronize your image with your repository. @@ -23,12 +25,12 @@ This action opens a preview window before doing any change. This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> icon [ ^ self iconNamed: #branch ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -38,17 +40,17 @@ IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ and: [ aRepository project isUnborn or: [ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> title [ ^ 'Checkout an existing branch discarding image changes' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st index fa85dd2b84..f843cc3782 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st @@ -7,12 +7,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutNewBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutNewBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> help [ ^ 'It creates a new branch from the commit your image is pointing to. This will not lose any change in the image. @@ -22,12 +24,12 @@ This situation happens because the code loaded in your image does not correspond This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> title [ ^ 'Create a new branch pointing to your image commit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutNewBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st index 2bbf694e4d..229ce41e08 100644 --- a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairCloneRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCloneRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> help [ ^ 'Clone again the repository into a new location. @@ -23,29 +25,29 @@ So, this action will very probably let you in a detached status. You will need to re-synchronize your repository with another repair action.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> icon [ ^ self iconNamed: #smallAdd ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCloneRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> title [ ^ 'Clone again this repository in a new location' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCloneRepository >> basicExecute [ ((IceTipRegisterRepositoryDialogPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipRepairCommand.class.st b/Iceberg-TipUI/IceTipRepairCommand.class.st index ad3f612190..1ea3fd269e 100644 --- a/Iceberg-TipUI/IceTipRepairCommand.class.st +++ b/Iceberg-TipUI/IceTipRepairCommand.class.st @@ -2,36 +2,38 @@ Command that opens the repair window on a repository " Class { - #name : #IceTipRepairCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultDescription [ ^ 'Helps you to repair your repository when it is detached.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultName [ ^ 'Repair repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultToolbarItemName [ ^ 'Repair' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCommand >> execute [ ((IceTipRepairRepositoryDialogPresenter @@ -42,7 +44,7 @@ IceTipRepairCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st index 71012bf783..a0d2a6921c 100644 --- a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st +++ b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairCreateSubdirectory, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCreateSubdirectory', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> help [ ^ 'Create a new subdirectory for the code. @@ -20,28 +22,28 @@ It is possible that the directory has been deleted or never commited after creat This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCreateSubdirectory class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> title [ ^ 'Create code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCreateSubdirectory >> basicExecute [ self repositoryModel createSourceDirectory. diff --git a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st index 6a06d6a430..3fc00951ed 100644 --- a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st +++ b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairDiscardAndLoad, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairDiscardAndLoad', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> help [ ^ 'Discard all changes in your image and checkout the current commit (HEAD) in the repository. @@ -24,12 +26,12 @@ This situation happens because loaded code in your image is from a different com Opens a preview window with the incoming changes before doing any change.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> icon [ ^ self iconNamed: #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ and: [ aRepository head isDetached not ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> order [ ^ 40 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> title [ ^ 'Discard image changes and load repository version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairDiscardAndLoad >> basicExecute [ (IceTipCheckoutPreviewBrowser onBranch: self repositoryModel branchModel) @@ -58,7 +60,7 @@ IceTipRepairDiscardAndLoad >> basicExecute [ open ] -{ #category : #private } +{ #category : 'private' } IceTipRepairDiscardAndLoad >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairEditRepository.class.st b/Iceberg-TipUI/IceTipRepairEditRepository.class.st index 8850faf7bf..44a93839e4 100644 --- a/Iceberg-TipUI/IceTipRepairEditRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairEditRepository.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairEditRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairEditRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> help [ ^ 'You can edit the repository to inform another subdirectory name. Once the new subdirectory is updated, the packages in the repository are available. @@ -20,28 +22,28 @@ This happens because the source code directory has been moved or renamed. ' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> icon [ ^ self iconNamed: #edit ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairEditRepository class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> title [ ^ 'Edit the repository to select the correct code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairEditRepository >> basicExecute [ (IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st index c12b889730..74e0a17e52 100644 --- a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st @@ -6,12 +6,14 @@ matches if: " Class { - #name : #IceTipRepairFetchRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairFetchRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> help [ ^ 'You can fetch commits from a remote to find your image commit in your repository. This will not lose any change in the image or the repository. @@ -23,12 +25,12 @@ After doing the fetch, it is required to create a new branch to commit into the A second repair action will help you.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> icon [ ^ self iconNamed: #smallUpdate ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy referenceCommit isUnknownCommit" @@ -37,24 +39,24 @@ IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy referenceCommit isUnknownCommit ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> order [ ^ 15 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> title [ ^ 'Fetch remote commits including the commits of the image version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" self fetchAllRemotes ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st index 232abefec4..985b9b5f55 100644 --- a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairLocateRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairLocateRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> help [ ^ 'Locate this repository in your file system. @@ -23,29 +25,29 @@ You will need to re-synchronize your repository with another repair action. This happens if the repository has been removed from the disk or the image was pointing to a repository in another machine (For example, when sharing images with other machines / people).' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> icon [ ^ self iconNamed: #glamorousFolder ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairLocateRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> title [ ^ 'Locate this repository in your file system' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> basicExecute [ | dialog | @@ -61,12 +63,12 @@ IceTipRepairLocateRepository >> basicExecute [ open. ] -{ #category : #private } +{ #category : 'private' } IceTipRepairLocateRepository >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] diff --git a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st index 3ee897f53c..0f258921e7 100644 --- a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairMergeWithBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairMergeWithBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> help [ ^ 'This action checkouts an existing branch and loads the code in your image without discarding any change. This will not lose any change in the image but may lead to conflicts. If there are conflicts it opens a merge view. @@ -21,12 +23,12 @@ This situation happens because loaded code in your image is from a different com This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-commited changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> icon [ ^ self iconNamed: #merge ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -39,17 +41,17 @@ IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ aRepository head isDetached not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> title [ ^ 'Checkout an existing branch and merge the changes into the image (without discarding image changes)' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairMergeWithBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairProject.class.st b/Iceberg-TipUI/IceTipRepairProject.class.st index ce164f63e0..92caae1ec9 100644 --- a/Iceberg-TipUI/IceTipRepairProject.class.st +++ b/Iceberg-TipUI/IceTipRepairProject.class.st @@ -2,12 +2,14 @@ I'm an action to repair a project, which is useful when it answers true to #isUnborn. " Class { - #name : #IceTipRepairProject, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairProject', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> help [ ^ 'Edit the repository to add project meta-data. This action will create a .project file in the root of your repository adding meta information such as source code directory, project name, format and so on. @@ -15,12 +17,12 @@ This action will create a .project file in the root of your repository adding me This situation happens because your project does not have project meta-data and Iceberg does not know how to correctly interpret its data.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> icon [ ^ self iconNamed: #config ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairProject class >> isAvailableFor: aRepository [ "matches if: - workingCopy is atached @@ -32,17 +34,17 @@ IceTipRepairProject class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy project isUnborn ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> title [ ^ 'Create project meta-data' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairProject >> basicExecute [ ((IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st index 65432e1357..8ace58c44b 100644 --- a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st @@ -5,12 +5,14 @@ matches if: - workingCopy is detached AND there is no commit in the current available commits " Class { - #name : #IceTipRepairPullRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairPullRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> help [ ^ 'You can pull commits from a remote to put your image and your repository in sync. This will not lose any change in the image. @@ -20,12 +22,12 @@ This situation happens because the code loaded in your image is not in the branc This operation will modify the state of your working copy in disk. All non-commited changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> icon [ ^ self iconNamed: #down ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached AND there is no commit in the current available commits" @@ -37,17 +39,17 @@ IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ (aRepository includesCommit: aRepository workingCopy referenceCommit) not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> title [ ^ 'Pull remote commits to put your repository in sync' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairPullRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st index 9284c8ae2d..c67813e158 100644 --- a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRepairRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRepairRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'optionsList', 'detailPanel', @@ -8,16 +8,18 @@ Class { 'selectedOption', 'reasonPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepairRepositoryDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepairRepositoryDialogPresenter >> accept [ self closeWindow. @@ -26,13 +28,13 @@ IceTipRepairRepositoryDialogPresenter >> accept [ model: self model ] -{ #category : #'api - focus' } +{ #category : 'api - focus' } IceTipRepairRepositoryDialogPresenter >> defaultKeyboardFocus [ ^ optionsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepairRepositoryDialogPresenter >> defaultLayout [ self flag: #TODO. "Replace the fixed height with a correct style" @@ -44,19 +46,19 @@ IceTipRepairRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> detailPanel [ ^ detailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -70,7 +72,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ optionsList @@ -89,7 +91,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ whenActivatedDo: [ :selection | selection ifNotNil: [ self accept ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializePresenters [ reasonPanel := self newText @@ -108,31 +110,31 @@ IceTipRepairRepositoryDialogPresenter >> initializePresenters [ self initializeOptionsList ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> initializeReasonPanel [ reasonPanel text: self model longStatus ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> optionsList [ ^ optionsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> reasonPanel [ ^ reasonPanel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ selectedOption ifNotNil: [ @@ -141,14 +143,14 @@ IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> refreshDialogButtons [ self window ifNotNil: [ :aWindow | aWindow buttons first enabled: (selectedOption isNotNil) ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ selectedOption := selectedItem. @@ -157,13 +159,13 @@ IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> titleForWindow [ ^ 'Repair repository' diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 0bf3a8bff7..6f732e32db 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -5,17 +5,19 @@ I define basic actions and an entry point to manage each repository individually IceTipRepositoriesBrowser new open. " Class { - #name : #IceTipRepositoriesBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoriesBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'currentGroupPanel', 'repositoryNotebook', 'notifyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipFetchAllProjectCommand. @@ -26,7 +28,7 @@ IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -47,7 +49,7 @@ IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ super buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup. @@ -60,13 +62,13 @@ IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presente ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser class >> iconForWorldMenu [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #'world menu' } +{ #category : 'world menu' } IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ "Add a custom menu item to the world menu" @@ -80,13 +82,13 @@ IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ action: [ self new open ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> new [ ^ self newOnRepositoryProvider: IceRepository ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ | application | @@ -104,15 +106,16 @@ IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ notifyPanel layout add: (notifyPanel newLabel label: 'There is no libgit2 available in your system! Please verify everything is fine before continue.'; - yourself) + yourself). + notifyPanel show ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> connectPresenters [ repositoryNotebook whenSelectedPageChangedDo: [ :newPage | @@ -120,19 +123,19 @@ IceTipRepositoriesBrowser >> connectPresenters [ aPresenter updatePresenter ] ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> currentGroupPanel [ ^ currentGroupPanel ifNil: [ currentGroupPanel := self layout children first ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> defaultKeyboardFocus [ ^ repositoryNotebook ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoriesBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -141,7 +144,7 @@ IceTipRepositoriesBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> hasSelectedItem [ ^ repositoryNotebook selectedPage @@ -150,36 +153,37 @@ IceTipRepositoriesBrowser >> hasSelectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> iconForWindow [ ^ self class iconForWorldMenu ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initialExtentForWindow [ ^ (600 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initializePresenters [ notifyPanel := self newPresenter. notifyPanel layout: SpBoxLayout newVertical. notifyPanel addStyle: 'libgit2NotAvailable'. + notifyPanel hide. repositoryNotebook := self newNotebook ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> mainList [ "should not arrive here" ^ nil ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -187,20 +191,20 @@ IceTipRepositoriesBrowser >> openManagePackagesWindow [ execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanel [ "this method is using exclusively for testing." ^ repositoryNotebook pages first activePresenter ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelIsShowingRepository: anIceLibgitRepository [ ^ self projectsPanel isShowingRepository: anIceLibgitRepository ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ "this method is using exclusively for testing. it will answer the repository list form the projects page" @@ -208,21 +212,21 @@ IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ ^ self projectsPanel repositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryModels [ "this method is used exclusively for testing" ^ self projectsPanelRepositoryList items ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> refresh [ repositoryNotebook selectedPage ifNil: [ ^ self ]. repositoryNotebook selectedPage activePresenter updatePresenter ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> refreshCommands [ | rootGroup | @@ -233,13 +237,13 @@ IceTipRepositoriesBrowser >> refreshCommands [ refreshToolbarWith: rootGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> selectedItem [ ^ repositoryNotebook selectedPage @@ -247,7 +251,7 @@ IceTipRepositoriesBrowser >> selectedItem [ ifNil: [ nil ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -255,7 +259,7 @@ IceTipRepositoriesBrowser >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -264,13 +268,13 @@ IceTipRepositoriesBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> titleForWindow [ ^ 'Repositories' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> updatePresenter [ LGitLibrary uniqueInstance isAvailable @@ -287,7 +291,7 @@ IceTipRepositoriesBrowser >> updatePresenter [ self refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoriesModel.class.st b/Iceberg-TipUI/IceTipRepositoriesModel.class.st index 363bd7ed9a..8d3cf107d6 100644 --- a/Iceberg-TipUI/IceTipRepositoriesModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesModel.class.st @@ -2,21 +2,23 @@ I'm a model to provide access to all repositories registered. " Class { - #name : #IceTipRepositoriesModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoriesModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositories [ ^ repositoryProvider repositories collect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryGroups [ | sortGroup groups | @@ -46,7 +48,7 @@ IceTipRepositoriesModel >> repositoryGroups [ group: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st index 3932c52a2d..d4c3e05009 100644 --- a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st @@ -3,16 +3,18 @@ I'm a browser to show the internals of a repository. I will show remotes, branches, tags and all possible operations in low level repository (pull, push, branch. But all edit remotes, etc.) " Class { - #name : #IceTipRepositoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'sidebarTree', 'historyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddRemoteCommand. @@ -24,7 +26,7 @@ IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aC aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ | aGroup | @@ -50,30 +52,30 @@ IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> new [ self error: 'Use #onRepository:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepositoryNamed: aString [ ^ self onRepository: (IceRepository registry detect: [ :each | each name = aString ]) ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipRepositoryBrowser >> commitishSelected: ann [ historyPanel model: ann ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryBrowser >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -83,19 +85,19 @@ IceTipRepositoryBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> historyPanel [ ^ historyPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initialExtentForWindow [ ^ (1000 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializePresenters [ sidebarTree := self newTreeTable. @@ -109,7 +111,7 @@ IceTipRepositoryBrowser >> initializePresenters [ self initializeSidebarTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializeSidebarTree [ sidebarTree @@ -129,14 +131,14 @@ IceTipRepositoryBrowser >> initializeSidebarTree [ ifTrue: [ self commitishSelected: selection selectedItem ] ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ sidebarTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryBrowser >> refresh [ self refreshCommands. @@ -145,7 +147,7 @@ IceTipRepositoryBrowser >> refresh [ self selectCurrentBranch ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) ifFalse: [ ^ self ]. @@ -153,7 +155,7 @@ IceTipRepositoryBrowser >> refreshWhenRepository: ann [ self updatePresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> selectCurrentBranch [ | branch | @@ -166,13 +168,13 @@ IceTipRepositoryBrowser >> selectCurrentBranch [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> sidebarTree [ ^ sidebarTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -181,13 +183,13 @@ IceTipRepositoryBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> titleForWindow [ ^ 'Repository of ' , self model name ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipRepositoryCommand.class.st b/Iceberg-TipUI/IceTipRepositoryCommand.class.st index 31cfa04b4c..42a298249b 100644 --- a/Iceberg-TipUI/IceTipRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipRepositoryCommand.class.st @@ -2,42 +2,44 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRepositoryCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepositoryCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand class >> isAbstract [ ^ self == IceTipRepositoryCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryCommand >> announcer [ ^ self context toolAnnouncer ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> canBeExecuted [ ^ self repositoryModel isNotNil diff --git a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st index d8aec6c69b..a31676a85a 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st @@ -4,23 +4,25 @@ Repository groups are taken from tags added to the repository metadata (usually NOTICE: first tag will be taken as the group. " Class { - #name : #IceTipRepositoryGroupModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoryGroupModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider', 'repositories', 'group' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel class >> defaultLabel [ ^ 'Projects' ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryGroupModel >> containsRepository: aRepository [ (self group isEmpty and: [ aRepository project tags isEmpty ]) @@ -29,19 +31,19 @@ IceTipRepositoryGroupModel >> containsRepository: aRepository [ ^ aRepository project tags includes: self group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group [ ^ group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group: aGroup [ group := aGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> label [ ^ self group @@ -49,7 +51,7 @@ IceTipRepositoryGroupModel >> label [ ifEmpty: [ self class defaultLabel ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositories [ ^ repositories := repositoryProvider repositories @@ -57,7 +59,7 @@ IceTipRepositoryGroupModel >> repositories [ thenCollect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st index 783b0f3295..fd61359ed0 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRepositoryGroupPanel, - #superclass : #SpPresenter, + #name : 'IceTipRepositoryGroupPanel', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', #instVars : [ 'repositoryList', 'repositoryFilter' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ self flag: #HACK. "I extracted this panel from IceTipRepositoriesBrowser, @@ -21,7 +23,7 @@ IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: a forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ | rootCommandGroup | @@ -36,13 +38,13 @@ IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ ^ rootCommandGroup ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> allListItems [ ^ self model repositories ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryGroupPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,26 +53,26 @@ IceTipRepositoryGroupPanel >> defaultLayout [ yourself ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> defaultOutputPort [ ^ self outputSelectionPort ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryGroupPanel >> hasSelectedItem [ ^ repositoryList selectedItem notNil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializePresenters [ repositoryList := self newTable. @@ -78,7 +80,7 @@ IceTipRepositoryGroupPanel >> initializePresenters [ self initializeRepositoryFilter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ repositoryFilter := self newTextInput. @@ -88,7 +90,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryList [ repositoryList @@ -122,7 +124,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryList [ whenActivatedDo: [ self openManagePackagesWindow ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ "this method is using just for test" @@ -130,7 +132,7 @@ IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ aRepositoryModel entity = anIceLibgitRepository ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ^ self rootCommandsGroup @@ -138,7 +140,7 @@ IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ifNone: [ nil ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryGroupPanel >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -146,7 +148,7 @@ IceTipRepositoryGroupPanel >> openManagePackagesWindow [ execute ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> outputSelectionPort [ ^ (SpSelectionPort newPresenter: self) @@ -154,7 +156,7 @@ IceTipRepositoryGroupPanel >> outputSelectionPort [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> refreshRepositoryList [ repositoryList updateItemsKeepingSelection: (repositoryFilter text @@ -163,25 +165,25 @@ IceTipRepositoryGroupPanel >> refreshRepositoryList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryList [ ^ repositoryList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> selectedItem [ ^ repositoryList selectedItem ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -189,13 +191,13 @@ IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> updatePresenter [ self refreshRepositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st index 5d75754d1b..a9dab849ef 100644 --- a/Iceberg-TipUI/IceTipRepositoryModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryModel.class.st @@ -2,26 +2,28 @@ I'm a model for IceRepository entries. " Class { - #name : #IceTipRepositoryModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRepositoryModel', + #superclass : 'IceTipEntityModel', #traits : 'TIceCopyCommitId + TWithBranchModel', #classTraits : 'TIceCopyCommitId classTrait + TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel class >> unknownBranchLabel [ ^ 'Unknown' ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> = other [ ^ self species = other species and: [ self entity = other entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> allBranchModels [ ^ self entity allBranches collect: [ :each | @@ -31,14 +33,14 @@ IceTipRepositoryModel >> allBranchModels [ beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> availableRepairOptions [ ^ IceTipRepairAction allAvailableFor: self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModel [ ^ (IceTipBranchModel @@ -47,7 +49,7 @@ IceTipRepositoryModel >> branchModel [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModelFor: aBranch [ ^ (IceTipBranchModel repositoryModel: self @@ -55,7 +57,7 @@ IceTipRepositoryModel >> branchModelFor: aBranch [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchName [ (self isLibGitAvailable not or: [ self entity isMissing ]) @@ -64,36 +66,36 @@ IceTipRepositoryModel >> branchName [ ^ self entity head description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchNamed: aString [ ^ self entity branchNamed: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branches [ ^ self entity localBranches ] -{ #category : #checking } +{ #category : 'checking' } IceTipRepositoryModel >> checkMissing [ self isMissing ifTrue: [ IceError signal: ('You have no repository attached to project "{1}"' format: { self name }) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commit [ ^ self entity workingCopy referenceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitId [ ^ [ self entity headCommit id ] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitModelFor: aCommit [ ^ (IceTipCommitModel repositoryModel: self @@ -101,13 +103,13 @@ IceTipRepositoryModel >> commitModelFor: aCommit [ beCached ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> createSourceDirectory [ entity createSourceDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> description [ | text | @@ -117,7 +119,7 @@ IceTipRepositoryModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> descriptionDecorator [ (self isLibGitAvailable and: [ self entity isModified ]) @@ -125,24 +127,24 @@ IceTipRepositoryModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasRemotes [ ^ self entity remotes notEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasUnbornProject [ ^ self entity workingCopy project isUnborn ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> hash [ ^ self species hash bitXor: self entity hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> headModel [ | head | @@ -152,12 +154,12 @@ IceTipRepositoryModel >> headModel [ ifFalse: [ self commitModelFor: head ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> incomingCommits [ ^ self entity incomingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> info [ ^ { 'Branch' -> self entity branch name. @@ -166,46 +168,46 @@ IceTipRepositoryModel >> info [ } ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isCodeMissing [ ^ entity isCodeMissing ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLibGitAvailable [ ^ LGitLibrary uniqueInstance isAvailable ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLoaded [ ^ self entity loadedPackages notEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isMissing [ ^ self entity isMissing ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> localRepositoryMissing [ ^ 'Local repository missing' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> location [ ^ entity location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> longStatus [ (entity isMissing and: [ entity location isNil ]) @@ -229,17 +231,17 @@ IceTipRepositoryModel >> longStatus [ ^ 'Your repository seems ok. Please report a ticket in Iceberg''s issue tracker. If you can, please send us a backup of your image in this state for debugging.' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> matches: aString [ ^ self entity name matchesRegexIgnoringCase: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddPackagesAction: aCollection [ @@ -253,7 +255,7 @@ IceTipRepositoryModel >> newAddPackagesAction: aCollection [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ @@ -268,7 +270,7 @@ IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ @@ -279,7 +281,7 @@ IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ action: [ self entity createBranch: aString inCommit: aCommit ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCommitAction [ ^ IceTipCommitAction new @@ -287,7 +289,7 @@ IceTipRepositoryModel >> newCommitAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDeleteAction [ @@ -298,7 +300,7 @@ IceTipRepositoryModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDiscardChangesAction [ @@ -312,7 +314,7 @@ IceTipRepositoryModel >> newDiscardChangesAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newFetchAction [ @@ -324,7 +326,7 @@ IceTipRepositoryModel >> newFetchAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newForgetAction [ @@ -335,12 +337,12 @@ IceTipRepositoryModel >> newForgetAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfIncomingCommits [ ^ self incomingCommits size ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfOutgoingCommits [ ^ [ | size | self entity branch hasUpstream ifFalse: [ ^ '*' ]. @@ -351,40 +353,40 @@ IceTipRepositoryModel >> numberOfOutgoingCommits [ on: IceNotInBranch do: [ :e | '0' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> outgoingCommits [ ^ self entity outgoingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> packages [ ^ self entity workingCopy packages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> pushRemoteName [ ^ self entity branch upstream name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remoteModels [ ^ self entity remotes collect: [ :each | (IceTipRemoteModel repositoryModel: self on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remotes [ ^ entity remotes ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModel [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModelsByGroup [ | branches tags | branches := self allBranchModels. @@ -422,12 +424,12 @@ IceTipRepositoryModel >> repositoryModelsByGroup [ } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> shortCommitId [ ^ [self entity headCommit shortId] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> status [ [ | status incoming outgoing | @@ -465,7 +467,7 @@ IceTipRepositoryModel >> status [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusDecorator [ [ @@ -488,7 +490,7 @@ IceTipRepositoryModel >> statusDecorator [ ^ IceTipStatusDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusString [ [ | status incoming outgoing | @@ -525,13 +527,13 @@ IceTipRepositoryModel >> statusString [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> subdirectory [ ^ self entity subdirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> tagModels [ ^ self entity tags @@ -542,7 +544,7 @@ IceTipRepositoryModel >> tagModels [ beCached ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> updateLocation: aReference [ "change location" @@ -552,18 +554,18 @@ IceTipRepositoryModel >> updateLocation: aReference [ Iceberg announcer announce: (IceRepositoryModified for: self entity) ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> verifyDirectoryStructureIfMissing: aBlock [ self entity isMissing ifTrue: [ ^ aBlock value: self localRepositoryMissing ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopy [ ^ IceTipWorkingCopyModel on: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopyDiff [ diff --git a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st index 5d7d48dc7e..a5bff37e31 100644 --- a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st @@ -3,8 +3,8 @@ I'm a generic repository type panel. I'm used as part of the creation dialog and to edit repository properties. " Class { - #name : #IceTipRepositoryTypePanel, - #superclass : #IceTipPresenter, + #name : 'IceTipRepositoryTypePanel', + #superclass : 'IceTipPresenter', #instVars : [ 'projectLocationLabel', 'projectLocation', @@ -12,10 +12,12 @@ Class { 'remoteInputText', 'repository' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> allTypes [ ^ ((self allSubclasses reject: #isAbstract) @@ -23,37 +25,37 @@ IceTipRepositoryTypePanel class >> allTypes [ collect: #new ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel class >> isAbstract [ ^ self = IceTipRepositoryTypePanel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> order [ ^ 0 ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryTypePanel >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation pathString ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializePresenters [ self initializeProjectLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeProjectLocation [ projectLocationLabel := self newLabel label: 'Local directory'. @@ -63,7 +65,7 @@ IceTipRepositoryTypePanel >> initializeProjectLocation [ location: self defaultLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeRemoteURL [ remoteLabel := self newLabel label: 'Remote URL'; yourself. @@ -73,50 +75,50 @@ IceTipRepositoryTypePanel >> initializeRemoteURL [ yourself. ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isLocalRepository [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isNewRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> newRepository [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> projectLocation [ ^ projectLocation ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteInputText [ ^ remoteInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteLabel [ ^ remoteLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> repository: aRepository [ "Used if editing an existing repository" repository := aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> validate [ ^ self subclassResponsibility diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index a92054e657..fe4979489e 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -2,37 +2,39 @@ I'm a command to reset the selected branch to the selected commit. It does not modify the working copy. " Class { - #name : #IceTipResetBranchToThisCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipResetBranchToThisCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipResetBranchToThisCommitCommand class >> defaultDescription [ ^ 'Resets the selected branch to the selected commit. It does not modify the working copy (!!).' ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [ ^ 'Reset ', self selectedBranch name, ' to commit ', self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> execute [ self selectedBranch resetToCommit: self selectedCommitish. Iceberg announcer announce: (IceRepositoryModified for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> iconName [ ^ #bottom ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipResetBranchToThisCommitCommand >> name [ ^ self context @@ -40,13 +42,13 @@ IceTipResetBranchToThisCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedBranch [ ^ self context model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st index 2a35d1e302..32620f7057 100644 --- a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st +++ b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st @@ -3,24 +3,26 @@ I'm a command to install a chunk of code from a commit (shown in a diff) into th ""chunk"" can be a package, class or single method. " Class { - #name : #IceTipRevertChangeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRevertChangeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultDescription [ ^ 'Revert selected change in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultName [ ^ 'Revert change' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> execute [ UIManager default @@ -33,13 +35,13 @@ IceTipRevertChangeCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRevertChangeCommand >> iconName [ ^ #smallUndo ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> tool [ "We consider the diffPanel of the context as our tool. This is important because we have to announce in the same Announcer instance that is subscribed for our news." diff --git a/Iceberg-TipUI/IceTipSaveImageAction.class.st b/Iceberg-TipUI/IceTipSaveImageAction.class.st index a60893f771..0dc8f6057b 100644 --- a/Iceberg-TipUI/IceTipSaveImageAction.class.st +++ b/Iceberg-TipUI/IceTipSaveImageAction.class.st @@ -4,12 +4,14 @@ I implement the action of saving the image. I'm used by the presenter that prepares the commit. " Class { - #name : #IceTipSaveImageAction, - #superclass : #Object, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSaveImageAction', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execution } +{ #category : 'execution' } IceTipSaveImageAction >> execute [ Smalltalk saveSession. diff --git a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st index 69334d31e0..4b30645958 100644 --- a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st @@ -3,24 +3,26 @@ Implements the select all option behavior in the ""Select New Packages to Load"" " Class { - #name : #IceTipSelectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultName [ ^ 'Select all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSelectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display and they are not all selected " @@ -30,7 +32,7 @@ IceTipSelectAllPackagesCommand >> canBeExecuted [ ^ pkgList items notEmpty and: [ pkgList items size ~= pkgList selectedItems size ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipSelectAllPackagesCommand >> execute [ " Private - Select all the receiver's packages " @@ -38,7 +40,7 @@ IceTipSelectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectAllPackagesCommand >> iconName [ ^ #checkboxSelected diff --git a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st index c8218a5b92..25f6293bb2 100644 --- a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st @@ -2,12 +2,14 @@ Provides common behavior to accesing the packages list presenters in its context. " Class { - #name : #IceTipSelectPackagesCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectPackagesCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipSelectPackagesCommand >> packagesList [ " Answer a including the receiver's packages " diff --git a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st index 51ece93142..9ed3ec2535 100644 --- a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st +++ b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipSelectRemotePresenter, - #superclass : #SpPresenter, + #name : 'IceTipSelectRemotePresenter', + #superclass : 'SpPresenter', #instVars : [ 'remoteList', 'addButton', 'model' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> addButton [ ^ addButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipSelectRemotePresenter >> addRemote [ ((IceTipAddRemoteDialogPresenter @@ -30,7 +32,7 @@ IceTipSelectRemotePresenter >> addRemote [ open ] -{ #category : #layout } +{ #category : 'layout' } IceTipSelectRemotePresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -40,13 +42,13 @@ IceTipSelectRemotePresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> icon [ ^ self iconNamed: #add ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> initializePresenters [ remoteList := self newDropList @@ -60,44 +62,44 @@ IceTipSelectRemotePresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> label: aString [ self remoteLabel label: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> refresh [ remoteList items: self model remoteModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> remoteList [ ^ remoteList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> selectRemoteNamed: aString [ remoteList selectItem: (self model remoteModels detect: [ :each | each name = aString ]) ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipSelectRemotePresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> updatePresenter [ self refresh. diff --git a/Iceberg-TipUI/IceTipSettingsCommand.class.st b/Iceberg-TipUI/IceTipSettingsCommand.class.st index 7fd84a78c0..487cfeffdc 100644 --- a/Iceberg-TipUI/IceTipSettingsCommand.class.st +++ b/Iceberg-TipUI/IceTipSettingsCommand.class.st @@ -2,31 +2,33 @@ Command that opens the settings on a repository " Class { - #name : #IceTipSettingsCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSettingsCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultDescription [ ^ 'Open settings browser to configure Iceberg' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultName [ ^ 'Settings' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSettingsCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipSettingsCommand >> execute [ | browser window path | @@ -41,19 +43,19 @@ IceTipSettingsCommand >> execute [ browser expandNodePath: path first contents first contents first path. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> iconName [ ^ #configuration ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shortcutKey [ ^ $n meta ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipSpCommand.class.st b/Iceberg-TipUI/IceTipSpCommand.class.st index 41ad221c73..02907cc53e 100644 --- a/Iceberg-TipUI/IceTipSpCommand.class.st +++ b/Iceberg-TipUI/IceTipSpCommand.class.st @@ -4,27 +4,29 @@ I am a CmUICommand that is specialized for Iceberg UI. In particular, I'm used to wrap instances of IceTipCommand in a IceTipBrowser. " Class { - #name : #IceTipSpCommand, - #superclass : #CmUICommand, + #name : 'IceTipSpCommand', + #superclass : 'CmUICommand', #instVars : [ 'presenterBuildingStrategy' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> buildPresenter [ ^ self presenterBuildingStrategy resultOn: self ] -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> configureAsToolbarButton [ self presenterBuildingStrategy: IceTipToolbarButtonStrategy new ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ self displayStrategy @@ -33,30 +35,30 @@ IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ do: aBlock ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> ifVisible: aBlock [ self displayStrategy ifVisible: self do: aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSpCommand >> initialize [ super initialize. self configureAsToolbarButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy [ ^ presenterBuildingStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy: aStrategy [ presenterBuildingStrategy := aStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> toolbarItemName [ ^ self decoratedCommand toolbarItemName diff --git a/Iceberg-TipUI/IceTipStandardAction.class.st b/Iceberg-TipUI/IceTipStandardAction.class.st index 6d97da6496..205c3bf83c 100644 --- a/Iceberg-TipUI/IceTipStandardAction.class.st +++ b/Iceberg-TipUI/IceTipStandardAction.class.st @@ -4,27 +4,29 @@ I will perform an action by informing user what's happening. I will also check for errors happening while performing the task and try to recover from them. " Class { - #name : #IceTipStandardAction, - #superclass : #IceTipAction, + #name : 'IceTipStandardAction', + #superclass : 'IceTipAction', #instVars : [ 'message', 'successAnnounceBlock', 'actionBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action [ ^ actionBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action: aBlock [ actionBlock := aBlock ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> basicExecute [ | result | @@ -38,35 +40,35 @@ IceTipStandardAction >> basicExecute [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> do: aBlock [ self action: aBlock. self execute ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> execute: aBlock [ self action: aBlock. self execute ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message: anObject [ message := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessAnnounce: aValuable [ successAnnounceBlock := aValuable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessRepositoryModified [ ^ self onSuccessAnnounce: [ IceRepositoryModified for: self repository ] ] diff --git a/Iceberg-TipUI/IceTipStatusDecorator.class.st b/Iceberg-TipUI/IceTipStatusDecorator.class.st index ba1f418e96..47bd5ea718 100644 --- a/Iceberg-TipUI/IceTipStatusDecorator.class.st +++ b/Iceberg-TipUI/IceTipStatusDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> error [ ^ IceTipStatusDecoratorError uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> warning [ ^ IceTipStatusDecoratorWarning uniqueInstance diff --git a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st index c68d74a199..b17b0b0531 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecoratorError, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorError', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorError >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipStatusDecoratorError >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st index 4ab0410f00..27b044612c 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipStatusDecoratorWarning, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorWarning', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorWarning >> color [ ^ Smalltalk ui theme warningTextColor diff --git a/Iceberg-TipUI/IceTipStyleContributor.class.st b/Iceberg-TipUI/IceTipStyleContributor.class.st index 57fadcd53a..85cad5d70c 100644 --- a/Iceberg-TipUI/IceTipStyleContributor.class.st +++ b/Iceberg-TipUI/IceTipStyleContributor.class.st @@ -4,12 +4,14 @@ This class is call by Spec2 to extend the default stylesheet. Check its superclass to understand the way of working. " Class { - #name : #IceTipStyleContributor, - #superclass : #StPharoStyleContributor, - #category : #'Iceberg-TipUI-Styles' + #name : 'IceTipStyleContributor', + #superclass : 'StPharoStyleContributor', + #category : 'Iceberg-TipUI-Styles', + #package : 'Iceberg-TipUI', + #tag : 'Styles' } -{ #category : #styles } +{ #category : 'styles' } IceTipStyleContributor >> styleSheetContribution [ ^ SpStyle newApplication diff --git a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st index 20245a7b30..2cf032c786 100644 --- a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st +++ b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st @@ -8,12 +8,14 @@ I will switch first to the new branch, and then I will perform a merge with curr This strategy is used to re-attach image when it is detached from current development branch. " Class { - #name : #IceTipSwitchAndMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipSwitchAndMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipSwitchAndMergeType >> newMergeAction: aModel [ ^ aModel newSwitchAndMergeAction diff --git a/Iceberg-TipUI/IceTipTagDecorator.class.st b/Iceberg-TipUI/IceTipTagDecorator.class.st index 695df71986..52aafff355 100644 --- a/Iceberg-TipUI/IceTipTagDecorator.class.st +++ b/Iceberg-TipUI/IceTipTagDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipTagDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagDecorator >> color [ ^ Smalltalk ui theme disabledColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTagDecorator >> isItalic [ ^ true diff --git a/Iceberg-TipUI/IceTipTagModel.class.st b/Iceberg-TipUI/IceTipTagModel.class.st index cfd67df83a..cc72af64a0 100644 --- a/Iceberg-TipUI/IceTipTagModel.class.st +++ b/Iceberg-TipUI/IceTipTagModel.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTagModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> commitModels [ | commits | @@ -17,7 +19,7 @@ IceTipTagModel >> commitModels [ ^ commits ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> delete [ @@ -28,19 +30,19 @@ IceTipTagModel >> delete [ do: [ self repositoryModel entity removeTag: self entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> description [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" diff --git a/Iceberg-TipUI/IceTipTextDecorator.class.st b/Iceberg-TipUI/IceTipTextDecorator.class.st index 879c33d06a..0530538c8a 100644 --- a/Iceberg-TipUI/IceTipTextDecorator.class.st +++ b/Iceberg-TipUI/IceTipTextDecorator.class.st @@ -1,44 +1,46 @@ Class { - #name : #IceTipTextDecorator, - #superclass : #Object, + #name : 'IceTipTextDecorator', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator class >> none [ ^ IceTipTextDecoratorNone uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> uniqueInstance [ self = IceTipTextDecorator ifTrue: [ ^ self error: 'I''m abstract, use one of my children.' ]. ^ uniqueInstance ifNil: [ uniqueInstance := super new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme textColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isBold [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isItalic [ ^ false diff --git a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st index 5bfcdfb1db..79c406d278 100644 --- a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st +++ b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTextDecoratorNone, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTextDecoratorNone', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } diff --git a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st index 610e84556c..ceb50f8d8a 100644 --- a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st +++ b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st @@ -3,18 +3,20 @@ I'm a strategy to build Spec2 buttons foro a toolar wrapping a IceTipSpCommand. " Class { - #name : #IceTipToolbarButtonStrategy, - #superclass : #IceTipCommandToPresenterBuildingStrategy, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarButtonStrategy', + #superclass : 'IceTipCommandToPresenterBuildingStrategy', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipToolbarButtonStrategy >> buttonPresenterClass [ ^ SpToolbarButtonPresenter ] -{ #category : #public } +{ #category : 'public' } IceTipToolbarButtonStrategy >> resultOn: aCommand [ | aButtonPresenter | diff --git a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st index 67f6838fb7..91cc8f7fce 100644 --- a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st +++ b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st @@ -3,12 +3,14 @@ I'm a SpToolbarPresenterBuilder that delegates to the command the decision to ac " Class { - #name : #IceTipToolbarPresenterBuilder, - #superclass : #SpToolbarPresenterBuilder, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarPresenterBuilder', + #superclass : 'SpToolbarPresenterBuilder', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipToolbarPresenterBuilder >> visitCommand: anEntry [ anEntry ifVisible: [ super visitCommand: anEntry ] diff --git a/Iceberg-TipUI/IceTipTreeBranch.class.st b/Iceberg-TipUI/IceTipTreeBranch.class.st index 2c2c76c0ba..048ef0aeb2 100644 --- a/Iceberg-TipUI/IceTipTreeBranch.class.st +++ b/Iceberg-TipUI/IceTipTreeBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeBranch, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeBranch', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeBranch >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnBranch: self ] diff --git a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st index abe4c6c3f2..6d6c8e77c2 100644 --- a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st @@ -3,31 +3,33 @@ A generic command to collapse a tree. It sends `doCollapseSelection` message to its context. " Class { - #name : #IceTipTreeCollapseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeCollapseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultDescription [ ^ 'Collapse selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultName [ ^ 'Collapse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeCollapseCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeCollapseCommand >> execute [ self context doCollapseSelection diff --git a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st index b3e6aab770..c7ff5ac195 100644 --- a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st @@ -2,37 +2,39 @@ A generic command to expand tree items within a tree. " Class { - #name : #IceTipTreeExpandCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeExpandCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultDescription [ ^ 'Expand selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultName [ ^ 'Expand' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeExpandCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeExpandCommand >> execute [ self context doExpandSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeExpandCommand >> iconName [ ^ nil diff --git a/Iceberg-TipUI/IceTipTreeGroup.class.st b/Iceberg-TipUI/IceTipTreeGroup.class.st index bf0b91e110..3de0ec917c 100644 --- a/Iceberg-TipUI/IceTipTreeGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeGroup.class.st @@ -4,16 +4,18 @@ I keep groups with elements. I can provide also a contexts for menu operations and other kind of options to be associated with group. " Class { - #name : #IceTipTreeGroup, - #superclass : #IceTipTreeNode, + #name : 'IceTipTreeGroup', + #superclass : 'IceTipTreeNode', #instVars : [ 'name', 'children' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName children: aCollection [ ^ self new name: aName; @@ -21,7 +23,7 @@ IceTipTreeGroup class >> name: aName children: aCollection [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ ^ self new name: aName; @@ -30,7 +32,7 @@ IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> addChild: anObject [ children ifNil: [ children := OrderedCollection new ]. children add: anObject. @@ -38,23 +40,23 @@ IceTipTreeGroup >> addChild: anObject [ ^ anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children [ ^ children ifNil: [ #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children: aCollection [ children := aCollection. children do: [ :each | each parent: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> ensurePath: aPath [ | first next | @@ -67,34 +69,34 @@ IceTipTreeGroup >> ensurePath: aPath [ ifEmpty: [ next ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isGroup [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isSameAs: aNode [ ^ aNode species = self species and: [ self name = aNode name and: [ aNode name notNil ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name: anObject [ name := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock [ ^ self traversingDo: aBlock parents: #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray. self children do: [ :each | diff --git a/Iceberg-TipUI/IceTipTreeItem.class.st b/Iceberg-TipUI/IceTipTreeItem.class.st index bea3c80b69..62ce9f9737 100644 --- a/Iceberg-TipUI/IceTipTreeItem.class.st +++ b/Iceberg-TipUI/IceTipTreeItem.class.st @@ -2,36 +2,38 @@ I'm a leaf element of a tree. " Class { - #name : #IceTipTreeItem, - #superclass : #IceTipTreeNode, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeItem', + #superclass : 'IceTipTreeNode', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> description [ ^ self model description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> descriptionDecorator [ ^ self model descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeItem >> isSameAs: aNode [ ^ aNode species = self species and: [ self model = aNode model ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> shortDescription [ ^ self model shortDescription ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray diff --git a/Iceberg-TipUI/IceTipTreeNode.class.st b/Iceberg-TipUI/IceTipTreeNode.class.st index 43b31c752c..932a612b46 100644 --- a/Iceberg-TipUI/IceTipTreeNode.class.st +++ b/Iceberg-TipUI/IceTipTreeNode.class.st @@ -5,38 +5,40 @@ I understand - icon " Class { - #name : #IceTipTreeNode, - #superclass : #Object, + #name : 'IceTipTreeNode', + #superclass : 'Object', #instVars : [ 'model', 'parent', 'icon' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeNode class >> on: aModel [ ^ self new model: aModel ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> canActivateCommand: aCommandClass [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> children [ ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> description [ ^ self subclassResponsibility ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipTreeNode >> doesNotUnderstand: aMessage [ "redirect to model to provide polymorphism." self flag: #pharoTodo. "I'm not sure this is good practice... we'll see how it works" @@ -44,59 +46,59 @@ IceTipTreeNode >> doesNotUnderstand: aMessage [ ^ aMessage sendTo: self model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon [ ^ icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon: anIcon [ icon := anIcon ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isGroup [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isLeaf [ ^ self isGroup not ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isSameAs: aNode [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent [ ^ parent ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent: anObject [ parent := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> path [ ^ self parent ifNotNil: [ :p | p path, { self } ] ifNil: [ { self } ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> traversingDo: aBlock parents: anArray [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipTreeRemote.class.st b/Iceberg-TipUI/IceTipTreeRemote.class.st index ca4a7d6761..df832c0592 100644 --- a/Iceberg-TipUI/IceTipTreeRemote.class.st +++ b/Iceberg-TipUI/IceTipTreeRemote.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeRemote, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRemote', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeRemote >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnRemote: self ] diff --git a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st index 641cdf415b..34b4cacef9 100644 --- a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTreeRepositoryGroup, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRepositoryGroup', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } diff --git a/Iceberg-TipUI/IceTipTreeTag.class.st b/Iceberg-TipUI/IceTipTreeTag.class.st index 1f930e5759..5369001c4b 100644 --- a/Iceberg-TipUI/IceTipTreeTag.class.st +++ b/Iceberg-TipUI/IceTipTreeTag.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeTag, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeTag', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeTag >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnTag: self ] diff --git a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st index 799a7e886a..95664d05d8 100644 --- a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st @@ -7,30 +7,32 @@ It gives the user with two checkboxes to choose: Right now this is only shown for loaded packages. " Class { - #name : #IceTipUnloadAndRemovePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadAndRemovePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultDescription [ ^ 'Opens a dialog to choose between unloading from system and/or removing a package from the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultName [ ^ 'Unload and/or remove from repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadAndRemovePackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadAndRemovePackageCommand >> execute [ (IceTipRemovePackageDialogPresenter @@ -41,7 +43,7 @@ IceTipUnloadAndRemovePackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadAndRemovePackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st index 6ca10d560f..ba89f54d03 100644 --- a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st @@ -2,36 +2,38 @@ Command to unload a package from the system, keeping it in the repository " Class { - #name : #IceTipUnloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultDescription [ ^ 'Unload selected package from the system, but keep it in the repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultName [ ^ 'Unload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadPackageCommand >> execute [ self packageModel unload ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadPackageCommand >> iconName [ ^ #smallCancel diff --git a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st index 9527d0f50e..f2b6ae1931 100644 --- a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st @@ -3,24 +3,26 @@ Implements the unselect all option behavior in the ""Select New Packages to Load " Class { - #name : #IceTipUnselectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnselectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnselectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipUnselectAllPackagesCommand class >> defaultName [ ^ 'Unselect all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnselectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display " @@ -30,7 +32,7 @@ IceTipUnselectAllPackagesCommand >> canBeExecuted [ ^ pkgList items notEmpty ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnselectAllPackagesCommand >> execute [ " Private - Unselect all the receiver's packages " @@ -38,7 +40,7 @@ IceTipUnselectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnselectAllPackagesCommand >> iconName [ ^ #checkboxUnselected diff --git a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st index c21462781d..57a7aa7cd3 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st @@ -8,8 +8,8 @@ For versions, I show the same commands of a regular history browser, but add som " Class { - #name : #IceTipVersionHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipVersionHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'selectedModel', @@ -17,16 +17,18 @@ Class { 'diffPage', 'commitPanel' ], - #category : #'Iceberg-TipUI-View-Versions' + #category : 'Iceberg-TipUI-View-Versions', + #package : 'Iceberg-TipUI', + #tag : 'View-Versions' } -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipInstallVersionCommand } @@ -35,7 +37,7 @@ IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter f ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ ^ self on: (IceTipVersionHistoryModel @@ -44,13 +46,13 @@ IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipVersionHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -59,13 +61,13 @@ IceTipVersionHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initialExtentForWindow [ ^ (700@700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitList [ commitList @@ -94,7 +96,7 @@ IceTipVersionHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -106,7 +108,7 @@ IceTipVersionHistoryBrowser >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -116,21 +118,21 @@ IceTipVersionHistoryBrowser >> initializePresenters [ self initializeCommitPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipVersionHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPage [ ^ SpNotebookPage @@ -139,7 +141,7 @@ IceTipVersionHistoryBrowser >> newDiffPage [ provider: [ self newDiffPresenter ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ ^ (self instantiate: SpDiffPresenter) @@ -148,7 +150,7 @@ IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ showOptions: false ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newDiffPresenter [ selectedModel ifNil: [ ^ self ]. @@ -159,7 +161,7 @@ IceTipVersionHistoryBrowser >> newDiffPresenter [ right: selectedModel source ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newInfoPage [ ^ SpNotebookPage @@ -169,14 +171,14 @@ IceTipVersionHistoryBrowser >> newInfoPage [ ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newVersionInfoPresenter [ selectedModel ifNil: [ ^ self ]. ^ IceTipReadOnlyFormBuilder newBuiltFor: selectedModel info application: self application ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> refresh [ commitList items: self model commitModels. @@ -186,7 +188,7 @@ IceTipVersionHistoryBrowser >> refresh [ self refreshCommitTabPanel ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ selectedModel ifNil: [ ^ self ]. @@ -198,14 +200,14 @@ IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ commitPanel resetAllPageContents ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipVersionHistoryBrowser >> selectionChanged: aSelectedItem [ selectedModel := aSelectedItem. self refreshCommitTabPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> titleForWindow [ ^ self model @@ -213,7 +215,7 @@ IceTipVersionHistoryBrowser >> titleForWindow [ ifNil: [ 'Versions' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st index 59bfc94f75..b5fd22c176 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st @@ -2,22 +2,24 @@ I'm a model to provide the history of a method. " Class { - #name : #IceTipVersionHistoryModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipVersionHistoryModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'commitModels' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModelAfter: aModel [ ^ self commitModels after: aModel ifAbsent: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModels [ ^ commitModels ifNil: [ commitModels := self retrieveHistory collect: [ :each | @@ -27,18 +29,18 @@ IceTipVersionHistoryModel >> commitModels [ beCached ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> name [ ^ '{1}>>{2}' format: { self entity origin name. self entity selector } ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryModel >> retrieveHistory [ self repositoryModel checkMissing. diff --git a/Iceberg-TipUI/IceTipVersionModel.class.st b/Iceberg-TipUI/IceTipVersionModel.class.st index a416351dc2..4382df60ce 100644 --- a/Iceberg-TipUI/IceTipVersionModel.class.st +++ b/Iceberg-TipUI/IceTipVersionModel.class.st @@ -5,12 +5,14 @@ I'm a model for IceLogVersion entries. - I can install a certain method version. " Class { - #name : #IceTipVersionModel, - #superclass : #IceTipCommitModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipVersionModel', + #superclass : 'IceTipCommitModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #private } +{ #category : 'private' } IceTipVersionModel >> basicInstall [ | definition | @@ -20,12 +22,12 @@ IceTipVersionModel >> basicInstall [ classified: definition category ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> commit [ ^ self entity commit ] -{ #category : #actions } +{ #category : 'actions' } IceTipVersionModel >> install [ @@ -36,7 +38,7 @@ IceTipVersionModel >> install [ execute: [ self basicInstall ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> source [ ^ self entity source ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st index ebf9dd35c6..e9379df0ba 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st @@ -5,17 +5,19 @@ I show the packages managed by this repository and a series of actions to proper (IceTipPackagesBrowser forRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipWorkingCopyBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipWorkingCopyBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'statusBar', 'packagesTable', 'filterInput' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipRepairCommand. @@ -33,7 +35,7 @@ IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: a ] -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipBrowsePackageCommand. @@ -47,19 +49,19 @@ IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> allListItems [ ^ self model packageModels ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ | commandClass | @@ -72,7 +74,7 @@ IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> connectPresenters [ super connectPresenters. @@ -82,7 +84,7 @@ IceTipWorkingCopyBrowser >> connectPresenters [ ] -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -91,20 +93,20 @@ IceTipWorkingCopyBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> filterInput [ ^ filterInput ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> iconFor: aPackage [ self decorations do: [ :each | @@ -114,13 +116,13 @@ IceTipWorkingCopyBrowser >> iconFor: aPackage [ ^ self iconNamed: #package ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePackagesTable [ packagesTable @@ -147,7 +149,7 @@ IceTipWorkingCopyBrowser >> initializePackagesTable [ whenActivatedDo: [ :selection | self browsePackage: selection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePresenters [ filterInput := self newTextInput. @@ -156,7 +158,7 @@ IceTipWorkingCopyBrowser >> initializePresenters [ statusBar := self instantiate: IceTipWorkingCopyStatusBarPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -165,25 +167,25 @@ IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> mainList [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> packageModel [ ^ packagesTable selectedItem ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> packagesTable [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> refresh [ self refreshCommands. @@ -191,7 +193,7 @@ IceTipWorkingCopyBrowser >> refresh [ self refreshPackagesTable ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshPackagesTable [ packagesTable items: (filterInput text @@ -200,13 +202,13 @@ IceTipWorkingCopyBrowser >> refreshPackagesTable [ ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshStatusBar [ statusBar model: self model ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ (ann repository isNil or: [ @@ -217,25 +219,25 @@ IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipWorkingCopyBrowser >> setModelBeforeInitialization: aRepositoryModel [ self model: ( IceTipWorkingCopyModel on: aRepositoryModel ) ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyBrowser >> showsPackageNamed: aString [ ^ packagesTable items anySatisfy: [ :packageModel | packageModel name = aString ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> statusBar [ ^ statusBar ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -244,13 +246,13 @@ IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> titleForWindow [ ^ 'Working copy of ', self model repositoryName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st index e116fd4bcb..507b1e2c59 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st @@ -2,30 +2,32 @@ I'm a diff model that represents a diff between the HEAD commit and the image working copy. " Class { - #name : #IceTipWorkingCopyDiffModel, - #superclass : #IceTipDiffModel, + #name : 'IceTipWorkingCopyDiffModel', + #superclass : 'IceTipDiffModel', #instVars : [ 'diff' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyDiffModel >> diff [ ^ diff ifNil: [ diff := self newDiff ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyDiffModel >> isEmpty [ ^ self diff isEmpty ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipWorkingCopyDiffModel >> newDiff [ ^ self entity workingCopyDiff ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyDiffModel >> resetDiff [ diff := nil ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st index 21b5734be7..201e8943a9 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st @@ -2,51 +2,53 @@ I'm a model to for IceWorkingCopy entries. " Class { - #name : #IceTipWorkingCopyModel, - #superclass : #IceTipModel, + #name : 'IceTipWorkingCopyModel', + #superclass : 'IceTipModel', #instVars : [ 'sortingStrategy', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> new [ self error: 'use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> on: aRepositoryModel [ ^ self basicNew initializeRepositoryModel: aRepositoryModel; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> branchName [ ^ self repositoryModel branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> commitId [ ^ repositoryModel commitId ] -{ #category : #operations } +{ #category : 'operations' } IceTipWorkingCopyModel >> copyCommitIDToClipboard [ repositoryModel copyCommitIDToClipboard ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyModel >> initializeRepositoryModel: aRepositoryModel [ repositoryModel := aRepositoryModel. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> packageModels [ ^ self sortingStrategy sort: (self repositoryModel entity workingCopy packages collect: [ :each | @@ -56,37 +58,37 @@ IceTipWorkingCopyModel >> packageModels [ beCached ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> reset [ self repositoryModel reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> shortCommitId [ ^ repositoryModel shortCommitId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> sortingStrategy [ ^ sortingStrategy ifNil: [ sortingStrategy := IceSortingStrategy new first: #modified ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> status [ ^ self repositoryModel status ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> statusDecorator [ ^ self repositoryModel statusDecorator diff --git a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st index 03e34062ab..8cbcf3dfce 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st @@ -2,17 +2,19 @@ I'm the status bar for a IceTipWorkingCopyBrowser. " Class { - #name : #IceTipWorkingCopyStatusBarPresenter, - #superclass : #SpPresenter, + #name : 'IceTipWorkingCopyStatusBarPresenter', + #superclass : 'SpPresenter', #instVars : [ 'branchLabel', 'commitLink', 'statusLabel' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -25,20 +27,20 @@ IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyStatusBarPresenter >> canTakeKeyboardFocus [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyStatusBarPresenter >> initializePresenters [ branchLabel := self newLabel. statusLabel := self newLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> model: aModel [ "Fill labels from a IceTipWorkingCopyModel." @@ -52,7 +54,7 @@ IceTipWorkingCopyStatusBarPresenter >> model: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ branchLabel label: ('{1} at ' format: { aModel branchName }). @@ -64,7 +66,7 @@ IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithoutCommitId: aModel [ branchLabel label: aModel branchName. diff --git a/Iceberg-TipUI/IceTokenCredentials.extension.st b/Iceberg-TipUI/IceTokenCredentials.extension.st index 5b476eeb69..7164335fb8 100644 --- a/Iceberg-TipUI/IceTokenCredentials.extension.st +++ b/Iceberg-TipUI/IceTokenCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceTokenCredentials } +Extension { #name : 'IceTokenCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> editModelClass [ ^ IceTipEditTokenCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTraitDefinition.extension.st b/Iceberg-TipUI/IceTraitDefinition.extension.st index d072826557..03b023e483 100644 --- a/Iceberg-TipUI/IceTraitDefinition.extension.st +++ b/Iceberg-TipUI/IceTraitDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTraitDefinition } +Extension { #name : 'IceTraitDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTraitDefinition >> icon [ ^ self iconNamed: #trait ] diff --git a/Iceberg-TipUI/IceWarning.class.st b/Iceberg-TipUI/IceWarning.class.st index 2015f64db3..9b64da1319 100644 --- a/Iceberg-TipUI/IceWarning.class.st +++ b/Iceberg-TipUI/IceWarning.class.st @@ -2,12 +2,14 @@ I'm a general warning in the context of iceberg UI. " Class { - #name : #IceWarning, - #superclass : #Warning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceWarning', + #superclass : 'Warning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceWarning >> acceptError: aVisitor [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceWorkingCopy.extension.st b/Iceberg-TipUI/IceWorkingCopy.extension.st index 77e8f52665..c95aa1cc69 100644 --- a/Iceberg-TipUI/IceWorkingCopy.extension.st +++ b/Iceberg-TipUI/IceWorkingCopy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceWorkingCopy } +Extension { #name : 'IceWorkingCopy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceWorkingCopy >> description [ ^ self workingCopyState description diff --git a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st index 6806b57051..13901f838c 100644 --- a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st +++ b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitCredentialsPlaintext } +Extension { #name : 'LGitCredentialsPlaintext' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } LGitCredentialsPlaintext >> askForModelClassOn: aString [ ^ IceTipAskForPlaintextCredentialsPresenter diff --git a/Iceberg-TipUI/MCAddition.extension.st b/Iceberg-TipUI/MCAddition.extension.st index 86d577821e..eb93d60d68 100644 --- a/Iceberg-TipUI/MCAddition.extension.st +++ b/Iceberg-TipUI/MCAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCAddition } +Extension { #name : 'MCAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCAddition >> icon [ ^ self iconNamed: #changeAdd ] diff --git a/Iceberg-TipUI/MCModification.extension.st b/Iceberg-TipUI/MCModification.extension.st index e38d6d6886..2e6b693643 100644 --- a/Iceberg-TipUI/MCModification.extension.st +++ b/Iceberg-TipUI/MCModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCModification } +Extension { #name : 'MCModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCModification >> icon [ ^ self iconNamed: #changeUpdate ] diff --git a/Iceberg-TipUI/MCPatchOperation.extension.st b/Iceberg-TipUI/MCPatchOperation.extension.st index 8c55a52b83..e1f00ea122 100644 --- a/Iceberg-TipUI/MCPatchOperation.extension.st +++ b/Iceberg-TipUI/MCPatchOperation.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCPatchOperation } +Extension { #name : 'MCPatchOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCPatchOperation >> canBeBrowsed [ ^ true ] diff --git a/Iceberg-TipUI/MCRemoval.extension.st b/Iceberg-TipUI/MCRemoval.extension.st index 0eb55e9bd1..64ad429fed 100644 --- a/Iceberg-TipUI/MCRemoval.extension.st +++ b/Iceberg-TipUI/MCRemoval.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #MCRemoval } +Extension { #name : 'MCRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> canBeBrowsed [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> icon [ ^ self iconNamed: #changeRemove ] diff --git a/Iceberg-TipUI/ManifestIcebergTipUI.class.st b/Iceberg-TipUI/ManifestIcebergTipUI.class.st index a47a98479d..22b6f421f0 100644 --- a/Iceberg-TipUI/ManifestIcebergTipUI.class.st +++ b/Iceberg-TipUI/ManifestIcebergTipUI.class.st @@ -2,22 +2,24 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergTipUI, - #superclass : #PackageManifest, - #category : #'Iceberg-TipUI-Manifest' + #name : 'ManifestIcebergTipUI', + #superclass : 'PackageManifest', + #category : 'Iceberg-TipUI-Manifest', + #package : 'Iceberg-TipUI', + #tag : 'Manifest' } -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleAnySatisfyRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #guessFormatFromDirectory: #false)) #'2021-01-05T16:19:22.932793-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleNotEliminationRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipBrowser #hasSelectedItem #false)) #'2020-12-17T18:54:45.342746-03:00') #(#(#RGMethodDefinition #(#IceTipRepositoryBrowser #initializeSidebarTree #false)) #'2021-01-05T16:19:22.920159-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleReGuardClauseRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #initializeMessagePanel #false)) #'2021-01-05T16:19:22.928248-03:00') ) ] diff --git a/Iceberg-TipUI/PharoDarkTheme.extension.st b/Iceberg-TipUI/PharoDarkTheme.extension.st index 197cd482cc..25b3e1736e 100644 --- a/Iceberg-TipUI/PharoDarkTheme.extension.st +++ b/Iceberg-TipUI/PharoDarkTheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #PharoDarkTheme } +Extension { #name : 'PharoDarkTheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeColor [ ^ Color red alpha: 0.5 ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeTextColor [ ^ self textColor ] diff --git a/Iceberg-TipUI/PharoShortcuts.extension.st b/Iceberg-TipUI/PharoShortcuts.extension.st index df7e450e6d..fa394b6cfb 100644 --- a/Iceberg-TipUI/PharoShortcuts.extension.st +++ b/Iceberg-TipUI/PharoShortcuts.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #PharoShortcuts } +Extension { #name : 'PharoShortcuts' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoShortcuts >> openIcebergShortcut [ ^ $o meta, $i meta ] diff --git a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st index d61a72635f..2f13adf7b3 100644 --- a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st +++ b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #SpToolbarButtonPresenter } +Extension { #name : 'SpToolbarButtonPresenter' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } SpToolbarButtonPresenter >> hasBadge [ ^ badge isNotNil ] diff --git a/Iceberg-TipUI/TIceCopyCommitId.trait.st b/Iceberg-TipUI/TIceCopyCommitId.trait.st index 66a989ae08..ad1849ee58 100644 --- a/Iceberg-TipUI/TIceCopyCommitId.trait.st +++ b/Iceberg-TipUI/TIceCopyCommitId.trait.st @@ -5,17 +5,19 @@ Description I am a simple Trait allowing to copy a commit ID to the clipboard without duplicating the code in Iceberg. " Trait { - #name : #TIceCopyCommitId, - #category : #'Iceberg-TipUI-Model' + #name : 'TIceCopyCommitId', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyCommitIDToClipboard [ self copyToClipboardId: self commitId ] -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyToClipboardId: id [ Clipboard clipboardText: id informing: ('Commitish ID copied to clipboard ({1})' format: {id}) ] diff --git a/Iceberg-TipUI/TWithBranchModel.trait.st b/Iceberg-TipUI/TWithBranchModel.trait.st index 9b2a646f4a..836a8e7053 100644 --- a/Iceberg-TipUI/TWithBranchModel.trait.st +++ b/Iceberg-TipUI/TWithBranchModel.trait.st @@ -1,19 +1,21 @@ Trait { - #name : #TWithBranchModel, - #category : #'Iceberg-TipUI-Model' + #name : 'TWithBranchModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branchModels [ ^ self branches collect: [ :each | (IceTipBranchModel repositoryModel: self repositoryModel on: each) beCached ] ] -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branches [ ^ self explicitRequirement ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> defaultBranchSelection [ ^ self branchModels detect: #isHead @@ -21,12 +23,12 @@ TWithBranchModel >> defaultBranchSelection [ ifTrue: [ self branchModels ifNotEmpty: #anyOne ] ] ] -{ #category : #testing } +{ #category : 'testing' } TWithBranchModel >> hasBranches [ ^ self branches isNotEmpty ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> repositoryModel [ ^ self explicitRequirement ] diff --git a/Iceberg-TipUI/Text.extension.st b/Iceberg-TipUI/Text.extension.st index 74d7bfde6c..0ae90973d7 100644 --- a/Iceberg-TipUI/Text.extension.st +++ b/Iceberg-TipUI/Text.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Text } +Extension { #name : 'Text' } -{ #category : #'*Iceberg-TipUI-Spec' } +{ #category : '*Iceberg-TipUI-Spec' } Text >> threeWayCompareTo: anotherText [ ^ self asString threeWayCompareTo: anotherText asString diff --git a/Iceberg-TipUI/ToolShortcutsCategory.extension.st b/Iceberg-TipUI/ToolShortcutsCategory.extension.st index 39e8ed6bf0..22fbb318cc 100644 --- a/Iceberg-TipUI/ToolShortcutsCategory.extension.st +++ b/Iceberg-TipUI/ToolShortcutsCategory.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #ToolShortcutsCategory } +Extension { #name : 'ToolShortcutsCategory' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } ToolShortcutsCategory >> openIceberg [ diff --git a/Iceberg-TipUI/UITheme.extension.st b/Iceberg-TipUI/UITheme.extension.st index 45eef9230e..b1aee015ae 100644 --- a/Iceberg-TipUI/UITheme.extension.st +++ b/Iceberg-TipUI/UITheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #UITheme } +Extension { #name : 'UITheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeColor [ ^ Color red ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeTextColor [ ^ Color white ] diff --git a/Iceberg-TipUI/package.st b/Iceberg-TipUI/package.st index 34a4b630d6..c1b5ad7667 100644 --- a/Iceberg-TipUI/package.st +++ b/Iceberg-TipUI/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-TipUI' } +Package { #name : 'Iceberg-TipUI' } From 0dc7edfbdb0784a8b8a0529f7d876b5d8aa20583 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Thu, 19 Oct 2023 14:31:59 +0200 Subject: [PATCH 35/83] adding a context to not depend on a singleton --- Iceberg-TipUI/IceTipCommitBrowser.class.st | 2 ++ Iceberg-TipUI/IceTipSaveImageAction.class.st | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Iceberg-TipUI/IceTipCommitBrowser.class.st b/Iceberg-TipUI/IceTipCommitBrowser.class.st index f763966e4f..e04852bebc 100644 --- a/Iceberg-TipUI/IceTipCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCommitBrowser.class.st @@ -146,6 +146,8 @@ IceTipCommitBrowser >> initialize [ super initialize. saveAction := IceTipSaveImageAction new + context: self; + yourself ] { #category : 'initialization' } diff --git a/Iceberg-TipUI/IceTipSaveImageAction.class.st b/Iceberg-TipUI/IceTipSaveImageAction.class.st index 0dc8f6057b..7e162740f0 100644 --- a/Iceberg-TipUI/IceTipSaveImageAction.class.st +++ b/Iceberg-TipUI/IceTipSaveImageAction.class.st @@ -6,14 +6,29 @@ I'm used by the presenter that prepares the commit. Class { #name : 'IceTipSaveImageAction', #superclass : 'Object', + #instVars : [ + 'context' + ], #category : 'Iceberg-TipUI-Commands', #package : 'Iceberg-TipUI', #tag : 'Commands' } +{ #category : 'accessing' } +IceTipSaveImageAction >> context [ + + ^ context +] + +{ #category : 'accessing' } +IceTipSaveImageAction >> context: anObject [ + + context := anObject +] + { #category : 'execution' } IceTipSaveImageAction >> execute [ Smalltalk saveSession. - SpApplication defaultApplication newInform title: 'Image automatically saved'; openModal + self context inform: 'Image automatically saved' ] From 470c169f912ea049c551d6c8f82fdc456d6a751e Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Thu, 19 Oct 2023 14:53:33 +0200 Subject: [PATCH 36/83] do not reload spec anymore (it should mostly work now) --- scripts/preLoading.st | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/preLoading.st b/scripts/preLoading.st index 719a94d1bb..a7027be304 100644 --- a/scripts/preLoading.st +++ b/scripts/preLoading.st @@ -56,6 +56,7 @@ Metacello new load. "Development branch requires latest Spec2" +" Metacello new githubUser: 'pharo-spec' project: 'Spec' commitish: 'Pharo10' path: 'src'; baseline: 'Spec2'; @@ -63,3 +64,4 @@ Metacello new onUpgrade: [ :e | e useIncoming ]; ignoreImage; load +" From 13fb372722c9d48c2363e10de02ee18f9c3af4e2 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Mon, 23 Oct 2023 17:12:27 +0200 Subject: [PATCH 37/83] - Updating to Libgit 3.0.8 to have proxy for the fetch. - Adding proxy configuration from the NetworkSettings - Setting proxy in Clone, Fetch, and Pull - Adding Tests --- BaselineOfIceberg/BaselineOfIceberg.class.st | 2 +- Iceberg-Libgit/IceBranchNotFound.class.st | 12 +- Iceberg-Libgit/IceChangeImporter.extension.st | 4 +- Iceberg-Libgit/IceCloneError.class.st | 10 +- .../IceCloneLocationAlreadyExists.class.st | 16 +- .../IceCloneRemoteNotFound.class.st | 16 +- Iceberg-Libgit/IceGitChange.class.st | 22 +- Iceberg-Libgit/IceGitChangeImporter.class.st | 24 +- Iceberg-Libgit/IceGitClone.class.st | 22 +- Iceberg-Libgit/IceGitCommit.class.st | 68 +++--- Iceberg-Libgit/IceGitFileRemote.class.st | 20 +- Iceberg-Libgit/IceGitHttpRemote.class.st | 14 +- Iceberg-Libgit/IceGitHttpsRemote.class.st | 12 +- Iceberg-Libgit/IceGitIndex.class.st | 36 +-- Iceberg-Libgit/IceGitLocalBranch.class.st | 110 +++++---- Iceberg-Libgit/IceGitNetworkRemote.class.st | 40 ++-- Iceberg-Libgit/IceGitRemote.class.st | 80 ++++--- Iceberg-Libgit/IceGitRemoteBranch.class.st | 26 ++- Iceberg-Libgit/IceGitScpRemote.class.st | 24 +- Iceberg-Libgit/IceGitSshRemote.class.st | 14 +- Iceberg-Libgit/IceGitUnbornBranch.class.st | 14 +- .../IceGitWorkingCopyUpdateVisitor.class.st | 38 ++-- Iceberg-Libgit/IceIndexUpdateVisitor.class.st | 32 +-- Iceberg-Libgit/IceLibgitCommitWalk.class.st | 32 +-- Iceberg-Libgit/IceLibgitErrorVisitor.class.st | 28 +-- Iceberg-Libgit/IceLibgitRepository.class.st | 210 +++++++++--------- Iceberg-Libgit/IceLibgitTreeBuilder.class.st | 48 ++-- .../IceMCSnapshotPatchVisitor.class.st | 20 +- Iceberg-Libgit/IceRepositoryCreator.class.st | 78 +++---- .../IceRepositoryProperties.class.st | 66 +++--- Iceberg-Libgit/IceSemanticVersion.class.st | 34 +-- .../IceUnbornRepositoryProperties.class.st | 14 +- Iceberg-Libgit/LGitAbstractError.extension.st | 4 +- .../LGit_GIT_ECONFLICT.extension.st | 4 +- Iceberg-Libgit/LGit_GIT_EEOF.extension.st | 4 +- .../LGit_GIT_ENOTFOUND.extension.st | 4 +- Iceberg-Libgit/LGit_GIT_ERROR.extension.st | 4 +- Iceberg-Libgit/LGit_GIT_EUSER.extension.st | 4 +- Iceberg-Libgit/Magnitude.extension.st | 4 +- Iceberg-Libgit/ManifestIcebergLibgit.class.st | 10 +- Iceberg-Libgit/TIceRepositoryReader.trait.st | 10 +- Iceberg-Libgit/TIceRepositoryWriter.trait.st | 12 +- Iceberg-Libgit/package.st | 2 +- Iceberg-Tests/IceAbstractTestCase.class.st | 42 ++-- Iceberg-Tests/IceAbstractTestFactory.class.st | 22 +- .../IceBasicCherryPickingFixture.class.st | 10 +- .../IceBasicRepositoryFixture.class.st | 26 ++- Iceberg-Tests/IceBornRepositoryTest.class.st | 68 +++--- .../IceCherryPickBrowserTest.class.st | 10 +- ...eCherryPickingInitialDependencies.class.st | 12 +- Iceberg-Tests/IceCherryPickingTest.class.st | 12 +- .../IceClassesCherryPickingTest.class.st | 28 +-- .../IceCleanWorkingCopyFixture.class.st | 10 +- .../IceCleanWorkingCopyTest.class.st | 32 +-- .../IceClonedFromRemoteFixture.class.st | 24 +- .../IceConflictsCherryPickingTest.class.st | 12 +- Iceberg-Tests/IceCredentialStoreTest.class.st | 40 ++-- .../IceDetachedWorkingCopyFixture.class.st | 10 +- .../IceDetachedWorkingCopyTest.class.st | 18 +- Iceberg-Tests/IceDiffTests.class.st | 22 +- ...ceDirtyDetachedWorkingCopyFixture.class.st | 10 +- .../IceDirtyDetachedWorkingCopyTest.class.st | 20 +- ...eExtensionMethodCherryPickingTest.class.st | 22 +- Iceberg-Tests/IceFileDefinitionTests.class.st | 18 +- Iceberg-Tests/IceFileRemoteTest.class.st | 12 +- .../IceGitCleanWorkingCopyTest.class.st | 10 +- Iceberg-Tests/IceGitCloneTest.class.st | 26 ++- Iceberg-Tests/IceGitCommand.class.st | 29 +-- .../IceGitCommitMessageTest.class.st | 22 +- .../IceGitDetachedWorkingCopyTest.class.st | 10 +- ...ceGitDirtyDetachedWorkingCopyTest.class.st | 10 +- Iceberg-Tests/IceGitFileFormatTest.class.st | 18 +- Iceberg-Tests/IceGitMergeTest.class.st | 34 +-- .../IceGitPropertiesFileTest.class.st | 18 +- Iceberg-Tests/IceGitRemoteTest.class.st | 104 ++++----- ...gleRemoteAndBranchWithSlashesTest.class.st | 10 +- ...hSingleRemoteAndMergeConflictTest.class.st | 10 +- ...GitRepositoryWithSingleRemoteTest.class.st | 12 +- Iceberg-Tests/IceGitTestFactory.class.st | 28 +-- .../IceGitUnbornProjectTest.class.st | 28 +-- ...IceGitUnknownCommitRepositoryTest.class.st | 10 +- .../IceGitWithoutUserNameTest.class.st | 32 +-- Iceberg-Tests/IceHttpRemoteTest.class.st | 30 +-- Iceberg-Tests/IceHttpsRemoteTest.class.st | 14 +- .../IceInMemoryCleanWorkingCopyTest.class.st | 10 +- Iceberg-Tests/IceInMemoryTestFactory.class.st | 20 +- .../IceInitialPropertiesFileTestCase.class.st | 12 +- Iceberg-Tests/IceLibGitIndexTestCase.class.st | 30 +-- .../IceLocalRepositoryMissingTest.class.st | 14 +- ...hSingleRemoteAndMergeConflictTest.class.st | 10 +- ...oryRepositoryWithSingleRemoteTest.class.st | 10 +- Iceberg-Tests/IceMergeTest.class.st | 52 ++--- .../IceMetaClassCherryPickingTest.class.st | 20 +- .../IceMethodCherryPickingTest.class.st | 46 ++-- .../IceMissingLocalRepositoryFixture.class.st | 10 +- .../IceMultiplePackageFixture.class.st | 10 +- ...iplePackageLocalGitRepositoryTest.class.st | 10 +- ...ePackageLocalMemoryRepositoryTest.class.st | 10 +- .../IceMultiplePackageRepositoryTest.class.st | 72 +++--- .../IceNewGitRepositoryTest.class.st | 10 +- Iceberg-Tests/IceNewRepositoryTest.class.st | 18 +- .../IceNotYetClonedRepositoryFixture.class.st | 40 ++-- .../IceParameterizedTestCase.class.st | 36 +-- Iceberg-Tests/IceProxySettingsTest.class.st | 81 +++++++ Iceberg-Tests/IceRepository.extension.st | 6 +- ...hSingleRemoteAndMergeConflictTest.class.st | 18 +- ...IceRepositoryWithSingleRemoteTest.class.st | 38 ++-- Iceberg-Tests/IceScpRemoteTest.class.st | 32 +-- .../IceSinglePackageFixture.class.st | 10 +- ...nglePackageLocalGitRepositoryTest.class.st | 10 +- ...sitoryWithComplexSubdirectoryTest.class.st | 10 +- ...RepositoryWithDotSubdirectoryTest.class.st | 12 +- ...epositoryWithLowerCasePackageTest.class.st | 10 +- ...GitRepositoryWithSubdirectoryTest.class.st | 10 +- ...ePackageLocalMemoryRepositoryTest.class.st | 10 +- ...eSinglePackageLocalRepositoryTest.class.st | 116 +++++----- Iceberg-Tests/IceTestDefinition.class.st | 20 +- Iceberg-Tests/IceTestParameter.class.st | 18 +- Iceberg-Tests/IceTestParameterValue.class.st | 36 +-- .../IceTraitsCherryPickingTest.class.st | 14 +- .../IceTreeConstructionTests.class.st | 26 ++- Iceberg-Tests/IceTreeMergeTests.class.st | 32 +-- Iceberg-Tests/IceTreeTests.class.st | 14 +- .../IceUnbornProjectFixture.class.st | 12 +- .../IceUnknownCommitRepositoryTest.class.st | 16 +- Iceberg-Tests/IceUrlBuilderTest.class.st | 28 +-- ...eAndLocalCommitAndUpstreamFixture.class.st | 10 +- ...ceWithRemoteAndLocalCommitFixture.class.st | 18 +- ...WithRemoteAndMergeConflictFixture.class.st | 10 +- ...WithRemoteAndUnknownCommitFixture.class.st | 10 +- Iceberg-Tests/IceWithRemoteFixture.class.st | 18 +- Iceberg-Tests/MCClassDefinition.extension.st | 4 +- ...abRepositoryIcebergExtensionsTest.class.st | 18 +- .../RG2MetaclassTraitDefinition.extension.st | 4 +- .../RG2PackageDefinition.extension.st | 4 +- Iceberg-Tests/RG2TraitDefinition.extension.st | 4 +- Iceberg-Tests/RG2UnresolvedValue.extension.st | 4 +- Iceberg-Tests/package.st | 2 +- Iceberg/Iceberg.class.st | 54 +++++ 139 files changed, 1881 insertions(+), 1481 deletions(-) create mode 100644 Iceberg-Tests/IceProxySettingsTest.class.st diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st index 8921116e73..96dcdeed61 100644 --- a/BaselineOfIceberg/BaselineOfIceberg.class.st +++ b/BaselineOfIceberg/BaselineOfIceberg.class.st @@ -77,7 +77,7 @@ BaselineOfIceberg >> libgit: spec [ baseline: 'LibGit' with: [ spec - repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.7'; + repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.8'; loads: 'default' ]. spec project: 'LibGit-Tests' diff --git a/Iceberg-Libgit/IceBranchNotFound.class.st b/Iceberg-Libgit/IceBranchNotFound.class.st index fa3ee75ef9..29fb6e220e 100644 --- a/Iceberg-Libgit/IceBranchNotFound.class.st +++ b/Iceberg-Libgit/IceBranchNotFound.class.st @@ -2,20 +2,22 @@ A branch was not found. " Class { - #name : #IceBranchNotFound, - #superclass : #IceError, + #name : 'IceBranchNotFound', + #superclass : 'IceError', #instVars : [ 'branchName' ], - #category : #'Iceberg-Libgit-Exceptions' + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #accessing } +{ #category : 'accessing' } IceBranchNotFound >> branchName [ ^ branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceBranchNotFound >> branchName: aString [ branchName := aString ] diff --git a/Iceberg-Libgit/IceChangeImporter.extension.st b/Iceberg-Libgit/IceChangeImporter.extension.st index 95c9b4b407..dea75d7242 100644 --- a/Iceberg-Libgit/IceChangeImporter.extension.st +++ b/Iceberg-Libgit/IceChangeImporter.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceChangeImporter } +Extension { #name : 'IceChangeImporter' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } IceChangeImporter >> visitGitChange: anIceGitChange [ | importer | diff --git a/Iceberg-Libgit/IceCloneError.class.st b/Iceberg-Libgit/IceCloneError.class.st index 47f92913c2..44393f940a 100644 --- a/Iceberg-Libgit/IceCloneError.class.st +++ b/Iceberg-Libgit/IceCloneError.class.st @@ -2,12 +2,14 @@ Error while cloning a project " Class { - #name : #IceCloneError, - #superclass : #IceError, - #category : #'Iceberg-Libgit-Exceptions' + #name : 'IceCloneError', + #superclass : 'IceError', + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #signalling } +{ #category : 'signalling' } IceCloneError class >> signalFor: anObject [ ^ self subclassResponsibility diff --git a/Iceberg-Libgit/IceCloneLocationAlreadyExists.class.st b/Iceberg-Libgit/IceCloneLocationAlreadyExists.class.st index 39cd0b8f15..debc41bae4 100644 --- a/Iceberg-Libgit/IceCloneLocationAlreadyExists.class.st +++ b/Iceberg-Libgit/IceCloneLocationAlreadyExists.class.st @@ -3,32 +3,34 @@ Error while cloning a project - the location on disk already exists " Class { - #name : #IceCloneLocationAlreadyExists, - #superclass : #IceCloneError, + #name : 'IceCloneLocationAlreadyExists', + #superclass : 'IceCloneError', #instVars : [ 'location' ], - #category : #'Iceberg-Libgit-Exceptions' + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #signalling } +{ #category : 'signalling' } IceCloneLocationAlreadyExists class >> signalFor: aLocation [ ^ self new location: aLocation; signal. ] -{ #category : #visiting } +{ #category : 'visiting' } IceCloneLocationAlreadyExists >> acceptError: aVisitor [ aVisitor visitCloneLocationAlreadyExists: self. ] -{ #category : #accessing } +{ #category : 'accessing' } IceCloneLocationAlreadyExists >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceCloneLocationAlreadyExists >> location: anObject [ location := anObject ] diff --git a/Iceberg-Libgit/IceCloneRemoteNotFound.class.st b/Iceberg-Libgit/IceCloneRemoteNotFound.class.st index 773fbe7ef6..8844171fd5 100644 --- a/Iceberg-Libgit/IceCloneRemoteNotFound.class.st +++ b/Iceberg-Libgit/IceCloneRemoteNotFound.class.st @@ -2,32 +2,34 @@ The remote was not found " Class { - #name : #IceCloneRemoteNotFound, - #superclass : #IceCloneError, + #name : 'IceCloneRemoteNotFound', + #superclass : 'IceCloneError', #instVars : [ 'remoteUrl' ], - #category : #'Iceberg-Libgit-Exceptions' + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #signalling } +{ #category : 'signalling' } IceCloneRemoteNotFound class >> signalFor: aUrl [ ^ self new remoteUrl: aUrl; signal. ] -{ #category : #visiting } +{ #category : 'visiting' } IceCloneRemoteNotFound >> acceptError: aVisitor [ aVisitor visitCloneRemoteNotFound: self. ] -{ #category : #accessing } +{ #category : 'accessing' } IceCloneRemoteNotFound >> remoteUrl [ ^ remoteUrl ] -{ #category : #accessing } +{ #category : 'accessing' } IceCloneRemoteNotFound >> remoteUrl: anObject [ remoteUrl := anObject ] diff --git a/Iceberg-Libgit/IceGitChange.class.st b/Iceberg-Libgit/IceGitChange.class.st index a9ccc3c0f2..fb5207f3c0 100644 --- a/Iceberg-Libgit/IceGitChange.class.st +++ b/Iceberg-Libgit/IceGitChange.class.st @@ -2,15 +2,17 @@ I represent a change coming from git (in contrast to a change coming from the image). I know the changed file and I can be visited to define the create a more detailed diff. " Class { - #name : #IceGitChange, - #superclass : #IceChange, + #name : 'IceGitChange', + #superclass : 'IceChange', #instVars : [ 'filePathString' ], - #category : #'Iceberg-Libgit-Changes' + #category : 'Iceberg-Libgit-Changes', + #package : 'Iceberg-Libgit', + #tag : 'Changes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitChange class >> on: aString [ ^ self new @@ -18,35 +20,35 @@ IceGitChange class >> on: aString [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitChange >> accept: aVisitor [ ^ aVisitor visitGitChange: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChange >> child [ ^ IceGitChange on: (RelativePath withAll: self path segments allButFirst) pathString ] -{ #category : #displaying } +{ #category : 'displaying' } IceGitChange >> displayingProgressString [ ^ 'Comparing changes of ' , filePathString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChange >> filePathString: aString [ filePathString := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChange >> path [ ^ Path from: filePathString ] -{ #category : #printing } +{ #category : 'printing' } IceGitChange >> printOn: aStream [ aStream diff --git a/Iceberg-Libgit/IceGitChangeImporter.class.st b/Iceberg-Libgit/IceGitChangeImporter.class.st index 836b801e9a..04f69f6ff7 100644 --- a/Iceberg-Libgit/IceGitChangeImporter.class.st +++ b/Iceberg-Libgit/IceGitChangeImporter.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceGitChangeImporter, - #superclass : #Object, + #name : 'IceGitChangeImporter', + #superclass : 'Object', #instVars : [ 'path', 'diff', 'version' ], - #category : #'Iceberg-Libgit-Changes' + #category : 'Iceberg-Libgit-Changes', + #package : 'Iceberg-Libgit', + #tag : 'Changes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitChangeImporter >> diff: anIceDiff [ diff := anIceDiff ] -{ #category : #building } +{ #category : 'building' } IceGitChangeImporter >> ensureDirectory: aFileReference inParentNode: aNode [ aNode childAt: aFileReference basename ifPresent: [ :node | @@ -23,7 +25,7 @@ IceGitChangeImporter >> ensureDirectory: aFileReference inParentNode: aNode [ ^ aNode addChild: (IceDirectoryDefinition named: aFileReference basename path: aNode path / aFileReference basename) ] -{ #category : #building } +{ #category : 'building' } IceGitChangeImporter >> ensurePackageFromDirectory: aFileReference inParentNode: aParentNode [ | importer packageName package | @@ -45,7 +47,7 @@ IceGitChangeImporter >> ensurePackageFromDirectory: aFileReference inParentNode: ^ importer importOn: aParentNode ] -{ #category : #importing } +{ #category : 'importing' } IceGitChangeImporter >> importOn: aNode [ | currentSegment fileReference filePath | @@ -84,7 +86,7 @@ IceGitChangeImporter >> importOn: aNode [ "If path size = 0 we should stop recursion" ] -{ #category : #building } +{ #category : 'building' } IceGitChangeImporter >> nextPath [ ^ IceGitChangeImporter new @@ -94,18 +96,18 @@ IceGitChangeImporter >> nextPath [ yourself. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChangeImporter >> path: aRelativePath [ path := aRelativePath ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChangeImporter >> repository [ ^ diff repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChangeImporter >> version: aVersion [ version := aVersion diff --git a/Iceberg-Libgit/IceGitClone.class.st b/Iceberg-Libgit/IceGitClone.class.st index a0dfd41c31..89819f179b 100644 --- a/Iceberg-Libgit/IceGitClone.class.st +++ b/Iceberg-Libgit/IceGitClone.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceGitClone, - #superclass : #Object, + #name : 'IceGitClone', + #superclass : 'Object', #instVars : [ 'location', 'url' ], - #category : #'Iceberg-Libgit-GitActions' + #category : 'Iceberg-Libgit-GitActions', + #package : 'Iceberg-Libgit', + #tag : 'GitActions' } -{ #category : #'private - operations' } +{ #category : 'private - operations' } IceGitClone >> cloneRepo: repo cloneOptions: cloneOptions remainingRetries: remainingRetries [ [repo clone: url options: cloneOptions] @@ -22,7 +24,7 @@ IceGitClone >> cloneRepo: repo cloneOptions: cloneOptions remainingRetries: rema ] -{ #category : #actions } +{ #category : 'actions' } IceGitClone >> execute [ | repo cloneOptions checkoutOptions callbacks | @@ -34,6 +36,8 @@ IceGitClone >> execute [ repo := LGitRepository on: location. cloneOptions := repo cloneOptionsStructureClass withCredentialsProvider: (IceCredentialsProvider defaultForRemoteUrl: url). + Iceberg configureLGitProxyOpt: cloneOptions fetchOptions proxyOptions. + "Keeping references, because if not the GC take them." checkoutOptions := cloneOptions checkoutOptions. callbacks := cloneOptions fetchOptions callbacks. @@ -53,22 +57,22 @@ IceGitClone >> execute [ error acceptError: (IceLibgitErrorVisitor onContext: self) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitClone >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitClone >> location: aFileReference [ location := aFileReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitClone >> url [ ^ url ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitClone >> url: aString [ url := aString ] diff --git a/Iceberg-Libgit/IceGitCommit.class.st b/Iceberg-Libgit/IceGitCommit.class.st index 58c7437335..85fc953dac 100644 --- a/Iceberg-Libgit/IceGitCommit.class.st +++ b/Iceberg-Libgit/IceGitCommit.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceGitCommit, - #superclass : #IceCommit, + #name : 'IceGitCommit', + #superclass : 'IceCommit', #instVars : [ 'id', 'author', @@ -9,10 +9,12 @@ Class { 'comment', 'packageNamesCache' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #comparing } +{ #category : 'comparing' } IceGitCommit >> = aGitCommit [ (aGitCommit isKindOf: self species) @@ -20,51 +22,51 @@ IceGitCommit >> = aGitCommit [ ^ self id = aGitCommit id ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> ancestorIds [ ^ ancestorIds ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> ancestorIds: aCollection [ ancestorIds := aCollection ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> ancestors [ ^ ancestorIds collect: [ :each | repository lookupCommit: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> author [ ^ author ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> author: aString [ author := aString ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceGitCommit >> changesFromCommit: anIceGitCommit [ | files | files := self repository changedFilesBetween: anIceGitCommit and: self. ^ files collect: [ :each | IceGitChange on: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> comment [ ^ comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> comment: aString [ comment := aString ] -{ #category : #ancestry } +{ #category : 'ancestry' } IceGitCommit >> commonAncestorWithCommit: anIceGitCommit [ repository handleLibgitError: [ | mergeBaseId | @@ -76,7 +78,7 @@ IceGitCommit >> commonAncestorWithCommit: anIceGitCommit [ ^ mergeBaseId ifNotNil: [ self repository lookupCommit: mergeBaseId ] ] ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceGitCommit >> createTag: aString [ self repository handleLibgitError: [ @@ -89,23 +91,23 @@ IceGitCommit >> createTag: aString [ inRepository: self repository ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> datetime [ ^ datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> datetime: aDateAndTime [ datetime := aDateAndTime ] -{ #category : #'accessing - file' } +{ #category : 'accessing - file' } IceGitCommit >> entryByPath: aString [ repository handleLibgitError: [ ^ (LGitCommit of: self repositoryHandle fromHexString: self id) entryByPath: aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> fetchPackageNames [ | writerClass dir | @@ -119,19 +121,19 @@ IceGitCommit >> fetchPackageNames [ thenCollect: [ :each | writerClass packageNameFromDirectory: each ] ] -{ #category : #'accessing - file' } +{ #category : 'accessing - file' } IceGitCommit >> fileSystem [ ^ (FileSystem onGitCommit: self libgitCommit) root ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> gitRef [ ^ self id ] -{ #category : #testing } +{ #category : 'testing' } IceGitCommit >> hasMultipleAncestors [ | ancestors | "using ancestorsIds because ancestors will instantiate parents and is slower" @@ -140,29 +142,29 @@ IceGitCommit >> hasMultipleAncestors [ and: [ ancestors size > 1 ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceGitCommit >> hash [ ^ self id hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> id [ ^ id ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> id: aString [ id := aString ] -{ #category : #private } +{ #category : 'private' } IceGitCommit >> libgitCommit [ repository handleLibgitError: [ ^ LGitCommit of: self repositoryHandle fromHexString: self id ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> packageNames [ ^ self repository commitsInPackageCache @@ -170,7 +172,7 @@ IceGitCommit >> packageNames [ ifAbsentPut: [ self fetchPackageNames ] ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceGitCommit >> project [ self flag: #todo. "This is a quick fix for issue https://github.com/pharo-vcs/iceberg/issues/1002 and this should probably be improved to also cover issue https://github.com/pharo-vcs/iceberg/issues/949 @@ -184,38 +186,38 @@ IceGitCommit >> project [ do: [ self repository fetch. IceProjectReader readProjectFrom: self ] ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceGitCommit >> readerClass [ ^ self properties readerClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceGitCommit >> resetPackageCache [ packageNamesCache := nil. ] -{ #category : #TOMOVE } +{ #category : 'TOMOVE' } IceGitCommit >> snapshotFor: package [ ^ [ (self repository mcVersionFor: (self versionFor: package)) snapshot ] on: IceVersionDoesNotExist do: [ :e | MCSnapshot empty ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> timeStamp [ ^ self datetime ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceGitCommit >> writerClass [ ^ self properties writerClass diff --git a/Iceberg-Libgit/IceGitFileRemote.class.st b/Iceberg-Libgit/IceGitFileRemote.class.st index 7299784e67..1bbfeb1c94 100644 --- a/Iceberg-Libgit/IceGitFileRemote.class.st +++ b/Iceberg-Libgit/IceGitFileRemote.class.st @@ -2,35 +2,37 @@ I am a 'remote' repository which is stored locally in your machine and accessed through a 'file://' url. " Class { - #name : #IceGitFileRemote, - #superclass : #IceGitRemote, + #name : 'IceGitFileRemote', + #superclass : 'IceGitRemote', #instVars : [ 'path' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitFileRemote class >> canHandleUrl: aRepositoryUrl [ ^ (aRepositoryUrl beginsWith: 'file:') or: [aRepositoryUrl beginsWith: '/'] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitFileRemote >> detailedInfo [ ^ { 'Origin' -> path pathString } ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitFileRemote >> host [ ^ 'local filesystem' ] -{ #category : #querying } +{ #category : 'querying' } IceGitFileRemote >> organizer [ ^ 'local' ] -{ #category : #private } +{ #category : 'private' } IceGitFileRemote >> parseUrl [ | znUrl | znUrl := ZnUrl fromString: url defaultScheme: 'file'. @@ -39,7 +41,7 @@ IceGitFileRemote >> parseUrl [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitFileRemote >> projectName [ ^ path basename diff --git a/Iceberg-Libgit/IceGitHttpRemote.class.st b/Iceberg-Libgit/IceGitHttpRemote.class.st index fba2683b17..d0f0214a1e 100644 --- a/Iceberg-Libgit/IceGitHttpRemote.class.st +++ b/Iceberg-Libgit/IceGitHttpRemote.class.st @@ -4,24 +4,26 @@ A remote repository created out of a HTTP url, such as 'http://localhost/owner/ " Class { - #name : #IceGitHttpRemote, - #superclass : #IceGitNetworkRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitHttpRemote', + #superclass : 'IceGitNetworkRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitHttpRemote class >> canHandleUrl: aRepositoryUrl [ ^ (aRepositoryUrl beginsWith: self protocolID, '://') ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHttpRemote class >> defaultPort [ "Returns the HTTP default port" ^80 ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHttpRemote class >> protocolID [ "Return the protocol identifier" diff --git a/Iceberg-Libgit/IceGitHttpsRemote.class.st b/Iceberg-Libgit/IceGitHttpsRemote.class.st index 949dcb3f94..0019c57c60 100644 --- a/Iceberg-Libgit/IceGitHttpsRemote.class.st +++ b/Iceberg-Libgit/IceGitHttpsRemote.class.st @@ -4,19 +4,21 @@ A remote repository created out of a HTTPS url, such as 'https://github.com/npa " Class { - #name : #IceGitHttpsRemote, - #superclass : #IceGitHttpRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitHttpsRemote', + #superclass : 'IceGitHttpRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHttpsRemote class >> defaultPort [ "Returns the HTTPS default port" ^443 ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHttpsRemote class >> protocolID [ "Return the protocol identifier" diff --git a/Iceberg-Libgit/IceGitIndex.class.st b/Iceberg-Libgit/IceGitIndex.class.st index b29dfd8dec..4c081a9227 100644 --- a/Iceberg-Libgit/IceGitIndex.class.st +++ b/Iceberg-Libgit/IceGitIndex.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceGitIndex, - #superclass : #IceIndex, + #name : 'IceGitIndex', + #superclass : 'IceIndex', #instVars : [ 'modifiedFilePaths' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #adding } +{ #category : 'adding' } IceGitIndex >> addPackage: anIcePackageDefinition [ | pathSegments | @@ -16,19 +18,19 @@ IceGitIndex >> addPackage: anIcePackageDefinition [ self addPath: (RelativePath withAll: pathSegments) ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> addPath: aPath [ modifiedFilePaths add: aPath ] -{ #category : #operations } +{ #category : 'operations' } IceGitIndex >> addToGitIndex [ repository addFilesToIndex: modifiedFilePaths. ] -{ #category : #'API - commiting' } +{ #category : 'API - commiting' } IceGitIndex >> commitWithMessage: message andParents: parentCommits [ | index | @@ -60,33 +62,33 @@ IceGitIndex >> commitWithMessage: message andParents: parentCommits [ ^ repository commitFromGitCommit: (LGitCommit of: self repositoryHandle fromId: commitId)] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitIndex >> includes: aRelativePath [ ^ modifiedFilePaths includes: aRelativePath ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitIndex >> initialize [ super initialize. modifiedFilePaths := Set new ] -{ #category : #testing } +{ #category : 'testing' } IceGitIndex >> isEmpty [ ^ modifiedFilePaths isEmpty ] -{ #category : #'API - commiting' } +{ #category : 'API - commiting' } IceGitIndex >> libGitCommitsFrom: aLGitRepository for: aListOfCommitish [ ^ aListOfCommitish collect: [ :commitish | LGitCommit of: aLGitRepository fromId: (LGitId fromHexString: commitish id) ] ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> removeFileDefinition: anIceFileDefinition [ (repository location resolve: anIceFileDefinition path) @@ -95,14 +97,14 @@ IceGitIndex >> removeFileDefinition: anIceFileDefinition [ self addPath: anIceFileDefinition path ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitIndex >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> storeFileDefinition: anIceFileDefinition [ (repository location resolve: anIceFileDefinition path) @@ -113,7 +115,7 @@ IceGitIndex >> storeFileDefinition: anIceFileDefinition [ self addPath: anIceFileDefinition path ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> storeMCVersion: aMCVersion [ | pathSegments | @@ -126,13 +128,13 @@ IceGitIndex >> storeMCVersion: aMCVersion [ self addPath: (RelativePath withAll: pathSegments) ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> storeVersion: aMCVersion [ repository internalStoreVersion: aMCVersion ] -{ #category : #updating } +{ #category : 'updating' } IceGitIndex >> updateDiskWorkingCopy: anIceDiff [ anIceDiff tree accept: diff --git a/Iceberg-Libgit/IceGitLocalBranch.class.st b/Iceberg-Libgit/IceGitLocalBranch.class.st index 86c55a68c4..1f2f236fa1 100644 --- a/Iceberg-Libgit/IceGitLocalBranch.class.st +++ b/Iceberg-Libgit/IceGitLocalBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitLocalBranch, - #superclass : #IceLocalBranch, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitLocalBranch', + #superclass : 'IceLocalBranch', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> basicPushTo: aRemote [ | gitRemote | @@ -32,13 +34,13 @@ IceGitLocalBranch >> basicPushTo: aRemote [ yourself) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> branchNamePrefix [ ^ 'refs/heads/' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> commit [ repository handleLibgitError: [ | gitCommit gitId | @@ -47,7 +49,7 @@ IceGitLocalBranch >> commit [ ^ self repository commitFromGitCommit: gitCommit ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> commit: anIceGitCommit [ "Update the branch to point to a commit. If the branch is HEAD, check it out in disk also." @@ -65,74 +67,94 @@ IceGitLocalBranch >> commit: anIceGitCommit [ yourself) ]] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceGitLocalBranch >> delete [ repository handleLibgitError: [ | found | found := self repositoryHandle lookupLocalBranch: self name ifAbsent: [ nil ]. self repositoryHandle deleteBranch: found ] ] -{ #category : #'file-access' } +{ #category : 'file-access' } IceGitLocalBranch >> fileSystem [ ^ self commit fileSystem ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> gitRef [ ^ self name ] -{ #category : #'private - tracking' } +{ #category : 'private - tracking' } IceGitLocalBranch >> hasUpstream [ self upstreamIfNone: [ ^ false ]. ^ true ] -{ #category : #merging } +{ #category : 'merging' } IceGitLocalBranch >> mergeWithBranch: anIceGitRemoteBranch [ self shouldBeImplemented. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> name [ ^ self fullname withoutPrefix: self branchNamePrefix ] -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> pushBranchToRemote: aRemote gitRemote: gitRemote progress: pushProgress [ - - gitRemote + + | pushOptions | + pushOptions := gitRemote ffiLibrary uniqueInstance + pushOptionsStructureClass defaults + callbacks: + ((gitRemote ffiLibrary uniqueInstance + remoteCallbacksStructureClass withProvider: + (IceCredentialsProvider defaultForRemote: + aRemote)) + pushTransferProgress: pushProgress; + yourself); + yourself. + + Iceberg configureLGitProxyOpt: pushOptions proxyOptions. + + gitRemote pushWithRefSpec: (LGitRefSpec new - source: self fullname; - destination: self fullname; - yourself) - pushOptions: (gitRemote ffiLibrary uniqueInstance pushOptionsStructureClass defaults - callbacks: ((gitRemote ffiLibrary uniqueInstance remoteCallbacksStructureClass withProvider: (IceCredentialsProvider defaultForRemote: aRemote)) - pushTransferProgress: pushProgress; - yourself); - yourself) + source: self fullname; + destination: self fullname; + yourself) + pushOptions: pushOptions ] -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> pushTag: tag toRemote: aRemote gitRemote: gitRemote progress: pushProgress [ - gitRemote + | pushOptions | + pushOptions := gitRemote ffiLibrary uniqueInstance + pushOptionsStructureClass defaults + callbacks: + ((gitRemote ffiLibrary uniqueInstance + remoteCallbacksStructureClass withProvider: + (IceCredentialsProvider defaultForRemote: + aRemote)) + pushTransferProgress: pushProgress; + yourself); + yourself. + + Iceberg configureLGitProxyOpt: pushOptions proxyOptions. + + gitRemote pushWithRefSpec: (LGitRefSpec new - source: 'refs/tags/' , tag name; - destination: 'refs/tags/' , tag name; - yourself) - pushOptions: (gitRemote ffiLibrary uniqueInstance pushOptionsStructureClass defaults - callbacks: ((gitRemote ffiLibrary uniqueInstance remoteCallbacksStructureClass withProvider: (IceCredentialsProvider defaultForRemote: aRemote)) - pushTransferProgress: pushProgress; - yourself); - yourself) + source: 'refs/tags/' , tag name; + destination: 'refs/tags/' , tag name; + yourself) + pushOptions: pushOptions ] -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> pushTagsToRemote: aRemote gitRemote: gitRemote progress: pushProgress [ self tags do: [ :tag | @@ -143,21 +165,21 @@ IceGitLocalBranch >> pushTagsToRemote: aRemote gitRemote: gitRemote progress: pu progress: pushProgress ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceGitLocalBranch >> pushTo: aRemote [ repository handleLibgitError: [ self basicPushTo: aRemote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceGitLocalBranch >> setUpstream: anIceGitRemoteBranch [ repository handleLibgitError: [ | localBranch | @@ -165,20 +187,20 @@ IceGitLocalBranch >> setUpstream: anIceGitRemoteBranch [ localBranch setUpstream: anIceGitRemoteBranch gitRef ] ] -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> setUpstreamIfMissing: aRemote [ self hasUpstream ifTrue: [ ^ self ]. self setUpstream: (aRemote remoteBranchNamed: self gitRef) ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> shortname [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> trackedBranch [ | upstream | @@ -189,19 +211,19 @@ IceGitLocalBranch >> trackedBranch [ ^ upstream ] -{ #category : #tracking } +{ #category : 'tracking' } IceGitLocalBranch >> tracksRemoteBranch [ ^ self hasUpstream ] -{ #category : #'private - tracking' } +{ #category : 'private - tracking' } IceGitLocalBranch >> upstream [ ^ self upstreamIfNone: [ IceUpstreamNotConfigured signal ] ] -{ #category : #'private - tracking' } +{ #category : 'private - tracking' } IceGitLocalBranch >> upstreamIfNone: aBlock [ repository handleLibgitError: [ | localBranch gitUpstream | localBranch := self repositoryHandle lookupLocalBranch: self name. diff --git a/Iceberg-Libgit/IceGitNetworkRemote.class.st b/Iceberg-Libgit/IceGitNetworkRemote.class.st index 38735c7e88..44457b73e7 100644 --- a/Iceberg-Libgit/IceGitNetworkRemote.class.st +++ b/Iceberg-Libgit/IceGitNetworkRemote.class.st @@ -2,8 +2,8 @@ Base abstract class for SCP and HTTPS remotes. " Class { - #name : #IceGitNetworkRemote, - #superclass : #IceGitRemote, + #name : 'IceGitNetworkRemote', + #superclass : 'IceGitRemote', #instVars : [ 'user', 'host', @@ -11,27 +11,29 @@ Class { 'path', 'owner' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitNetworkRemote class >> canHandleUrl: aString [ "I am abstract I can't handle any url." ^ false ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitNetworkRemote class >> defaultPort [ ^self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceGitNetworkRemote class >> isAbstract [ ^ self == IceGitNetworkRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> detailedInfo [ ^ { 'Origin' -> self url. @@ -41,22 +43,22 @@ IceGitNetworkRemote >> detailedInfo [ } ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> host [ ^ host ] -{ #category : #querying } +{ #category : 'querying' } IceGitNetworkRemote >> organizer [ ^ self owner ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> owner [ ^ owner ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> parseUrl [ | znUrl | znUrl := ZnUrl fromString: url. @@ -72,23 +74,23 @@ IceGitNetworkRemote >> parseUrl [ projectName := self stripPossibleExtension: (znUrl segments last). ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> path [ ^path ifNil: [ path := OrderedCollection new ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> port [ ^port ifNil: [ self class defaultPort ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> portName [ ^self port asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> projectPath [ | projectPath | @@ -99,26 +101,26 @@ IceGitNetworkRemote >> projectPath [ ^ (RelativePath withAll: projectPath) pathString ] -{ #category : #comparing } +{ #category : 'comparing' } IceGitNetworkRemote >> referencesSameRemoteLocationAs: another [ ^ (self httpsUrl withoutSuffix: '.git') sameAs: (another httpsUrl withoutSuffix: '.git') ] -{ #category : #private } +{ #category : 'private' } IceGitNetworkRemote >> stripPossibleExtension: aString [ ^ (aString endsWith: '.git') ifTrue: [ aString allButLast: 4 ] ifFalse: [ aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> user [ ^user ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> userName [ ^user ifNil: [ '' ] diff --git a/Iceberg-Libgit/IceGitRemote.class.st b/Iceberg-Libgit/IceGitRemote.class.st index 06bffe6ca0..b3981f5cca 100644 --- a/Iceberg-Libgit/IceGitRemote.class.st +++ b/Iceberg-Libgit/IceGitRemote.class.st @@ -1,34 +1,36 @@ Class { - #name : #IceGitRemote, - #superclass : #IceRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitRemote', + #superclass : 'IceRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitRemote class >> canHandleUrl: aRepositoryUrl [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceGitRemote class >> isAbstract [ ^ self == IceGitRemote ] -{ #category : #testing } +{ #category : 'testing' } IceGitRemote class >> isValidUrl: aRepositoryUrl [ ^ self allSubclasses anySatisfy: [ :subclass | subclass canHandleUrl: aRepositoryUrl ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitRemote class >> name: aName url: anUrl [ ^ (self url: anUrl) name: aName; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitRemote class >> url: aRepositoryUrl [ self allSubclasses detect: [ :subclass | subclass canHandleUrl: aRepositoryUrl ] @@ -36,52 +38,56 @@ IceGitRemote class >> url: aRepositoryUrl [ ifNone: [ IceWrongUrl signal: 'Remote repository scheme not supported: ', aRepositoryUrl ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceGitRemote >> = another [ ^ self species = another species and: [ self referencesSameRemoteLocationAs: another ] ] -{ #category : #branches } +{ #category : 'branches' } IceGitRemote >> branches [ ^ self localRepository remoteTrackedBranches select: [ :e | e remoteName = self name ] ] -{ #category : #fetching } -IceGitRemote >> fetch [ - +{ #category : 'fetching' } +IceGitRemote >> doFetchWithRefSpec: refSpec [ + localRepository handleLibgitError: [ - [ (LGitRemote of: self repositoryHandle named: self name) + [ + (LGitRemote of: self repositoryHandle named: self name) lookup; - fetchWithCredentials: (IceCredentialsProvider defaultForRemote: self) - andProgressCallback: IceGitTransferProgress new ] + fetchWithCredentials: + (IceCredentialsProvider defaultForRemote: self) + andProgressCallback: IceGitTransferProgress new + refSpec: refSpec + proxyConfigurationBlock: [ :proxyOpt | Iceberg configureLGitProxyOpt: proxyOpt ] ] on: LGitAbstractError - do: [ :e | e acceptError: (IceLibgitErrorVisitor onContext: self) ]. - - "Call post fetch to fix unknown commits" - localRepository postFetch ] + do: [ :e | e acceptError: (IceLibgitErrorVisitor onContext: self) ] ] +] + +{ #category : 'fetching' } +IceGitRemote >> fetch [ + + self doFetchWithRefSpec: nil. + + "Call post fetch to fix unknown commits" + localRepository postFetch ] -{ #category : #fetching } +{ #category : 'fetching' } IceGitRemote >> fetchBranch: aBranch [ - - localRepository handleLibgitError: [ - [ | refSpec remote | - refSpec := LGitRefSpec - fromString: - ('{2}:refs/remotes/{1}/{2}' - format: - {self name. - aBranch name}). - (remote := LGitRemote of: self repositoryHandle named: self name) - lookup; - fetchWithCredentials: (IceCredentialsProvider defaultForRemote: self) refSpec: refSpec ] - on: LGitAbstractError - do: [ :e | e acceptError: (IceLibgitErrorVisitor onContext: self) ] ] + + | refSpec | + refSpec := LGitRefSpec fromString: + ('{2}:refs/remotes/{1}/{2}' format: { + self name. + aBranch name }). + + self doFetchWithRefSpec: refSpec ] -{ #category : #branches } +{ #category : 'branches' } IceGitRemote >> remoteBranchNamed: aString ifPresent: presentBlock ifAbsent: absentBlock [ localRepository handleLibgitError: [ @@ -94,7 +100,7 @@ IceGitRemote >> remoteBranchNamed: aString ifPresent: presentBlock ifAbsent: abs ifNil: absentBlock ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemote >> repositoryHandle [ diff --git a/Iceberg-Libgit/IceGitRemoteBranch.class.st b/Iceberg-Libgit/IceGitRemoteBranch.class.st index b353f51311..fd596cd87e 100644 --- a/Iceberg-Libgit/IceGitRemoteBranch.class.st +++ b/Iceberg-Libgit/IceGitRemoteBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitRemoteBranch, - #superclass : #IceRemoteBranch, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitRemoteBranch', + #superclass : 'IceRemoteBranch', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> commit [ repository handleLibgitError: [ | gitCommit gitId | @@ -13,7 +15,7 @@ IceGitRemoteBranch >> commit [ ^ self repository commitFromGitCommit: gitCommit ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceGitRemoteBranch >> delete [ repository handleLibgitError: [ | found | @@ -21,43 +23,43 @@ IceGitRemoteBranch >> delete [ self repositoryHandle deleteBranch: found ] ] -{ #category : #filesystem } +{ #category : 'filesystem' } IceGitRemoteBranch >> fileSystem [ ^ self commit fileSystem ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> gitRef [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> name [ ^ self fullname withoutPrefix: self prefix ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> prefix [ ^ 'refs/remotes/' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> remoteName [ ^ (self fullname substrings: '/') third ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> shortname [ ^ self name withoutPrefix: self remoteName, '/' diff --git a/Iceberg-Libgit/IceGitScpRemote.class.st b/Iceberg-Libgit/IceGitScpRemote.class.st index a2370bdaa4..8a1b6b3301 100644 --- a/Iceberg-Libgit/IceGitScpRemote.class.st +++ b/Iceberg-Libgit/IceGitScpRemote.class.st @@ -4,12 +4,14 @@ A remote repository created out of a SCP url, such as 'git@github.com:npasserini " Class { - #name : #IceGitScpRemote, - #superclass : #IceGitNetworkRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitScpRemote', + #superclass : 'IceGitNetworkRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote class >> canHandleUrl: aUrl [ "Very simplistic implementation that does not cover all cases. Either there is the ssh scheme or treat all non absolute paths as SSH" @@ -17,41 +19,41 @@ IceGitScpRemote class >> canHandleUrl: aUrl [ ^ (self isSSHUrl: aUrl) or: [ self isAlternateSSHUrl: aUrl ] ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitScpRemote class >> defaultPort [ ^ 22 ] -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote class >> isAlternateSSHUrl: aUrl [ "Definition taken from https://stackoverflow.com/questions/14348874/git-repository-url-ssh-syntax-without-absolute-path" ^ (aUrl includesSubstring: '://') not and: [ (aUrl beginsWith: '/') not ] ] -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote class >> isSSHUrl: aUrl [ ^ aUrl beginsWith: 'ssh://' ] -{ #category : #'private - patches' } +{ #category : 'private - patches' } IceGitScpRemote >> httpsUrl [ ^ 'https://{1}/{2}.git' format: { self host . self projectPath } ] -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote >> isAlternateSSHUrl: aString [ ^ self class isAlternateSSHUrl: aString ] -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote >> isSSHUrl: aString [ ^ self class isSSHUrl: aString ] -{ #category : #'private - patches' } +{ #category : 'private - patches' } IceGitScpRemote >> parseUrl [ | urlStream restSegments | (self isSSHUrl: url) diff --git a/Iceberg-Libgit/IceGitSshRemote.class.st b/Iceberg-Libgit/IceGitSshRemote.class.st index eb06776166..728c3bda7c 100644 --- a/Iceberg-Libgit/IceGitSshRemote.class.st +++ b/Iceberg-Libgit/IceGitSshRemote.class.st @@ -4,22 +4,24 @@ A remote repository created out of a git url, such as 'git://localhost/owner/re " Class { - #name : #IceGitSshRemote, - #superclass : #IceGitNetworkRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitSshRemote', + #superclass : 'IceGitNetworkRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitSshRemote class >> canHandleUrl: aRepositoryUrl [ ^ aRepositoryUrl beginsWith: 'git://' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitSshRemote class >> defaultPort [ ^9418 ] -{ #category : #'private - patches' } +{ #category : 'private - patches' } IceGitSshRemote >> httpsUrl [ ^ 'https://{1}/{2}.git' format: { self host . self projectPath } diff --git a/Iceberg-Libgit/IceGitUnbornBranch.class.st b/Iceberg-Libgit/IceGitUnbornBranch.class.st index f0aaa8f118..bfb6f50102 100644 --- a/Iceberg-Libgit/IceGitUnbornBranch.class.st +++ b/Iceberg-Libgit/IceGitUnbornBranch.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceGitUnbornBranch, - #superclass : #IceUnbornBranch, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitUnbornBranch', + #superclass : 'IceUnbornBranch', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitUnbornBranch >> branchNamePrefix [ ^ 'refs/heads/' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitUnbornBranch >> gitRef [ "When the repository is unborn, the repository has a single ref that points to no commits. The HEAD file then contains some content such as: @@ -21,7 +23,7 @@ IceGitUnbornBranch >> gitRef [ ^ ((repository location / '.git' / 'HEAD') contents withoutPrefix: 'ref: ') trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitUnbornBranch >> name [ "Remove the refs/heads prefix from the full branch name" ^ self gitRef withoutPrefix: self branchNamePrefix diff --git a/Iceberg-Libgit/IceGitWorkingCopyUpdateVisitor.class.st b/Iceberg-Libgit/IceGitWorkingCopyUpdateVisitor.class.st index 54c69eed46..59bbfffb05 100644 --- a/Iceberg-Libgit/IceGitWorkingCopyUpdateVisitor.class.st +++ b/Iceberg-Libgit/IceGitWorkingCopyUpdateVisitor.class.st @@ -1,60 +1,62 @@ Class { - #name : #IceGitWorkingCopyUpdateVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceGitWorkingCopyUpdateVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'repository', 'diff', 'index' ], - #category : #'Iceberg-Libgit-Commit' + #category : 'Iceberg-Libgit-Commit', + #package : 'Iceberg-Libgit', + #tag : 'Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitWorkingCopyUpdateVisitor >> diff: anIceDiff [ diff := anIceDiff ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitWorkingCopyUpdateVisitor >> index: anIndex [ index := anIndex ] -{ #category : #operations } +{ #category : 'operations' } IceGitWorkingCopyUpdateVisitor >> removeFile: anIceFileDefinition [ (repository location resolvePath: anIceFileDefinition path) ensureDelete ] -{ #category : #actions } +{ #category : 'actions' } IceGitWorkingCopyUpdateVisitor >> removeFileReferenceInPath: aPath [ (repository workingCopy fileSystem resolve: aPath) ensureDeleteAll ] -{ #category : #operations } +{ #category : 'operations' } IceGitWorkingCopyUpdateVisitor >> removePackage: aDefinition [ (repository location resolvePath: aDefinition path) ensureDeleteAll ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitWorkingCopyUpdateVisitor >> repository: anIceLibgitRepository [ repository := anIceLibgitRepository ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitAddition: anIceAddition [ anIceAddition definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitDirectoryDefinition: anIceDirectoryDefinition [ self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitFileNode: anIceFileDefinition [ | reference | @@ -66,25 +68,25 @@ IceGitWorkingCopyUpdateVisitor >> visitFileNode: anIceFileDefinition [ writeStream nextPutAll: anIceFileDefinition basicContents ]. ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitModification: anIceModification [ ^ anIceModification leftDefinition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitNoModification: anIceNoModification [ anIceNoModification definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitPackage: anIcePackageDefinition [ "I am a package, I have to export my changes using the repository format. @@ -114,13 +116,13 @@ IceGitWorkingCopyUpdateVisitor >> visitPackage: anIcePackageDefinition [ index storeVersion: version ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitRemoval: anIceRemoval [ anIceRemoval definition removeFrom: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitRootDefinition: anIceRootDefinition [ self visitChildrenOf: currentNode diff --git a/Iceberg-Libgit/IceIndexUpdateVisitor.class.st b/Iceberg-Libgit/IceIndexUpdateVisitor.class.st index 3d32c8c960..122ae237cf 100644 --- a/Iceberg-Libgit/IceIndexUpdateVisitor.class.st +++ b/Iceberg-Libgit/IceIndexUpdateVisitor.class.st @@ -1,79 +1,81 @@ Class { - #name : #IceIndexUpdateVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceIndexUpdateVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'diff', 'index' ], - #category : #'Iceberg-Libgit-Commit' + #category : 'Iceberg-Libgit-Commit', + #package : 'Iceberg-Libgit', + #tag : 'Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceIndexUpdateVisitor >> diff: anIceDiff [ diff := anIceDiff ] -{ #category : #accessing } +{ #category : 'accessing' } IceIndexUpdateVisitor >> index: anIndex [ index := anIndex ] -{ #category : #accessing } +{ #category : 'accessing' } IceIndexUpdateVisitor >> repository [ ^ index repository ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitAddition: anIceAddition [ anIceAddition definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitDirectoryDefinition: anIceDirectoryDefinition [ self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitFileNode: anIceFileDefinition [ index addPath: anIceFileDefinition path ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitModification: anIceModification [ ^ anIceModification leftDefinition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitNoModification: anIceNoModification [ anIceNoModification definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitPackage: anIcePackageDefinition [ index addPackage: anIcePackageDefinition ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitRemoval: anIceRemoval [ "Do the same as an addition" self visitAddition: anIceRemoval ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitRootDefinition: anIceRootDefinition [ self visitChildrenOf: currentNode diff --git a/Iceberg-Libgit/IceLibgitCommitWalk.class.st b/Iceberg-Libgit/IceLibgitCommitWalk.class.st index 2ac805ce81..08816b49ca 100644 --- a/Iceberg-Libgit/IceLibgitCommitWalk.class.st +++ b/Iceberg-Libgit/IceLibgitCommitWalk.class.st @@ -2,16 +2,18 @@ Utility class for searching through a commit history taking advantage of git revwalk utilities. Found and returned commits will be added to the commit cache of the corresponding IceRepository. " Class { - #name : #IceLibgitCommitWalk, - #superclass : #IceAbstractCommitWalk, + #name : 'IceLibgitCommitWalk', + #superclass : 'IceAbstractCommitWalk', #instVars : [ 'revwalk', 'lgitRepository' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #walking } +{ #category : 'walking' } IceLibgitCommitWalk >> commitsDo: aBlock [ self maxNumber ifNil: [ super commitsDo: aBlock ] @@ -26,7 +28,7 @@ IceLibgitCommitWalk >> commitsDo: aBlock [ ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromBranch: branch [ [ self revwalk pushReference: (lgitRepository lookupBranch: (branch isRemote ifTrue: [branch fullname] ifFalse: [ branch shortname ]) remote: branch isRemote) ] on: LGit_GIT_EINVALIDSPEC do: [ @@ -38,27 +40,27 @@ IceLibgitCommitWalk >> fromBranch: branch [ ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromCommit: commit [ self fromCommitId: commit id ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromCommitId: commitId [ self fromLGitId: (LGitId fromHexString: commitId) ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromHead [ self revwalk pushHead ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromLGitId: lGitId [ self revwalk pushCommit: lGitId ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromTag: tag [ self revwalk. ^ self fromLGitId: (lgitRepository revparse: tag name) id @@ -66,21 +68,21 @@ IceLibgitCommitWalk >> fromTag: tag [ ] -{ #category : #private } +{ #category : 'private' } IceLibgitCommitWalk >> rawResultsDo: aBlockClosure [ self revwalk select: [ :result | self shouldInclude: result ] thenDo: aBlockClosure ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitCommitWalk >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitCommitWalk >> revwalk [ repository handleLibgitError: [ @@ -93,7 +95,7 @@ IceLibgitCommitWalk >> revwalk [ revwalk ]] ] -{ #category : #private } +{ #category : 'private' } IceLibgitCommitWalk >> shouldInclude: aLGitCommit [ ^ self modifyingPackage ifNil: [ true ] @@ -102,7 +104,7 @@ IceLibgitCommitWalk >> shouldInclude: aLGitCommit [ ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> uptoCommit: commit [ self revwalk hideCommit: (LGitId fromHexString: commit id) ] diff --git a/Iceberg-Libgit/IceLibgitErrorVisitor.class.st b/Iceberg-Libgit/IceLibgitErrorVisitor.class.st index 7221b4a4d6..38dfa13180 100644 --- a/Iceberg-Libgit/IceLibgitErrorVisitor.class.st +++ b/Iceberg-Libgit/IceLibgitErrorVisitor.class.st @@ -8,15 +8,17 @@ I also have a context, which points to the object that is requesting the excepti This context is used to obtain more information about the operation that failed, usually not provided by Libgit, such as urls, locations, etc. " Class { - #name : #IceLibgitErrorVisitor, - #superclass : #Object, + #name : 'IceLibgitErrorVisitor', + #superclass : 'Object', #instVars : [ 'context' ], - #category : #'Iceberg-Libgit-Exceptions' + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitErrorVisitor class >> onContext: aContext [ ^ self new @@ -24,24 +26,24 @@ IceLibgitErrorVisitor class >> onContext: aContext [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitErrorVisitor >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitErrorVisitor >> context: anObject [ context := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitECONFLICT: anError [ anError object = LGitErrorTypeEnum giterr_checkout ifTrue: [ ^ anError resignalAs: IceCheckoutConflictError new ]. self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitEEOF: aLGit_GIT_EEOF [ aLGit_GIT_EEOF messageText trimmed = 'ERROR: Repository not found.' @@ -50,7 +52,7 @@ IceLibgitErrorVisitor >> visitEEOF: aLGit_GIT_EEOF [ ^ self visitGenericError: aLGit_GIT_EEOF ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitEEXISTS: anError [ (anError messageText asLowercase beginsWith: 'failed to write reference ''refs/tags') @@ -66,13 +68,13 @@ IceLibgitErrorVisitor >> visitEEXISTS: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitENOTFOUND: anError [ NotFound signal: anError messageText ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitERROR: anError [ (anError object = LGitErrorTypeEnum giterr_ssh) @@ -93,7 +95,7 @@ IceLibgitErrorVisitor >> visitERROR: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitEUSER: anError [ "Since user errors do not have a code, they can can just be handled by analysis of messageText. String comparisson is not the thing in history, but for not it will @@ -105,7 +107,7 @@ IceLibgitErrorVisitor >> visitEUSER: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitGenericError: anError [ IceGenericError new diff --git a/Iceberg-Libgit/IceLibgitRepository.class.st b/Iceberg-Libgit/IceLibgitRepository.class.st index fe29a55322..1a52008d33 100644 --- a/Iceberg-Libgit/IceLibgitRepository.class.st +++ b/Iceberg-Libgit/IceLibgitRepository.class.st @@ -5,8 +5,8 @@ I have a handle to a LGitRepository that is lazily initialized on usage, and cle Every access to the libgit repository should be wrapped with a call to #handleLibgitError: to manage possible libgit errors and transform them to a correct iceberg error. " Class { - #name : #IceLibgitRepository, - #superclass : #IceRepository, + #name : 'IceLibgitRepository', + #superclass : 'IceRepository', #instVars : [ 'location', 'commitCache', @@ -18,27 +18,29 @@ Class { 'ShareRepositoriesBetweenImages', 'SharedRepositoriesLocation' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> defaultCodeSubdirectory [ ^ DefaultCodeSubdirectory ifNil: [ DefaultCodeSubdirectory := 'src' ] ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> defaultCodeSubdirectory: aString [ DefaultCodeSubdirectory := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitRepository class >> defaultFileFormat [ ^ Smalltalk at: self defaultFileFormatType asSymbol ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> defaultFileFormatType [ ^ DefaultFileFormatType ifNil: [ DefaultFileFormatType := TIceRepositoryWriter traitUsers @@ -47,19 +49,19 @@ IceLibgitRepository class >> defaultFileFormatType [ ifNone: [ nil "To be filled later (on first demand)" ] ] ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> defaultFileFormatType: anObject [ DefaultFileFormatType := anObject ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> formatTypeDomainValues [ ^ TIceRepositoryWriter traitUsers ifNotEmpty: [ :users | users collect: [ :each | each description -> each name ] ] ifEmpty: [ { 'Undefined' -> nil } ] ] -{ #category : #rules } +{ #category : 'rules' } IceLibgitRepository class >> libgitErrorHandlerPragmaSelector [ "Pragma selector used to detect methods used as libgit error handlers. @@ -67,7 +69,7 @@ IceLibgitRepository class >> libgitErrorHandlerPragmaSelector [ ^ #libgitErrorHandler ] -{ #category : #rules } +{ #category : 'rules' } IceLibgitRepository class >> libgitErrorHandlerSelector [ "Detect what method is used for handling libgit errors. @@ -78,7 +80,7 @@ IceLibgitRepository class >> libgitErrorHandlerSelector [ each pragmas anySatisfy: [ :pragma | pragma keyword = self libgitErrorHandlerPragmaSelector ] ]) selector ] -{ #category : #rules } +{ #category : 'rules' } IceLibgitRepository class >> libgitRepositoryHandleAccessorPragmaSelector [ "Pragma selector used to detect methods allowed to directly access the repository handle. @@ -86,25 +88,25 @@ IceLibgitRepository class >> libgitRepositoryHandleAccessorPragmaSelector [ ^ #repositoryHandleAccessor ] -{ #category : #rules } +{ #category : 'rules' } IceLibgitRepository class >> libgitRepositoryHandleAccessors [ ^ self allMethods select: [ :m | m pragmas anySatisfy: [ :p | p keyword = self libgitRepositoryHandleAccessorPragmaSelector ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitRepository class >> localRepositoriesLocation [ ^ FileLocator localDirectory / #iceberg ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitRepository class >> repositoriesLocation [ ^ self shareRepositoriesBetweenImages ifTrue: [ self sharedRepositoriesLocation ] ifFalse: [ self localRepositoriesLocation ] ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitRepository class >> requiredLibGit2MinimumVersion [ ^ IceSemanticVersion major: 0 @@ -112,7 +114,7 @@ IceLibgitRepository class >> requiredLibGit2MinimumVersion [ patch: 1 ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> settingsOn: aBuilder [ @@ -148,38 +150,38 @@ IceLibgitRepository class >> settingsOn: aBuilder [ ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> shareRepositoriesBetweenImages [ ^ ShareRepositoriesBetweenImages ifNil: [ ShareRepositoriesBetweenImages := false ] ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> shareRepositoriesBetweenImages: anObject [ ShareRepositoriesBetweenImages := anObject ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> sharedRepositoriesLocation [ ^ SharedRepositoriesLocation ifNil: [ SharedRepositoriesLocation := (FileLocator home / #iceberg) asFileReference ] ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> sharedRepositoriesLocation: anObject [ SharedRepositoriesLocation := anObject ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> sharedRepositoriesLocationString [ ^ self sharedRepositoriesLocation fullName ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> sharedRepositoriesLocationString: aString [ SharedRepositoriesLocation := aString asFileReference ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitRepository class >> verifyBackendAvailabilityIfNot: aBlock [ | presentVersion requiredVersion | @@ -189,13 +191,13 @@ IceLibgitRepository class >> verifyBackendAvailabilityIfNot: aBlock [ ifFalse: [ ^ aBlock cull: requiredVersion cull: presentVersion ] ] -{ #category : #'API - files' } +{ #category : 'API - files' } IceLibgitRepository >> addFileToIndex: aFile [ self addFilesToIndex: { aFile } ] -{ #category : #'API - files' } +{ #category : 'API - files' } IceLibgitRepository >> addFilesToIndex: aCollection [ self handleLibgitError: [ @@ -214,37 +216,37 @@ IceLibgitRepository >> addFilesToIndex: aCollection [ free ] ] -{ #category : #'to-cleanup' } +{ #category : 'to-cleanup' } IceLibgitRepository >> addTo: aMCRepositoryGroup [ "For now do not add me as an MCRepository" ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> allBranches [ ^ self localBranches, self remoteTrackedBranches ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> basicCodeDirectory [ ^ self subdirectory isEmptyOrNil ifTrue: [ self repositoryDirectory ] ifFalse: [ self repositoryDirectory / self subdirectory ]. ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> basicNewBranchNamed: aString [ ^ IceGitLocalBranch named: aString inRepository: self ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> basicNewRemoteBranchNamed: aString [ ^ IceGitRemoteBranch named: aString inRepository: self ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> branchNamed: aString ifPresent: presentBlock ifAbsent: absentBlock [ self handleLibgitError: [ | found | @@ -252,7 +254,7 @@ IceLibgitRepository >> branchNamed: aString ifPresent: presentBlock ifAbsent: ab ^ found ifNil: absentBlock ifNotNil: [ presentBlock value: (self basicNewBranchNamed: found name) ] ] ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceLibgitRepository >> changedFilesBetween: aCommitish and: otherCommitish [ "Answer a list of files that changed between two commits" @@ -263,7 +265,7 @@ IceLibgitRepository >> changedFilesBetween: aCommitish and: otherCommitish [ ^ diff files ] ] -{ #category : #'API - registry' } +{ #category : 'API - registry' } IceLibgitRepository >> checkForRegistryConflicts [ "If the repository has no location, do not check for conflicts." @@ -292,7 +294,7 @@ and the original repository''s url is {3}.' format: {self location. self origin. repo origin}) ]]. ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> codeDirectory [ "Code repository might have been deleted or image might have been moved." self repositoryDirectory exists @@ -300,13 +302,13 @@ IceLibgitRepository >> codeDirectory [ ifFalse: [ IceLocalRepositoryMissing signalFor: self ] ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceLibgitRepository >> commitCache [ ^ commitCache ifNil: [ commitCache := LRUCache new maximumWeight: 30 ] ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceLibgitRepository >> commitFromGitCommit: aLGitCommit [ ^ self commitCache at: aLGitCommit id hexString ifAbsentPut: [ @@ -321,12 +323,12 @@ IceLibgitRepository >> commitFromGitCommit: aLGitCommit [ yourself ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> commitIdFrom: aLGitCommit [ ^ aLGitCommit id hexString ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> commitishNamed: aName [ "Resolve a name in the form of: - a commit hash @@ -345,7 +347,7 @@ IceLibgitRepository >> commitishNamed: aName [ self revparse: aName ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> createBranch: branchName [ | newBranch | "This is really low level and may provoke problems. @@ -370,7 +372,7 @@ IceLibgitRepository >> createBranch: branchName [ ^ self head ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> createBranch: aString inCommit: anIceGitCommit [ self handleLibgitError: [ @@ -382,7 +384,7 @@ IceLibgitRepository >> createBranch: aString inCommit: anIceGitCommit [ yourself ] ] -{ #category : #'API - working copy' } +{ #category : 'API - working copy' } IceLibgitRepository >> createSourceDirectory [ (location / self subdirectory) ensureCreateDirectory. @@ -391,7 +393,7 @@ IceLibgitRepository >> createSourceDirectory [ store ] -{ #category : #'API - registry' } +{ #category : 'API - registry' } IceLibgitRepository >> delete [ "Delete is idempotent. If the repository does not exist, do nothing. Otherwise, forget the repository and remove it from the disk. @@ -403,7 +405,7 @@ IceLibgitRepository >> delete [ self locationIfPresent: [ :aLocation | aLocation ensureDeleteAll ] ] -{ #category : #printing } +{ #category : 'printing' } IceLibgitRepository >> description [ ^ [ super description ] on: Error do: [ self location isNil @@ -411,7 +413,7 @@ IceLibgitRepository >> description [ ifFalse: [ 'Bad location: ', self location path pathString ] ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> directoryForPackage: mcPackage [ | package | package := self packageNamed: mcPackage name. @@ -420,7 +422,7 @@ IceLibgitRepository >> directoryForPackage: mcPackage [ ifFalse: [ self subdirectory, '/', (self directoryNameForPackage: package) ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> directoryNameForPackage: package [ ^ (self writerClass @@ -428,7 +430,7 @@ IceLibgitRepository >> directoryNameForPackage: package [ asString ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> directoryPathStringForPackage: aMCPackage [ ^ self subdirectory isEmptyOrNil @@ -436,7 +438,7 @@ IceLibgitRepository >> directoryPathStringForPackage: aMCPackage [ ifFalse: [ self subdirectory, '/', (self directoryNameForPackage: aMCPackage) ] ] -{ #category : #'private - remotes' } +{ #category : 'private - remotes' } IceLibgitRepository >> doRemoveRemote: aRemote [ self handleLibgitError: [ (LGitRemote of: self repositoryHandle named: aRemote name) @@ -444,7 +446,7 @@ IceLibgitRepository >> doRemoveRemote: aRemote [ delete ] ] -{ #category : #'private - libgit' } +{ #category : 'private - libgit' } IceLibgitRepository >> free [ (handle isNil or: [ handle isNull ]) @@ -453,7 +455,7 @@ IceLibgitRepository >> free [ handle := nil ] ] -{ #category : #'API - configuration' } +{ #category : 'API - configuration' } IceLibgitRepository >> getConfigurationGlobal: aBoolean [ self handleLibgitError: [ | config | @@ -463,7 +465,7 @@ IceLibgitRepository >> getConfigurationGlobal: aBoolean [ ifFalse: [ config ] ] ] -{ #category : #'private - libgit' } +{ #category : 'private - libgit' } IceLibgitRepository >> handleLibgitError: aBlock [ "Handle errors while calling libgit. The pragma is used to detect this method and verify on architectural rules that it is correctly called" @@ -472,32 +474,32 @@ IceLibgitRepository >> handleLibgitError: aBlock [ aBlock on: LGitCallReturnHandler do: [ :error | error acceptError: (IceLibgitErrorVisitor onContext: self) ] ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceLibgitRepository >> hasTagNamed: aString [ ^ self tagNames includes: aString ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> head [ ^ self lookupHead ] -{ #category : #printing } +{ #category : 'printing' } IceLibgitRepository >> headDescription [ ^ [ super headDescription ] on: Error do: [ 'Bad location' ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> iceCommitFrom: aGitCommit [ "The type of 'aCommitish' depends on how each backend internal representation. " ^ self commitFromGitCommit: aGitCommit ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } IceLibgitRepository >> init [ "Initialize new repository. This is the equivalent to running in the command line: $ git init @@ -506,45 +508,45 @@ IceLibgitRepository >> init [ self initBare: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceLibgitRepository >> initBare: isBare [ (LGitRepository on: self location) initBare: isBare ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceLibgitRepository >> internalStoreVersion: aMCVersion [ self writerClass forInternalStoreFileOut: aMCVersion on: self ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitRepository >> isCloneOfUrl: aString [ ^ self isMissing not and: [ super isCloneOfUrl: aString ] ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitRepository >> isCodeMissing [ ^ self subdirectory isEmptyOrNil ifTrue: [ self isMissing ] ifFalse: [ (self repositoryDirectory / self subdirectory) exists not ] ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitRepository >> isMissing [ ^ self repositoryDirectory isNil or: [ self repositoryDirectory exists not ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> isModified [ "We cannot correctly determine if a repository is modified if it is missing so, false" ^ self isMissing not and: [ super isModified ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> isPackageExported: anIceSavedPackage [ | packageLocation | @@ -552,13 +554,13 @@ IceLibgitRepository >> isPackageExported: anIceSavedPackage [ ^ packageLocation exists and: [ packageLocation hasChildren ] ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitRepository >> isValid [ self flag: #pharoTodo. "Make this tests more solid" ^ self isMissing not ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> localBranches [ self handleLibgitError: [ @@ -569,24 +571,24 @@ IceLibgitRepository >> localBranches [ streamContents: [ :stream | self repositoryHandle localBranchesDo: [ :br :isLocal | stream nextPut: (self basicNewBranchNamed: br name) ] ] ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> location [ ^ location ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> location: aFileReference [ location := aFileReference. self resetHandle ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> locationIfPresent: aBlock [ ^ self locationIfPresent: aBlock ifAbsent: [ self ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> locationIfPresent: aBlock ifAbsent: absentBlock [ self location ifNil: [ ^ absentBlock value ]. @@ -596,25 +598,25 @@ IceLibgitRepository >> locationIfPresent: aBlock ifAbsent: absentBlock [ ifFalse: [ absentBlock value ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> log [ ^ self logClass for: self ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> logClass [ ^ IceLog allSubclasses detect: [ :each | each isAvailableFor: self ] ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceLibgitRepository >> lookupCommit: commitId ifAbsent: aBlock [ ^ [ self revparse: commitId ] on: NotFound do: aBlock ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> lookupHead [ self handleLibgitError: [ | head | self repositoryHandle isUnborn @@ -625,7 +627,7 @@ IceLibgitRepository >> lookupHead [ ifFalse: [ head object asIcebergObjectInRepository: self ] ] ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceLibgitRepository >> mcVersionFor: iceVersion [ [ | commit | commit := iceVersion commit libgitCommit. @@ -637,7 +639,7 @@ IceLibgitRepository >> mcVersionFor: iceVersion [ signal ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> mergeBaseBetween: aCommitId and: anotherCommitId [ self handleLibgitError: [ ^ (self repositoryHandle @@ -645,42 +647,42 @@ IceLibgitRepository >> mergeBaseBetween: aCommitId and: anotherCommitId [ and: (LGitId fromHexString: anotherCommitId)) hexString ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> name [ ^ name ifNil: [ name := self obtainRepositoryName ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> newCommitWalk [ ^ IceLibgitCommitWalk forRepository: self ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceLibgitRepository >> newIndex [ ^ IceGitIndex on: self ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceLibgitRepository >> newNoCommit [ ^ IceNoCommit repository: self ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceLibgitRepository >> newProjectFromCommit: aCommit [ ^ IceProjectReader readProjectFrom: self ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> obtainRepositoryName [ ^ self location basename ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> origin [ ^ self @@ -691,7 +693,7 @@ IceLibgitRepository >> origin [ yourself ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> packageLocationFor: anIceSavedPackage [ | packageLocation directoryName | @@ -703,36 +705,36 @@ IceLibgitRepository >> packageLocationFor: anIceSavedPackage [ ^ packageLocation ] -{ #category : #'private - tags' } +{ #category : 'private - tags' } IceLibgitRepository >> peelTag: anIceTag [ self handleLibgitError: [ | lgitRef | lgitRef := (self repositoryHandle lookup: 'refs/tags/', anIceTag name). ^ self lookupCommit: lgitRef targetId hexString ] ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceLibgitRepository >> project [ ^ self workingCopy project ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> properties [ ^ self workingCopy repositoryProperties ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceLibgitRepository >> readerClass [ ^ self properties readerClass ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remoteAt: aString put: aRemote [ self handleLibgitError: [ self repositoryHandle addRemote: aRemote name url: aRemote url ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remoteBranchNamed: aString ifPresent: presentBlock ifAbsent: absentBlock [ self handleLibgitError: [ | branchRef | @@ -740,7 +742,7 @@ IceLibgitRepository >> remoteBranchNamed: aString ifPresent: presentBlock ifAbse presentBlock value: (self basicNewRemoteBranchNamed: branchRef name) ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remoteNamed: aName ifAbsent: aBlockClosure [ self handleLibgitError: [ | gitRemote | @@ -752,7 +754,7 @@ IceLibgitRepository >> remoteNamed: aName ifAbsent: aBlockClosure [ do: [ ^ aBlockClosure value ] ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remoteTrackedBranches [ self handleLibgitError: [ @@ -765,7 +767,7 @@ IceLibgitRepository >> remoteTrackedBranches [ stream nextPut: (self basicNewRemoteBranchNamed: br name) ] ] ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remotes [ LGitLibrary uniqueInstance isAvailable @@ -783,19 +785,19 @@ IceLibgitRepository >> remotes [ yourself ] ] ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceLibgitRepository >> removeTag: anIceTag [ self handleLibgitError: [ self repositoryHandle git_tag_delete: anIceTag name ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> repositoryDirectory [ ^ self location ] -{ #category : #'private - libgit' } +{ #category : 'private - libgit' } IceLibgitRepository >> repositoryHandle [ @@ -804,12 +806,12 @@ IceLibgitRepository >> repositoryHandle [ ^ handle ] -{ #category : #'private - libgit' } +{ #category : 'private - libgit' } IceLibgitRepository >> resetHandle [ handle := nil ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceLibgitRepository >> revparse: aName [ self handleLibgitError: [ | gitCommit gitId | @@ -818,7 +820,7 @@ IceLibgitRepository >> revparse: aName [ ^ self commitFromGitCommit: gitCommit ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> setHead: anIceGitCommitish [ "Need to keep the reference, if not it is garbage collected. As the options are only passed to a FFI call" @@ -835,18 +837,18 @@ IceLibgitRepository >> setHead: anIceGitCommitish [ yourself) ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> subdirectory [ ^ self project sourceDirectory ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> subdirectory: aString [ self project sourceDirectory: aString ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> subdirectoryPath [ "API compatible both with Pharo6 and Pharo7. @@ -857,13 +859,13 @@ IceLibgitRepository >> subdirectoryPath [ ^ RelativePath withAll: (RelativePath canonicalizeElements: ($/ split: self subdirectory)) ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> subdirectoryReference [ ^ self location resolve: self subdirectoryPath ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceLibgitRepository >> tags [ self handleLibgitError: [ ^ self repositoryHandle tags @@ -871,7 +873,7 @@ IceLibgitRepository >> tags [ IceTag named: each inRepository: self ] ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> writerClass [ ^ self project writerClass ] diff --git a/Iceberg-Libgit/IceLibgitTreeBuilder.class.st b/Iceberg-Libgit/IceLibgitTreeBuilder.class.st index d4f13da3d9..77a6ff4c0f 100644 --- a/Iceberg-Libgit/IceLibgitTreeBuilder.class.st +++ b/Iceberg-Libgit/IceLibgitTreeBuilder.class.st @@ -29,8 +29,8 @@ Internal Representation and Key Implementation Points. Implementation Points " Class { - #name : #IceLibgitTreeBuilder, - #superclass : #Object, + #name : 'IceLibgitTreeBuilder', + #superclass : 'Object', #instVars : [ 'parent', 'entryName', @@ -40,16 +40,18 @@ Class { 'initialTree', 'hasChanges' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitTreeBuilder class >> on: aLGitTree [ "Creates a tree builder on the root of the repository" ^ self new initializeWithTree: aLGitTree ] -{ #category : #modifying } +{ #category : 'modifying' } IceLibgitTreeBuilder >> addEntryNamed: name withContents: aString [ self builder addEntry: (LGitBlob of: self repository fromString: aString) @@ -59,7 +61,7 @@ IceLibgitTreeBuilder >> addEntryNamed: name withContents: aString [ hasChanges := true ] -{ #category : #building } +{ #category : 'building' } IceLibgitTreeBuilder >> buildTree [ self children keysAndValuesDo: [ :childEntryName :childBuilder | childBuilder hasChanges ifTrue: [ @@ -72,7 +74,7 @@ IceLibgitTreeBuilder >> buildTree [ ^ self builder newTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> builder [ ^ builder ifNil: [ builder := LGitTreeBuilder @@ -81,28 +83,28 @@ IceLibgitTreeBuilder >> builder [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> changes [ ^ changes ifNil: [ changes := OrderedCollection new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> children [ ^ children ifNil: [ children := Dictionary new ] ] -{ #category : #modifying } +{ #category : 'modifying' } IceLibgitTreeBuilder >> deleteAll [ self builder clear. ] -{ #category : #patches } +{ #category : 'patches' } IceLibgitTreeBuilder >> directory [ ^ self ] -{ #category : #querying } +{ #category : 'querying' } IceLibgitTreeBuilder >> entryByName: aString [ ^ self children at: aString @@ -112,7 +114,7 @@ IceLibgitTreeBuilder >> entryByName: aString [ entryName: aString ] ] -{ #category : #querying } +{ #category : 'querying' } IceLibgitTreeBuilder >> entryByPath: aString [ ^ (aString = '.' ) ifTrue: [ self ] @@ -121,12 +123,12 @@ IceLibgitTreeBuilder >> entryByPath: aString [ into: [ :treeBuilder :name | treeBuilder entryByName: name ]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> entryName [ ^ entryName ] -{ #category : #querying } +{ #category : 'querying' } IceLibgitTreeBuilder >> hasChanges [ ^ hasChanges or: [ initialTree isNil "It means that this is a new tree" @@ -134,20 +136,20 @@ IceLibgitTreeBuilder >> hasChanges [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> initialTree [ ^ initialTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceLibgitTreeBuilder >> initialize [ super initialize. hasChanges := false. ] -{ #category : #initializing } +{ #category : 'initializing' } IceLibgitTreeBuilder >> initializeWithParent: anIceTreeBuilder entryName: aString [ | treeEntry | parent := anIceTreeBuilder. @@ -162,18 +164,18 @@ IceLibgitTreeBuilder >> initializeWithParent: anIceTreeBuilder entryName: aStrin ] -{ #category : #initializing } +{ #category : 'initializing' } IceLibgitTreeBuilder >> initializeWithTree: aLGitTree [ "This is a builder on the root of a repository" initialTree := aLGitTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> parent [ ^ parent ] -{ #category : #printing } +{ #category : 'printing' } IceLibgitTreeBuilder >> printOn: aStream [ aStream nextPutAll: self class name; @@ -183,7 +185,7 @@ IceLibgitTreeBuilder >> printOn: aStream [ ] -{ #category : #printing } +{ #category : 'printing' } IceLibgitTreeBuilder >> printPathOn: aStream [ parent ifNil: [ @@ -194,7 +196,7 @@ IceLibgitTreeBuilder >> printPathOn: aStream [ nextPutAll: entryName ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> repository [ ^ parent ifNotNil: [ self parent repository ] diff --git a/Iceberg-Libgit/IceMCSnapshotPatchVisitor.class.st b/Iceberg-Libgit/IceMCSnapshotPatchVisitor.class.st index 85f316af55..47f3fb5750 100644 --- a/Iceberg-Libgit/IceMCSnapshotPatchVisitor.class.st +++ b/Iceberg-Libgit/IceMCSnapshotPatchVisitor.class.st @@ -1,44 +1,46 @@ Class { - #name : #IceMCSnapshotPatchVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceMCSnapshotPatchVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'patcher' ], - #category : #'Iceberg-Libgit-Commit' + #category : 'Iceberg-Libgit-Commit', + #package : 'Iceberg-Libgit', + #tag : 'Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceMCSnapshotPatchVisitor >> patcher: aMCPatcher [ patcher := aMCPatcher ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitAddition: anIceAddition [ anIceAddition definition addToPatcher: patcher. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitModification: anIceModification [ anIceModification leftDefinition addModification: anIceModification toPatcher: patcher. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitNoModification: anIceNoModification [ anIceNoModification definition addToPatcher: patcher. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ ^ anIceNonConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitRemoval: anIceRemoval [ anIceRemoval definition removeFromPatcher: patcher. self visitChildrenOf: currentNode diff --git a/Iceberg-Libgit/IceRepositoryCreator.class.st b/Iceberg-Libgit/IceRepositoryCreator.class.st index 8be5355293..73240d6d15 100644 --- a/Iceberg-Libgit/IceRepositoryCreator.class.st +++ b/Iceberg-Libgit/IceRepositoryCreator.class.st @@ -8,8 +8,8 @@ I do this (trying in this order): You can also define branchName to checkout a specific branch. " Class { - #name : #IceRepositoryCreator, - #superclass : #Object, + #name : 'IceRepositoryCreator', + #superclass : 'Object', #instVars : [ 'location', 'url', @@ -20,15 +20,17 @@ Class { 'ensureProjectFile', 'isBareRepository' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator class >> defaultSubdirectory [ ^ '' ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCreator class >> isGitRoot: aReference [ self flag: #pharoTodo. "This does not understand submodules" ^ aReference isDirectory @@ -36,7 +38,7 @@ IceRepositoryCreator class >> isGitRoot: aReference [ and: [ (aReference / '.git' / 'config') exists ] ] ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceRepositoryCreator >> addLocalRepository [ self repository location: self locationToUse. self repository pluginManager repositoryWillBeCreated: self repository. @@ -48,7 +50,7 @@ IceRepositoryCreator >> addLocalRepository [ ^ self repository ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceRepositoryCreator >> addLocalRepositoryAndCheckout [ | localRepository | localRepository := self addLocalRepository. @@ -59,7 +61,7 @@ IceRepositoryCreator >> addLocalRepositoryAndCheckout [ ^ localRepository ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> addProjectFileTo: aRepository [ | newProject | @@ -68,24 +70,24 @@ IceRepositoryCreator >> addProjectFileTo: aRepository [ aRepository workingCopy basicSetProject: newProject. ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> addPropertiesFileTo: aRepository [ aRepository properties fileFormat: self formatToUse ] -{ #category : #remotes } +{ #category : 'remotes' } IceRepositoryCreator >> addRemote: aString [ self remote: (IceGitRemote url: aString) ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCreator >> beBare [ isBareRepository := true ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceRepositoryCreator >> cloneRepository [ IceGitClone new location: self locationToUse; @@ -104,17 +106,17 @@ IceRepositoryCreator >> cloneRepository [ ^ self repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> commitishName [ ^ branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> commitishName: aName [ branchName := aName ] -{ #category : #actions } +{ #category : 'actions' } IceRepositoryCreator >> createNewRepositoryNamed: aString [ | locationToUse | self validate. @@ -136,7 +138,7 @@ IceRepositoryCreator >> createNewRepositoryNamed: aString [ ^ repository ] -{ #category : #actions } +{ #category : 'actions' } IceRepositoryCreator >> createRepository [ ^ [ self validate. @@ -149,7 +151,7 @@ IceRepositoryCreator >> createRepository [ e signal ] ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceRepositoryCreator >> defaultLocation [ | remoteToUse | remoteToUse := self remoteToUse. @@ -158,7 +160,7 @@ IceRepositoryCreator >> defaultLocation [ / remoteToUse projectName ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> doEnsureProject [ ensureProjectFile ifFalse: [ ^ self ]. @@ -177,100 +179,100 @@ IceRepositoryCreator >> doEnsureProject [ self repository workingCopy refreshPackages. ] -{ #category : #'API-project' } +{ #category : 'API-project' } IceRepositoryCreator >> ensureProjectFile [ ensureProjectFile := true ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> formatToUse [ ^ IceLibgitRepository defaultFileFormat ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCreator >> initialize [ super initialize. ensureProjectFile := false. isBareRepository := false ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceRepositoryCreator >> isCloning [ ^ self remoteToUse notNil ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> location: anObject [ location := anObject ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceRepositoryCreator >> locationToUse [ ^ self location ifNil: [ self defaultLocation ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> remote: anObject [ remote := anObject ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceRepositoryCreator >> remoteToUse [ self remote ifNotNil: [ ^ self remote ]. self url ifNotNil: [ ^ IceGitRemote url: self url ]. ^ nil ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> repository [ ^ repository ifNil: [ repository := IceLibgitRepository new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> repository: anExistingRepository [ repository := anExistingRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> subdirectory [ ^ subdirectory ifNil: [ self class defaultSubdirectory ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> subdirectory: anObject [ subdirectory := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> url [ ^ url ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> url: anObject [ url := anObject ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> validate [ self validateLocation. self validateAlreadyPresentAndNotGit. self validateNotDuplicated ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> validateAlreadyPresentAndNotGit [ "Validate if I will add a local repository (url isNil and location isNotNil)... testing the local directory actually exists" @@ -283,14 +285,14 @@ IceRepositoryCreator >> validateAlreadyPresentAndNotGit [ ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> validateLocation [ (self location isNil and: [ self remoteToUse isNil ]) ifTrue: [ IceError signal: 'No location/url or remote defined.' ] ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> validateNotDuplicated [ (self remoteToUse isNotNil and: [ self locationToUse exists and: [ self locationToUse hasChildren ] ]) diff --git a/Iceberg-Libgit/IceRepositoryProperties.class.st b/Iceberg-Libgit/IceRepositoryProperties.class.st index 6a547b0e63..3f47452796 100644 --- a/Iceberg-Libgit/IceRepositoryProperties.class.st +++ b/Iceberg-Libgit/IceRepositoryProperties.class.st @@ -7,17 +7,19 @@ I can answer concrete things about repositories, e.g. : - ... " Class { - #name : #IceRepositoryProperties, - #superclass : #Object, + #name : 'IceRepositoryProperties', + #superclass : 'Object', #instVars : [ 'properties', 'repository', 'commitish' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryProperties class >> fromDictionary: aDictionary commitish: aCommitish [ ^ self new repository: aCommitish repository; @@ -27,7 +29,7 @@ IceRepositoryProperties class >> fromDictionary: aDictionary commitish: aCommiti yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryProperties class >> fromFileReference: aFileReference commitish: aCommitish [ aFileReference exists @@ -35,31 +37,31 @@ IceRepositoryProperties class >> fromFileReference: aFileReference commitish: aC ^ self fromDictionary: (self readPropertiesFrom: aFileReference) commitish: aCommitish ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryProperties class >> fromFileReferenceDirectory: aDirectory commitish: aCommitish [ ^ self fromFileReference: aDirectory / self propertiesFileName commitish: aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties class >> propertiesFileName [ ^ '.properties' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryProperties class >> readPropertiesFrom: aFileReference [ self flag: #pharoFixMe. "When Pharo 6.1 will not be supported anymore we can directly use: `ref readStreamDo: [ :stream | STON fromStream: stream ]` but currently FileReference>>readStream return a ZnBufferedStream in Pharo 61 and a ZnCharacterReadStream decoding utf8 in Pharo 7." ^ aFileReference binaryReadStreamDo: [ :stream | STON fromStream: (ZnCharacterReadStream on: stream encoding: 'utf8') ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceRepositoryProperties >> = anotherObject [ ^ self species = anotherObject species and: [ properties = anotherObject properties ] ] -{ #category : #writing } +{ #category : 'writing' } IceRepositoryProperties >> addToChangeBuilder: anIceChangeImporter [ anIceChangeImporter @@ -68,36 +70,36 @@ IceRepositoryProperties >> addToChangeBuilder: anIceChangeImporter [ contents: self contentsString ] -{ #category : #converting } +{ #category : 'converting' } IceRepositoryProperties >> asBornProperties [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> at: aKey [ ^ self properties at: aKey ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> at: aKey put: aValue [ self properties at: aKey put: aValue ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> commitish [ ^ commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> commitish: anObject [ self assert: anObject isNotNil. commitish := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> contentsString [ ^ ByteArray streamContents: [ :stream | @@ -107,7 +109,7 @@ IceRepositoryProperties >> contentsString [ nextPut: self properties ] ] -{ #category : #'initialization-release' } +{ #category : 'initialization-release' } IceRepositoryProperties >> ensureDefaultProperties [ properties at: #format ifAbsentPut: [ @@ -115,72 +117,72 @@ IceRepositoryProperties >> ensureDefaultProperties [ ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> fileFormat [ ^ self writerClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> fileFormat: aClass [ self fileFormatId: aClass id ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> fileFormatId: aFileFormatId [ self properties at: #format put: aFileFormatId ] -{ #category : #comparing } +{ #category : 'comparing' } IceRepositoryProperties >> hash [ ^ properties hash ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryProperties >> isDirty [ ^ repository workingCopy referenceCommit properties ~= self ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryProperties >> isUnborn [ ^ false ] -{ #category : #private } +{ #category : 'private' } IceRepositoryProperties >> properties [ ^ properties ifNil: [ properties := Dictionary new ] ] -{ #category : #private } +{ #category : 'private' } IceRepositoryProperties >> properties: aDictionary [ properties := aDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> propertiesFilePath [ ^ repository project sourceDirectoryPath / self class propertiesFileName ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> readerClass [ ^ TIceRepositoryReader users detect: [ :each | each id = self fileFormat id ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> repository: anIceLibgitRepository [ repository := anIceLibgitRepository ] -{ #category : #storing } +{ #category : 'storing' } IceRepositoryProperties >> storeOnDirectory: aFileLocator root: rootDirectory [ | propertiesFileReference relativePath | @@ -196,7 +198,7 @@ IceRepositoryProperties >> storeOnDirectory: aFileLocator root: rootDirectory [ nextPut: self properties ] ] -{ #category : #storing } +{ #category : 'storing' } IceRepositoryProperties >> storeOnFileReference: aFileReference [ aFileReference @@ -208,7 +210,7 @@ IceRepositoryProperties >> storeOnFileReference: aFileReference [ nextPut: self properties ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> writerClass [ ^ self properties at: 'format' diff --git a/Iceberg-Libgit/IceSemanticVersion.class.st b/Iceberg-Libgit/IceSemanticVersion.class.st index 7476697175..b567db4abe 100644 --- a/Iceberg-Libgit/IceSemanticVersion.class.st +++ b/Iceberg-Libgit/IceSemanticVersion.class.st @@ -4,17 +4,19 @@ Since I exist just to be able to compare versions, I'm limited (reason why I'm n " Class { - #name : #IceSemanticVersion, - #superclass : #Magnitude, + #name : 'IceSemanticVersion', + #superclass : 'Magnitude', #instVars : [ 'major', 'minor', 'patch' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceSemanticVersion class >> fromArray: anArray [ ^ self major: anArray first @@ -22,7 +24,7 @@ IceSemanticVersion class >> fromArray: anArray [ patch: anArray third ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceSemanticVersion class >> major: majorNumber minor: minorNumber patch: patchNumber [ ^ self basicNew initializeMajor: majorNumber @@ -31,12 +33,12 @@ IceSemanticVersion class >> major: majorNumber minor: minorNumber patch: patchNu yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceSemanticVersion class >> new [ self error: 'Use one of my siblings' ] -{ #category : #comparing } +{ #category : 'comparing' } IceSemanticVersion >> < aMagnitude [ "Answer whether the receiver is less than the argument." | version | @@ -45,7 +47,7 @@ IceSemanticVersion >> < aMagnitude [ ] -{ #category : #comparing } +{ #category : 'comparing' } IceSemanticVersion >> = aMagnitude [ "Compare the receiver with the argument and answer with true if the receiver is equal to the argument. Otherwise answer false." @@ -56,7 +58,7 @@ IceSemanticVersion >> = aMagnitude [ ] -{ #category : #converting } +{ #category : 'converting' } IceSemanticVersion >> asInteger [ "this does not works for versions 0.100+.*, but I do not think it will arrive to that" ^ (self major * 10000) @@ -64,7 +66,7 @@ IceSemanticVersion >> asInteger [ + self patch ] -{ #category : #comparing } +{ #category : 'comparing' } IceSemanticVersion >> hash [ ^ ((self species hash bitXor: self major) @@ -73,34 +75,34 @@ IceSemanticVersion >> hash [ ] -{ #category : #converting } +{ #category : 'converting' } IceSemanticVersion >> iceSemanticVersion [ ^ self ] -{ #category : #initialization } +{ #category : 'initialization' } IceSemanticVersion >> initializeMajor: majorNumber minor: minorNumber patch: patchNumber [ major := majorNumber. minor := minorNumber. patch := patchNumber ] -{ #category : #accessing } +{ #category : 'accessing' } IceSemanticVersion >> major [ ^ major ] -{ #category : #accessing } +{ #category : 'accessing' } IceSemanticVersion >> minor [ ^ minor ] -{ #category : #accessing } +{ #category : 'accessing' } IceSemanticVersion >> patch [ ^ patch ] -{ #category : #printing } +{ #category : 'printing' } IceSemanticVersion >> printOn: stream [ stream << self major asString diff --git a/Iceberg-Libgit/IceUnbornRepositoryProperties.class.st b/Iceberg-Libgit/IceUnbornRepositoryProperties.class.st index 59bccec1ad..dcf385a31d 100644 --- a/Iceberg-Libgit/IceUnbornRepositoryProperties.class.st +++ b/Iceberg-Libgit/IceUnbornRepositoryProperties.class.st @@ -1,17 +1,19 @@ Class { - #name : #IceUnbornRepositoryProperties, - #superclass : #IceRepositoryProperties, - #category : #'Iceberg-Libgit-Core' + #name : 'IceUnbornRepositoryProperties', + #superclass : 'IceRepositoryProperties', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceUnbornRepositoryProperties >> addToChangeBuilder: anIceChangeImporter [ "I'm unborn" ^ self ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornRepositoryProperties >> asBornProperties [ ^ IceRepositoryProperties @@ -19,7 +21,7 @@ IceUnbornRepositoryProperties >> asBornProperties [ commitish: commitish ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornRepositoryProperties >> isUnborn [ ^ true diff --git a/Iceberg-Libgit/LGitAbstractError.extension.st b/Iceberg-Libgit/LGitAbstractError.extension.st index a03353045d..0b3773409b 100644 --- a/Iceberg-Libgit/LGitAbstractError.extension.st +++ b/Iceberg-Libgit/LGitAbstractError.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitAbstractError } +Extension { #name : 'LGitAbstractError' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGitAbstractError >> acceptError: aVisitor [ ^ aVisitor visitGenericError: self ] diff --git a/Iceberg-Libgit/LGit_GIT_ECONFLICT.extension.st b/Iceberg-Libgit/LGit_GIT_ECONFLICT.extension.st index e1416fe606..d17964ccaf 100644 --- a/Iceberg-Libgit/LGit_GIT_ECONFLICT.extension.st +++ b/Iceberg-Libgit/LGit_GIT_ECONFLICT.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_ECONFLICT' } +Extension { #name : 'LGit_GIT_ECONFLICT' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_ECONFLICT >> acceptError: aVisitor [ ^ aVisitor visitECONFLICT: self ] diff --git a/Iceberg-Libgit/LGit_GIT_EEOF.extension.st b/Iceberg-Libgit/LGit_GIT_EEOF.extension.st index aa4d074d34..132eaea2dd 100644 --- a/Iceberg-Libgit/LGit_GIT_EEOF.extension.st +++ b/Iceberg-Libgit/LGit_GIT_EEOF.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_EEOF' } +Extension { #name : 'LGit_GIT_EEOF' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_EEOF >> acceptError: aVisitor [ ^ aVisitor visitEEOF: self diff --git a/Iceberg-Libgit/LGit_GIT_ENOTFOUND.extension.st b/Iceberg-Libgit/LGit_GIT_ENOTFOUND.extension.st index 6462c57e5d..008c807c52 100644 --- a/Iceberg-Libgit/LGit_GIT_ENOTFOUND.extension.st +++ b/Iceberg-Libgit/LGit_GIT_ENOTFOUND.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_ENOTFOUND' } +Extension { #name : 'LGit_GIT_ENOTFOUND' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_ENOTFOUND >> acceptError: aVisitor [ ^ aVisitor visitENOTFOUND: self ] diff --git a/Iceberg-Libgit/LGit_GIT_ERROR.extension.st b/Iceberg-Libgit/LGit_GIT_ERROR.extension.st index 996009194d..5479d79a31 100644 --- a/Iceberg-Libgit/LGit_GIT_ERROR.extension.st +++ b/Iceberg-Libgit/LGit_GIT_ERROR.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_ERROR' } +Extension { #name : 'LGit_GIT_ERROR' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_ERROR >> acceptError: aVisitor [ ^ aVisitor visitERROR: self ] diff --git a/Iceberg-Libgit/LGit_GIT_EUSER.extension.st b/Iceberg-Libgit/LGit_GIT_EUSER.extension.st index a7e670a417..a8d53004d6 100644 --- a/Iceberg-Libgit/LGit_GIT_EUSER.extension.st +++ b/Iceberg-Libgit/LGit_GIT_EUSER.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_EUSER' } +Extension { #name : 'LGit_GIT_EUSER' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_EUSER >> acceptError: aVisitor [ ^ aVisitor visitEUSER: self ] diff --git a/Iceberg-Libgit/Magnitude.extension.st b/Iceberg-Libgit/Magnitude.extension.st index d27342fa45..1206c0237f 100644 --- a/Iceberg-Libgit/Magnitude.extension.st +++ b/Iceberg-Libgit/Magnitude.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Magnitude } +Extension { #name : 'Magnitude' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } Magnitude >> iceSemanticVersion [ ^ IceSemanticVersion major: self asInteger minor: 0 patch: 0 ] diff --git a/Iceberg-Libgit/ManifestIcebergLibgit.class.st b/Iceberg-Libgit/ManifestIcebergLibgit.class.st index ffd7d0a8b8..d1a372608c 100644 --- a/Iceberg-Libgit/ManifestIcebergLibgit.class.st +++ b/Iceberg-Libgit/ManifestIcebergLibgit.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergLibgit, - #superclass : #PackageManifest, - #category : #'Iceberg-Libgit-Manifest' + #name : 'ManifestIcebergLibgit', + #superclass : 'PackageManifest', + #category : 'Iceberg-Libgit-Manifest', + #package : 'Iceberg-Libgit', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergLibgit class >> description [ ^ 'I contains the core of the libgit binding of Iceberg. diff --git a/Iceberg-Libgit/TIceRepositoryReader.trait.st b/Iceberg-Libgit/TIceRepositoryReader.trait.st index fdf9f0a4ee..452e058883 100644 --- a/Iceberg-Libgit/TIceRepositoryReader.trait.st +++ b/Iceberg-Libgit/TIceRepositoryReader.trait.st @@ -2,16 +2,18 @@ I indicate when a clas is reader for iceberg " Trait { - #name : #TIceRepositoryReader, - #category : #'Iceberg-Libgit-Writing' + #name : 'TIceRepositoryReader', + #category : 'Iceberg-Libgit-Writing', + #package : 'Iceberg-Libgit', + #tag : 'Writing' } -{ #category : #accessing } +{ #category : 'accessing' } TIceRepositoryReader classSide >> id [ ^ self required ] -{ #category : #testing } +{ #category : 'testing' } TIceRepositoryReader classSide >> isLegacyDefault [ ^ false ] diff --git a/Iceberg-Libgit/TIceRepositoryWriter.trait.st b/Iceberg-Libgit/TIceRepositoryWriter.trait.st index 29bc669bb6..ae87f6b5d8 100644 --- a/Iceberg-Libgit/TIceRepositoryWriter.trait.st +++ b/Iceberg-Libgit/TIceRepositoryWriter.trait.st @@ -2,22 +2,24 @@ I indicate when a class is writer for iceberg " Trait { - #name : #TIceRepositoryWriter, - #category : #'Iceberg-Libgit-Writing' + #name : 'TIceRepositoryWriter', + #category : 'Iceberg-Libgit-Writing', + #package : 'Iceberg-Libgit', + #tag : 'Writing' } -{ #category : #accessing } +{ #category : 'accessing' } TIceRepositoryWriter classSide >> id [ ^ self required ] -{ #category : #testing } +{ #category : 'testing' } TIceRepositoryWriter classSide >> isDefault [ "Indicates when this is default when create new repositories" ^ false ] -{ #category : #testing } +{ #category : 'testing' } TIceRepositoryWriter classSide >> isLegacyDefault [ "Indicates when repository is default as legacy (when there is no properties file indicating a specific format type)" diff --git a/Iceberg-Libgit/package.st b/Iceberg-Libgit/package.st index 5b2adfb856..994226c8c8 100644 --- a/Iceberg-Libgit/package.st +++ b/Iceberg-Libgit/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Libgit' } +Package { #name : 'Iceberg-Libgit' } diff --git a/Iceberg-Tests/IceAbstractTestCase.class.st b/Iceberg-Tests/IceAbstractTestCase.class.st index c358683866..24009302d0 100644 --- a/Iceberg-Tests/IceAbstractTestCase.class.st +++ b/Iceberg-Tests/IceAbstractTestCase.class.st @@ -1,111 +1,113 @@ Class { - #name : #IceAbstractTestCase, - #superclass : #IceParameterizedTestCase, + #name : 'IceAbstractTestCase', + #superclass : 'IceParameterizedTestCase', #instVars : [ 'fixture' ], - #category : 'Iceberg-Tests-Base' + #category : 'Iceberg-Tests-Base', + #package : 'Iceberg-Tests', + #tag : 'Base' } -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> assertClassExists: aString [ self assert: (self repository workingCopy environment ask includesClassNamed: aString) ] -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> assertMethodExists: aMethodName inClass: aClassName [ self assert: ((self repository workingCopy environment ask classNamed: aClassName) includesSelector: aMethodName) ] -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> assertPackageExists: aString [ self assert: (self repository workingCopy environment ask includesPackageNamed: aString) ] -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> denyClassExists: aString [ self deny: (self repository workingCopy environment ask includesClassNamed: aString) ] -{ #category : #asserting } +{ #category : 'asserting' } IceAbstractTestCase >> denyMethodExists: aMethodName inClass: aClassName [ self deny: ((self repository workingCopy environment ask classNamed: aClassName) includesSelector: aMethodName) ] -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> denyPackageExists: aString [ self deny: (self repository workingCopy environment ask includesPackageNamed: aString) ] -{ #category : #running } +{ #category : 'running' } IceAbstractTestCase >> newFixture [ self subclassResponsibility ] -{ #category : #factory } +{ #category : 'factory' } IceAbstractTestCase >> newRemoteNamed: aString [ ^ fixture newRemoteNamed: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> packageName1 [ ^ fixture packageName1 ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> packageName2 [ ^ fixture packageName2 ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> remote [ ^ fixture remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> remoteBranchName [ ^ fixture remoteBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> remoteRepository [ ^ fixture remoteRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> repository [ ^ fixture repository ] -{ #category : #running } +{ #category : 'running' } IceAbstractTestCase >> setUp [ super setUp. fixture := self newFixture. fixture setUp ] -{ #category : #running } +{ #category : 'running' } IceAbstractTestCase >> tearDown [ fixture tearDown. super tearDown. ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> workingCopy [ ^ self repository workingCopy diff --git a/Iceberg-Tests/IceAbstractTestFactory.class.st b/Iceberg-Tests/IceAbstractTestFactory.class.st index 8a4bebf73d..1bd35ca1a2 100644 --- a/Iceberg-Tests/IceAbstractTestFactory.class.st +++ b/Iceberg-Tests/IceAbstractTestFactory.class.st @@ -1,46 +1,48 @@ Class { - #name : #IceAbstractTestFactory, - #superclass : #Object, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceAbstractTestFactory', + #superclass : 'Object', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory class >> setUp [ ^ self new setUp ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestFactory >> ensureRemoteRepository [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceAbstractTestFactory >> isGit [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory >> newRemoteNamed: aName toRepository: aRepository [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory >> newRepositoryNamed: projectName [ ^ self newRepositoryNamed: projectName withSubdirectory: '' ] -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirectory [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory >> tearDownWithRepository: aRepository [ self subclassResponsibility diff --git a/Iceberg-Tests/IceBasicCherryPickingFixture.class.st b/Iceberg-Tests/IceBasicCherryPickingFixture.class.st index d3264849bc..25e9773fa2 100644 --- a/Iceberg-Tests/IceBasicCherryPickingFixture.class.st +++ b/Iceberg-Tests/IceBasicCherryPickingFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceBasicCherryPickingFixture, - #superclass : #IceBasicRepositoryFixture, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceBasicCherryPickingFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #running } +{ #category : 'running' } IceBasicCherryPickingFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceBasicRepositoryFixture.class.st b/Iceberg-Tests/IceBasicRepositoryFixture.class.st index e41f987c8b..c299f52fe4 100644 --- a/Iceberg-Tests/IceBasicRepositoryFixture.class.st +++ b/Iceberg-Tests/IceBasicRepositoryFixture.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceBasicRepositoryFixture, - #superclass : #IceNotYetClonedRepositoryFixture, + #name : 'IceBasicRepositoryFixture', + #superclass : 'IceNotYetClonedRepositoryFixture', #instVars : [ 'repository', 'subdirectory' ], - #category : 'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #initialization } +{ #category : 'initialization' } IceBasicRepositoryFixture class >> inGit [ ^ self new @@ -16,7 +18,7 @@ IceBasicRepositoryFixture class >> inGit [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceBasicRepositoryFixture class >> inMemory [ ^ self new @@ -24,43 +26,43 @@ IceBasicRepositoryFixture class >> inMemory [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceBasicRepositoryFixture >> initialize [ super initialize. subdirectory := ''. ] -{ #category : #initialization } +{ #category : 'initialization' } IceBasicRepositoryFixture >> newRemoteNamed: aName [ ^ factory newRemoteNamed: aName toRepository: repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicRepositoryFixture >> repository [ ^ repository ] -{ #category : #running } +{ #category : 'running' } IceBasicRepositoryFixture >> setUp [ super setUp. repository := factory newRepositoryNamed: projectName withSubdirectory: self subdirectory ] -{ #category : #running } +{ #category : 'running' } IceBasicRepositoryFixture >> subdirectory [ ^ subdirectory ] -{ #category : #running } +{ #category : 'running' } IceBasicRepositoryFixture >> subdirectory: aSubdirectory [ subdirectory := aSubdirectory ] -{ #category : #running } +{ #category : 'running' } IceBasicRepositoryFixture >> tearDown [ factory tearDownWithRepository: repository. diff --git a/Iceberg-Tests/IceBornRepositoryTest.class.st b/Iceberg-Tests/IceBornRepositoryTest.class.st index 46a8125840..82f23a18a2 100644 --- a/Iceberg-Tests/IceBornRepositoryTest.class.st +++ b/Iceberg-Tests/IceBornRepositoryTest.class.st @@ -1,23 +1,25 @@ Class { - #name : #IceBornRepositoryTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceBornRepositoryTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceBornRepositoryTest class >> isAbstract [ ^ self == IceBornRepositoryTest ] -{ #category : #accessing } +{ #category : 'accessing' } IceBornRepositoryTest >> expectedCommitsInNewBranch [ "A git repository has just the initial commit" ^ 1 ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testAccessingNonExistingTagRaisesException [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -25,7 +27,7 @@ IceBornRepositoryTest >> testAccessingNonExistingTagRaisesException [ self should: [self repository tagNamed: 'nonExisting'] raise: IceTagNotFound ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testAddNewRemoteListsRemote [ | remote | @@ -35,7 +37,7 @@ IceBornRepositoryTest >> testAddNewRemoteListsRemote [ self assert: (self repository remotes includes: remote). ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testAddTwoRemotesWithSameNameRaiseError [ | remote | @@ -46,7 +48,7 @@ IceBornRepositoryTest >> testAddTwoRemotesWithSameNameRaiseError [ self should: [ self repository addRemote: remote ] raise: IceRemoteAlreadyExistsError ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testBranchAlreadyExistsErrorInformsExistingBranchName [ | branchName | @@ -59,7 +61,7 @@ IceBornRepositoryTest >> testBranchAlreadyExistsErrorInformsExistingBranchName [ do: [ :error | self assert: error branchName equals: branchName ] ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testBranchNotFoundErrorInformsNotFoundBranchName [ | branchName | @@ -70,7 +72,7 @@ IceBornRepositoryTest >> testBranchNotFoundErrorInformsNotFoundBranchName [ do: [ :error | self assert: error branchName equals: branchName ] ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testBranchWithSlashesNotFoundErrorInformsNotFoundBranchName [ | branchName | @@ -81,7 +83,7 @@ IceBornRepositoryTest >> testBranchWithSlashesNotFoundErrorInformsNotFoundBranch do: [ :error | self assert: error branchName equals: branchName ] ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testCreateExistingBranchRaisesError [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -89,7 +91,7 @@ IceBornRepositoryTest >> testCreateExistingBranchRaisesError [ self should: [self repository createBranch: 'master'] raise: IceBranchAlreadyExists ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testCreateExistingTagRaisesError [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -98,7 +100,7 @@ IceBornRepositoryTest >> testCreateExistingTagRaisesError [ self should: [self repository createTag: 'v1.0'] raise: IceTagAlreadyExists ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testCreateNewBranchSwitchesToBranch [ | createdBranch | @@ -106,7 +108,7 @@ IceBornRepositoryTest >> testCreateNewBranchSwitchesToBranch [ self assert: self repository head equals: createdBranch ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testCreateNewBranchWithSlashesSwitchesToBranch [ | createdBranch | @@ -114,7 +116,7 @@ IceBornRepositoryTest >> testCreateNewBranchWithSlashesSwitchesToBranch [ self assert: self repository head equals: createdBranch ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testDeleteRepositoryDeletesLocation [ "Test valid only for git backend. Other backends may not have location" @@ -126,7 +128,7 @@ IceBornRepositoryTest >> testDeleteRepositoryDeletesLocation [ self deny: self repository location exists. ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testDeleteTagDoesNotListListsDeletedTag [ | tagName | @@ -139,7 +141,7 @@ IceBornRepositoryTest >> testDeleteTagDoesNotListListsDeletedTag [ self assert: self repository tags isEmpty ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testListBranchesListsExistingBranches [ | branches | @@ -148,7 +150,7 @@ IceBornRepositoryTest >> testListBranchesListsExistingBranches [ self assert: branches first name equals: 'master' ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testListBranchesListsNewBranch [ | branches branchName | @@ -164,7 +166,7 @@ IceBornRepositoryTest >> testListBranchesListsNewBranch [ ifNone: [ self fail ] ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testListBranchesListsNewBranchWithSlashes [ | branches branchName | @@ -180,7 +182,7 @@ IceBornRepositoryTest >> testListBranchesListsNewBranchWithSlashes [ ifNone: [ self fail ] ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testListTagsListsNewTag [ | tags tagName | @@ -196,7 +198,7 @@ IceBornRepositoryTest >> testListTagsListsNewTag [ ifNone: [ self fail ] ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testListTagsOfACommitWithNoTagsReturnsEmptyCollection [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -204,7 +206,7 @@ IceBornRepositoryTest >> testListTagsOfACommitWithNoTagsReturnsEmptyCollection [ self assert: self repository headCommit tags isEmpty ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testListTagsOfACommitWithTagsReturnsTagCollection [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -213,7 +215,7 @@ IceBornRepositoryTest >> testListTagsOfACommitWithTagsReturnsTagCollection [ self assert: self repository headCommit tags first name equals: 'test' ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testNewBranchReferencesCurrentCommitAtBranchTime [ | commitAtBranchTime createdBranch | @@ -222,7 +224,7 @@ IceBornRepositoryTest >> testNewBranchReferencesCurrentCommitAtBranchTime [ self assert: createdBranch commit equals: commitAtBranchTime ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testNewBranchWithSlashReferencesCurrentCommitAtBranchTime [ | commitAtBranchTime createdBranch | @@ -231,13 +233,13 @@ IceBornRepositoryTest >> testNewBranchWithSlashReferencesCurrentCommitAtBranchTi self assert: createdBranch commit equals: commitAtBranchTime ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testNewRepositoryHasNoRemotes [ self assert: self repository remotes isEmpty ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testRemoteAlreadyExistsErrorReferencesExistingRemote [ | remote remoteName | @@ -252,7 +254,7 @@ IceBornRepositoryTest >> testRemoteAlreadyExistsErrorReferencesExistingRemote [ do: [ :error | self assert: error remoteName equals: remoteName ] ] -{ #category : #'tests-project' } +{ #category : 'tests-project' } IceBornRepositoryTest >> testRepositoryHasProjectFile [ fixture factory isGit ifFalse: [ ^ self skip ]. @@ -261,7 +263,7 @@ IceBornRepositoryTest >> testRepositoryHasProjectFile [ self assert: (self repository location / '.project') exists ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testSwitchToExistingBranchNameChangesRepositoryHead [ | branchName newBranch masterBranch | @@ -278,7 +280,7 @@ IceBornRepositoryTest >> testSwitchToExistingBranchNameChangesRepositoryHead [ self assert: newBranch equals: self repository head. ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testSwitchToExistingBranchNameWithSlashesChangesRepositoryHead [ | branchName newBranch masterBranch | @@ -295,19 +297,19 @@ IceBornRepositoryTest >> testSwitchToExistingBranchNameWithSlashesChangesReposit self assert: newBranch equals: self repository head. ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testSwitchToUnexistingBranchRaisesError [ self should: [self repository switchToBranchNamed: 'nonexisting'] raise: IceBranchNotFound ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testSwitchToUnexistingBranchWithSlashesRaisesError [ self should: [self repository switchToBranchNamed: 'feature/nonexisting'] raise: IceBranchNotFound ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testTagAlreadyExistsErrorInformsExistingTagName [ | tagName | diff --git a/Iceberg-Tests/IceCherryPickBrowserTest.class.st b/Iceberg-Tests/IceCherryPickBrowserTest.class.st index 0a8da366c2..fcf654b9fa 100644 --- a/Iceberg-Tests/IceCherryPickBrowserTest.class.st +++ b/Iceberg-Tests/IceCherryPickBrowserTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceCherryPickBrowserTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceCherryPickBrowserTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceCherryPickBrowserTest >> testWindowOnMethodConflict [ | commitToCherryPick presenter | diff --git a/Iceberg-Tests/IceCherryPickingInitialDependencies.class.st b/Iceberg-Tests/IceCherryPickingInitialDependencies.class.st index 86cf8a48da..4ee15245c0 100644 --- a/Iceberg-Tests/IceCherryPickingInitialDependencies.class.st +++ b/Iceberg-Tests/IceCherryPickingInitialDependencies.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceCherryPickingInitialDependencies, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceCherryPickingInitialDependencies', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceCherryPickingInitialDependencies >> testAddClassWithMethod [ | commitToCherryPick initialDiff commonAncestor extendedDiff receiverDiff cherrypicker | self repository createBranch: 'b2'. @@ -45,7 +47,7 @@ IceCherryPickingInitialDependencies >> testAddClassWithMethod [ equals: 1. ] -{ #category : #tests } +{ #category : 'tests' } IceCherryPickingInitialDependencies >> testRemoveClassWithMethod [ | commitToCherryPick initialDiff commonAncestor extendedDiff receiverDiff cherrypicker | diff --git a/Iceberg-Tests/IceCherryPickingTest.class.st b/Iceberg-Tests/IceCherryPickingTest.class.st index 3b99e430b6..24a1c8ef29 100644 --- a/Iceberg-Tests/IceCherryPickingTest.class.st +++ b/Iceberg-Tests/IceCherryPickingTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceCherryPickingTest, - #superclass : #IceAbstractTestCase, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceCherryPickingTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #testing } +{ #category : 'testing' } IceCherryPickingTest class >> isAbstract [ ^ self name = #IceCherryPickingTest ] -{ #category : #running } +{ #category : 'running' } IceCherryPickingTest >> newFixture [ ^ IceBasicCherryPickingFixture inGit diff --git a/Iceberg-Tests/IceClassesCherryPickingTest.class.st b/Iceberg-Tests/IceClassesCherryPickingTest.class.st index 43ae0f7d63..3226450f27 100644 --- a/Iceberg-Tests/IceClassesCherryPickingTest.class.st +++ b/Iceberg-Tests/IceClassesCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceClassesCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceClassesCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassDependingInATrait [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -52,7 +54,7 @@ IceClassesCherryPickingTest >> testAddClassDependingInATrait [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassDependingInATraitWithComposition [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -102,7 +104,7 @@ IceClassesCherryPickingTest >> testAddClassDependingInATraitWithComposition [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassSideMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -134,7 +136,7 @@ IceClassesCherryPickingTest >> testAddClassSideMethodInExistingClass [ / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassUsingASharedPool [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -186,7 +188,7 @@ IceClassesCherryPickingTest >> testAddClassUsingASharedPool [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassWithMethod [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -215,7 +217,7 @@ IceClassesCherryPickingTest >> testAddClassWithMethod [ assert: (diff / self packageName1 / 'TestClass2' / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassWithSuperclassAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -263,7 +265,7 @@ IceClassesCherryPickingTest >> testAddClassWithSuperclassAsDependency [ isClassDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassWithoutDependencies [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -292,7 +294,7 @@ IceClassesCherryPickingTest >> testAddClassWithoutDependencies [ definition isClassDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testModifyClassWithoutDependencies [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -323,7 +325,7 @@ IceClassesCherryPickingTest >> testModifyClassWithoutDependencies [ definition isClassDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testRemoveClassWithSubclasses [ | commitToCherryPick diff mergeTree | @@ -360,7 +362,7 @@ IceClassesCherryPickingTest >> testRemoveClassWithSubclasses [ (diff / self packageName1 / 'TestSubclass') value isRemoval . ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testRemoveClassWithSubclassesAndIntermediarySubclass [ | commitToCherryPick diff mergeTree | self repository workingCopy diff --git a/Iceberg-Tests/IceCleanWorkingCopyFixture.class.st b/Iceberg-Tests/IceCleanWorkingCopyFixture.class.st index efe7321fa1..c6a56eafae 100644 --- a/Iceberg-Tests/IceCleanWorkingCopyFixture.class.st +++ b/Iceberg-Tests/IceCleanWorkingCopyFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceCleanWorkingCopyFixture, - #superclass : #IceBasicRepositoryFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceCleanWorkingCopyFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceCleanWorkingCopyFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceCleanWorkingCopyTest.class.st b/Iceberg-Tests/IceCleanWorkingCopyTest.class.st index d7c635d903..5678308dcb 100644 --- a/Iceberg-Tests/IceCleanWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceCleanWorkingCopyTest.class.st @@ -1,41 +1,43 @@ Class { - #name : #IceCleanWorkingCopyTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceCleanWorkingCopyTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceCleanWorkingCopyTest class >> isAbstract [ ^ self == IceCleanWorkingCopyTest ] -{ #category : #helpers } +{ #category : 'helpers' } IceCleanWorkingCopyTest >> commit1 [ ^ self currentCommitOfPackage: self packageName1 ] -{ #category : #helpers } +{ #category : 'helpers' } IceCleanWorkingCopyTest >> commit2 [ ^ self currentCommitOfPackage: self packageName2 ] -{ #category : #helpers } +{ #category : 'helpers' } IceCleanWorkingCopyTest >> currentCommitOfPackage: aPackageName [ ^ (self repository workingCopy packageNamed: aPackageName) currentCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopyHasSingleCommit [ self repository workingCopy initializePackagesFromRepository. self assert: self repository workingCopy hasSingleCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopyIsInSingleCommitStateWhenNewPackageIsCreated [ self repository workingCopy initializePackagesFromRepository. @@ -48,7 +50,7 @@ IceCleanWorkingCopyTest >> testWorkingCopyIsInSingleCommitStateWhenNewPackageIsC self shouldnt: [self repository workingCopy validateCanCommit] raise: IceWorkingCopyDesyncronized ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopyIsInSingleCommitStateWhenPackageIsNotLoaded [ (self repository packageNamed: self packageName1) unload. @@ -65,14 +67,14 @@ IceCleanWorkingCopyTest >> testWorkingCopyIsInSingleCommitStateWhenPackageIsNotL self shouldnt: [self repository workingCopy validateCanCommit] raise: IceWorkingCopyDesyncronized ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopyIsNotUnknownCommot [ self repository workingCopy initializePackagesFromRepository. self deny: self repository workingCopy hasUnknownCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopySingleCommitIsPackage1Commit [ self repository workingCopy initializePackagesFromRepository. @@ -81,7 +83,7 @@ IceCleanWorkingCopyTest >> testWorkingCopySingleCommitIsPackage1Commit [ equals: (self repository packageNamed: self packageName1) currentCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopySingleCommitIsPackage2Commit [ self repository workingCopy initializePackagesFromRepository. @@ -90,14 +92,14 @@ IceCleanWorkingCopyTest >> testWorkingCopySingleCommitIsPackage2Commit [ equals: (self repository packageNamed: self packageName2) currentCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingStateIncludesPackage1CurrentCommit [ self repository workingCopy initializePackagesFromRepository. self assert: (self repository workingCopy workingCopyState includesCommit: self commit1). ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingStateIncludesPackage2CurrentCommit [ self repository workingCopy initializePackagesFromRepository. diff --git a/Iceberg-Tests/IceClonedFromRemoteFixture.class.st b/Iceberg-Tests/IceClonedFromRemoteFixture.class.st index 38c8159f4c..3268c450cc 100644 --- a/Iceberg-Tests/IceClonedFromRemoteFixture.class.st +++ b/Iceberg-Tests/IceClonedFromRemoteFixture.class.st @@ -1,47 +1,49 @@ Class { - #name : #IceClonedFromRemoteFixture, - #superclass : #IceNotYetClonedRepositoryFixture, + #name : 'IceClonedFromRemoteFixture', + #superclass : 'IceNotYetClonedRepositoryFixture', #instVars : [ 'remote', 'remoteBranchName', 'repository', 'pushRepository' ], - #category : #'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> pushRepository [ ^ pushRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> remoteBranchName [ ^ remoteBranchName ifNil: [ remoteBranchName := 'master' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> remoteBranchName: aBranchName [ remoteBranchName := aBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> remoteRepository [ ^ remoteRepository ] -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } IceClonedFromRemoteFixture >> repository [ ^ repository ] -{ #category : #running } +{ #category : 'running' } IceClonedFromRemoteFixture >> setUp [ super setUp. remoteRepository := self ensureRemoteRepository. @@ -79,7 +81,7 @@ IceClonedFromRemoteFixture >> setUp [ repository commitWithMessage: 'Initial local commit'." ] -{ #category : #running } +{ #category : 'running' } IceClonedFromRemoteFixture >> tearDown [ factory tearDownWithRepository: repository. factory tearDownWithRepository: remoteRepository. diff --git a/Iceberg-Tests/IceConflictsCherryPickingTest.class.st b/Iceberg-Tests/IceConflictsCherryPickingTest.class.st index c74c72ed69..f16d06239b 100644 --- a/Iceberg-Tests/IceConflictsCherryPickingTest.class.st +++ b/Iceberg-Tests/IceConflictsCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceConflictsCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceConflictsCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceConflictsCherryPickingTest >> testAddPackageConflict [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -34,7 +36,7 @@ IceConflictsCherryPickingTest >> testAddPackageConflict [ deny: (mergeTree / self packageName2) value isConflict ] -{ #category : #tests } +{ #category : 'tests' } IceConflictsCherryPickingTest >> testMethodModificationConflict [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. diff --git a/Iceberg-Tests/IceCredentialStoreTest.class.st b/Iceberg-Tests/IceCredentialStoreTest.class.st index 23290389f0..b6ccb11423 100644 --- a/Iceberg-Tests/IceCredentialStoreTest.class.st +++ b/Iceberg-Tests/IceCredentialStoreTest.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceCredentialStoreTest, - #superclass : #TestCase, + #name : 'IceCredentialStoreTest', + #superclass : 'TestCase', #instVars : [ 'store', 'file', 'dir' ], - #category : #'Iceberg-Tests-Security' + #category : 'Iceberg-Tests-Security', + #package : 'Iceberg-Tests', + #tag : 'Security' } -{ #category : #running } +{ #category : 'running' } IceCredentialStoreTest >> setUp [ super setUp. store := IceCredentialStore new ] -{ #category : #running } +{ #category : 'running' } IceCredentialStoreTest >> tearDown [ file ifNotNil: [ file ensureDelete ]. dir ifNotNil: [ dir ensureDeleteAll ]. @@ -23,7 +25,7 @@ IceCredentialStoreTest >> tearDown [ ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testEmptySShStore [ | cred | @@ -34,7 +36,7 @@ IceCredentialStoreTest >> testEmptySShStore [ self assert: cred privateKey equals: IceSshCredentials defaultPrivateKey. ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testEmptyStore [ | cred | @@ -42,7 +44,7 @@ IceCredentialStoreTest >> testEmptyStore [ self deny: cred isPresent. ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testLoadNonExistingFile [ | newStore cred | @@ -60,7 +62,7 @@ IceCredentialStoreTest >> testLoadNonExistingFile [ ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testLookupHostname [ | cred orig | @@ -78,7 +80,7 @@ IceCredentialStoreTest >> testLookupHostname [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testSaveAndLoadEmptyStore [ | newStore cred | @@ -98,7 +100,7 @@ IceCredentialStoreTest >> testSaveAndLoadEmptyStore [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStoreInNonExistingDirectory [ | newStore cred otherStore | @@ -130,7 +132,7 @@ IceCredentialStoreTest >> testStoreInNonExistingDirectory [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStoreInNonExistingFile [ | newStore cred otherStore | @@ -159,7 +161,7 @@ IceCredentialStoreTest >> testStoreInNonExistingFile [ ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testStorePlainText [ | cred orig | @@ -177,7 +179,7 @@ IceCredentialStoreTest >> testStorePlainText [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStorePlainTextSavingInFile [ | cred orig newStore | @@ -203,7 +205,7 @@ IceCredentialStoreTest >> testStorePlainTextSavingInFile [ ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testStoreSSH [ | cred orig | @@ -224,7 +226,7 @@ IceCredentialStoreTest >> testStoreSSH [ self assert: cred keyPassphrase equals: 'aPassword'. ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStoreToken [ | original | @@ -243,7 +245,7 @@ IceCredentialStoreTest >> testStoreToken [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStoreTokenSavingInFile [ | original newStore | @@ -270,13 +272,13 @@ IceCredentialStoreTest >> testStoreTokenSavingInFile [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> tokenForTesting [ ^ 'e72e16c7e42f292c6912e7710c838347ae178b4a' ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> usernameForTesting [ ^ 'aUsername' diff --git a/Iceberg-Tests/IceDetachedWorkingCopyFixture.class.st b/Iceberg-Tests/IceDetachedWorkingCopyFixture.class.st index 19730594ba..80f68d238b 100644 --- a/Iceberg-Tests/IceDetachedWorkingCopyFixture.class.st +++ b/Iceberg-Tests/IceDetachedWorkingCopyFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceDetachedWorkingCopyFixture, - #superclass : #IceBasicRepositoryFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceDetachedWorkingCopyFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceDetachedWorkingCopyFixture >> setUp [ | head | diff --git a/Iceberg-Tests/IceDetachedWorkingCopyTest.class.st b/Iceberg-Tests/IceDetachedWorkingCopyTest.class.st index efc79d6b90..0cc36b4c68 100644 --- a/Iceberg-Tests/IceDetachedWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceDetachedWorkingCopyTest.class.st @@ -1,36 +1,38 @@ Class { - #name : #IceDetachedWorkingCopyTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceDetachedWorkingCopyTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceDetachedWorkingCopyTest class >> isAbstract [ ^ self == IceDetachedWorkingCopyTest ] -{ #category : #tests } +{ #category : 'tests' } IceDetachedWorkingCopyTest >> testIsDetached [ self assert: self repository workingCopy isDetached ] -{ #category : #tests } +{ #category : 'tests' } IceDetachedWorkingCopyTest >> testPackageIsNotDirty [ "There is no difference between the code in the image and the checkout'd code" self deny: self repository workingCopy isModified ] -{ #category : #tests } +{ #category : 'tests' } IceDetachedWorkingCopyTest >> testReattachInNewBranchMakesNoMoreDetached [ self repository createBranch: 'test' inCommit: self repository workingCopy referenceCommit. self deny: self repository workingCopy isDetached. ] -{ #category : #tests } +{ #category : 'tests' } IceDetachedWorkingCopyTest >> testReattachInNewBranchMakesNoMoreDirty [ self repository createBranch: 'test' inCommit: self repository workingCopy referenceCommit. diff --git a/Iceberg-Tests/IceDiffTests.class.st b/Iceberg-Tests/IceDiffTests.class.st index 7f95c49c78..036f623b6b 100644 --- a/Iceberg-Tests/IceDiffTests.class.st +++ b/Iceberg-Tests/IceDiffTests.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceDiffTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceDiffTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfEmptyTreesGivesEmptyDiff [ | left right diff | @@ -16,7 +18,7 @@ IceDiffTests >> testSimmetricDifferenceOfEmptyTreesGivesEmptyDiff [ self deny: diff notEmpty ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileAdditionCreatesAdditionOperation [ | left right diff | @@ -29,7 +31,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileAdditionCreatesAdditionOperation [ self assert: (diff / 'Readme.md') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileModificationCreatesModificationOperation [ | left right diff leftMemoryFileSystem leftFileRef rightMemoryFileSystem rightFileRef | @@ -54,7 +56,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileModificationCreatesModificationOper self assert: (diff / 'Readme.md') value rightDefinition contents equals: 'right'. ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileModificationWithinDirectoryCreatesModificationOnDirectory [ | left right diff leftMemoryFileSystem leftFileRef rightMemoryFileSystem rightFileRef | @@ -77,7 +79,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileModificationWithinDirectoryCreatesM self assert: (diff / 'src') value isModification ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileModificationWithinDirectoryCreatesModificationOperationOnFile [ | left right diff leftMemoryFileSystem leftFileRef rightMemoryFileSystem rightFileRef leftSrc rightSrc | @@ -104,7 +106,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileModificationWithinDirectoryCreatesM self assert: (diff / 'src' / 'Readme.md') value rightDefinition contents equals: 'right'. ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileRemovalCreatesRemovalOperation [ | left right diff | @@ -117,7 +119,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileRemovalCreatesRemovalOperation [ self assert: (diff / 'Readme.md') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testTwoSimmetricDifferencesShouldGiveTheSameResult [ | left right leftMemoryFileSystem leftFileRef rightMemoryFileSystem rightFileRef diff1 diff2 leftSrc rightSrc | diff --git a/Iceberg-Tests/IceDirtyDetachedWorkingCopyFixture.class.st b/Iceberg-Tests/IceDirtyDetachedWorkingCopyFixture.class.st index bf743e1d5e..1dbb526ebc 100644 --- a/Iceberg-Tests/IceDirtyDetachedWorkingCopyFixture.class.st +++ b/Iceberg-Tests/IceDirtyDetachedWorkingCopyFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceDirtyDetachedWorkingCopyFixture, - #superclass : #IceDetachedWorkingCopyFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceDirtyDetachedWorkingCopyFixture', + #superclass : 'IceDetachedWorkingCopyFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceDirtyDetachedWorkingCopyFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceDirtyDetachedWorkingCopyTest.class.st b/Iceberg-Tests/IceDirtyDetachedWorkingCopyTest.class.st index a5f2a215e9..fcd32eddf9 100644 --- a/Iceberg-Tests/IceDirtyDetachedWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceDirtyDetachedWorkingCopyTest.class.st @@ -1,43 +1,45 @@ Class { - #name : #IceDirtyDetachedWorkingCopyTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceDirtyDetachedWorkingCopyTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceDirtyDetachedWorkingCopyTest class >> isAbstract [ ^ self == IceDirtyDetachedWorkingCopyTest ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testIsDetached [ self assert: self repository workingCopy isDetached ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testPackageIsDirty [ "There are uncommited changes" self assert: self repository workingCopy isModified ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testReattachInNewBranchIsStillDirty [ self repository createBranch: 'test' inCommit: self repository workingCopy referenceCommit. self assert: self repository workingCopy isModified. ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testReattachInNewBranchMakesNoMoreDetached [ self repository createBranch: 'test' inCommit: self repository workingCopy referenceCommit. self deny: self repository workingCopy isDetached. ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testWorkingCopyDiffIsAgainstReferenceCommitAndNotHead [ self assert: self repository workingCopyDiff targetVersion equals: self repository workingCopy referenceCommit. diff --git a/Iceberg-Tests/IceExtensionMethodCherryPickingTest.class.st b/Iceberg-Tests/IceExtensionMethodCherryPickingTest.class.st index 275bbae6b1..7aa8ce38a9 100644 --- a/Iceberg-Tests/IceExtensionMethodCherryPickingTest.class.st +++ b/Iceberg-Tests/IceExtensionMethodCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceExtensionMethodCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceExtensionMethodCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddExtensionMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -34,7 +36,7 @@ IceExtensionMethodCherryPickingTest >> testAddExtensionMethodInExistingClass [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddExtensionMethodInExistingTrait [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -65,7 +67,7 @@ IceExtensionMethodCherryPickingTest >> testAddExtensionMethodInExistingTrait [ / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -96,7 +98,7 @@ IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInExistingClass assert: (diff / self packageName2 / 'TestClass' / 'm2') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInExistingClasses [ | commitToCherryPick diff mergeTree | @@ -137,7 +139,7 @@ IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInExistingClass assert: (diff / self packageName2 / 'TestClass2' / 'm2') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInNonExistingClasses [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName2. @@ -188,7 +190,7 @@ IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInNonExistingCl assert: (diff / self packageName2 / 'TestClass2' / 'm2') value isAddition. ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testModifyExtensionMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName2. @@ -223,7 +225,7 @@ IceExtensionMethodCherryPickingTest >> testModifyExtensionMethodInExistingClass assert: (diff / self packageName2 / 'TestClass' / 'm1') value isModification. ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testRemoveExtensionMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName2. diff --git a/Iceberg-Tests/IceFileDefinitionTests.class.st b/Iceberg-Tests/IceFileDefinitionTests.class.st index a2d6690a41..a4fcf4b1c6 100644 --- a/Iceberg-Tests/IceFileDefinitionTests.class.st +++ b/Iceberg-Tests/IceFileDefinitionTests.class.st @@ -1,23 +1,25 @@ Class { - #name : #IceFileDefinitionTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceFileDefinitionTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } IceFileDefinitionTests class >> bytesWithIlegalLeadingBytes [ ^ #[102 111 111 160 102 111 111] ] -{ #category : #tests } +{ #category : 'tests' } IceFileDefinitionTests >> hexDumped: bytesWithIlegalLeadingBytes [ ^ String streamContents: [ :str | bytesWithIlegalLeadingBytes hexDumpOn: str max: Float infinity ]. ] -{ #category : #tests } +{ #category : 'tests' } IceFileDefinitionTests >> testContentsOfBinaryTextFileDefinitionInUtf8IsHexDumped [ | definition hexDumped | @@ -31,7 +33,7 @@ IceFileDefinitionTests >> testContentsOfBinaryTextFileDefinitionInUtf8IsHexDumpe self assert: definition contents equals: hexDumped. ] -{ #category : #tests } +{ #category : 'tests' } IceFileDefinitionTests >> testContentsOfTextFileDefinitionInUtf16IsHexDumped [ | text definition bytes | @@ -46,7 +48,7 @@ IceFileDefinitionTests >> testContentsOfTextFileDefinitionInUtf16IsHexDumped [ self assert: definition contents equals: (self hexDumped: bytes). ] -{ #category : #tests } +{ #category : 'tests' } IceFileDefinitionTests >> testContentsOfTextFileDefinitionInUtf8IsDecoded [ | text definition | diff --git a/Iceberg-Tests/IceFileRemoteTest.class.st b/Iceberg-Tests/IceFileRemoteTest.class.st index 7dc03d5fc2..f385cd7b49 100644 --- a/Iceberg-Tests/IceFileRemoteTest.class.st +++ b/Iceberg-Tests/IceFileRemoteTest.class.st @@ -2,12 +2,14 @@ An IceFileRemoteTest is a test class for testing the behavior of IceFileRemote " Class { - #name : #IceFileRemoteTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'IceFileRemoteTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #tests } +{ #category : 'tests' } IceFileRemoteTest >> testCanHandleFileUrl [ | url | self assert: (IceGitFileRemote canHandleUrl: 'file:///Users/pharo/some-repo-name'). @@ -22,7 +24,7 @@ IceFileRemoteTest >> testCanHandleFileUrl [ ifFalse: [ '/Users/pharo/some-repo-name' ]). ] -{ #category : #tests } +{ #category : 'tests' } IceFileRemoteTest >> testCanHandleUnixPath [ "git clone existing-repo tmp-repo produces a url = /..../existing-repo remote" | url | diff --git a/Iceberg-Tests/IceGitCleanWorkingCopyTest.class.st b/Iceberg-Tests/IceGitCleanWorkingCopyTest.class.st index 3a19db3937..b676a0aa26 100644 --- a/Iceberg-Tests/IceGitCleanWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceGitCleanWorkingCopyTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitCleanWorkingCopyTest, - #superclass : #IceCleanWorkingCopyTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitCleanWorkingCopyTest', + #superclass : 'IceCleanWorkingCopyTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitCleanWorkingCopyTest >> newFixture [ ^ IceCleanWorkingCopyFixture inGit ] diff --git a/Iceberg-Tests/IceGitCloneTest.class.st b/Iceberg-Tests/IceGitCloneTest.class.st index 4b8caa1da5..567026f166 100644 --- a/Iceberg-Tests/IceGitCloneTest.class.st +++ b/Iceberg-Tests/IceGitCloneTest.class.st @@ -1,19 +1,21 @@ Class { - #name : #IceGitCloneTest, - #superclass : #IceAbstractTestCase, + #name : 'IceGitCloneTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'oldProviderType' ], - #category : #'Iceberg-Tests-Git' + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitCloneTest >> newFixture [ ^ IceNotYetClonedRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> setUp [ super setUp. @@ -21,14 +23,14 @@ IceGitCloneTest >> setUp [ IceCredentialsProvider providerType: IceNonInteractiveCredentialsProvider. ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> tearDown [ IceCredentialsProvider providerType: oldProviderType. super tearDown. ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testCloneErrorRemovesLocation [ fixture ensureRemoteRepository. @@ -41,7 +43,7 @@ IceGitCloneTest >> testCloneErrorRemovesLocation [ self deny: fixture location exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testClonedRepositoryIsGitClone [ fixture ensureRemoteRepository. @@ -54,7 +56,7 @@ IceGitCloneTest >> testClonedRepositoryIsGitClone [ self assert: (fixture location / '.git') exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testLocationAlreadyExistsThrowsException [ | action | @@ -70,13 +72,13 @@ IceGitCloneTest >> testLocationAlreadyExistsThrowsException [ self should: [ action execute ] raise: IceCloneLocationAlreadyExists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testLocationDoesNotInitiallyExist [ self deny: fixture location exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testLocationExistsAfterClone [ fixture ensureRemoteRepository. @@ -89,7 +91,7 @@ IceGitCloneTest >> testLocationExistsAfterClone [ self assert: fixture location exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testRemoteDoesNotExistsShouldThrowException [ self isCI ifTrue: [ self skip ]. diff --git a/Iceberg-Tests/IceGitCommand.class.st b/Iceberg-Tests/IceGitCommand.class.st index be17760405..4e73aefd1a 100644 --- a/Iceberg-Tests/IceGitCommand.class.st +++ b/Iceberg-Tests/IceGitCommand.class.st @@ -31,22 +31,23 @@ The latter is useful for simplifying the specification of optional parameters, f " Class { - #name : #IceGitCommand, - #superclass : #Object, + #name : 'IceGitCommand', + #superclass : 'Object', #instVars : [ 'directory', 'command' ], - #category : #'Iceberg-Tests' + #category : 'Iceberg-Tests', + #package : 'Iceberg-Tests' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand class >> gitCommand [ ^ Smalltalk os isWindows ifTrue: [ 'git' ] ifFalse:[ '/usr/bin/git' ] ] -{ #category : #execute } +{ #category : 'execute' } IceGitCommand class >> in: directory execute: commandDescription [ "See class comments for the specification of possible command descriptions" ^ self new @@ -56,7 +57,7 @@ IceGitCommand class >> in: directory execute: commandDescription [ ] -{ #category : #execute } +{ #category : 'execute' } IceGitCommand class >> preprocess: commandDescription [ commandDescription ifNil: [ ^ {} ]. commandDescription isString ifTrue: [ @@ -69,37 +70,37 @@ IceGitCommand class >> preprocess: commandDescription [ self error: ('Unknown argument type in git command: {1}' format: commandDescription) ] -{ #category : #execute } +{ #category : 'execute' } IceGitCommand class >> preprocessString: commandDescription [ ^ (commandDescription withoutPrefix: '"') withoutSuffix: '"' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> command [ ^ command ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> command: anObject [ command := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> directory [ ^ directory ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> directory: anObject [ directory := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> gitCommand [ ^ self class gitCommand ] -{ #category : #running } +{ #category : 'running' } IceGitCommand >> run [ UIManager default informUserDuring: [ :bar | @@ -108,7 +109,7 @@ IceGitCommand >> run [ ] -{ #category : #running } +{ #category : 'running' } IceGitCommand >> runLibCGitCommand [ | exitCode aCommandString | diff --git a/Iceberg-Tests/IceGitCommitMessageTest.class.st b/Iceberg-Tests/IceGitCommitMessageTest.class.st index a8a39dd12b..6c3fd745be 100644 --- a/Iceberg-Tests/IceGitCommitMessageTest.class.st +++ b/Iceberg-Tests/IceGitCommitMessageTest.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceGitCommitMessageTest, - #superclass : #IceAbstractTestCase, - #category : #'Iceberg-Tests-Git' + #name : 'IceGitCommitMessageTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitCommitMessageTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitEmptyString [ self repository commitWithMessage: ''. @@ -17,14 +19,14 @@ IceGitCommitMessageTest >> testCommitEmptyString [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitNullString [ self should: [self repository commitWithMessage: nil] raise: Error. ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitWideString [ | msg | msg := ZnUTF8Encoder new decodeBytes: (ByteArray readHexFrom: 'e38182e38184e38186'). "Japanese vowels a,i, and u - 'あいう'" @@ -33,7 +35,7 @@ IceGitCommitMessageTest >> testCommitWideString [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitWithEndingPesosSign [ "We used to have a problem that in some messages (depending of padding) the $ was added at the end" | msg | @@ -43,7 +45,7 @@ IceGitCommitMessageTest >> testCommitWithEndingPesosSign [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitWithoutPesosSign [ "We used to have a problem that in some messages (depending of padding) the $ was added at the end" | msg | @@ -53,7 +55,7 @@ IceGitCommitMessageTest >> testCommitWithoutPesosSign [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testDifferentSizes [ "We used to have a problem that in some messages (depending of padding) the $ was added at the end" | msg | diff --git a/Iceberg-Tests/IceGitDetachedWorkingCopyTest.class.st b/Iceberg-Tests/IceGitDetachedWorkingCopyTest.class.st index 1a5b386afc..e51f533659 100644 --- a/Iceberg-Tests/IceGitDetachedWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceGitDetachedWorkingCopyTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitDetachedWorkingCopyTest, - #superclass : #IceDetachedWorkingCopyTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitDetachedWorkingCopyTest', + #superclass : 'IceDetachedWorkingCopyTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitDetachedWorkingCopyTest >> newFixture [ ^ IceDetachedWorkingCopyFixture inGit diff --git a/Iceberg-Tests/IceGitDirtyDetachedWorkingCopyTest.class.st b/Iceberg-Tests/IceGitDirtyDetachedWorkingCopyTest.class.st index 70346261fa..bf2e677114 100644 --- a/Iceberg-Tests/IceGitDirtyDetachedWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceGitDirtyDetachedWorkingCopyTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitDirtyDetachedWorkingCopyTest, - #superclass : #IceDirtyDetachedWorkingCopyTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitDirtyDetachedWorkingCopyTest', + #superclass : 'IceDirtyDetachedWorkingCopyTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitDirtyDetachedWorkingCopyTest >> newFixture [ ^ IceDirtyDetachedWorkingCopyFixture inGit diff --git a/Iceberg-Tests/IceGitFileFormatTest.class.st b/Iceberg-Tests/IceGitFileFormatTest.class.st index 311c313664..2a54e25fd6 100644 --- a/Iceberg-Tests/IceGitFileFormatTest.class.st +++ b/Iceberg-Tests/IceGitFileFormatTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceGitFileFormatTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitFileFormatTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitFileFormatTest >> newFixture [ ^ IceMultiplePackageFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitFileFormatTest >> testRepositoryInFileTreeDoesNotSeeFilesCalledAsPackages [ | fileRef | @@ -28,7 +30,7 @@ IceGitFileFormatTest >> testRepositoryInFileTreeDoesNotSeeFilesCalledAsPackages self assertCollection: (self repository workingCopy packages collect: #name) hasSameElements: { #FileTreePackage } ] -{ #category : #tests } +{ #category : 'tests' } IceGitFileFormatTest >> testRepositoryInFileTreeDoesNotSeeTonelPackages [ self repository project fileFormat: IceLibgitFiletreeWriter. @@ -39,7 +41,7 @@ IceGitFileFormatTest >> testRepositoryInFileTreeDoesNotSeeTonelPackages [ self assertCollection: (self repository workingCopy packages collect: #name) hasSameElements: { #FileTreePackage } ] -{ #category : #tests } +{ #category : 'tests' } IceGitFileFormatTest >> testRepositoryWithFilesInUppercaseAreNotRecognizedAsPackages [ | fileRef | @@ -53,7 +55,7 @@ IceGitFileFormatTest >> testRepositoryWithFilesInUppercaseAreNotRecognizedAsPack self assertCollection: (self repository workingCopy packages collect: #name) hasSameElements: { self packageName1 asSymbol. self packageName2 asSymbol } ] -{ #category : #tests } +{ #category : 'tests' } IceGitFileFormatTest >> testRepositoryWithFiletreePackageNotRecognizedAsPackages [ self repository project fileFormat: IceLibgitFiletreeWriter. diff --git a/Iceberg-Tests/IceGitMergeTest.class.st b/Iceberg-Tests/IceGitMergeTest.class.st index 6ee068d5ba..ae8b7c26b7 100644 --- a/Iceberg-Tests/IceGitMergeTest.class.st +++ b/Iceberg-Tests/IceGitMergeTest.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceGitMergeTest, - #superclass : #IceMergeTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitMergeTest', + #superclass : 'IceMergeTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitMergeTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testConflictFile [ | fileRef branchMaster branchRemove | @@ -33,7 +35,7 @@ IceGitMergeTest >> testConflictFile [ self should: [ branchRemove merge ] raise: IceMergeResolutionRequest ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeBinaryFileAdditionCreatesFileInWorkingCopy [ | fileRef branchMaster newBranch | @@ -59,7 +61,7 @@ IceGitMergeTest >> testMergeBinaryFileAdditionCreatesFileInWorkingCopy [ self assert: fileRef exists. ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeOfInnessaryMergeCommit [ | c1 c2 c3 c4 i1 fileRef| @@ -135,7 +137,7 @@ IceGitMergeTest >> testMergeOfInnessaryMergeCommit [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeTextFileAdditionCreatesFileInWorkingCopy [ | fileRef branchMaster newBranch | @@ -160,7 +162,7 @@ IceGitMergeTest >> testMergeTextFileAdditionCreatesFileInWorkingCopy [ self assert: fileRef exists. ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithDirectoryRemovedOnOneBranchButNotOtherCausesConflict [ | fileRef otherFileRef branchMaster branchRemove | @@ -187,7 +189,7 @@ IceGitMergeTest >> testMergeWithDirectoryRemovedOnOneBranchButNotOtherCausesConf self should: [ branchRemove merge ] raise: IceMergeResolutionRequest ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithDirectoryRemovedWithFastForward [ | fileRef branchMaster branchRemove | @@ -211,7 +213,7 @@ IceGitMergeTest >> testMergeWithDirectoryRemovedWithFastForward [ self deny: fileRef parent exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithDirectoryRemovedWithMerge [ | fileRef otherFileRef branchMaster branchRemove | @@ -240,7 +242,7 @@ IceGitMergeTest >> testMergeWithDirectoryRemovedWithMerge [ self deny: fileRef parent exists. ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithEmptyIncomingCommitCreatesMergeCommit [ | incomingBranch | @@ -262,7 +264,7 @@ IceGitMergeTest >> testMergeWithEmptyIncomingCommitCreatesMergeCommit [ self assert: self repository workingCopy referenceCommit comment equals: 'Merge ' , incomingBranch commit id ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithFileRemovedWithFastForward [ | fileRef branchMaster branchRemove | @@ -285,7 +287,7 @@ IceGitMergeTest >> testMergeWithFileRemovedWithFastForward [ self deny: fileRef exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithFileRemovedWithMerge [ | fileRef otherFileRef branchMaster branchRemove | @@ -313,7 +315,7 @@ IceGitMergeTest >> testMergeWithFileRemovedWithMerge [ self deny: fileRef exists. ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithMissingProjectFile [ | incomingBranch fileRef | @@ -340,7 +342,7 @@ IceGitMergeTest >> testMergeWithMissingProjectFile [ self assert: self repository workingCopy referenceCommit comment equals: 'Merge ' , incomingBranch commit id ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testResolveConflictInFileCreatesCorrectMergeCommit [ | fileRef branchMaster conflictingCommit baseCommit | diff --git a/Iceberg-Tests/IceGitPropertiesFileTest.class.st b/Iceberg-Tests/IceGitPropertiesFileTest.class.st index ba83484cb3..39de743538 100644 --- a/Iceberg-Tests/IceGitPropertiesFileTest.class.st +++ b/Iceberg-Tests/IceGitPropertiesFileTest.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceGitPropertiesFileTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitPropertiesFileTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitPropertiesFileTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitPropertiesFileTest >> testCommitSavesPropertiesFile [ self repository properties at: #bla put: #blo. @@ -18,7 +20,7 @@ IceGitPropertiesFileTest >> testCommitSavesPropertiesFile [ self assert: (self repository head properties at: #bla) equals: #blo ] -{ #category : #tests } +{ #category : 'tests' } IceGitPropertiesFileTest >> testPropertiesFileIsStoredInMemory [ | ston | @@ -29,7 +31,7 @@ IceGitPropertiesFileTest >> testPropertiesFileIsStoredInMemory [ self assert: (self repository properties at: #bla) equals: #blo ] -{ #category : #tests } +{ #category : 'tests' } IceGitPropertiesFileTest >> testRecoverPropertiesFromOldCommitEvenIfDiskIsDifferent [ self repository properties at: #bla put: #old. @@ -44,7 +46,7 @@ IceGitPropertiesFileTest >> testRecoverPropertiesFromOldCommitEvenIfDiskIsDiffer self assert: (self repository head properties at: #bla) equals: #old ] -{ #category : #tests } +{ #category : 'tests' } IceGitPropertiesFileTest >> testRecoverPropertiesFromOldCommitEvenIfHeadIsDifferent [ self repository properties at: #bla put: #old. diff --git a/Iceberg-Tests/IceGitRemoteTest.class.st b/Iceberg-Tests/IceGitRemoteTest.class.st index 44dc1891f6..50912e21cb 100644 --- a/Iceberg-Tests/IceGitRemoteTest.class.st +++ b/Iceberg-Tests/IceGitRemoteTest.class.st @@ -1,86 +1,88 @@ Class { - #name : #IceGitRemoteTest, - #superclass : #TestCase, - #category : #'Iceberg-Tests-Core-Remotes' + #name : 'IceGitRemoteTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testCanHandleGithubImplicitScpUrl [ self assert: (IceGitScpRemote canHandleUrl: 'git@github.com:npasserini/iceberg.git') ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testCanHandleGithubSSHUrl [ self assert: (IceGitSshRemote canHandleUrl: 'git://github.com/pharo-vcs/iceberg.git') ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testCanHandleGithubSSHUrlWithExplicitPort [ self assert: (IceGitSshRemote canHandleUrl: 'git://github.com:8372/pharo-vcs/iceberg'). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testCanHandleGithubScpUrl [ self assert: (IceGitScpRemote canHandleUrl: 'ssh://git@github.com/npasserini/iceberg.git'). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testCanHandleNonGithubImplicitScpUrl [ self assert: (IceGitScpRemote canHandleUrl: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git') ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testCanHandleNonGithubSSHUrl [ self assert: (IceGitSshRemote canHandleUrl: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testCanHandleNonGithubScpUrl [ self assert: (IceGitScpRemote canHandleUrl: 'ssh://git@git.fremont.lamrc.net/diffuse/300/rdebug.git'). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlExtractsFullUrlPath [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url projectPath equals: 'pharo-vcs/iceberg' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlExtractsOwner [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url owner equals: 'pharo-vcs'. ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlExtractsPath [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url path equals: #( ) ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlExtractsProjectName [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url projectName equals: 'iceberg' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlHasDefaultPort [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url port equals: 22 ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlShouldBeTransformableToHttps [ | remote | @@ -88,49 +90,49 @@ IceGitRemoteTest >> testGithubImplicitScpUrlShouldBeTransformableToHttps [ self assert: remote httpsUrl equals: 'https://github.com/npasserini/iceberg.git' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsFullUrlPath [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url projectPath equals: 'pharo-vcs/iceberg' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsOwner [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url owner equals: 'pharo-vcs'. ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsPath [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url path equals: OrderedCollection new ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsPort [ | url | url := IceGitSshRemote new url: 'git://github.com:8372/pharo-vcs/iceberg.git'. self assert: url port equals: 8372 ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsProjectName [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url projectName equals: 'iceberg' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlHasDefaultPort [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url port equals: 9418 ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlShouldBeTransformableToHttps [ | url | @@ -138,42 +140,42 @@ IceGitRemoteTest >> testGithubSSHUrlShouldBeTransformableToHttps [ self assert: url httpsUrl equals: 'https://github.com/pharo-vcs/iceberg.git' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlExtractsFullUrlPath [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url projectPath equals: 'pharo-vcs/iceberg' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlExtractsOwner [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url owner equals: 'pharo-vcs'. ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlExtractsPath [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url path asArray equals: #( ) ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlExtractsProjectName [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url projectName equals: 'iceberg' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlHasDefaultPort [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url port equals: 22 ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlShouldBeTransformableToHttps [ | remote | @@ -181,7 +183,7 @@ IceGitRemoteTest >> testGithubScpUrlShouldBeTransformableToHttps [ self assert: remote httpsUrl equals: 'https://github.com/npasserini/iceberg.git' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testHTTPSRemoteEqualsLocationThanSCPRemote [ | sshremote scpremote | sshremote := IceGitHttpsRemote new url: 'https://github.com/pharo-vcs/iceberg.git'. @@ -189,7 +191,7 @@ IceGitRemoteTest >> testHTTPSRemoteEqualsLocationThanSCPRemote [ self assert: (sshremote referencesSameRemoteLocationAs: scpremote). ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testHTTPSRemoteNotEqualsLocationThanSCPRemote [ | sshremote scpremote | sshremote := IceGitHttpsRemote new url: 'https://github.com/pharo-vcs/iceberg.git'. @@ -197,42 +199,42 @@ IceGitRemoteTest >> testHTTPSRemoteNotEqualsLocationThanSCPRemote [ self deny: (sshremote referencesSameRemoteLocationAs: scpremote). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlExtractsFullUrlPath [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url projectPath equals: 'diffuse/300/rdebug' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlExtractsOwner [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url owner equals: '300'. ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlExtractsPath [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url path equals: #( diffuse ) ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlExtractsProjectName [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url projectName equals: 'rdebug' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlHasDefaultPort [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url port equals: 22 ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlShouldBeTransformableToHttps [ | url | @@ -240,42 +242,42 @@ IceGitRemoteTest >> testNonGithubImplicitScpUrlShouldBeTransformableToHttps [ self assert: url httpsUrl equals: 'https://git.fremont.lamrc.net/diffuse/300/rdebug.git' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlExtractsFullUrlPath [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url projectPath equals: 'diffuse/300/rdebug' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlExtractsOwner [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url owner equals: '300'. ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlExtractsPath [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url path asArray equals: #( diffuse ) ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlExtractsPort [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net:8372/diffuse/300/rdebug.git'. self assert: url port equals: 8372 ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlHasDefaultPort [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url port equals: 9418 ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlShouldBeTransformableToHttps [ | url | @@ -283,42 +285,42 @@ IceGitRemoteTest >> testNonGithubSSHUrlShouldBeTransformableToHttps [ self assert: url httpsUrl equals: 'https://git.fremont.lamrc.net/diffuse/300/rdebug.git' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlExtractsFullUrlPath [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url projectPath equals: 'diffuse/300/rdebug' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlExtractsOwner [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url owner equals: '300'. ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlExtractsPath [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url path asArray equals: #( diffuse ) ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlExtractsProjectName [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url projectName equals: 'rdebug' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlHasDefaultPort [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url port equals: 22 ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlShouldBeTransformableToHttps [ | url | @@ -326,7 +328,7 @@ IceGitRemoteTest >> testNonGithubScpUrlShouldBeTransformableToHttps [ self assert: url httpsUrl equals: 'https://git.fremont.lamrc.net/diffuse/300/rdebug.git' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testSSHRemoteEqualsLocationThanSCPRemote [ | sshremote scpremote | sshremote := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. @@ -334,7 +336,7 @@ IceGitRemoteTest >> testSSHRemoteEqualsLocationThanSCPRemote [ self assert: (sshremote referencesSameRemoteLocationAs: scpremote). ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testSSHRemoteNotEqualsLocationThanSCPRemote [ | sshremote scpremote | sshremote := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. diff --git a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest.class.st b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest.class.st index ec4245a695..87422e91ab 100644 --- a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest.class.st +++ b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest, - #superclass : #IceGitRepositoryWithSingleRemoteTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest', + #superclass : 'IceGitRepositoryWithSingleRemoteTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest >> newFixture [ ^ IceWithRemoteFixture inGit remoteBranchName: 'feature/master' diff --git a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndMergeConflictTest.class.st b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndMergeConflictTest.class.st index 5a23100940..49e55c7c5e 100644 --- a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndMergeConflictTest.class.st +++ b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndMergeConflictTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitRepositoryWithSingleRemoteAndMergeConflictTest, - #superclass : #IceRepositoryWithSingleRemoteAndMergeConflictTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitRepositoryWithSingleRemoteAndMergeConflictTest', + #superclass : 'IceRepositoryWithSingleRemoteAndMergeConflictTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitRepositoryWithSingleRemoteAndMergeConflictTest >> newFixture [ ^ IceWithRemoteAndMergeConflictFixture inGit ] diff --git a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteTest.class.st b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteTest.class.st index 4d81d5d0b4..6d122a2c2d 100644 --- a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteTest.class.st +++ b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceGitRepositoryWithSingleRemoteTest, - #superclass : #IceRepositoryWithSingleRemoteTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitRepositoryWithSingleRemoteTest', + #superclass : 'IceRepositoryWithSingleRemoteTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitRepositoryWithSingleRemoteTest >> newFixture [ ^ IceWithRemoteFixture inGit remoteBranchName: 'newBranch' ] -{ #category : #running } +{ #category : 'running' } IceGitRepositoryWithSingleRemoteTest >> testPushPushesTags [ "We can only push if the repository is bare" diff --git a/Iceberg-Tests/IceGitTestFactory.class.st b/Iceberg-Tests/IceGitTestFactory.class.st index bee23a4f7d..d7af8c424d 100644 --- a/Iceberg-Tests/IceGitTestFactory.class.st +++ b/Iceberg-Tests/IceGitTestFactory.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceGitTestFactory, - #superclass : #IceAbstractTestFactory, - #category : #'Iceberg-Tests-Git' + #name : 'IceGitTestFactory', + #superclass : 'IceAbstractTestFactory', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory class >> setUp [ ^ self new setUp ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> defaultRemoteUrl [ ^ self remoteFileUrl asString ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> ensureRemoteRepository [ | remoteRepository | remoteRepository := self remoteFileUrl asFileReference exists @@ -31,19 +33,19 @@ IceGitTestFactory >> ensureRemoteRepository [ ^ remoteRepository ] -{ #category : #testing } +{ #category : 'testing' } IceGitTestFactory >> isGit [ ^ true ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> location [ ^ FileLocator imageDirectory / 'test' ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> newBareRepositoryNamed: projectName withSubdirectory: aSubdirectory [ | repository | (self location / projectName) ensureDeleteAll. @@ -69,13 +71,13 @@ IceGitTestFactory >> newBareRepositoryNamed: projectName withSubdirectory: aSubd ^ repository ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> newRemoteNamed: aName toRepository: aRepository [ ^ IceGitRemote name: aName url: aRepository location resolve asUrl asString ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirectory [ | repository | (self location / projectName) ensureDeleteAll. @@ -96,13 +98,13 @@ IceGitTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirec ^ repository ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> remoteFileUrl [ ^ (IceLibgitRepository repositoriesLocation / 'remote') resolve asUrl. ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> tearDownWithRepository: aRepository [ aRepository ifNotNil: [ diff --git a/Iceberg-Tests/IceGitUnbornProjectTest.class.st b/Iceberg-Tests/IceGitUnbornProjectTest.class.st index c74eb78c7c..a67a9ed8c5 100644 --- a/Iceberg-Tests/IceGitUnbornProjectTest.class.st +++ b/Iceberg-Tests/IceGitUnbornProjectTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceGitUnbornProjectTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitUnbornProjectTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitUnbornProjectTest >> newFixture [ ^ IceUnbornProjectFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testCommitNewProjectCreatesProjectFile [ self repository workingCopy project: (IceBasicProject onRepository: self repository withSourceDirectory: fixture subdirectory). @@ -18,7 +20,7 @@ IceGitUnbornProjectTest >> testCommitNewProjectCreatesProjectFile [ self assert: (self repository headCommit fileSystem / '.project') exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testCommitNewProjectFindsPropertiesFile [ self repository workingCopy project: (IceBasicProject onRepository: self repository withSourceDirectory: fixture subdirectory). @@ -27,7 +29,7 @@ IceGitUnbornProjectTest >> testCommitNewProjectFindsPropertiesFile [ self assert: (self repository headCommit fileSystem resolve: self repository properties propertiesFilePath) exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testDiffContainsNewProject [ | diff | @@ -37,7 +39,7 @@ IceGitUnbornProjectTest >> testDiffContainsNewProject [ self assert: (diff tree / '.project') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testInvalidProjectReturnsSameSourceDirectoryThanCurrentProject [ "Create a new commit" @@ -50,7 +52,7 @@ IceGitUnbornProjectTest >> testInvalidProjectReturnsSameSourceDirectoryThanCurre self assert: self repository headCommit parent project isInvalid ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testProjectCurrentCommitAfterChangeIsUnborn [ "Create a new commit" @@ -64,13 +66,13 @@ IceGitUnbornProjectTest >> testProjectCurrentCommitAfterChangeIsUnborn [ self assert: self repository headCommit project isInvalid. ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testProjectIsUnborn [ self assert: self repository project isUnborn ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testProjectOlderCommitIsInvalid [ "Create a new commit" @@ -84,7 +86,7 @@ IceGitUnbornProjectTest >> testProjectOlderCommitIsInvalid [ self assert: self repository headCommit parent project sourceDirectory equals: 'test' ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testPropertiesFileIsNotEmpty [ | props | @@ -95,7 +97,7 @@ IceGitUnbornProjectTest >> testPropertiesFileIsNotEmpty [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testRepositoryHasNoProjectFile [ self deny: (self repository location / '.project') exists diff --git a/Iceberg-Tests/IceGitUnknownCommitRepositoryTest.class.st b/Iceberg-Tests/IceGitUnknownCommitRepositoryTest.class.st index 8de925c226..98089cff91 100644 --- a/Iceberg-Tests/IceGitUnknownCommitRepositoryTest.class.st +++ b/Iceberg-Tests/IceGitUnknownCommitRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitUnknownCommitRepositoryTest, - #superclass : #IceUnknownCommitRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitUnknownCommitRepositoryTest', + #superclass : 'IceUnknownCommitRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitUnknownCommitRepositoryTest >> newFixture [ ^ IceWithRemoteAndUnknownCommitFixture inGit diff --git a/Iceberg-Tests/IceGitWithoutUserNameTest.class.st b/Iceberg-Tests/IceGitWithoutUserNameTest.class.st index 2edd92ae5e..ad23f9bed6 100644 --- a/Iceberg-Tests/IceGitWithoutUserNameTest.class.st +++ b/Iceberg-Tests/IceGitWithoutUserNameTest.class.st @@ -1,19 +1,21 @@ Class { - #name : #IceGitWithoutUserNameTest, - #superclass : #IceAbstractTestCase, + #name : 'IceGitWithoutUserNameTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'username', 'email' ], - #category : #'Iceberg-Tests-Git' + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitWithoutUserNameTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceGitWithoutUserNameTest >> setUp [ | global | @@ -30,7 +32,7 @@ IceGitWithoutUserNameTest >> setUp [ email: 'mock mail'. ] -{ #category : #running } +{ #category : 'running' } IceGitWithoutUserNameTest >> tearDown [ | global | @@ -42,7 +44,7 @@ IceGitWithoutUserNameTest >> tearDown [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testCommitWithEmptyUserMailThrowsException [ (self repository getConfigurationGlobal: false) @@ -54,7 +56,7 @@ IceGitWithoutUserNameTest >> testCommitWithEmptyUserMailThrowsException [ raise: IceGitUsernameOrEmailNotFound ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testCommitWithEmptyUserNameThrowsException [ (self repository getConfigurationGlobal: false) @@ -66,7 +68,7 @@ IceGitWithoutUserNameTest >> testCommitWithEmptyUserNameThrowsException [ raise: IceGitUsernameOrEmailNotFound ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testCommitWithoutUserMailThrowsException [ (self repository getConfigurationGlobal: false) @@ -78,7 +80,7 @@ IceGitWithoutUserNameTest >> testCommitWithoutUserMailThrowsException [ raise: IceGitUsernameOrEmailNotFound ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testCommitWithoutUserNameThrowsException [ (self repository getConfigurationGlobal: false) @@ -90,7 +92,7 @@ IceGitWithoutUserNameTest >> testCommitWithoutUserNameThrowsException [ raise: IceGitUsernameOrEmailNotFound ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testFixEmptyUserMailAndResumeDoesCommit [ | before after | (self repository getConfigurationGlobal: false) email: ''. @@ -107,7 +109,7 @@ IceGitWithoutUserNameTest >> testFixEmptyUserMailAndResumeDoesCommit [ self fail ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testFixEmptyUserNameAndResumeDoesCommit [ | before after | (self repository getConfigurationGlobal: false) username: ''. @@ -124,7 +126,7 @@ IceGitWithoutUserNameTest >> testFixEmptyUserNameAndResumeDoesCommit [ self fail ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testFixUnsetUserMailAndResumeDoesCommit [ | before after | (self repository getConfigurationGlobal: false) unset: 'user.email'. @@ -141,7 +143,7 @@ IceGitWithoutUserNameTest >> testFixUnsetUserMailAndResumeDoesCommit [ self fail ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testFixUnsetUserNameAndResumeDoesCommit [ | before after | (self repository getConfigurationGlobal: false) unset: 'user.name'. @@ -158,7 +160,7 @@ IceGitWithoutUserNameTest >> testFixUnsetUserNameAndResumeDoesCommit [ self fail ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testUtf8Username [ | after utf8Username | utf8Username := 'Yn-aë éé'. diff --git a/Iceberg-Tests/IceHttpRemoteTest.class.st b/Iceberg-Tests/IceHttpRemoteTest.class.st index d2a351e756..9efcce63e0 100644 --- a/Iceberg-Tests/IceHttpRemoteTest.class.st +++ b/Iceberg-Tests/IceHttpRemoteTest.class.st @@ -2,26 +2,28 @@ Tests for IceHTTPRemote " Class { - #name : #IceHttpRemoteTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'IceHttpRemoteTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #'private - defaults' } +{ #category : 'private - defaults' } IceHttpRemoteTest >> defaultTestClass [ "Return the default test class" ^IceGitHttpRemote ] -{ #category : #'private - defaults' } +{ #category : 'private - defaults' } IceHttpRemoteTest >> protocolID [ "Return the protocol identifier" ^self defaultTestClass protocolID ] -{ #category : #'private - utilities' } +{ #category : 'private - utilities' } IceHttpRemoteTest >> protocolURLFor: aString [ ^IceGitRemote url: self protocolID, '://', aString @@ -29,7 +31,7 @@ IceHttpRemoteTest >> protocolURLFor: aString [ ] -{ #category : #'tests - providers' } +{ #category : 'tests - providers' } IceHttpRemoteTest >> testBitBucketURL [ |remote| remote := self protocolURLFor: 'bitbucket.org/owner/repo.git'. @@ -40,13 +42,13 @@ IceHttpRemoteTest >> testBitBucketURL [ assert: remote projectName equals: 'repo' ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testCanHandleProtocol [ self assert: (self defaultTestClass canHandleUrl: self protocolID ,'://') ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testFullURL [ | remote | remote := self protocolURLFor: 'user@hostname.com:1234/subpath1/subpath2/owner/repo.git'. @@ -57,7 +59,7 @@ IceHttpRemoteTest >> testFullURL [ assert: remote projectName equals: 'repo' ] -{ #category : #'tests - providers' } +{ #category : 'tests - providers' } IceHttpRemoteTest >> testGitHubURL [ |remote| remote := self protocolURLFor: 'github.com/owner/repo.git'. @@ -68,7 +70,7 @@ IceHttpRemoteTest >> testGitHubURL [ assert: remote projectName equals: 'repo' ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testLocalhostRepo [ |remote| remote := self protocolURLFor: 'hostname/owner/repo.git'. @@ -79,7 +81,7 @@ IceHttpRemoteTest >> testLocalhostRepo [ assert: remote projectName equals: 'repo' ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testURLWithDeepPath [ |remote| remote := self protocolURLFor: 'hostname:8080/sub1/sub2/sub3/owner/repo.git'. @@ -90,7 +92,7 @@ IceHttpRemoteTest >> testURLWithDeepPath [ assert: remote path third equals: 'sub3' ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testURLWithEmpty [ |remote| remote := self protocolURLFor: 'hostname:8080/owner/repo.git'. @@ -98,7 +100,7 @@ IceHttpRemoteTest >> testURLWithEmpty [ assert: remote path isEmpty ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testURLWithSinglePath [ |remote| remote := self protocolURLFor: 'hostname:8080/path/owner/repo.git'. diff --git a/Iceberg-Tests/IceHttpsRemoteTest.class.st b/Iceberg-Tests/IceHttpsRemoteTest.class.st index c11442365b..66947c7ea8 100644 --- a/Iceberg-Tests/IceHttpsRemoteTest.class.st +++ b/Iceberg-Tests/IceHttpsRemoteTest.class.st @@ -2,19 +2,21 @@ Test for IceHttpsRemoteTest " Class { - #name : #IceHttpsRemoteTest, - #superclass : #IceHttpRemoteTest, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'IceHttpsRemoteTest', + #superclass : 'IceHttpRemoteTest', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #'private - defaults' } +{ #category : 'private - defaults' } IceHttpsRemoteTest >> defaultTestClass [ "Return the default test class" ^IceGitHttpsRemote ] -{ #category : #tests } +{ #category : 'tests' } IceHttpsRemoteTest >> testSameRemoteReference [ | r1 r2 | @@ -23,7 +25,7 @@ IceHttpsRemoteTest >> testSameRemoteReference [ self assert: (r1 referencesSameRemoteLocationAs: r2) ] -{ #category : #tests } +{ #category : 'tests' } IceHttpsRemoteTest >> testSameRemoteReferenceWithoutGitExtension [ | r1 r2 | diff --git a/Iceberg-Tests/IceInMemoryCleanWorkingCopyTest.class.st b/Iceberg-Tests/IceInMemoryCleanWorkingCopyTest.class.st index 7544b33816..13ff6fe38d 100644 --- a/Iceberg-Tests/IceInMemoryCleanWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceInMemoryCleanWorkingCopyTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceInMemoryCleanWorkingCopyTest, - #superclass : #IceCleanWorkingCopyTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceInMemoryCleanWorkingCopyTest', + #superclass : 'IceCleanWorkingCopyTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceInMemoryCleanWorkingCopyTest >> newFixture [ ^ IceCleanWorkingCopyFixture inMemory ] diff --git a/Iceberg-Tests/IceInMemoryTestFactory.class.st b/Iceberg-Tests/IceInMemoryTestFactory.class.st index 2638cdabba..9491041f1b 100644 --- a/Iceberg-Tests/IceInMemoryTestFactory.class.st +++ b/Iceberg-Tests/IceInMemoryTestFactory.class.st @@ -1,28 +1,30 @@ Class { - #name : #IceInMemoryTestFactory, - #superclass : #IceAbstractTestFactory, - #category : 'Iceberg-Tests-Memory' + #name : 'IceInMemoryTestFactory', + #superclass : 'IceAbstractTestFactory', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #initialization } +{ #category : 'initialization' } IceInMemoryTestFactory class >> setUp [ ^ self new setUp ] -{ #category : #accessing } +{ #category : 'accessing' } IceInMemoryTestFactory >> ensureRemoteRepository [ ^ self newRepositoryNamed: 'remoteRepo' ] -{ #category : #testing } +{ #category : 'testing' } IceInMemoryTestFactory >> isGit [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceInMemoryTestFactory >> newRemoteNamed: aName toRepository: remoteRepository [ ^ IceMemoryRemote @@ -31,7 +33,7 @@ IceInMemoryTestFactory >> newRemoteNamed: aName toRepository: remoteRepository [ branchRepository: MCDictionaryRepository new ] -{ #category : #initialization } +{ #category : 'initialization' } IceInMemoryTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirectory [ "Ignore the subdirectory in memory" | repository | @@ -40,7 +42,7 @@ IceInMemoryTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSub ^ repository ] -{ #category : #initialization } +{ #category : 'initialization' } IceInMemoryTestFactory >> tearDownWithRepository: aRepository [ "Nothing" diff --git a/Iceberg-Tests/IceInitialPropertiesFileTestCase.class.st b/Iceberg-Tests/IceInitialPropertiesFileTestCase.class.st index 77e4799f58..dc6cb632f8 100644 --- a/Iceberg-Tests/IceInitialPropertiesFileTestCase.class.st +++ b/Iceberg-Tests/IceInitialPropertiesFileTestCase.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceInitialPropertiesFileTestCase, - #superclass : #IceParameterizedTestCase, - #category : 'Iceberg-Tests-Formats' + #name : 'IceInitialPropertiesFileTestCase', + #superclass : 'IceParameterizedTestCase', + #category : 'Iceberg-Tests-Formats', + #package : 'Iceberg-Tests', + #tag : 'Formats' } -{ #category : #running } +{ #category : 'running' } IceInitialPropertiesFileTestCase >> testNewRepositoryHasPropertiesFileWithFileTreeInIndex [ | format | format := IceLibgitRepository defaultFileFormatType. @@ -19,7 +21,7 @@ IceInitialPropertiesFileTestCase >> testNewRepositoryHasPropertiesFileWithFileTr ensure: [ IceLibgitRepository defaultFileFormatType: format ] ] -{ #category : #running } +{ #category : 'running' } IceInitialPropertiesFileTestCase >> testNewRepositoryHasPropertiesFileWithTonelInIndex [ | format | format := IceLibgitRepository defaultFileFormatType. diff --git a/Iceberg-Tests/IceLibGitIndexTestCase.class.st b/Iceberg-Tests/IceLibGitIndexTestCase.class.st index 772004e5b9..2699e8aae5 100644 --- a/Iceberg-Tests/IceLibGitIndexTestCase.class.st +++ b/Iceberg-Tests/IceLibGitIndexTestCase.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceLibGitIndexTestCase, - #superclass : #IceMergeTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceLibGitIndexTestCase', + #superclass : 'IceMergeTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceLibGitIndexTestCase >> assertIndexIsClean [ | diff | @@ -15,12 +17,12 @@ IceLibGitIndexTestCase >> assertIndexIsClean [ self assert: diff numberOfDeltas equals: 0 ] -{ #category : #running } +{ #category : 'running' } IceLibGitIndexTestCase >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceLibGitIndexTestCase >> testGitIndexIsCleanAfterCheckoutBranch [ "If we checkout a branch, git's index should be clean. @@ -48,56 +50,56 @@ IceLibGitIndexTestCase >> testGitIndexIsCleanAfterCheckoutBranch [ self assertIndexIsClean ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testImageAndHeadBehindMergeCommitShouldMergeInImageAndAdvanceHead [ super testImageAndHeadBehindMergeCommitShouldMergeInImageAndAdvanceHead. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testImageAndHeadInverseMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage [ super testImageAndHeadInverseMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testImageAndHeadMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage [ super testImageAndHeadMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testImageBehindHeadShouldOnlyMergeInImage [ super testImageBehindHeadShouldOnlyMergeInImage. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testMergeAheadImageCommitShouldFastForwardHEAD [ super testMergeAheadImageCommitShouldFastForwardHEAD. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testMergeCommitInHistoryShouldDoNothing [ super testMergeCommitInHistoryShouldDoNothing. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testMergeImageReferenceCommitInHistoryShouldDoNothing [ super testMergeImageReferenceCommitInHistoryShouldDoNothing. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testTrimergeShouldRaiseError [ super testTrimergeShouldRaiseError. diff --git a/Iceberg-Tests/IceLocalRepositoryMissingTest.class.st b/Iceberg-Tests/IceLocalRepositoryMissingTest.class.st index 7eac232243..333a810c01 100644 --- a/Iceberg-Tests/IceLocalRepositoryMissingTest.class.st +++ b/Iceberg-Tests/IceLocalRepositoryMissingTest.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceLocalRepositoryMissingTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceLocalRepositoryMissingTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceLocalRepositoryMissingTest >> newFixture [ ^ IceMissingLocalRepositoryFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceLocalRepositoryMissingTest >> testDeleteDoesNothing [ self shouldnt: [ self repository delete ] raise: Error ] -{ #category : #running } +{ #category : 'running' } IceLocalRepositoryMissingTest >> testRepositoryIsMissing [ self assert: self repository isMissing diff --git a/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest.class.st b/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest.class.st index 6e4a0beb88..f9251a5dfd 100644 --- a/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest.class.st +++ b/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest, - #superclass : #IceRepositoryWithSingleRemoteAndMergeConflictTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest', + #superclass : 'IceRepositoryWithSingleRemoteAndMergeConflictTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest >> newFixture [ ^ IceWithRemoteAndMergeConflictFixture inMemory ] diff --git a/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteTest.class.st b/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteTest.class.st index 7664074f1c..ecb5cf04a5 100644 --- a/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteTest.class.st +++ b/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMemoryRepositoryWithSingleRemoteTest, - #superclass : #IceRepositoryWithSingleRemoteTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceMemoryRepositoryWithSingleRemoteTest', + #superclass : 'IceRepositoryWithSingleRemoteTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceMemoryRepositoryWithSingleRemoteTest >> newFixture [ ^ IceWithRemoteFixture inMemory ] diff --git a/Iceberg-Tests/IceMergeTest.class.st b/Iceberg-Tests/IceMergeTest.class.st index 28e1a5b024..ab96f6b67a 100644 --- a/Iceberg-Tests/IceMergeTest.class.st +++ b/Iceberg-Tests/IceMergeTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceMergeTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceMergeTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceMergeTest class >> isAbstract [ ^ self == IceMergeTest ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testFastForwardApplyChangesCorrectly [ "This is a Ring working copy" @@ -36,7 +38,7 @@ IceMergeTest >> testFastForwardApplyChangesCorrectly [ self assert: (self repository workingCopy environment ask includesClassNamed: #IceGeneratedClassForTesting2) ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testImageAndHeadBehindMergeCommitShouldMergeInImageAndAdvanceHead [ "If the image and HEAD are behind the commit to merge, we need to advance HEAD and update the image so they correspond. @@ -80,7 +82,7 @@ IceMergeTest >> testImageAndHeadBehindMergeCommitShouldMergeInImageAndAdvanceHea self assert: self workingCopy isModified not. ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testImageAndHeadInverseMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage [ "If we want to merge the image into the head commit the usual thing would be to: @@ -142,7 +144,7 @@ IceMergeTest >> testImageAndHeadInverseMergeDivergingCommitShouldCreateMergeComm self assert: self repository workingCopy isModified not. ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testImageAndHeadMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage [ "If the image and HEAD diverted from the merge commit, we need to create a merge commit and advance both HEAD and the image to it. @@ -200,7 +202,7 @@ IceMergeTest >> testImageAndHeadMergeDivergingCommitShouldCreateMergeCommitAdvan self deny: self repository workingCopy isModified. ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testImageBehindHeadShouldOnlyMergeInImage [ "If the image is behind HEAD and we want to merge HEAD we need to update the image to be in HEAD. @@ -245,7 +247,7 @@ IceMergeTest >> testImageBehindHeadShouldOnlyMergeInImage [ self assert: headCommit equals: self repository workingCopy referenceCommit. ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testMergeAheadImageCommitShouldFastForwardHEAD [ "If the image corresponds to the head commit and the commit we want to merge is in the history of the head commit, the merge should be ignored. @@ -288,7 +290,7 @@ IceMergeTest >> testMergeAheadImageCommitShouldFastForwardHEAD [ self assert: self repository workingCopy isModified not. ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInDifferentClassesButSamePackageCausesNoConflicts [ "This is a Ring working copy" @@ -320,7 +322,7 @@ IceMergeTest >> testMergeChangesInDifferentClassesButSamePackageCausesNoConflict self assert: (self repository headCommit ancestors includes: change2Commit). ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInDifferentMethodsButSameClassCausesNoConflicts [ "This is a Ring working copy" @@ -353,7 +355,7 @@ IceMergeTest >> testMergeChangesInDifferentMethodsButSameClassCausesNoConflicts self assert: (self repository headCommit ancestors includes: change2Commit). ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInDifferentPackagesCausesNoConflicts [ "This is a Ring working copy" @@ -386,7 +388,7 @@ IceMergeTest >> testMergeChangesInDifferentPackagesCausesNoConflicts [ self assert: (self repository headCommit ancestors includes: change2Commit). ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInSameClassesSamePackageCausesConflicts [ "This is a Ring working copy" @@ -418,7 +420,7 @@ IceMergeTest >> testMergeChangesInSameClassesSamePackageCausesConflicts [ self should: [self repository workingCopy mergeCommit: change2Commit] raise: IceMergeResolutionRequest ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInSameMethodSameClassSamePackageCausesConflicts [ "This is a Ring working copy" @@ -449,7 +451,7 @@ IceMergeTest >> testMergeChangesInSameMethodSameClassSamePackageCausesConflicts self should: [self repository workingCopy mergeCommit: change2Commit] raise: IceMergeResolutionRequest ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testMergeCommitInHistoryShouldDoNothing [ "If the image corresponds to the head commit and the commit we want to merge is in the history of the head commit, the merge should be ignored. @@ -489,7 +491,7 @@ IceMergeTest >> testMergeCommitInHistoryShouldDoNothing [ self assert: self repository workingCopy isModified not. ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeFastForwardClassRemovalIsAppliedToWorkingCopy [ | headCommit mergeCommit | @@ -511,7 +513,7 @@ IceMergeTest >> testMergeFastForwardClassRemovalIsAppliedToWorkingCopy [ self denyClassExists: 'IceGeneratedClassForTesting'. ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeFastForwardMethodRemovalIsAppliedToWorkingCopy [ | headCommit mergeCommit | @@ -537,7 +539,7 @@ IceMergeTest >> testMergeFastForwardMethodRemovalIsAppliedToWorkingCopy [ ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testMergeImageReferenceCommitInHistoryShouldDoNothing [ "If the image corresponds to the merge commit and is in the history of the head commit, the merge should be ignored. @@ -580,7 +582,7 @@ IceMergeTest >> testMergeImageReferenceCommitInHistoryShouldDoNothing [ self assert: self repository workingCopy isModified not. ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardClassRemovalIsAppliedToWorkingCopy [ | headCommit mergeCommit | @@ -610,7 +612,7 @@ IceMergeTest >> testMergeNonFastForwardClassRemovalIsAppliedToWorkingCopy [ self denyClassExists: 'IceGeneratedClassForTesting'. ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardLocalMethodAdditionIsNotInMergeTree [ | headCommit mergeCommit mergeTree | @@ -647,7 +649,7 @@ IceMergeTest >> testMergeNonFastForwardLocalMethodAdditionIsNotInMergeTree [ ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardLocalMethodModificationIsNotInMergeTree [ | headCommit mergeCommit mergeTree | @@ -684,7 +686,7 @@ IceMergeTest >> testMergeNonFastForwardLocalMethodModificationIsNotInMergeTree [ ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardLocalMethodRemovalIsNotInMergeTree [ | headCommit mergeCommit mergeTree | @@ -721,7 +723,7 @@ IceMergeTest >> testMergeNonFastForwardLocalMethodRemovalIsNotInMergeTree [ ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardMethodRemovalIsAppliedToWorkingCopy [ | headCommit mergeCommit | @@ -753,7 +755,7 @@ IceMergeTest >> testMergeNonFastForwardMethodRemovalIsAppliedToWorkingCopy [ ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testTrimergeShouldRaiseError [ "If the image, HEAD and merge commit are three different commits, we should avoid merging. diff --git a/Iceberg-Tests/IceMetaClassCherryPickingTest.class.st b/Iceberg-Tests/IceMetaClassCherryPickingTest.class.st index 2aa18ab1ae..674dd33c19 100644 --- a/Iceberg-Tests/IceMetaClassCherryPickingTest.class.st +++ b/Iceberg-Tests/IceMetaClassCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMetaClassCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceMetaClassCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testAddExtensionMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -34,7 +36,7 @@ IceMetaClassCherryPickingTest >> testAddExtensionMethodInMetaSideOfExistingClass assert: (diff / self packageName2 / 'TestClass class' / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testAddMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | @@ -61,7 +63,7 @@ IceMetaClassCherryPickingTest >> testAddMethodInMetaSideOfExistingClass [ assert: (diff / self packageName1 / 'TestClass class' / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testModifyExtensionMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName2. @@ -104,7 +106,7 @@ IceMetaClassCherryPickingTest >> testModifyExtensionMethodInMetaSideOfExistingCl assert: (diff / self packageName2 / 'TestClass class' / 'm1') value isModification ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testModifyMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. @@ -143,7 +145,7 @@ IceMetaClassCherryPickingTest >> testModifyMethodInMetaSideOfExistingClass [ assert: (diff / self packageName1 / 'TestClass class' / 'm1') value isModification ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testRemoveExtensionMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | @@ -182,7 +184,7 @@ IceMetaClassCherryPickingTest >> testRemoveExtensionMethodInMetaSideOfExistingCl assert: (diff / self packageName2 / 'TestClass class' / 'm1') value isRemoval . ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testRemoveMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. diff --git a/Iceberg-Tests/IceMethodCherryPickingTest.class.st b/Iceberg-Tests/IceMethodCherryPickingTest.class.st index c89134e1f5..6f5558717d 100644 --- a/Iceberg-Tests/IceMethodCherryPickingTest.class.st +++ b/Iceberg-Tests/IceMethodCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMethodCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceMethodCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodInClassAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -47,7 +49,7 @@ IceMethodCherryPickingTest >> testAddMethodInClassAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -82,7 +84,7 @@ IceMethodCherryPickingTest >> testAddMethodInExistingClass [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodInExistingTrait [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -122,7 +124,7 @@ IceMethodCherryPickingTest >> testAddMethodInExistingTrait [ / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodInTraitAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -165,7 +167,7 @@ IceMethodCherryPickingTest >> testAddMethodInTraitAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodReferingAnAddedMethod [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -209,7 +211,7 @@ IceMethodCherryPickingTest >> testAddMethodReferingAnAddedMethod [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodThatVariablesThatAreNotDependencies [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -235,7 +237,7 @@ IceMethodCherryPickingTest >> testAddMethodThatVariablesThatAreNotDependencies [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodUsingASharedPoolAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -293,7 +295,7 @@ IceMethodCherryPickingTest >> testAddMethodUsingASharedPoolAsDependency [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodUsingASharedPoolAsDependencyWithClassAlreadyCommited [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. @@ -360,7 +362,7 @@ IceMethodCherryPickingTest >> testAddMethodUsingASharedPoolAsDependencyWithClass equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithClassAndSuperclassAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -423,7 +425,7 @@ IceMethodCherryPickingTest >> testAddMethodWithClassAndSuperclassAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -493,7 +495,7 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependencyWithSuperclassAlreadyCommited [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -557,7 +559,7 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependencyWithSupe value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithInstanceVariableAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -622,7 +624,7 @@ IceMethodCherryPickingTest >> testAddMethodWithInstanceVariableAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithInstanceVariableAsDependencyWithSuperclassAlreadyCommited [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -681,7 +683,7 @@ IceMethodCherryPickingTest >> testAddMethodWithInstanceVariableAsDependencyWithS value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithReferencedClassAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -724,7 +726,7 @@ IceMethodCherryPickingTest >> testAddMethodWithReferencedClassAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithReferencedTraitAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -767,7 +769,7 @@ IceMethodCherryPickingTest >> testAddMethodWithReferencedTraitAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithTwoCommits [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -799,7 +801,7 @@ IceMethodCherryPickingTest >> testAddMethodWithTwoCommits [ assert: (diff / self packageName1 / 'TestClass' / 'm1') value definition sourceCode equals: 'm1 ^36'. ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testRemoveClassWithMethods [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. @@ -835,7 +837,7 @@ IceMethodCherryPickingTest >> testRemoveClassWithMethods [ assert: (diff / self packageName1 / 'TestClass2' / 'm1') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testRemoveMethodInExistingClass [ | commitToCherryPick diff mergeTree | @@ -869,7 +871,7 @@ IceMethodCherryPickingTest >> testRemoveMethodInExistingClass [ assert: (diff / self packageName1 / 'TestClass' / 'm1') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testRemoveMethodInExistingTrait [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. diff --git a/Iceberg-Tests/IceMissingLocalRepositoryFixture.class.st b/Iceberg-Tests/IceMissingLocalRepositoryFixture.class.st index 6435ef07a8..bfa4c2f531 100644 --- a/Iceberg-Tests/IceMissingLocalRepositoryFixture.class.st +++ b/Iceberg-Tests/IceMissingLocalRepositoryFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMissingLocalRepositoryFixture, - #superclass : #IceCleanWorkingCopyFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceMissingLocalRepositoryFixture', + #superclass : 'IceCleanWorkingCopyFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceMissingLocalRepositoryFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceMultiplePackageFixture.class.st b/Iceberg-Tests/IceMultiplePackageFixture.class.st index 34dfe281ab..9058aeb221 100644 --- a/Iceberg-Tests/IceMultiplePackageFixture.class.st +++ b/Iceberg-Tests/IceMultiplePackageFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMultiplePackageFixture, - #superclass : #IceBasicRepositoryFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceMultiplePackageFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceMultiplePackageFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceMultiplePackageLocalGitRepositoryTest.class.st b/Iceberg-Tests/IceMultiplePackageLocalGitRepositoryTest.class.st index 3f2a39a079..49a6ce1303 100644 --- a/Iceberg-Tests/IceMultiplePackageLocalGitRepositoryTest.class.st +++ b/Iceberg-Tests/IceMultiplePackageLocalGitRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMultiplePackageLocalGitRepositoryTest, - #superclass : #IceMultiplePackageRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceMultiplePackageLocalGitRepositoryTest', + #superclass : 'IceMultiplePackageRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceMultiplePackageLocalGitRepositoryTest >> newFixture [ ^ IceMultiplePackageFixture inGit ] diff --git a/Iceberg-Tests/IceMultiplePackageLocalMemoryRepositoryTest.class.st b/Iceberg-Tests/IceMultiplePackageLocalMemoryRepositoryTest.class.st index 8ff976bc72..a506ebff4c 100644 --- a/Iceberg-Tests/IceMultiplePackageLocalMemoryRepositoryTest.class.st +++ b/Iceberg-Tests/IceMultiplePackageLocalMemoryRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMultiplePackageLocalMemoryRepositoryTest, - #superclass : #IceMultiplePackageRepositoryTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceMultiplePackageLocalMemoryRepositoryTest', + #superclass : 'IceMultiplePackageRepositoryTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceMultiplePackageLocalMemoryRepositoryTest >> newFixture [ ^ IceMultiplePackageFixture inMemory ] diff --git a/Iceberg-Tests/IceMultiplePackageRepositoryTest.class.st b/Iceberg-Tests/IceMultiplePackageRepositoryTest.class.st index 6b171374ff..70329cfddb 100644 --- a/Iceberg-Tests/IceMultiplePackageRepositoryTest.class.st +++ b/Iceberg-Tests/IceMultiplePackageRepositoryTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceMultiplePackageRepositoryTest, - #superclass : #IceBornRepositoryTest, - #category : #'Iceberg-Tests-Common' + #name : 'IceMultiplePackageRepositoryTest', + #superclass : 'IceBornRepositoryTest', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceMultiplePackageRepositoryTest class >> isAbstract [ ^ self == IceMultiplePackageRepositoryTest ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testAdoptCommitChangesWorkingCopyCommit [ | message commitToAdopt | @@ -27,7 +29,7 @@ IceMultiplePackageRepositoryTest >> testAdoptCommitChangesWorkingCopyCommit [ self assert: self repository workingCopy referenceCommit equals: commitToAdopt ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testAdoptCommitDoesNotChangeBranchCommit [ | message commitToAdopt branchCommitBeforeAdopt | @@ -45,7 +47,7 @@ IceMultiplePackageRepositoryTest >> testAdoptCommitDoesNotChangeBranchCommit [ self assert: self repository branch commit equals: branchCommitBeforeAdopt ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testAdoptCommitDoesNotChangeCheckedOutCodeInImage [ | message commitToAdopt | @@ -62,7 +64,7 @@ IceMultiplePackageRepositoryTest >> testAdoptCommitDoesNotChangeCheckedOutCodeIn self assert: (self repository workingCopy environment ask includesClassNamed: 'IceGeneratedClassForTesting') ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testAdoptCommitMarksPackagesAsDirty [ | message commitToAdopt | @@ -79,14 +81,14 @@ IceMultiplePackageRepositoryTest >> testAdoptCommitMarksPackagesAsDirty [ self assert: (self repository workingCopy packageNamed: self packageName1 asSymbol) isDirty ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutBranchDoesNotLeaveDetachedHead [ self repository branch checkout. self deny: self repository head isDetached ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutBranchInstallsCodeInImage [ | message | @@ -117,7 +119,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutBranchInstallsCodeInImage [ self assertPackageExists: self packageName2 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutBranchInstallsPackageInImage [ self repository branch checkout. @@ -125,7 +127,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutBranchInstallsPackageInImage [ self assertPackageExists: self packageName2. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInImage [ | message | @@ -154,7 +156,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInImag self assertPackageExists: self packageName2 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutCodeRepositoryInstallsPackageInImage [ self repository checkoutAllPackages. @@ -162,7 +164,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutCodeRepositoryInstallsPackageInI self assertPackageExists: self packageName2 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ | message | @@ -191,7 +193,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ self assertPackageExists: self packageName2 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutCommitInstallsPackageInImage [ self repository branch commit checkout. @@ -199,7 +201,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutCommitInstallsPackageInImage [ self assertPackageExists: self packageName2 ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceMultiplePackageRepositoryTest >> testCheckoutDoesNotAffectBranchCommit [ | commitAtBranchTime createdBranch message | @@ -221,14 +223,14 @@ IceMultiplePackageRepositoryTest >> testCheckoutDoesNotAffectBranchCommit [ self assert: createdBranch commit equals: commitAtBranchTime ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutLatestBranchCommitLeavesDetachedHead [ self repository branch commit checkoutAllPackages. self assert: self repository head isDetached. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutOlderCommitLeavesRepositoryInDetachedMode [ | message | @@ -250,14 +252,14 @@ IceMultiplePackageRepositoryTest >> testCheckoutOlderCommitLeavesRepositoryInDet self assert: self repository head isDetached ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutRepositoryDoesNotLeaveDetachedHead [ self repository checkoutAllPackages. self deny: self repository head isDetached ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testCommitModificationsCreatesNewCommit [ | message | @@ -272,7 +274,7 @@ IceMultiplePackageRepositoryTest >> testCommitModificationsCreatesNewCommit [ self deny: self repository workingCopy isDetached. ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testCommitModificationsDoNotCreateBranch [ | message | @@ -287,7 +289,7 @@ IceMultiplePackageRepositoryTest >> testCommitModificationsDoNotCreateBranch [ self deny: self repository workingCopy isDetached. ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testCommitWithDetachedHeadRaisesException [ | message | @@ -303,7 +305,7 @@ IceMultiplePackageRepositoryTest >> testCommitWithDetachedHeadRaisesException [ self should: [self repository commitWithMessage: message] raise: IceWorkingCopyDesyncronized. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testCreateClassInImageInNotManagedPackageKeepChangesEmpty [ "This is a Ring working copy" @@ -313,7 +315,7 @@ IceMultiplePackageRepositoryTest >> testCreateClassInImageInNotManagedPackageKee self assert: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesChangesContainClassDefinition [ | diff | @@ -330,7 +332,7 @@ IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesChangesContainCla self assert: (diff tree / self packageName1 / 'IceGeneratedClassForTesting') value definition name equals: #IceGeneratedClassForTesting. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesChangesNonEmpty [ "This is a Ring working copy" @@ -340,7 +342,7 @@ IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesChangesNonEmpty [ self deny: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesRespositoryModifications [ "This is a Ring working copy" @@ -350,13 +352,13 @@ IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesRespositoryModifi self assert: self repository isModified ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceMultiplePackageRepositoryTest >> testCurrentBranchIsDefaultMasterBranch [ self assert: self repository branch name equals: 'master' ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testDetachedHeadCannotCommit [ self repository branch commit checkout. @@ -364,7 +366,7 @@ IceMultiplePackageRepositoryTest >> testDetachedHeadCannotCommit [ self should: [self repository validateCanCommit] raise: IceWorkingCopyDesyncronized. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceMultiplePackageRepositoryTest >> testListBranchCommitsListsCommitsInBranch [ | branches commits | @@ -375,7 +377,7 @@ IceMultiplePackageRepositoryTest >> testListBranchCommitsListsCommitsInBranch [ self assert: commits first comment equals: 'Initial commit'. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceMultiplePackageRepositoryTest >> testListPackagesListExistingPackage [ | packages | @@ -385,19 +387,19 @@ IceMultiplePackageRepositoryTest >> testListPackagesListExistingPackage [ self assert: (packages includes: self packageName2). ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testNoChangesInImageMakesChangesEmpty [ self assert: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testNoChangesInImageMakesNoModifications [ self deny: self repository isModified ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testResetBranchDoesNotChangeCheckedOutCodeInImage [ | message commitToReset | @@ -415,7 +417,7 @@ IceMultiplePackageRepositoryTest >> testResetBranchDoesNotChangeCheckedOutCodeIn self assert: (self repository workingCopy environment ask includesClassNamed: 'IceGeneratedClassForTesting') ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testResetBranchDoesNotChangeCheckedOutCommit [ | message commitToReset workingCopyCommitBeforeReset | @@ -433,7 +435,7 @@ IceMultiplePackageRepositoryTest >> testResetBranchDoesNotChangeCheckedOutCommit self assert: self repository workingCopy referenceCommit equals: workingCopyCommitBeforeReset ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testResetBranchRestoresBranchCommit [ | message commitToReset | diff --git a/Iceberg-Tests/IceNewGitRepositoryTest.class.st b/Iceberg-Tests/IceNewGitRepositoryTest.class.st index 5bb748076a..aeaab2d00a 100644 --- a/Iceberg-Tests/IceNewGitRepositoryTest.class.st +++ b/Iceberg-Tests/IceNewGitRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceNewGitRepositoryTest, - #superclass : #IceNewRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceNewGitRepositoryTest', + #superclass : 'IceNewRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceNewGitRepositoryTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] diff --git a/Iceberg-Tests/IceNewRepositoryTest.class.st b/Iceberg-Tests/IceNewRepositoryTest.class.st index fa9129508a..3e4bd973f5 100644 --- a/Iceberg-Tests/IceNewRepositoryTest.class.st +++ b/Iceberg-Tests/IceNewRepositoryTest.class.st @@ -1,34 +1,36 @@ Class { - #name : #IceNewRepositoryTest, - #superclass : #IceBornRepositoryTest, - #category : 'Iceberg-Tests-Common' + #name : 'IceNewRepositoryTest', + #superclass : 'IceBornRepositoryTest', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #running } +{ #category : 'running' } IceNewRepositoryTest class >> isAbstract [ ^ self == IceNewRepositoryTest ] -{ #category : #tests } +{ #category : 'tests' } IceNewRepositoryTest >> testNewRepositoryBranchIsNamedMaster [ self assert: self repository branch name equals: 'master' ] -{ #category : #tests } +{ #category : 'tests' } IceNewRepositoryTest >> testNewRepositoryHasNoTags [ self assert: self repository tags isEmpty ] -{ #category : #tests } +{ #category : 'tests' } IceNewRepositoryTest >> testNewRepositoryPushDoesNothing [ self shouldnt: [ self repository push ] raise: Error ] -{ #category : #tests } +{ #category : 'tests' } IceNewRepositoryTest >> testNewRepositoryPushToExplicitRemoteDoesNothing [ self shouldnt: [ self repository pushTo: (IceGitRemote url: 'git@github.com:pharo-vcs/testing.git') ] raise: Error diff --git a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st index 057abf06dd..744e62fc7e 100644 --- a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st +++ b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceNotYetClonedRepositoryFixture, - #superclass : #Object, + #name : 'IceNotYetClonedRepositoryFixture', + #superclass : 'Object', #instVars : [ 'factory', 'projectName', @@ -10,10 +10,12 @@ Class { 'remoteRepository', 'location' ], - #category : 'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture class >> inGit [ ^ self new @@ -21,7 +23,7 @@ IceNotYetClonedRepositoryFixture class >> inGit [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture class >> inMemory [ ^ self new @@ -29,24 +31,24 @@ IceNotYetClonedRepositoryFixture class >> inMemory [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture >> ensureRemoteRepository [ ^ remoteRepository := factory ensureRemoteRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> factory [ ^ factory ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> factory: aFactory [ factory := aFactory ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture >> initialize [ super initialize. location := FileLocator imageDirectory / 'test' / UUID new asString. @@ -55,57 +57,57 @@ IceNotYetClonedRepositoryFixture >> initialize [ packageName2 := 'IceMockPackage2'. ] -{ #category : #testing } +{ #category : 'testing' } IceNotYetClonedRepositoryFixture >> isGit [ ^ factory isGit ] -{ #category : #testing } +{ #category : 'testing' } IceNotYetClonedRepositoryFixture >> isUnbornProjectFixture [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture >> location [ ^ location ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture >> newRemoteNamed: aName toRepository: aRepository [ ^ factory newRemoteNamed: aName toRepository: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> packageName1 [ ^ packageName1 ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> packageName1: anObject [ packageName1 := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> packageName2 [ ^ packageName2 ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> packageName2: anObject [ packageName2 := anObject ] -{ #category : #running } +{ #category : 'running' } IceNotYetClonedRepositoryFixture >> setUp [ projectName := 'test-project'. ] -{ #category : #running } +{ #category : 'running' } IceNotYetClonedRepositoryFixture >> tearDown [ Smalltalk garbageCollect. diff --git a/Iceberg-Tests/IceParameterizedTestCase.class.st b/Iceberg-Tests/IceParameterizedTestCase.class.st index e2bc3be42a..1bda0f3054 100644 --- a/Iceberg-Tests/IceParameterizedTestCase.class.st +++ b/Iceberg-Tests/IceParameterizedTestCase.class.st @@ -6,17 +6,19 @@ If #parameters method is not overriden, I will be run as a normal test case. To run with the parameterization you have to use Test Runner. If you run tests from Nautilus, they will ignore parameterization and run with current global configuration. For example if you ran IceBranchTest from the test runner it will be run with every Iceberg backend loaded in the image (see #parameters class method in IceBranchTest). But if you run it from Nautilus it will run the test only once with the current backend, as specified by IceRepository class>>defaultBackendType. " Class { - #name : #IceParameterizedTestCase, - #superclass : #TestCase, + #name : 'IceParameterizedTestCase', + #superclass : 'TestCase', #instVars : [ 'testParameters', 'oldShareRepositoriesBetweenImages', 'provider' ], - #category : #'Iceberg-Tests-Base' + #category : 'Iceberg-Tests-Base', + #package : 'Iceberg-Tests', + #tag : 'Base' } -{ #category : #'building suites' } +{ #category : 'building suites' } IceParameterizedTestCase class >> buildSuite [ ^ self buildSuiteNamed: self name asString withGlobals: #() @@ -24,7 +26,7 @@ IceParameterizedTestCase class >> buildSuite [ ] -{ #category : #'building suites' } +{ #category : 'building suites' } IceParameterizedTestCase class >> buildSuiteNamed: suiteName withGlobals: globals andConfigurations: configs [ | suite | configs ifEmpty: [ @@ -48,7 +50,7 @@ IceParameterizedTestCase class >> buildSuiteNamed: suiteName withGlobals: global ] -{ #category : #'building suites' } +{ #category : 'building suites' } IceParameterizedTestCase class >> buildSuiteNamed: suiteName withGlobals: globalParameterValues andSubsuites: moreParameters [ | suite | moreParameters ifEmpty: [ @@ -72,18 +74,18 @@ IceParameterizedTestCase class >> buildSuiteNamed: suiteName withGlobals: global ] -{ #category : #history } +{ #category : 'history' } IceParameterizedTestCase class >> lastStoredRun [ ^ ((Dictionary new) add: (#timeStamp->(DateAndTime basicNew instVarAt: 1 put: 72896; instVarAt: 2 put: (Duration seconds: 3600 nanoSeconds: 0); instVarAt: 3 put: 2457731; instVarAt: 4 put: 823745000; yourself)); add: (#passed->((Set new) add: #testParameters; yourself)); add: (#failures->((Set new))); add: (#errors->((Set new))); yourself) ] -{ #category : #'building suites' } +{ #category : 'building suites' } IceParameterizedTestCase class >> parameters [ "No parameters will make this tests work like a normal TestCase" ^ #() ] -{ #category : #configurations } +{ #category : 'configurations' } IceParameterizedTestCase class >> remoteTypeConfiguration [ ^ IceTestParameter withOptions: { #httpsUrl. #scpUrl } @@ -91,12 +93,12 @@ IceParameterizedTestCase class >> remoteTypeConfiguration [ selector: #remoteTypeSelector ] -{ #category : #configurations } +{ #category : 'configurations' } IceParameterizedTestCase class >> repositoryBackendConfiguration [ ^ IceTestParameter withOptions: {1} ] -{ #category : #private } +{ #category : 'private' } IceParameterizedTestCase >> cleanUpInstanceVariables [ | instanceVariablesNames | instanceVariablesNames := #('testSelector' 'testParameters'). @@ -106,22 +108,22 @@ IceParameterizedTestCase >> cleanUpInstanceVariables [ ifFalse: [ self instVarNamed: name put: nil ] ] ] -{ #category : #running } +{ #category : 'running' } IceParameterizedTestCase >> isCI [ ^ (OSEnvironment current at: 'CI' ifAbsent: [ 'false' ]) asLowercase = 'true' ] -{ #category : #accessing } +{ #category : 'accessing' } IceParameterizedTestCase >> parameters [ ^ testParameters ifNil: [ testParameters := #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceParameterizedTestCase >> parameters: anObject [ testParameters := anObject ] -{ #category : #printing } +{ #category : 'printing' } IceParameterizedTestCase >> printOn: aStream [ super printOn: aStream. @@ -133,7 +135,7 @@ IceParameterizedTestCase >> printOn: aStream [ ] -{ #category : #running } +{ #category : 'running' } IceParameterizedTestCase >> setUp [ super setUp. @@ -146,7 +148,7 @@ IceParameterizedTestCase >> setUp [ self parameters do: [ :each | each activate ] ] -{ #category : #running } +{ #category : 'running' } IceParameterizedTestCase >> tearDown [ self parameters do: [ :parameter | diff --git a/Iceberg-Tests/IceProxySettingsTest.class.st b/Iceberg-Tests/IceProxySettingsTest.class.st new file mode 100644 index 0000000000..7a4560f482 --- /dev/null +++ b/Iceberg-Tests/IceProxySettingsTest.class.st @@ -0,0 +1,81 @@ +Class { + #name : 'IceProxySettingsTest', + #superclass : 'TestCase', + #instVars : [ + 'oldNetworkSettingsHost', + 'oldNetworkSettingsPort' + ], + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' +} + +{ #category : 'asserting' } +IceProxySettingsTest >> assertProxyURLExternalStringHasValue: aString [ + + | value | + value := Iceberg proxyURLExternalString. + + self assert: value isExternalAddress. + self deny: value isNull. + + self assert: value utf8StringFromCString equals: aString +] + +{ #category : 'running' } +IceProxySettingsTest >> setUp [ + + super setUp. + + oldNetworkSettingsHost := NetworkSystemSettings httpProxyServer. + oldNetworkSettingsPort := NetworkSystemSettings httpProxyPort. +] + +{ #category : 'running' } +IceProxySettingsTest >> tearDown [ + + NetworkSystemSettings httpProxyServer: oldNetworkSettingsHost. + NetworkSystemSettings httpProxyPort: oldNetworkSettingsPort. + + super tearDown +] + +{ #category : 'tests' } +IceProxySettingsTest >> testConfigureProxyOptWithCorrectProxyUrl [ + + | proxyOpt | + + NetworkSystemSettings httpProxyServer: 'myproxy.company.com'. + NetworkSystemSettings httpProxyPort: 8080. + + proxyOpt := LGitProxyOptions defaults. + Iceberg configureLGitProxyOpt: proxyOpt. + + self assert: proxyOpt prim_url value equals: Iceberg proxyURLExternalString value. + self assert: proxyOpt prim_url utf8StringFromCString equals: 'https://myproxy.company.com:8080'. +] + +{ #category : 'tests' } +IceProxySettingsTest >> testEmptyHostReturnsNullPointer [ + + NetworkSystemSettings httpProxyServer: ''. + + self assert: Iceberg proxyURLExternalString isNull. +] + +{ #category : 'tests' } +IceProxySettingsTest >> testHostAndDefaultPortHasCorrectAddress [ + + NetworkSystemSettings httpProxyServer: 'myproxy.company.com'. + + self assertProxyURLExternalStringHasValue: 'https://myproxy.company.com:80'. +] + +{ #category : 'tests' } +IceProxySettingsTest >> testHostAndPortHasCorrectAddress [ + + NetworkSystemSettings httpProxyServer: 'myproxy.company.com'. + NetworkSystemSettings httpProxyPort: 8080. + + self assertProxyURLExternalStringHasValue: 'https://myproxy.company.com:8080'. +] diff --git a/Iceberg-Tests/IceRepository.extension.st b/Iceberg-Tests/IceRepository.extension.st index 2688b0acbb..90ab367f8c 100644 --- a/Iceberg-Tests/IceRepository.extension.st +++ b/Iceberg-Tests/IceRepository.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } IceRepository >> latestVersion: packageName [ ^ (self packageNamed: packageName) latestVersion ] -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } IceRepository >> loadPackageNamed: packageName [ self workingCopy diff --git a/Iceberg-Tests/IceRepositoryWithSingleRemoteAndMergeConflictTest.class.st b/Iceberg-Tests/IceRepositoryWithSingleRemoteAndMergeConflictTest.class.st index ef88da2467..e43d4b6e2a 100644 --- a/Iceberg-Tests/IceRepositoryWithSingleRemoteAndMergeConflictTest.class.st +++ b/Iceberg-Tests/IceRepositoryWithSingleRemoteAndMergeConflictTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceRepositoryWithSingleRemoteAndMergeConflictTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceRepositoryWithSingleRemoteAndMergeConflictTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryWithSingleRemoteAndMergeConflictTest class >> isAbstract [ ^ self == IceRepositoryWithSingleRemoteAndMergeConflictTest ] -{ #category : #tests } +{ #category : 'tests' } IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasIncomingCommitsAfterFetch [ self repository fetch. @@ -18,19 +20,19 @@ IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasIncomingCo self assert: self repository hasIncomingCommits ] -{ #category : #tests } +{ #category : 'tests' } IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasNoIncomingCommitsIfNoFetch [ self deny: self repository hasIncomingCommits ] -{ #category : #tests } +{ #category : 'tests' } IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasNoOutgoingCommitsIfNoFetch [ self deny: self repository hasOutgoingCommits ] -{ #category : #tests } +{ #category : 'tests' } IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasOutgoingCommitsAfterFetch [ self repository fetch. diff --git a/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st b/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st index 9e3409ebfe..9bd2157083 100644 --- a/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st +++ b/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st @@ -1,29 +1,31 @@ Class { - #name : #IceRepositoryWithSingleRemoteTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceRepositoryWithSingleRemoteTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryWithSingleRemoteTest class >> isAbstract [ ^ self == IceRepositoryWithSingleRemoteTest ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testAfterFetchingARepositoryTracksRemoteBranch [ self repository fetch. self assert: self repository remoteTrackedBranches notEmpty ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testBeforeFetchingARepositoryHasNoRemoteTrackedBranches [ self assert: self repository remoteTrackedBranches isEmpty ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testFetchUpdatesTrackedRemoteBranch [ | newCommit remoteTrackedBranches | @@ -36,7 +38,7 @@ IceRepositoryWithSingleRemoteTest >> testFetchUpdatesTrackedRemoteBranch [ self assert: self repository remoteTrackedBranches anyOne commit equals: newCommit ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceRepositoryWithSingleRemoteTest >> testLocalBranchDoesNotTrackARemoteBranchBeforeFetching [ "We commit to force the creation of the local branch" @@ -46,7 +48,7 @@ IceRepositoryWithSingleRemoteTest >> testLocalBranchDoesNotTrackARemoteBranchBef self deny: (self repository branchNamed: self remoteBranchName) tracksRemoteBranch. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceRepositoryWithSingleRemoteTest >> testLocalCheckedOutBranchIsEqualsToHEAD [ "We commit to force the creation of the local branch" @@ -56,7 +58,7 @@ IceRepositoryWithSingleRemoteTest >> testLocalCheckedOutBranchIsEqualsToHEAD [ self assert: (self repository branchNamed: self repository head name) equals: self repository head. ] -{ #category : #'tests-push' } +{ #category : 'tests-push' } IceRepositoryWithSingleRemoteTest >> testPushPushesTags [ (self repository isKindOf: IceMemoryRepository) @@ -71,40 +73,40 @@ IceRepositoryWithSingleRemoteTest >> testPushPushesTags [ self assert: (self remoteRepository tagNames includes: 'exampleTag') ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testRemoteTrackedBranchHasSameNameAsRemoteBranch [ self repository fetch. self assert: self repository remoteTrackedBranches anyOne shortname equals: self remoteBranchName ] -{ #category : #'tests-push' } +{ #category : 'tests-push' } IceRepositoryWithSingleRemoteTest >> testRepositoryHasIncomingCommits [ self assert: self repository hasIncomingCommits ] -{ #category : #'tests-push' } +{ #category : 'tests-push' } IceRepositoryWithSingleRemoteTest >> testRepositoryHasNoMoreIncomingCommitsAfterPull [ self repository pull. self deny: self repository hasIncomingCommits ] -{ #category : #'tests-push' } +{ #category : 'tests-push' } IceRepositoryWithSingleRemoteTest >> testRepositoryHasNoOutgoingCommits [ self deny: self repository hasOutgoingCommits ] -{ #category : #'tests-pull' } +{ #category : 'tests-pull' } IceRepositoryWithSingleRemoteTest >> testRepositoryPullDoesFetchAndMergeFromOrigin [ self repository pull. self assert: self repository head commit equals: self remoteRepository head commit. ] -{ #category : #'tests-pull' } +{ #category : 'tests-pull' } IceRepositoryWithSingleRemoteTest >> testRepositoryPullFromBranchThatDoesNotHaveACorrespondingRemoteBranchDoesNothing [ | prePullCommit | @@ -117,7 +119,7 @@ IceRepositoryWithSingleRemoteTest >> testRepositoryPullFromBranchThatDoesNotHave self assert: self repository head commit equals: prePullCommit. ] -{ #category : #'tests-pull' } +{ #category : 'tests-pull' } IceRepositoryWithSingleRemoteTest >> testRepositoryPullFromUnbornBranchThatDoesNotHaveACorrespondingRemoteBranchDoesNothing [ | prePullCommit | @@ -129,7 +131,7 @@ IceRepositoryWithSingleRemoteTest >> testRepositoryPullFromUnbornBranchThatDoesN self assert: self repository head commit equals: prePullCommit. ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testWithoutFetchTrackedRemoteBranchIsNotUpdated [ | newCommit | diff --git a/Iceberg-Tests/IceScpRemoteTest.class.st b/Iceberg-Tests/IceScpRemoteTest.class.st index 7b856a50cc..1ee59c73be 100644 --- a/Iceberg-Tests/IceScpRemoteTest.class.st +++ b/Iceberg-Tests/IceScpRemoteTest.class.st @@ -2,44 +2,46 @@ Unit test for IceScpRemote " Class { - #name : #IceScpRemoteTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'IceScpRemoteTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #support } +{ #category : 'support' } IceScpRemoteTest >> gitoliteUrl1 [ ^ 'gitolite3@server.bogus.edu:reponame' ] -{ #category : #support } +{ #category : 'support' } IceScpRemoteTest >> gitoliteUrl2 [ ^ 'ssh://gitolite3@server.bogus.edu/reponame' ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testCanHandleGitProtocol [ self assert: (IceGitScpRemote canHandleUrl: 'git@github.com:owner/repo.git') ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testCanHandleGitoliteProtocol1 [ self assert: (IceGitScpRemote canHandleUrl: self gitoliteUrl1) ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testCanHandleGitoliteProtocol2 [ self assert: (IceGitScpRemote canHandleUrl: self gitoliteUrl2) ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testCanHandleSSHProtocol [ self assert: (IceGitScpRemote canHandleUrl: 'ssh://github.com:owner/repo.git') ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testGitHubURL [ | remote | remote := IceGitRemote url: 'git@github.com:owner/repo.git'. @@ -50,7 +52,7 @@ IceScpRemoteTest >> testGitHubURL [ assert: remote projectName equals: 'repo'. ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testGitoliteURL1 [ | remote | remote := IceGitRemote url: self gitoliteUrl1. @@ -61,7 +63,7 @@ IceScpRemoteTest >> testGitoliteURL1 [ assert: remote projectName equals: 'reponame' ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testGitoliteURL2 [ | remote | remote := IceGitRemote url: self gitoliteUrl2. @@ -72,7 +74,7 @@ IceScpRemoteTest >> testGitoliteURL2 [ assert: remote projectName equals: 'reponame' ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testSameRemoteReference [ | r1 r2 | @@ -81,7 +83,7 @@ IceScpRemoteTest >> testSameRemoteReference [ self assert: (r1 referencesSameRemoteLocationAs: r2) ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testSameRemoteReferenceWithoutGitExtension [ | r1 r2 | @@ -90,7 +92,7 @@ IceScpRemoteTest >> testSameRemoteReferenceWithoutGitExtension [ self assert: (r1 referencesSameRemoteLocationAs: r2) ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testSshUrl [ | remote | remote := IceGitRemote url: 'git@github.com:npasserini/pharo-git.git'. diff --git a/Iceberg-Tests/IceSinglePackageFixture.class.st b/Iceberg-Tests/IceSinglePackageFixture.class.st index a673fefb0b..b835599320 100644 --- a/Iceberg-Tests/IceSinglePackageFixture.class.st +++ b/Iceberg-Tests/IceSinglePackageFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageFixture, - #superclass : #IceBasicRepositoryFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceSinglePackageFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryTest.class.st index 48b876bbb9..6037b24786 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryTest >> newFixture [ ^ IceSinglePackageFixture inGit ] diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest.class.st index 691212f3f2..ba6b3d3aad 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest >> newFixture [ ^ IceSinglePackageFixture inGit diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest.class.st index 3ba9702855..c5f2831c8b 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest.class.st @@ -1,17 +1,19 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest >> newFixture [ ^ IceSinglePackageFixture inGit subdirectory: '.'; yourself ] -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest >> testCodeSubdirectoryIsRoot [ self assert: self repository location equals: self repository subdirectoryReference diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest.class.st index 47d785b5ae..e819bc5278 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest >> newFixture [ ^ IceSinglePackageFixture inGit diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithSubdirectoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithSubdirectoryTest.class.st index c1602ee15d..5d33056cc3 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithSubdirectoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithSubdirectoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryWithSubdirectoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryWithSubdirectoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithSubdirectoryTest >> newFixture [ ^ IceSinglePackageFixture inGit diff --git a/Iceberg-Tests/IceSinglePackageLocalMemoryRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalMemoryRepositoryTest.class.st index 5c2dc91d44..27046034e5 100644 --- a/Iceberg-Tests/IceSinglePackageLocalMemoryRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalMemoryRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalMemoryRepositoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceSinglePackageLocalMemoryRepositoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalMemoryRepositoryTest >> newFixture [ ^ IceSinglePackageFixture inMemory ] diff --git a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st index a85b82fc31..15e4c35637 100644 --- a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceSinglePackageLocalRepositoryTest, - #superclass : #IceBornRepositoryTest, - #category : #'Iceberg-Tests-Common' + #name : 'IceSinglePackageLocalRepositoryTest', + #superclass : 'IceBornRepositoryTest', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceSinglePackageLocalRepositoryTest class >> isAbstract [ ^ self == IceSinglePackageLocalRepositoryTest ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testAddClassInstanceVariableIsExportedInCommit [ | diff | @@ -36,7 +38,7 @@ IceSinglePackageLocalRepositoryTest >> testAddClassInstanceVariableIsExportedInC self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testAddClassInstanceVariableIsExportedInCommitSecondVariable [ | diff | @@ -69,7 +71,7 @@ IceSinglePackageLocalRepositoryTest >> testAddClassInstanceVariableIsExportedInC self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesChangesContainClassDefinition [ | diff | @@ -93,7 +95,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesChangesContainCla self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesIsExportedInCommit [ | diff | @@ -119,7 +121,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesIsExportedInCommi self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesIsExportedInCommitSecondVariable [ | diff | @@ -152,7 +154,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesIsExportedInCommi self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsCompositionIsExported [ | diff | @@ -190,7 +192,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsCompositionIsExportedInSecondCommit [ | diff | @@ -247,7 +249,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExportedInCommit [ | diff | @@ -282,7 +284,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExpor self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExportedInCommitSecondVariable [ | diff | @@ -324,7 +326,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExpor self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeTraitWithClassSideTraitsCompositionIsExportedInSecondCommit [ | diff | @@ -379,14 +381,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeTraitWithClassSideTraitsComposi ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutBranchDoesNotLeaveDetachedHead [ self repository branch checkout. self deny: self repository head isDetached ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutBranchInstallsCodeInImage [ | message | @@ -407,14 +409,14 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutBranchInstallsCodeInImage [ self assertPackageExists: self packageName1. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutBranchInstallsPackageInImage [ self repository branch checkout. self assertPackageExists: self packageName1 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInImage [ | message | @@ -435,14 +437,14 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInI self assertPackageExists: self packageName1. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsPackageInImage [ self repository checkoutAllPackages. self assertPackageExists: self packageName1 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ | message | @@ -463,21 +465,21 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ self assertPackageExists: self packageName1. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsPackageInImage [ self repository branch commit checkout. self assertPackageExists: self packageName1. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutLatestBranchCommitLeavesDetachedHead [ self repository branch commit checkout. self assert: self repository head isDetached. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutOlderCommitLeavesRepositoryInDetachedMode [ | message | @@ -502,14 +504,14 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutOlderCommitLeavesRepositoryIn self assert: self repository head isDetached ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutRepositoryDoesNotLeaveDetachedHead [ self repository checkoutAllPackages. self deny: self repository head isDetached ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceSinglePackageLocalRepositoryTest >> testCommitModificationsCreatesNewCommit [ | message | @@ -526,7 +528,7 @@ IceSinglePackageLocalRepositoryTest >> testCommitModificationsCreatesNewCommit [ self deny: self repository workingCopy isDetached. ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceSinglePackageLocalRepositoryTest >> testCommitModificationsDoNotCreateBranch [ | message | @@ -543,7 +545,7 @@ IceSinglePackageLocalRepositoryTest >> testCommitModificationsDoNotCreateBranch self deny: self repository workingCopy isDetached. ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceSinglePackageLocalRepositoryTest >> testCommitWithDetachedHeadRaisesException [ | message | @@ -559,7 +561,7 @@ IceSinglePackageLocalRepositoryTest >> testCommitWithDetachedHeadRaisesException self should: [self repository commitWithMessage: message] raise: IceWorkingCopyDesyncronized. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesChangesContainClassDefinition [ | diff | @@ -576,7 +578,7 @@ IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesChangesContain self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting') value definition name equals: #IceGeneratedClassForTesting. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesChangesNonEmpty [ "This is a Ring working copy" @@ -586,7 +588,7 @@ IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesChangesNonEmpt self deny: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesRespositoryModifications [ "This is a Ring working copy" @@ -596,7 +598,7 @@ IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesRespositoryMod self assert: self repository isModified ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateClassWithClassInstanceVariableInImageMakesChangesContainClassAndMetaclassDefinition [ | diff | @@ -614,7 +616,7 @@ IceSinglePackageLocalRepositoryTest >> testCreateClassWithClassInstanceVariableI self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting') value definition name equals: #IceGeneratedClassForTesting. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateExtensionMethodMakesExtensionMethodAsAddition [ | diff | @@ -634,13 +636,13 @@ IceSinglePackageLocalRepositoryTest >> testCreateExtensionMethodMakesExtensionMe self assert: (diff codeSubdirectoryNode / self packageName1 / 'ToBeExtended' / 'method') value definition isMethodDefinition. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceSinglePackageLocalRepositoryTest >> testCurrentBranchIsDefaultMasterBranch [ self assert: self repository branch name equals: 'master' ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceSinglePackageLocalRepositoryTest >> testDetachedHeadCannotCommit [ self repository branch commit checkout. @@ -648,7 +650,7 @@ IceSinglePackageLocalRepositoryTest >> testDetachedHeadCannotCommit [ self should: [self repository validateCanCommit] raise: IceWorkingCopyDesyncronized. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceSinglePackageLocalRepositoryTest >> testListBranchCommitsListsCommitsInBranch [ | branches commits | @@ -659,7 +661,7 @@ IceSinglePackageLocalRepositoryTest >> testListBranchCommitsListsCommitsInBranch self assert: commits first comment equals: 'Initial commit'. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceSinglePackageLocalRepositoryTest >> testListBranchesListsExistingBranches [ | branches | @@ -668,7 +670,7 @@ IceSinglePackageLocalRepositoryTest >> testListBranchesListsExistingBranches [ self assert: branches first name equals: 'master' ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceSinglePackageLocalRepositoryTest >> testListPackagesListExistingPackage [ | packages | @@ -677,19 +679,19 @@ IceSinglePackageLocalRepositoryTest >> testListPackagesListExistingPackage [ self assert: packages first equals: self packageName1 ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testNoChangesInImageMakesChangesEmpty [ self assert: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testNoChangesInImageMakesNoModifications [ self deny: self repository isModified ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testRemoveClassInstanceVariableIsExportedInCommit [ | diff | @@ -722,7 +724,7 @@ IceSinglePackageLocalRepositoryTest >> testRemoveClassInstanceVariableIsExported self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testRemoveClassWithClassMethodIsExportedInCommit [ | diff | @@ -749,7 +751,7 @@ IceSinglePackageLocalRepositoryTest >> testRemoveClassWithClassMethodIsExportedI self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class' / 'foo') value isRemoval. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testRemoveExtensionMethodDoesNotRemoveExtendedClass [ | commitWithExtension commitWithoutExtension | @@ -777,7 +779,7 @@ IceSinglePackageLocalRepositoryTest >> testRemoveExtensionMethodDoesNotRemoveExt self assertClassExists: #ToBeExtended ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testRemoveExtensionMethodMakesExtensionRemoval [ | diff | @@ -805,7 +807,7 @@ IceSinglePackageLocalRepositoryTest >> testRemoveExtensionMethodMakesExtensionRe self assert: (diff codeSubdirectoryNode / self packageName1 / 'ToBeExtended' / 'method') value definition isMethodDefinition. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testRemovePackageRemovesIt [ | package | @@ -815,7 +817,7 @@ IceSinglePackageLocalRepositoryTest >> testRemovePackageRemovesIt [ self assert: (self repository workingCopyDiff codeSubdirectoryNode / self packageName1) value isRemoval ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassAddition [ | className | @@ -831,7 +833,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassAddition [ self denyClassExists: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassRemoval [ | className | @@ -852,7 +854,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassRemoval [ self assertClassExists: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassSlotModification [ | className class | @@ -878,7 +880,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassSlotModification environment ask behaviorNamed: className) instVarNames includes: #slot). ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodAddition [ | className | @@ -899,7 +901,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodAddition [ self denyMethodExists: 'method' inClass: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodModification [ | className | @@ -929,7 +931,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodModification [ equals: 'method' ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodRemoval [ | className | @@ -953,7 +955,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodRemoval [ self assertMethodExists: 'method' inClass: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassAddition [ | className | @@ -969,7 +971,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassAdd self denyClassExists: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassRemoval [ | className | @@ -990,7 +992,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassRem self assertClassExists: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassSlotModification [ | className class | @@ -1016,7 +1018,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassSlo environment ask behaviorNamed: className) instVarNames includes: #slot). ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodAddition [ | className | @@ -1037,7 +1039,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodAd self denyMethodExists: 'method' inClass: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodModification [ | className | @@ -1067,7 +1069,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodMo equals: 'method' ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodRemoval [ | className | @@ -1091,7 +1093,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodRe self assertMethodExists: 'method' inClass: className. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testUnloadDoesNotRemovePackage [ | package | diff --git a/Iceberg-Tests/IceTestDefinition.class.st b/Iceberg-Tests/IceTestDefinition.class.st index b34bce7170..2228369635 100644 --- a/Iceberg-Tests/IceTestDefinition.class.st +++ b/Iceberg-Tests/IceTestDefinition.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTestDefinition, - #superclass : #IceDefinition, + #name : 'IceTestDefinition', + #superclass : 'IceDefinition', #instVars : [ 'contents' ], - #category : 'Iceberg-Tests-Changes' + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } IceTestDefinition class >> named: aString contents: aContensts [ ^ self new @@ -16,32 +18,32 @@ IceTestDefinition class >> named: aString contents: aContensts [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceTestDefinition >> = aTestDefinition [ ^ super = aTestDefinition and: [ contents = aTestDefinition contents ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestDefinition >> contents [ ^ contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestDefinition >> contents: aString [ contents := aString ] -{ #category : #comparing } +{ #category : 'comparing' } IceTestDefinition >> hash [ ^ super hash + contents hash ] -{ #category : #initialization } +{ #category : 'initialization' } IceTestDefinition >> initialize [ super initialize. name := 'test' diff --git a/Iceberg-Tests/IceTestParameter.class.st b/Iceberg-Tests/IceTestParameter.class.st index 8829feb960..bb435b5cdd 100644 --- a/Iceberg-Tests/IceTestParameter.class.st +++ b/Iceberg-Tests/IceTestParameter.class.st @@ -2,20 +2,22 @@ I represent a test parameter, including a set of possible values for each parameter. See ParameterizedTest for more information about usage. " Class { - #name : #IceTestParameter, - #superclass : #Object, + #name : 'IceTestParameter', + #superclass : 'Object', #instVars : [ 'options' ], - #category : 'Iceberg-Tests-Base' + #category : 'Iceberg-Tests-Base', + #package : 'Iceberg-Tests', + #tag : 'Base' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTestParameter class >> withOptions: aCollection [ ^ self new options: (aCollection collect: #asTestParameterValue); yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTestParameter class >> withOptions: aCollection on: target selector: selector [ ^ self new options: (aCollection collect: [:value | @@ -26,17 +28,17 @@ IceTestParameter class >> withOptions: aCollection on: target selector: selector yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameter >> options [ ^ options ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameter >> options: anObject [ options := anObject ] -{ #category : #printing } +{ #category : 'printing' } IceTestParameter >> printOn: aStream [ aStream print: self class; diff --git a/Iceberg-Tests/IceTestParameterValue.class.st b/Iceberg-Tests/IceTestParameterValue.class.st index 3ef6462909..5dc23d9550 100644 --- a/Iceberg-Tests/IceTestParameterValue.class.st +++ b/Iceberg-Tests/IceTestParameterValue.class.st @@ -18,44 +18,46 @@ Internal Representation and Key Implementation Points. " Class { - #name : #IceTestParameterValue, - #superclass : #Object, + #name : 'IceTestParameterValue', + #superclass : 'Object', #instVars : [ 'value', 'target', 'selector', 'previousValue' ], - #category : 'Iceberg-Tests-Base' + #category : 'Iceberg-Tests-Base', + #package : 'Iceberg-Tests', + #tag : 'Base' } -{ #category : #activating } +{ #category : 'activating' } IceTestParameterValue >> activate [ self previousValue: self getValue. self setValue: self value ] -{ #category : #activating } +{ #category : 'activating' } IceTestParameterValue >> deactivate [ self setValue: self previousValue ] -{ #category : #activating } +{ #category : 'activating' } IceTestParameterValue >> getValue [ ^ self target perform: self selector ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> previousValue [ ^ previousValue ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> previousValue: anObject [ previousValue := anObject ] -{ #category : #printing } +{ #category : 'printing' } IceTestParameterValue >> printOn: aStream [ aStream print: self class; @@ -64,44 +66,44 @@ IceTestParameterValue >> printOn: aStream [ nextPut: $) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> selector [ ^ selector ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> selector: anObject [ selector := anObject ] -{ #category : #activating } +{ #category : 'activating' } IceTestParameterValue >> setValue: newValue [ ^ self target perform: self selector asMutator with: newValue ] -{ #category : #printing } +{ #category : 'printing' } IceTestParameterValue >> shortName [ ^ (self value respondsTo: #shortName) ifTrue: [ self value shortName ] ifFalse: [ self value printString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> target [ ^ target ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> target: anObject [ target := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> value [ ^ value ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> value: anObject [ value := anObject ] diff --git a/Iceberg-Tests/IceTraitsCherryPickingTest.class.st b/Iceberg-Tests/IceTraitsCherryPickingTest.class.st index 7cf8ca36e1..aae53d3007 100644 --- a/Iceberg-Tests/IceTraitsCherryPickingTest.class.st +++ b/Iceberg-Tests/IceTraitsCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTraitsCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceTraitsCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceTraitsCherryPickingTest >> testAddTraitDependingInATrait [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -62,7 +64,7 @@ IceTraitsCherryPickingTest >> testAddTraitDependingInATrait [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceTraitsCherryPickingTest >> testRemoveTraitUsedByAClass [ | commitToCherryPick diff mergeTree | self repository workingCopy @@ -102,7 +104,7 @@ IceTraitsCherryPickingTest >> testRemoveTraitUsedByAClass [ assert: (diff / self packageName1 / 'TestClassUsingTrait') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceTraitsCherryPickingTest >> testRemoveTraitUsedByATrait [ | commitToCherryPick diff mergeTree | self repository workingCopy diff --git a/Iceberg-Tests/IceTreeConstructionTests.class.st b/Iceberg-Tests/IceTreeConstructionTests.class.st index 43e59570d8..3816f38482 100644 --- a/Iceberg-Tests/IceTreeConstructionTests.class.st +++ b/Iceberg-Tests/IceTreeConstructionTests.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceTreeConstructionTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceTreeConstructionTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #helpers } +{ #category : 'helpers' } IceTreeConstructionTests >> includesPackageNamed: aString [ ^ aString = 'MonticelloMocks' ] -{ #category : #helpers } +{ #category : 'helpers' } IceTreeConstructionTests >> snapshotForPackage: anIcePackage [ ^ anIcePackage name asPackage mcWorkingCopy snapshot ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateDirectoryWithDirectory [ | tree child | @@ -27,7 +29,7 @@ IceTreeConstructionTests >> testCreateDirectoryWithDirectory [ self assert: (tree / 'src' / 'tmp') value isDirectoryDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateDirectoryWithFile [ | tree child | @@ -38,7 +40,7 @@ IceTreeConstructionTests >> testCreateDirectoryWithFile [ self assert: (tree / 'src' / 'tmp') value isFileDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateDirectoryWithPackage [ | tree importer child | @@ -63,7 +65,7 @@ IceTreeConstructionTests >> testCreateDirectoryWithPackage [ self assert: (tree / 'src' / 'MonticelloMocks' / 'MCSnapshotTest' / 'mockClassExtension') value isMethodDefinition. ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateTreeWithDirectory [ | tree | @@ -73,7 +75,7 @@ IceTreeConstructionTests >> testCreateTreeWithDirectory [ self assert: (tree / 'src') value isDirectoryDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateTreeWithFile [ | tree | @@ -83,7 +85,7 @@ IceTreeConstructionTests >> testCreateTreeWithFile [ self assert: (tree / 'Readme.md') value isFileDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateTreeWithPackage [ | tree importer | @@ -107,7 +109,7 @@ IceTreeConstructionTests >> testCreateTreeWithPackage [ self assert: (tree / 'MonticelloMocks' / 'MCSnapshotTest' / 'mockClassExtension') value isMethodDefinition. ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testEmptyTreeIsRootNode [ | tree | diff --git a/Iceberg-Tests/IceTreeMergeTests.class.st b/Iceberg-Tests/IceTreeMergeTests.class.st index 23821a149e..530b765c89 100644 --- a/Iceberg-Tests/IceTreeMergeTests.class.st +++ b/Iceberg-Tests/IceTreeMergeTests.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTreeMergeTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceTreeMergeTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> buildTestTreeWithOperation: anOperation [ ^ (IceNode value: (IceNoModification definition: IceRootDefinition new)) @@ -12,7 +14,7 @@ IceTreeMergeTests >> buildTestTreeWithOperation: anOperation [ yourself ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testConflictingModificationWithRemoval [ | rightTree leftTree mergedTree conflictOperation | @@ -31,7 +33,7 @@ IceTreeMergeTests >> testConflictingModificationWithRemoval [ self assert: conflictOperation rightContents equals: ''. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testConflictingNoModificationWithRemoval [ | rightTree leftTree mergedTree conflictOperation | @@ -48,7 +50,7 @@ IceTreeMergeTests >> testConflictingNoModificationWithRemoval [ self assert: conflictOperation rightContents equals: ''. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testConflictingRemovalWithModification [ | rightTree leftTree mergedTree conflictOperation | @@ -68,7 +70,7 @@ IceTreeMergeTests >> testConflictingRemovalWithModification [ self assert: conflictOperation rightContents equals: 'new'. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testConflictingRemovalWithNoModification [ | rightTree leftTree mergedTree conflictOperation | @@ -85,7 +87,7 @@ IceTreeMergeTests >> testConflictingRemovalWithNoModification [ self assert: conflictOperation rightContents equals: 'old'. ] -{ #category : #'test-additions' } +{ #category : 'test-additions' } IceTreeMergeTests >> testMergeConflictingAdditions [ | rightTree leftTree mergedTree conflictOperation | @@ -102,7 +104,7 @@ IceTreeMergeTests >> testMergeConflictingAdditions [ self assert: conflictOperation rightContents equals: 'new2'. ] -{ #category : #'tests-basic' } +{ #category : 'tests-basic' } IceTreeMergeTests >> testMergeEmptyRootNodesReturnsNewEmptyRootNode [ | rightTree leftTree mergedTree | @@ -112,7 +114,7 @@ IceTreeMergeTests >> testMergeEmptyRootNodesReturnsNewEmptyRootNode [ self assert: mergedTree isEmpty. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testMergeTwoEqualAdditionsIsNoModification [ | rightTree leftTree mergedTree operation | @@ -126,7 +128,7 @@ IceTreeMergeTests >> testMergeTwoEqualAdditionsIsNoModification [ self deny: operation chosenOperation isModification. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testMergeTwoEqualRemovalsIsNoModification [ | rightTree leftTree mergedTree operation | @@ -140,7 +142,7 @@ IceTreeMergeTests >> testMergeTwoEqualRemovalsIsNoModification [ self deny: operation chosenOperation isModification. ] -{ #category : #'test-modifications' } +{ #category : 'test-modifications' } IceTreeMergeTests >> testMergeTwoModificationsToDifferentDefinitionsInverseIsConflict [ | rightTree leftTree mergedTree conflictOperation | @@ -159,7 +161,7 @@ IceTreeMergeTests >> testMergeTwoModificationsToDifferentDefinitionsInverseIsCon self assert: conflictOperation leftContents equals: 'new'. ] -{ #category : #'test-modifications' } +{ #category : 'test-modifications' } IceTreeMergeTests >> testMergeTwoModificationsToDifferentDefinitionsIsConflict [ | rightTree leftTree mergedTree conflictOperation | @@ -179,7 +181,7 @@ IceTreeMergeTests >> testMergeTwoModificationsToDifferentDefinitionsIsConflict [ self assert: conflictOperation rightContents equals: 'old'. ] -{ #category : #'test-modifications' } +{ #category : 'test-modifications' } IceTreeMergeTests >> testMergeTwoModificationsToTheSameDefinitionIsNoModification [ | rightTree leftTree mergedTree operation | diff --git a/Iceberg-Tests/IceTreeTests.class.st b/Iceberg-Tests/IceTreeTests.class.st index 7343ccd4ef..78e0a488de 100644 --- a/Iceberg-Tests/IceTreeTests.class.st +++ b/Iceberg-Tests/IceTreeTests.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTreeTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceTreeTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #tests } +{ #category : 'tests' } IceTreeTests >> testDetectFoundElement [ | selected | @@ -13,12 +15,12 @@ IceTreeTests >> testDetectFoundElement [ self assert: selected equals: 2 ] -{ #category : #tests } +{ #category : 'tests' } IceTreeTests >> testDetectNotFoundElement [ self should: [ (IceNode value: 1) detect: [ :e | e value even ] ] raise: NotFound ] -{ #category : #tests } +{ #category : 'tests' } IceTreeTests >> testSelect [ | selected | diff --git a/Iceberg-Tests/IceUnbornProjectFixture.class.st b/Iceberg-Tests/IceUnbornProjectFixture.class.st index b3d5bd58ed..ba5d2ec21e 100644 --- a/Iceberg-Tests/IceUnbornProjectFixture.class.st +++ b/Iceberg-Tests/IceUnbornProjectFixture.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceUnbornProjectFixture, - #superclass : #IceSinglePackageFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceUnbornProjectFixture', + #superclass : 'IceSinglePackageFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceUnbornProjectFixture >> isUnbornProjectFixture [ ^ true ] -{ #category : #running } +{ #category : 'running' } IceUnbornProjectFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceUnknownCommitRepositoryTest.class.st b/Iceberg-Tests/IceUnknownCommitRepositoryTest.class.st index 1c7fed5678..9e550e0b05 100644 --- a/Iceberg-Tests/IceUnknownCommitRepositoryTest.class.st +++ b/Iceberg-Tests/IceUnknownCommitRepositoryTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceUnknownCommitRepositoryTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceUnknownCommitRepositoryTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceUnknownCommitRepositoryTest class >> isAbstract [ ^ self == IceUnknownCommitRepositoryTest ] -{ #category : #running } +{ #category : 'running' } IceUnknownCommitRepositoryTest >> testFetchFixesUnknownCommit [ self repository fetch. @@ -18,13 +20,13 @@ IceUnknownCommitRepositoryTest >> testFetchFixesUnknownCommit [ self assert: self repository workingCopy workingCopyState isSingleCommitState ] -{ #category : #running } +{ #category : 'running' } IceUnknownCommitRepositoryTest >> testReferenceCommitIsUnknown [ self assert: self repository workingCopy referenceCommit isUnknownCommit ] -{ #category : #running } +{ #category : 'running' } IceUnknownCommitRepositoryTest >> testWorkingCopyIsUnknownVersionWorkingCopy [ self assert: self repository workingCopy workingCopyState isUnknownCommitState diff --git a/Iceberg-Tests/IceUrlBuilderTest.class.st b/Iceberg-Tests/IceUrlBuilderTest.class.st index 8c8cf0e95b..6798ad9769 100644 --- a/Iceberg-Tests/IceUrlBuilderTest.class.st +++ b/Iceberg-Tests/IceUrlBuilderTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceUrlBuilderTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceUrlBuilderTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testArbitraryHttpsUrl [ | url | @@ -17,7 +19,7 @@ IceUrlBuilderTest >> testArbitraryHttpsUrl [ self assert: url equals: 'https://localhost/repo.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testArbitrarySSHUrl [ | url | @@ -30,7 +32,7 @@ IceUrlBuilderTest >> testArbitrarySSHUrl [ self assert: url equals: 'git@localhost:repo.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testBitbucketHttpsUrl [ | url | @@ -43,7 +45,7 @@ IceUrlBuilderTest >> testBitbucketHttpsUrl [ self assert: url equals: 'https://bitbucket.org/username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testBitbucketSSHUrl [ | url | @@ -56,7 +58,7 @@ IceUrlBuilderTest >> testBitbucketSSHUrl [ self assert: url equals: 'git@bitbucket.org:username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testExplicitHttpsProtocolUrl [ | url | @@ -69,7 +71,7 @@ IceUrlBuilderTest >> testExplicitHttpsProtocolUrl [ self assert: url equals: 'https://localhost/repo.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testExplicitSSHProtocolUrl [ | url | @@ -82,7 +84,7 @@ IceUrlBuilderTest >> testExplicitSSHProtocolUrl [ self assert: url equals: 'git@localhost:repo.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testGitHubHttpsUrl [ | url | @@ -95,7 +97,7 @@ IceUrlBuilderTest >> testGitHubHttpsUrl [ self assert: url equals: 'https://github.com/username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testGitHubSSHUrl [ | url | @@ -108,7 +110,7 @@ IceUrlBuilderTest >> testGitHubSSHUrl [ self assert: url equals: 'git@github.com:username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testGitLabHttpsUrl [ | url | @@ -121,7 +123,7 @@ IceUrlBuilderTest >> testGitLabHttpsUrl [ self assert: url equals: 'https://gitlab.com/username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testGitLabSSHUrl [ | url | diff --git a/Iceberg-Tests/IceWithRemoteAndLocalCommitAndUpstreamFixture.class.st b/Iceberg-Tests/IceWithRemoteAndLocalCommitAndUpstreamFixture.class.st index c71e632103..6af7c7a28c 100644 --- a/Iceberg-Tests/IceWithRemoteAndLocalCommitAndUpstreamFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteAndLocalCommitAndUpstreamFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceWithRemoteAndLocalCommitAndUpstreamFixture, - #superclass : #IceWithRemoteAndLocalCommitFixture, - #category : #'Iceberg-Tests-Common-Fixtures' + #name : 'IceWithRemoteAndLocalCommitAndUpstreamFixture', + #superclass : 'IceWithRemoteAndLocalCommitFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceWithRemoteAndLocalCommitAndUpstreamFixture >> setUp [ super setUp. repository branch setUpstream: remoteRepository branch. diff --git a/Iceberg-Tests/IceWithRemoteAndLocalCommitFixture.class.st b/Iceberg-Tests/IceWithRemoteAndLocalCommitFixture.class.st index 74f79571f9..d6ed37a2ab 100644 --- a/Iceberg-Tests/IceWithRemoteAndLocalCommitFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteAndLocalCommitFixture.class.st @@ -1,35 +1,37 @@ Class { - #name : #IceWithRemoteAndLocalCommitFixture, - #superclass : #IceBasicRepositoryFixture, + #name : 'IceWithRemoteAndLocalCommitFixture', + #superclass : 'IceBasicRepositoryFixture', #instVars : [ 'remote', 'remoteBranchName' ], - #category : #'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteAndLocalCommitFixture >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteAndLocalCommitFixture >> remoteBranchName [ ^ remoteBranchName ifNil: [ remoteBranchName := 'master' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteAndLocalCommitFixture >> remoteBranchName: aBranchName [ remoteBranchName := aBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteAndLocalCommitFixture >> remoteRepository [ ^ remoteRepository ] -{ #category : #running } +{ #category : 'running' } IceWithRemoteAndLocalCommitFixture >> setUp [ super setUp. remoteRepository := self ensureRemoteRepository. diff --git a/Iceberg-Tests/IceWithRemoteAndMergeConflictFixture.class.st b/Iceberg-Tests/IceWithRemoteAndMergeConflictFixture.class.st index 0fa00a3299..79c3f1d4ff 100644 --- a/Iceberg-Tests/IceWithRemoteAndMergeConflictFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteAndMergeConflictFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceWithRemoteAndMergeConflictFixture, - #superclass : #IceWithRemoteFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceWithRemoteAndMergeConflictFixture', + #superclass : 'IceWithRemoteFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceWithRemoteAndMergeConflictFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceWithRemoteAndUnknownCommitFixture.class.st b/Iceberg-Tests/IceWithRemoteAndUnknownCommitFixture.class.st index a024bd2fdc..1ade452c5d 100644 --- a/Iceberg-Tests/IceWithRemoteAndUnknownCommitFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteAndUnknownCommitFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceWithRemoteAndUnknownCommitFixture, - #superclass : #IceWithRemoteFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceWithRemoteAndUnknownCommitFixture', + #superclass : 'IceWithRemoteFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceWithRemoteAndUnknownCommitFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceWithRemoteFixture.class.st b/Iceberg-Tests/IceWithRemoteFixture.class.st index 2dafc0be23..ac084576af 100644 --- a/Iceberg-Tests/IceWithRemoteFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteFixture.class.st @@ -1,35 +1,37 @@ Class { - #name : #IceWithRemoteFixture, - #superclass : #IceBasicRepositoryFixture, + #name : 'IceWithRemoteFixture', + #superclass : 'IceBasicRepositoryFixture', #instVars : [ 'remote', 'remoteBranchName' ], - #category : 'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteFixture >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteFixture >> remoteBranchName [ ^ remoteBranchName ifNil: [ remoteBranchName := 'master' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteFixture >> remoteBranchName: aBranchName [ remoteBranchName := aBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteFixture >> remoteRepository [ ^ remoteRepository ] -{ #category : #running } +{ #category : 'running' } IceWithRemoteFixture >> setUp [ super setUp. remoteRepository := self ensureRemoteRepository. diff --git a/Iceberg-Tests/MCClassDefinition.extension.st b/Iceberg-Tests/MCClassDefinition.extension.st index 90e54c3283..a8f54d3426 100644 --- a/Iceberg-Tests/MCClassDefinition.extension.st +++ b/Iceberg-Tests/MCClassDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCClassDefinition } +Extension { #name : 'MCClassDefinition' } -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } MCClassDefinition >> ensureRing2DefinitionIn: aRG2Environment package: aRG2PackageDefinition [ | def | diff --git a/Iceberg-Tests/MCGitlabRepositoryIcebergExtensionsTest.class.st b/Iceberg-Tests/MCGitlabRepositoryIcebergExtensionsTest.class.st index 2bccddd0c0..643bf2468b 100644 --- a/Iceberg-Tests/MCGitlabRepositoryIcebergExtensionsTest.class.st +++ b/Iceberg-Tests/MCGitlabRepositoryIcebergExtensionsTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #MCGitlabRepositoryIcebergExtensionsTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'MCGitlabRepositoryIcebergExtensionsTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testHttpsUrl [ | repository | @@ -13,7 +15,7 @@ MCGitlabRepositoryIcebergExtensionsTest >> testHttpsUrl [ self assert: repository httpsUrl equals: 'https://gitlab.com/pharo-project/pharo.git' ] -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testHttpsUrlForSelfHostedGitlab [ | repository | @@ -24,7 +26,7 @@ MCGitlabRepositoryIcebergExtensionsTest >> testHttpsUrlForSelfHostedGitlab [ ] -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testScpUrl [ | repository | @@ -33,7 +35,7 @@ MCGitlabRepositoryIcebergExtensionsTest >> testScpUrl [ self assert: repository scpUrl equals: 'git@gitlab.com:pharo-project/pharo.git' ] -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testScpUrlForSelfHostedGitlab [ | repository | @@ -44,7 +46,7 @@ MCGitlabRepositoryIcebergExtensionsTest >> testScpUrlForSelfHostedGitlab [ ] -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testScpUrlForSelfHostedGitlabWithNonDefaultSSHPort [ | repository | SystemVersion current major <= 6 ifTrue: [ self skip ]. diff --git a/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st b/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st index 3a75af1456..3254182648 100644 --- a/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st +++ b/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #RG2MetaclassTraitDefinition } +Extension { #name : 'RG2MetaclassTraitDefinition' } -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } RG2MetaclassTraitDefinition >> asMCDefinition [ ^ MCClassTraitDefinition diff --git a/Iceberg-Tests/RG2PackageDefinition.extension.st b/Iceberg-Tests/RG2PackageDefinition.extension.st index 93d826948c..7abc8170d7 100644 --- a/Iceberg-Tests/RG2PackageDefinition.extension.st +++ b/Iceberg-Tests/RG2PackageDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #RG2PackageDefinition } +Extension { #name : 'RG2PackageDefinition' } -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } RG2PackageDefinition >> asMCSnapshot [ | definitions | diff --git a/Iceberg-Tests/RG2TraitDefinition.extension.st b/Iceberg-Tests/RG2TraitDefinition.extension.st index f70ff20dc1..0e3c62a7e5 100644 --- a/Iceberg-Tests/RG2TraitDefinition.extension.st +++ b/Iceberg-Tests/RG2TraitDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #RG2TraitDefinition } +Extension { #name : 'RG2TraitDefinition' } -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } RG2TraitDefinition >> asMCDefinition [ ^ MCTraitDefinition diff --git a/Iceberg-Tests/RG2UnresolvedValue.extension.st b/Iceberg-Tests/RG2UnresolvedValue.extension.st index 790070f126..5cf171826e 100644 --- a/Iceberg-Tests/RG2UnresolvedValue.extension.st +++ b/Iceberg-Tests/RG2UnresolvedValue.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #RG2UnresolvedValue } +Extension { #name : 'RG2UnresolvedValue' } -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } RG2UnresolvedValue >> remove: aRG2MethodDefinition [ "I am undefined, removing something is futil" diff --git a/Iceberg-Tests/package.st b/Iceberg-Tests/package.st index 5ce11db7f6..cd00971291 100644 --- a/Iceberg-Tests/package.st +++ b/Iceberg-Tests/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Tests' } +Package { #name : 'Iceberg-Tests' } diff --git a/Iceberg/Iceberg.class.st b/Iceberg/Iceberg.class.st index 4bce23fd51..3227b7b320 100644 --- a/Iceberg/Iceberg.class.st +++ b/Iceberg/Iceberg.class.st @@ -19,6 +19,7 @@ Class { #superclass : 'Object', #classVars : [ 'EnableMetacelloIntegration', + 'ProxyURLExternalString', 'RemoteTypeSelector', 'ShowSystemRepositories' ], @@ -66,6 +67,27 @@ Iceberg class >> bootstrapWithCommitId: commitId packageList: packageNameList [ repository register ] +{ #category : 'proxy' } +Iceberg class >> configureLGitProxyOpt: aLGitProxyOptions [ + + | proxyURL | + proxyURL := self proxyURLExternalString. + + "If there is not configured proxy, let's return" + proxyURL isNull ifTrue: [ ^ self ]. + + aLGitProxyOptions prim_url: proxyURL +] + +{ #category : 'proxy' } +Iceberg class >> createProxyURLExternalString [ + + NetworkSystemSettings httpProxyServer isEmpty + ifTrue: [ ^ ProxyURLExternalString := ExternalAddress null ]. + + ProxyURLExternalString := ExternalAddress fromString: self formatNetworkSettingsProxyServer. +] + { #category : 'settings' } Iceberg class >> enableMetacelloIntegration [ ^ EnableMetacelloIntegration ifNil: [ EnableMetacelloIntegration := true ] @@ -76,6 +98,31 @@ Iceberg class >> enableMetacelloIntegration: anObject [ EnableMetacelloIntegration := anObject ] +{ #category : 'proxy' } +Iceberg class >> ensureProxyURLExternalString [ + + + "If we have a valid string in the external memory, we check its value" + (ProxyURLExternalString isNotNil and: [ ProxyURLExternalString isNull not ]) ifTrue: [ + + "If it is the same that we want, let's just continue. If it is different, we need to free it so, we can allocate a new one" + ProxyURLExternalString utf8StringFromCString = self formatNetworkSettingsProxyServer + ifTrue: [ ^ self ] + ifFalse: [ ProxyURLExternalString free ] ]. + + ^ self createProxyURLExternalString +] + +{ #category : 'proxy' } +Iceberg class >> formatNetworkSettingsProxyServer [ + + ^ String streamContents: [ :s | + s nextPutAll: 'https://'. + s nextPutAll: NetworkSystemSettings httpProxyServer. + s nextPutAll: ':'. + s nextPutAll: NetworkSystemSettings httpProxyPort printString ] +] + { #category : 'accessing' } Iceberg class >> icebergRepositoriesURLs [ ^ { @@ -105,6 +152,13 @@ Iceberg class >> mcRepositoryFor: aLocationString [ ^ (IceMetacelloRepositoryType for: aLocationString) mcRepository ] +{ #category : 'proxy' } +Iceberg class >> proxyURLExternalString [ + + self ensureProxyURLExternalString. + ^ ProxyURLExternalString +] + { #category : 'accessing' } Iceberg class >> remoteTypeSelector [ "Should be #scpURL or #httpsURL" From bd4e69d0d1c40850b848e87358a85e5f0a845e04 Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Tue, 24 Oct 2023 14:27:19 +0200 Subject: [PATCH 38/83] iceberg was still using keyword, not selector, for Pragmas --- Iceberg-Libgit/IceLibgitRepository.class.st | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Iceberg-Libgit/IceLibgitRepository.class.st b/Iceberg-Libgit/IceLibgitRepository.class.st index 1a52008d33..7b2d6fcc41 100644 --- a/Iceberg-Libgit/IceLibgitRepository.class.st +++ b/Iceberg-Libgit/IceLibgitRepository.class.st @@ -77,7 +77,7 @@ IceLibgitRepository class >> libgitErrorHandlerSelector [ This selector is mainly used by architectural rules to ensure that libgit is being called correctly." ^ (self methods detect: [ :each | - each pragmas anySatisfy: [ :pragma | pragma keyword = self libgitErrorHandlerPragmaSelector ] ]) selector + each pragmas anySatisfy: [ :pragma | pragma selector = self libgitErrorHandlerPragmaSelector ] ]) selector ] { #category : 'rules' } @@ -90,8 +90,8 @@ IceLibgitRepository class >> libgitRepositoryHandleAccessorPragmaSelector [ { #category : 'rules' } IceLibgitRepository class >> libgitRepositoryHandleAccessors [ - - ^ self allMethods select: [ :m | m pragmas anySatisfy: [ :p | p keyword = self libgitRepositoryHandleAccessorPragmaSelector ] ] + + ^ self allMethods select: [ :m | m pragmas anySatisfy: [ :p | p selector = self libgitRepositoryHandleAccessorPragmaSelector ] ] ] { #category : 'accessing' } From 6b01b44b997b8a2174392075d807fb03dae9a0a2 Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Thu, 26 Oct 2023 23:00:27 +0200 Subject: [PATCH 39/83] Use #isNotEmpty instead of #notEmpty in Iceberg Fix #1751 --- Iceberg-Libgit/IceRepositoryCreator.class.st | 2 +- Iceberg-Plugin-GitHub/IceGitHubAPI.class.st | 80 ++++++----- .../IceGitHubAPIPaginatedResult.class.st | 26 ++-- .../IceGitHubAcceptPullRequestModel.class.st | 42 +++--- .../IceGitHubAction.class.st | 28 ++-- .../IceGitHubBadCredentialsError.class.st | 12 +- .../IceGitHubCommand.class.st | 14 +- .../IceGitHubCreatePullRequestModel.class.st | 104 +++++++------- Iceberg-Plugin-GitHub/IceGitHubError.class.st | 38 ++--- .../IceGitHubGenericError.class.st | 10 +- .../IceGitHubJSONDataSource.class.st | 16 ++- ...ceGitHubNewBranchFromIssueCommand.class.st | 20 +-- .../IceGitHubNewBranchFromIssuePanel.class.st | 50 +++---- .../IceGitHubNewPullRequestAction.class.st | 16 ++- .../IceGitHubNewPullRequestCommand.class.st | 12 +- .../IceGitHubNilPullRequest.class.st | 18 +-- .../IceGitHubOpenOnGithubAction.class.st | 20 +-- .../IceGitHubOpenOnGithubCommand.class.st | 12 +- .../IceGitHubPlugin.class.st | 12 +- .../IceGitHubPullRequest.class.st | 76 +++++----- .../IceGitHubPullRequestDataSource.class.st | 26 ++-- .../IceGitHubPullRequestDefinition.class.st | 38 ++--- .../IceGitHubPullRequestDetailModel.class.st | 66 ++++----- .../IceGitHubRejectPullRequestModel.class.st | 36 ++--- .../IceGitHubRemoteCommand.class.st | 18 +-- .../IceGitHubRemoveBranchesAction.class.st | 26 ++-- .../IceGitHubRemoveBranchesCommand.class.st | 12 +- .../IceGitHubRemoveBranchesModel.class.st | 38 ++--- .../IceGitHubSelectItem.class.st | 22 +-- .../IceGitHubTipPullRequestBrowser.class.st | 64 +++++---- .../IceGitHubTreeCommand.class.st | 20 +-- ...ceGitHubTreeNewPullRequestCommand.class.st | 12 +- .../IceGitHubTreeOpenOnGithubCommand.class.st | 12 +- ...ceGitHubTreeRemoveBranchesCommand.class.st | 12 +- ...eGitHubTreeViewPullRequestCommand.class.st | 12 +- .../IceGitHubViewPullRequestAction.class.st | 10 +- ...tHubViewPullRequestOnGithubAction.class.st | 20 +-- .../IceGitHubViewPullRequestsCommand.class.st | 12 +- .../IceHttpsProtocol.extension.st | 4 +- .../IcePlaintextCredentials.extension.st | 4 +- .../IcePlaintextOtpCredentials.extension.st | 4 +- .../IceSSHProtocol.extension.st | 4 +- ...ceTipGitHubPullRequestListBrowser.class.st | 50 +++---- .../IceTipGitHubRepositoryPanel.class.st | 22 +-- .../IceTipOpenCheckUrlCommand.class.st | 16 ++- ...ceTipOpenGitHubPullRequestCommand.class.st | 18 +-- ...GitHubPullRequestInBrowserCommand.class.st | 16 ++- .../IceTipRefreshPullRequestsCommand.class.st | 18 +-- .../IceTipRepositoriesBrowser.extension.st | 8 +- .../IceTokenCredentials.extension.st | 8 +- .../IceUrlProtocol.extension.st | 4 +- .../ManifestIcebergPluginGitHub.class.st | 10 +- .../MorphicUIManager.extension.st | 4 +- Iceberg-Plugin-GitHub/UIManager.extension.st | 4 +- Iceberg-Plugin-GitHub/package.st | 2 +- Iceberg-TipUI/Clipboard.extension.st | 4 +- Iceberg-TipUI/CmCommandGroup.extension.st | 4 +- .../CmCommandGroupDecorator.extension.st | 4 +- .../CmUICommandDisplayStrategy.extension.st | 4 +- .../CmUIDisableWhenCantBeRun.extension.st | 4 +- .../CmUIHideWhenCantBeRun.extension.st | 4 +- Iceberg-TipUI/FTBasicItem.extension.st | 4 +- Iceberg-TipUI/FTRootItem.extension.st | 4 +- Iceberg-TipUI/FTTableMorph.extension.st | 6 +- Iceberg-TipUI/FTTreeItem.extension.st | 4 +- .../IceAbstractCredentials.extension.st | 6 +- Iceberg-TipUI/IceAddition.extension.st | 4 +- .../IceCheckoutAllPackages.extension.st | 4 +- ...CheckoutAlreadyLoadedPackages.extension.st | 4 +- .../IceCheckoutDoNotLoadPackages.extension.st | 4 +- .../IceCheckoutStrategy.extension.st | 6 +- Iceberg-TipUI/IceClassDefinition.extension.st | 4 +- .../IceConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceCreateBranchCommand.class.st | 10 +- Iceberg-TipUI/IceDefinition.extension.st | 4 +- .../IceDirectoryDefinition.extension.st | 4 +- Iceberg-TipUI/IceErrorVisitor.extension.st | 6 +- Iceberg-TipUI/IceExperimentalFeature.class.st | 10 +- .../IceExtensionDefinition.extension.st | 4 +- Iceberg-TipUI/IceFileDefinition.extension.st | 4 +- .../IceFileSystemDefinition.extension.st | 6 +- Iceberg-TipUI/IceMergeListWrapper.class.st | 28 ++-- .../IceMergeWorkingCopyCommand.class.st | 10 +- .../IceMethodContainerDefinition.extension.st | 10 +- .../IceMethodDefinition.extension.st | 10 +- Iceberg-TipUI/IceModification.extension.st | 4 +- Iceberg-TipUI/IceNoCommitMessage.class.st | 14 +- Iceberg-TipUI/IceNoModification.extension.st | 4 +- Iceberg-TipUI/IceNode.extension.st | 4 +- .../IceNodeCodeDisplayVisitor.class.st | 24 ++-- .../IceNonConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceOperation.extension.st | 12 +- Iceberg-TipUI/IceOperationMerge.extension.st | 6 +- Iceberg-TipUI/IcePackage.extension.st | 4 +- .../IcePackageDefinition.extension.st | 10 +- .../IcePlaintextCredentials.extension.st | 8 +- .../IcePlaintextOtpCredentials.extension.st | 4 +- Iceberg-TipUI/IcePullRemoteCommand.class.st | 14 +- Iceberg-TipUI/IceRemoval.extension.st | 4 +- Iceberg-TipUI/IceRepository.extension.st | 4 +- Iceberg-TipUI/IceRepositoryCommand.class.st | 24 ++-- .../IceSavedPackageVersion.extension.st | 4 +- Iceberg-TipUI/IceSortingStrategy.class.st | 28 ++-- Iceberg-TipUI/IceSshCredentials.extension.st | 6 +- .../IceTipAbstractCredentialCommand.class.st | 14 +- ...TipAbstractCredentialStoreCommand.class.st | 16 ++- ...ceTipAbstractCredentialsPresenter.class.st | 56 ++++---- ...ractPlaintextCredentialsPresenter.class.st | 24 ++-- ...ipAbstractSSHCredentialsPresenter.class.st | 20 +-- Iceberg-TipUI/IceTipAction.class.st | 30 ++-- ...eTipAddNewPackagesDialogPresenter.class.st | 40 +++--- .../IceTipAddPackageCommand.class.st | 20 +-- .../IceTipAddPackagesDialogPresenter.class.st | 44 +++--- ...eTipAddPlainTextCredentialCommand.class.st | 14 +- ...pAddPlaintextCredentialsPresenter.class.st | 22 +-- Iceberg-TipUI/IceTipAddRemoteCommand.class.st | 20 +-- .../IceTipAddRemoteDialogPresenter.class.st | 44 +++--- .../IceTipAddRepositoryCommand.class.st | 22 +-- .../IceTipAddSSHCredentialsPresenter.class.st | 22 +-- .../IceTipAddSshCredentialCommand.class.st | 14 +- .../IceTipAddTokenCredentialCommand.class.st | 14 +- ...ceTipAddTokenCredentialsPresenter.class.st | 28 ++-- .../IceTipAdoptCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipAnnouncement.class.st | 8 +- ...kForPlaintextCredentialsPresenter.class.st | 20 +-- ...rPlaintextOtpCredentialsPresenter.class.st | 18 +-- ...bForPlaintextCredentialsPresenter.class.st | 10 +- .../IceTipAskSSHCredentialsPresenter.class.st | 14 +- Iceberg-TipUI/IceTipBranchModel.class.st | 48 ++++--- Iceberg-TipUI/IceTipBranchPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipBrowseCommand.class.st | 20 +-- .../IceTipBrowsePackageCommand.class.st | 18 +-- ...seRepositoryPackageVersionCommand.class.st | 14 +- Iceberg-TipUI/IceTipBrowser.class.st | 62 ++++---- Iceberg-TipUI/IceTipCache.class.st | 28 ++-- Iceberg-TipUI/IceTipCachedModel.class.st | 26 ++-- ...eTipCalculateDirtyPackagesCommand.class.st | 16 ++- .../IceTipCheckoutBranchCommand.class.st | 20 +-- .../IceTipCheckoutBranchDialog.class.st | 30 ++-- .../IceTipCheckoutBranchPanel.class.st | 10 +- .../IceTipCheckoutCommitCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCheckoutModel.class.st | 26 ++-- .../IceTipCheckoutNewBranchCommand.class.st | 18 +-- .../IceTipCheckoutNewBranchPanel.class.st | 40 +++--- .../IceTipCheckoutPreviewBrowser.class.st | 32 +++-- ...eTipCheckoutSelectedBranchCommand.class.st | 18 +-- .../IceTipCheckoutSelectedTagCommand.class.st | 18 +-- .../IceTipCherryPickCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCherrypickModel.class.st | 22 +-- .../IceTipCherrypickPreviewBrowser.class.st | 34 ++--- .../IceTipCleanCommandGroupVisitor.class.st | 12 +- Iceberg-TipUI/IceTipCommand.class.st | 50 +++---- ...ommandToPresenterBuildingStrategy.class.st | 12 +- Iceberg-TipUI/IceTipCommentPanel.class.st | 54 +++---- Iceberg-TipUI/IceTipCommitAction.class.st | 28 ++-- Iceberg-TipUI/IceTipCommitBrowser.class.st | 58 ++++---- Iceberg-TipUI/IceTipCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipCommitDiffModel.class.st | 10 +- .../IceTipCommitInfoPresenter.class.st | 46 +++--- Iceberg-TipUI/IceTipCommitModel.class.st | 64 +++++---- Iceberg-TipUI/IceTipCommitRangeModel.class.st | 18 +-- Iceberg-TipUI/IceTipCommitishModel.class.st | 18 +-- .../IceTipCopyCommitishCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagPanel.class.st | 60 ++++---- .../IceTipCredentialsSettings.class.st | 16 ++- .../IceTipCredentialsStoreBrowser.class.st | 34 ++--- ...ceTipCritiquesBeforeCommitBrowser.class.st | 50 +++---- .../IceTipDeleteBranchCommand.class.st | 18 +-- .../IceTipDeleteRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipDeleteTagCommand.class.st | 20 +-- .../IceTipDescriptionDecorator.class.st | 14 +- .../IceTipDescriptionDecoratorHead.class.st | 10 +- ...ceTipDescriptionDecoratorModified.class.st | 10 +- ...eTipDescriptionDecoratorNotLoaded.class.st | 10 +- Iceberg-TipUI/IceTipDialogPresenter.class.st | 14 +- Iceberg-TipUI/IceTipDiffEntryRemoved.class.st | 14 +- Iceberg-TipUI/IceTipDiffModel.class.st | 24 ++-- Iceberg-TipUI/IceTipDiffPanel.class.st | 66 ++++----- Iceberg-TipUI/IceTipDiffPreviewModel.class.st | 22 +-- Iceberg-TipUI/IceTipDiffRefreshed.class.st | 14 +- .../IceTipDiffSelectingPanel.class.st | 26 ++-- Iceberg-TipUI/IceTipDirectMergeType.class.st | 10 +- .../IceTipDirectoryPresenter.class.st | 10 +- ...ipDiscardAllChangesPreviewBrowser.class.st | 22 +-- Iceberg-TipUI/IceTipDiscardAllModel.class.st | 24 ++-- .../IceTipDiscardChangesCommand.class.st | 20 +-- .../IceTipEditCredentialCommand.class.st | 18 +-- ...EditPlaintextCredentialsPresenter.class.st | 20 +-- .../IceTipEditProjectDialogPresenter.class.st | 74 +++++----- .../IceTipEditRepositoryCommand.class.st | 18 +-- ...IceTipEditSSHCredentialsPresenter.class.st | 20 +-- ...eTipEditTokenCredentialsPresenter.class.st | 16 ++- Iceberg-TipUI/IceTipEntityModel.class.st | 38 ++--- .../IceTipErrorDialogPresenter.class.st | 30 ++-- .../IceTipExistingBranchPanel.class.st | 32 +++-- .../IceTipFetchAllProjectCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFetchCommand.class.st | 20 +-- .../IceTipFetchInPullCommand.class.st | 16 ++- .../IceTipFetchRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFilePresenter.class.st | 10 +- .../IceTipForgetRepositoryCommand.class.st | 18 +-- .../IceTipGitProviderRepositoryPanel.class.st | 42 +++--- .../IceTipGitRepositoryPanel.class.st | 26 ++-- ...itUsernameAndEmailDialogPresenter.class.st | 38 ++--- ...pHiedraAltComponentHistoryBrowser.class.st | 36 ++--- .../IceTipHiedraAltHistoryBrowser.class.st | 32 +++-- ...ceTipHiedraAltHistoryRowPresenter.class.st | 16 ++- .../IceTipHiedraHistoryBrowser.class.st | 18 +-- .../IceTipHistoryActionBrowser.class.st | 32 +++-- Iceberg-TipUI/IceTipHistoryBrowser.class.st | 46 +++--- .../IceTipHistoryDiffFromHead.class.st | 12 +- .../IceTipHistoryDiffToAncestor.class.st | 12 +- .../IceTipHistoryDiffToHead.class.st | 12 +- .../IceTipHistoryDiffUpdater.class.st | 28 ++-- Iceberg-TipUI/IceTipInspectCommand.class.st | 20 +-- .../IceTipInstallVersionCommand.class.st | 18 +-- ...TipInteractiveCredentialsProvider.class.st | 18 +-- .../IceTipInteractiveErrorVisitor.class.st | 54 +++---- .../IceTipLoadPackageCommand.class.st | 18 +-- .../IceTipLocalRepositoryPanel.class.st | 28 ++-- .../IceTipLocationPresenter.class.st | 46 +++--- .../IceTipManagePackagesCommand.class.st | 18 +-- .../IceTipManageRepositoryCommand.class.st | 24 ++-- .../IceTipMergeBranchDialogPresenter.class.st | 30 ++-- Iceberg-TipUI/IceTipMergeBranchPanel.class.st | 18 +-- Iceberg-TipUI/IceTipMergeCommand.class.st | 18 +-- .../IceTipMergeHistoryCommand.class.st | 18 +-- Iceberg-TipUI/IceTipMergeModel.class.st | 20 +-- Iceberg-TipUI/IceTipMergeMorph.class.st | 14 +- Iceberg-TipUI/IceTipMergePatchMorph.class.st | 40 +++--- .../IceTipMergePreviewBrowser.class.st | 20 +-- .../IceTipMergeSelectingPanel.class.st | 32 +++-- Iceberg-TipUI/IceTipMergeType.class.st | 22 +-- Iceberg-TipUI/IceTipModel.class.st | 18 +-- .../IceTipNewRepositoryPanel.class.st | 34 ++--- .../IceTipOpenNativelyCommand.class.st | 18 +-- .../IceTipOptionDialogPresenter.class.st | 36 ++--- Iceberg-TipUI/IceTipPackageCommand.class.st | 20 +-- Iceberg-TipUI/IceTipPackageModel.class.st | 36 ++--- Iceberg-TipUI/IceTipPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipPreviewBrowser.class.st | 26 ++-- Iceberg-TipUI/IceTipPullBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPullCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPullModel.class.st | 12 +- Iceberg-TipUI/IceTipPushAction.class.st | 10 +- Iceberg-TipUI/IceTipPushBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPushCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPushModel.class.st | 12 +- .../IceTipReadOnlyFormBuilder.class.st | 36 ++--- .../IceTipRefreshCommitCommand.class.st | 18 +-- ...RegisterRepositoryDialogPresenter.class.st | 26 ++-- .../IceTipReloadPackageCommand.class.st | 18 +-- .../IceTipRemoteActionBrowser.class.st | 26 ++-- .../IceTipRemoteActionCommand.class.st | 14 +- .../IceTipRemoteActionModel.class.st | 24 ++-- Iceberg-TipUI/IceTipRemoteModel.class.st | 20 +-- .../IceTipRemotesTreeCommand.class.st | 18 +-- .../IceTipRemoveCredentialCommand.class.st | 20 +-- ...emoveFromRepositoryPackageCommand.class.st | 16 ++- ...ceTipRemovePackageDialogPresenter.class.st | 34 ++--- ...ipRemoveRepositoryDialogPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipRepairAction.class.st | 38 ++--- .../IceTipRepairCheckoutBranch.class.st | 20 +-- .../IceTipRepairCheckoutNewBranch.class.st | 20 +-- .../IceTipRepairCloneRepository.class.st | 20 +-- Iceberg-TipUI/IceTipRepairCommand.class.st | 20 +-- .../IceTipRepairCreateSubdirectory.class.st | 20 +-- .../IceTipRepairDiscardAndLoad.class.st | 22 +-- .../IceTipRepairEditRepository.class.st | 20 +-- .../IceTipRepairFetchRemoteBranch.class.st | 22 +-- .../IceTipRepairLocateRepository.class.st | 24 ++-- .../IceTipRepairMergeWithBranch.class.st | 20 +-- Iceberg-TipUI/IceTipRepairProject.class.st | 20 +-- .../IceTipRepairPullRemoteBranch.class.st | 20 +-- ...ipRepairRepositoryDialogPresenter.class.st | 44 +++--- .../IceTipRepositoriesBrowser.class.st | 70 ++++----- .../IceTipRepositoriesModel.class.st | 14 +- .../IceTipRepositoryBrowser.class.st | 46 +++--- .../IceTipRepositoryCommand.class.st | 20 +-- .../IceTipRepositoryGroupModel.class.st | 22 +-- .../IceTipRepositoryGroupPanel.class.st | 50 +++---- Iceberg-TipUI/IceTipRepositoryModel.class.st | 136 +++++++++--------- .../IceTipRepositoryTypePanel.class.st | 40 +++--- ...TipResetBranchToThisCommitCommand.class.st | 22 +-- .../IceTipRevertChangeCommand.class.st | 18 +-- Iceberg-TipUI/IceTipSaveImageAction.class.st | 10 +- .../IceTipSelectAllPackagesCommand.class.st | 20 +-- .../IceTipSelectPackagesCommand.class.st | 10 +- .../IceTipSelectRemotePresenter.class.st | 32 +++-- Iceberg-TipUI/IceTipSettingsCommand.class.st | 22 +-- Iceberg-TipUI/IceTipSpCommand.class.st | 24 ++-- Iceberg-TipUI/IceTipStandardAction.class.st | 26 ++-- Iceberg-TipUI/IceTipStatusDecorator.class.st | 12 +- .../IceTipStatusDecoratorError.class.st | 12 +- .../IceTipStatusDecoratorWarning.class.st | 10 +- Iceberg-TipUI/IceTipStyleContributor.class.st | 10 +- .../IceTipSwitchAndMergeType.class.st | 10 +- Iceberg-TipUI/IceTipTagDecorator.class.st | 12 +- Iceberg-TipUI/IceTipTagModel.class.st | 18 +-- Iceberg-TipUI/IceTipTextDecorator.class.st | 20 +-- .../IceTipTextDecoratorNone.class.st | 8 +- .../IceTipToolbarButtonStrategy.class.st | 12 +- .../IceTipToolbarPresenterBuilder.class.st | 10 +- Iceberg-TipUI/IceTipTreeBranch.class.st | 10 +- .../IceTipTreeCollapseCommand.class.st | 16 ++- .../IceTipTreeExpandCommand.class.st | 18 +-- Iceberg-TipUI/IceTipTreeGroup.class.st | 34 ++--- Iceberg-TipUI/IceTipTreeItem.class.st | 18 +-- Iceberg-TipUI/IceTipTreeNode.class.st | 40 +++--- Iceberg-TipUI/IceTipTreeRemote.class.st | 10 +- .../IceTipTreeRepositoryGroup.class.st | 8 +- Iceberg-TipUI/IceTipTreeTag.class.st | 10 +- ...eTipUnloadAndRemovePackageCommand.class.st | 18 +-- .../IceTipUnloadPackageCommand.class.st | 18 +-- .../IceTipUnselectAllPackagesCommand.class.st | 20 +-- .../IceTipVersionHistoryBrowser.class.st | 50 +++---- .../IceTipVersionHistoryModel.class.st | 18 +-- Iceberg-TipUI/IceTipVersionModel.class.st | 16 ++- .../IceTipWorkingCopyBrowser.class.st | 62 ++++---- .../IceTipWorkingCopyDiffModel.class.st | 16 ++- Iceberg-TipUI/IceTipWorkingCopyModel.class.st | 36 ++--- ...eTipWorkingCopyStatusBarPresenter.class.st | 20 +-- .../IceTokenCredentials.extension.st | 6 +- Iceberg-TipUI/IceTraitDefinition.extension.st | 4 +- Iceberg-TipUI/IceWarning.class.st | 10 +- Iceberg-TipUI/IceWorkingCopy.extension.st | 4 +- .../LGitCredentialsPlaintext.extension.st | 4 +- Iceberg-TipUI/MCAddition.extension.st | 4 +- Iceberg-TipUI/MCModification.extension.st | 4 +- Iceberg-TipUI/MCPatchOperation.extension.st | 4 +- Iceberg-TipUI/MCRemoval.extension.st | 6 +- Iceberg-TipUI/ManifestIcebergTipUI.class.st | 14 +- Iceberg-TipUI/PharoDarkTheme.extension.st | 6 +- Iceberg-TipUI/PharoShortcuts.extension.st | 4 +- .../SpToolbarButtonPresenter.extension.st | 4 +- Iceberg-TipUI/TIceCopyCommitId.trait.st | 10 +- Iceberg-TipUI/TWithBranchModel.trait.st | 16 ++- Iceberg-TipUI/Text.extension.st | 4 +- .../ToolShortcutsCategory.extension.st | 4 +- Iceberg-TipUI/UITheme.extension.st | 6 +- Iceberg-TipUI/package.st | 2 +- Iceberg/IceRepository.class.st | 2 +- Iceberg/IceSshCredentials.class.st | 6 +- Iceberg/IceTokenCredentials.class.st | 2 +- 345 files changed, 3848 insertions(+), 3296 deletions(-) diff --git a/Iceberg-Libgit/IceRepositoryCreator.class.st b/Iceberg-Libgit/IceRepositoryCreator.class.st index 73240d6d15..213999bf6d 100644 --- a/Iceberg-Libgit/IceRepositoryCreator.class.st +++ b/Iceberg-Libgit/IceRepositoryCreator.class.st @@ -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 ] ] ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st b/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st index b1757b8910..e43b1d23a5 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st @@ -3,17 +3,19 @@ I represent an access point to the GitHub API. I provide different high level abstractions to interact with GitHub, following the speciphications you can find here: https://developer.github.com/v3/ " Class { - #name : #IceGitHubAPI, - #superclass : #Object, + #name : 'IceGitHubAPI', + #superclass : 'Object', #instVars : [ 'credentials', 'isAnonymous', 'acceptMediaType' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #credentials } +{ #category : 'credentials' } IceGitHubAPI class >> ensureCredentials [ | provider | @@ -21,7 +23,7 @@ IceGitHubAPI class >> ensureCredentials [ ^ provider providePlaintextCredentials. ] -{ #category : #utilities } +{ #category : 'utilities' } IceGitHubAPI class >> issuesClosedOn: repoName milestone: milestone [ "Answers a string with a list and description of items closed on a milestone. Used to paste it as explanations on releases, etc. @@ -57,7 +59,7 @@ IceGitHubAPI class >> issuesClosedOn: repoName milestone: milestone [ separatedBy: [ stream << String lf ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI class >> obtainCredentials [ | provider | @@ -70,14 +72,14 @@ IceGitHubAPI class >> obtainCredentials [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> acceptMediaType [ ^ acceptMediaType ifNil: [ acceptMediaType := 'application/vnd.github.v3+json' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> acceptMediaType: aString [ "Set the media type to use in the request. See: https://developer.github.com/v3/media/" @@ -85,7 +87,7 @@ IceGitHubAPI >> acceptMediaType: aString [ acceptMediaType := aString ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> acceptPullRequest: owner project: projectName number: aNumber data: aDictionary [ ^ self put: 'repos/', owner, '/', projectName, '/pulls/', aNumber asString, '/merge' @@ -95,7 +97,7 @@ IceGitHubAPI >> acceptPullRequest: owner project: projectName number: aNumber da contentType: ZnMimeType applicationJson ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> addComment: owner project: projectName number: aNumber data: aDictionary [ ^ self post: 'repos/', owner, '/', projectName, '/issues/', aNumber asString, '/comments' @@ -105,7 +107,7 @@ IceGitHubAPI >> addComment: owner project: projectName number: aNumber data: aDi contentType: ZnMimeType applicationJson ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> addPullRequest: owner project: projectName data: aDictionary [ ^ self post: 'repos/', owner, '/', projectName, '/pulls' @@ -115,28 +117,28 @@ IceGitHubAPI >> addPullRequest: owner project: projectName data: aDictionary [ contentType: ZnMimeType applicationJson ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> beAnonymous [ isAnonymous := true ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> contentsWithValidationDo: aBlock [ ^ (self responseWithValidationDo: aBlock) contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> credentials [ ^ credentials ifNil: [ credentials := self class obtainCredentials ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> credentials: anObject [ credentials := anObject ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> delete: aString [ ^ self contentsWithValidationDo: [ (self newRequestTo: aString) @@ -144,12 +146,12 @@ IceGitHubAPI >> delete: aString [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> deleteBranch: owner project: projectName name: branchName [ ^ self delete: 'repos/', owner, '/', projectName, '/git/refs/heads/', branchName ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> get: aString [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -157,7 +159,7 @@ IceGitHubAPI >> get: aString [ response ] ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> get: aString parameters: aDictionary [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString, (String streamContents: [ :stream | @@ -169,41 +171,41 @@ IceGitHubAPI >> get: aString parameters: aDictionary [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getBranch: owner project: projectName name: branchName [ ^ self get: 'repos/', owner,'/', projectName, '/branches/', branchName ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getBranches: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName, '/branches' ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getCommit: aCommitish owner: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName, '/commits/', aCommitish ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getIssue: owner project: projectName number: issueNumber [ ^ self get: 'repos/', owner,'/', projectName, '/issues/', (issueNumber asString) ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> getPaginated: aString [ ^ IceGitHubAPIPaginatedResult api: self request: aString ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getPullRequests: owner project: projectName [ ^ self getPaginated: 'repos/', owner, '/', projectName, '/pulls' ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> getRaw: aString [ ^ self responseWithValidationDo: [ (self newRequestTo: aString) @@ -211,18 +213,18 @@ IceGitHubAPI >> getRaw: aString [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getRepository: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getTagsOwner: owner project: project [ ^ self get: 'repos', '/', owner, '/', project, '/tags' ] -{ #category : #responses } +{ #category : 'responses' } IceGitHubAPI >> handleUnauthorized: aZnResponse [ "If we are in unauthorized we require the correct credentials." @@ -243,20 +245,20 @@ IceGitHubAPI >> handleUnauthorized: aZnResponse [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAPI >> initialize [ super initialize. isAnonymous := false ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> jsonContentsWithValidationDo: aBlock [ ^ STON fromString: (self contentsWithValidationDo: aBlock) ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceGitHubAPI >> newRequestTo: aString [ ^ ZnClient new @@ -270,7 +272,7 @@ IceGitHubAPI >> newRequestTo: aString [ yourself ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> patch: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -279,7 +281,7 @@ IceGitHubAPI >> patch: aString with: aBlock [ response ] ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> post: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -288,7 +290,7 @@ IceGitHubAPI >> post: aString with: aBlock [ response ] ] -{ #category : #'requesting - gists' } +{ #category : 'requesting - gists' } IceGitHubAPI >> postGist: descriptionString public: aBoolean files: anArrayOfAssociations [ ^ self @@ -306,7 +308,7 @@ IceGitHubAPI >> postGist: descriptionString public: aBoolean files: anArrayOfAss contentType: ZnMimeType applicationJson ] ] -{ #category : #'requesting - gists' } +{ #category : 'requesting - gists' } IceGitHubAPI >> postGist: descriptionString public: aBoolean name: fileName contents: contentsString [ ^ self @@ -315,7 +317,7 @@ IceGitHubAPI >> postGist: descriptionString public: aBoolean name: fileName cont files: { fileName -> contentsString } ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> put: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -324,7 +326,7 @@ IceGitHubAPI >> put: aString with: aBlock [ response ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> responseWithValidationDo: aBlock [ | response | @@ -337,7 +339,7 @@ IceGitHubAPI >> responseWithValidationDo: aBlock [ ^ response ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> updatePullRequest: owner project: projectName number: aNumber data: aDictionary [ ^ self patch: 'repos/', owner, '/', projectName, '/pulls/', aNumber asString diff --git a/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st b/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st index d556e04f6d..d6cb2cb7aa 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st @@ -2,18 +2,20 @@ I'm a paginated answer from github (he sends results in pages and includes information in headers) " Class { - #name : #IceGitHubAPIPaginatedResult, - #superclass : #Object, + #name : 'IceGitHubAPIPaginatedResult', + #superclass : 'Object', #instVars : [ 'api', 'request', 'result', 'nextPage' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubAPIPaginatedResult class >> api: anAPI request: aString [ ^ self new api: anAPI; @@ -22,7 +24,7 @@ IceGitHubAPIPaginatedResult class >> api: anAPI request: aString [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> all [ | stream | stream := Array new writeStream. @@ -31,22 +33,22 @@ IceGitHubAPIPaginatedResult >> all [ ^ stream contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> api [ ^ api ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> api: anObject [ api := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> hasNext [ ^ result isNil or: [ self parseMorePages: (result headers at: 'Link' ifAbsent: [ nil ]) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> next [ nextPage ifNil: [ nextPage := 1 ]. @@ -59,7 +61,7 @@ IceGitHubAPIPaginatedResult >> next [ ] ensure: [ nextPage := nextPage + 1 ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPIPaginatedResult >> parseMorePages: aString [ "github does not send 'Links' header if there are no pages, and it does not sends 'next' link if we are at the last page" @@ -67,12 +69,12 @@ IceGitHubAPIPaginatedResult >> parseMorePages: aString [ ^ (aString substrings: ',') anySatisfy: [ :each | each includesSubstring: 'rel="next"' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> request [ ^ request ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> request: anObject [ request := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st index cd59c9f869..5a19df5eec 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st @@ -2,8 +2,8 @@ I'm a dialog for collecting data to accept a pull request. " Class { - #name : #IceGitHubAcceptPullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubAcceptPullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'messageLabel', 'messageText', @@ -11,10 +11,12 @@ Class { 'typeList', 'acceptBlock' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubAcceptPullRequestModel >> accept [ acceptBlock ifNotNil: [ @@ -22,13 +24,13 @@ IceGitHubAcceptPullRequestModel >> accept [ self closeWindow ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> availableTypes [ ^ #( 'merge' 'squash' 'rebase' ) ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> connectPresenters [ self typeList @@ -36,7 +38,7 @@ IceGitHubAcceptPullRequestModel >> connectPresenters [ selectItem: self defaultType ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubAcceptPullRequestModel >> defaultLayout [ ^ SpGridLayout new @@ -48,19 +50,19 @@ IceGitHubAcceptPullRequestModel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> defaultType [ ^ 'merge' ] -{ #category : #api } +{ #category : 'api' } IceGitHubAcceptPullRequestModel >> initialExtentForWindow [ ^ (600 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -71,7 +73,7 @@ IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresente presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> initializePresenters [ messageLabel := self newLabel. @@ -85,13 +87,13 @@ IceGitHubAcceptPullRequestModel >> initializePresenters [ typeLabel label: 'Merge type' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> message [ ^ self messageText text asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> messageGhostText [ ^ 'Commit title @@ -99,42 +101,42 @@ IceGitHubAcceptPullRequestModel >> messageGhostText [ Add an optional extented description' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> messageLabel [ ^ messageLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> messageText [ ^ messageText ] -{ #category : #events } +{ #category : 'events' } IceGitHubAcceptPullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubAcceptPullRequestModel >> titleForWindow [ ^ 'Accept pull request' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> type [ ^ self typeList selectedItem ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> typeLabel [ ^ typeLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> typeList [ ^ typeList diff --git a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st index 3aaad09ba9..b25a0b4725 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st @@ -2,34 +2,36 @@ I represent a common behavior for the actions of the GithubPlugin " Class { - #name : #IceGitHubAction, - #superclass : #IceTipAction, + #name : 'IceGitHubAction', + #superclass : 'IceTipAction', #instVars : [ 'credentials', 'remote', 'retries' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubAction class >> isAbstract [ ^ self == IceGitHubAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> credentials [ ^ credentials ifNil: [ credentials := self obtainCredentials ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubAction >> execute [ self withErrorHandlingDo: [ [[ self basicExecute ] on: IceAuthenticationError do: [ :e | @@ -40,34 +42,34 @@ IceGitHubAction >> execute [ self finishSuccess ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> github [ ^ IceGitHubAPI new credentials: self credentials; yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAction >> initialize [ retries := 3 ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> obtainCredentials [ ^ IceGitHubAPI obtainCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> remote: anObject [ remote := anObject ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> reportError: error [ | message | diff --git a/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st b/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st index ab3dbcd6c4..bd1f0039e2 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st @@ -2,17 +2,19 @@ I'm an error that happens when credentials are bad. " Class { - #name : #IceGitHubBadCredentialsError, - #superclass : #IceGitHubError, - #category : 'Iceberg-Plugin-GitHub-Model' + #name : 'IceGitHubBadCredentialsError', + #superclass : 'IceGitHubError', + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubBadCredentialsError class >> isAppropriateFor: aResponse [ ^ aResponse status = 401 ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubBadCredentialsError >> messageBody [ ^ 'Credentials provided are wrong' ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st index 73aa81a6df..347e57926c 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st @@ -3,24 +3,26 @@ I'm a generic command to perform plugin actions for GitHub. My children define the real behavior, and they need to implement #execute. " Class { - #name : #IceGitHubCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubCommand class >> isAbstract [ ^ self == IceGitHubCommand ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self remote url includesSubstring: 'github.com' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCommand >> remote [ ^ self subclassResponsibility diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st index 5407bc4e0e..56a27acda2 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st @@ -2,8 +2,8 @@ I'm a dialog to ask for data relevant to create a pull request. " Class { - #name : #IceGitHubCreatePullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubCreatePullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'repository', 'titleLabel', @@ -26,15 +26,17 @@ Class { 'titleTextInput', 'bodyText' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubCreatePullRequestModel class >> new [ self error: 'Use #repository:credentials:headRemote:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubCreatePullRequestModel class >> newApplication: anApplication repository: aRepository credentials: aCredentials @@ -48,13 +50,13 @@ IceGitHubCreatePullRequestModel class >> newApplication: anApplication yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel class >> titleSize [ ^ 80 ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubCreatePullRequestModel >> accept [ | title | @@ -72,14 +74,14 @@ IceGitHubCreatePullRequestModel >> accept [ self closeWindow ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> availableBranchNames [ ^ availableBranchNames ifNil: [ availableBranchNames := self obtainAvailableBranchNames ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> availableRemotes [ "Retrieves available remotes to perform the PR" @@ -87,40 +89,40 @@ IceGitHubCreatePullRequestModel >> availableRemotes [ availableRemotes := self obtainAvailableRemotes ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseBranchList [ ^ baseBranchList ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> baseBranchNames [ ^ self baseBranches collect: [ :each | each at: #name ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> baseBranches [ ^ baseBranches ifNil: [ baseBranches := self requestBaseBranches ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> baseDefaultBranchName [ ^ self gitBase at: #default_branch ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseForkList [ ^ baseForkList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseLabel [ ^ baseLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> baseRemote [ "This is the 'base' remote (the place where the repository is forked). This is used to suggest fork PR destination (base)" @@ -128,23 +130,23 @@ IceGitHubCreatePullRequestModel >> baseRemote [ ^ baseRemote ifNil: [ baseRemote := self obtainBaseRemote ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> bodyLabel [ ^ bodyLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> bodyPanel [ ^ bodyText ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> branch [ ^ self repository branch ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> createPullRequest [ ^ IceGitHubPullRequestDefinition new @@ -158,19 +160,19 @@ IceGitHubCreatePullRequestModel >> createPullRequest [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> credentials: aCredentials [ credentials := aCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> defaultBaseBranchName [ self hasParent ifFalse: [ ^ self baseDefaultBranchName ]. @@ -179,13 +181,13 @@ IceGitHubCreatePullRequestModel >> defaultBaseBranchName [ ifNone: [ self baseDefaultBranchName ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> defaultHeadBranchName [ ^ self branch shortname ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubCreatePullRequestModel >> defaultLayout [ ^ SpGridLayout new @@ -200,7 +202,7 @@ IceGitHubCreatePullRequestModel >> defaultLayout [ yourself ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> gitBase [ | json | @@ -208,47 +210,47 @@ IceGitHubCreatePullRequestModel >> gitBase [ ^ json at: #parent ifAbsent: [ json ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> gitRepositoryInfo [ ^ gitRepositoryInfo ifNil: [ gitRepositoryInfo := self requestGitRepositoryInfo ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> hasParent [ ^ self gitRepositoryInfo includesKey: #parent ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headBranchList [ ^ headBranchList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headForkList [ ^ headForkList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headLabel [ ^ headLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> headRemote [ ^ headRemote ifNil: [ self repository head upstream remote ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ aWindow @@ -259,7 +261,7 @@ IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializePresenters [ titleLabel := self newLabel label: 'Title'. @@ -280,7 +282,7 @@ IceGitHubCreatePullRequestModel >> initializePresenters [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializeRepository: aRepository credentials: aCredentials headRemote: aRemote [ repository := aRepository. @@ -289,13 +291,13 @@ IceGitHubCreatePullRequestModel >> initializeRepository: aRepository credentials self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> lastCommitMessage [ ^ lastCommitMessage ifNil: [ lastCommitMessage := self obtainLastCommitMessage ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainAvailableBranchNames [ ^ ((self repository allBranches collect: #shortname as: Set) @@ -305,7 +307,7 @@ IceGitHubCreatePullRequestModel >> obtainAvailableBranchNames [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainAvailableRemotes [ | remotes | @@ -316,7 +318,7 @@ IceGitHubCreatePullRequestModel >> obtainAvailableRemotes [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainBaseRemote [ | base sshUrl httpUrl | @@ -331,19 +333,19 @@ IceGitHubCreatePullRequestModel >> obtainBaseRemote [ yourself ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainLastCommitMessage [ ^ self branch commit comment ] -{ #category : #events } +{ #category : 'events' } IceGitHubCreatePullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> proposedComment [ | lines firstLine remainingLines | @@ -362,7 +364,7 @@ IceGitHubCreatePullRequestModel >> proposedComment [ separatedBy: [ stream cr ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> proposedTitle [ self lastCommitMessage linesDo: [ :eachLine | @@ -373,13 +375,13 @@ IceGitHubCreatePullRequestModel >> proposedTitle [ ^ '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> repository [ ^ repository ] -{ #category : #'private - request' } +{ #category : 'private - request' } IceGitHubCreatePullRequestModel >> requestBaseBranches [ ^ IceGitHubAPI new @@ -388,7 +390,7 @@ IceGitHubCreatePullRequestModel >> requestBaseBranches [ project: self baseRemote projectBasename ] -{ #category : #'private - request' } +{ #category : 'private - request' } IceGitHubCreatePullRequestModel >> requestGitRepositoryInfo [ | remote | @@ -398,25 +400,25 @@ IceGitHubCreatePullRequestModel >> requestGitRepositoryInfo [ getRepository: remote owner project: remote projectBasename ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubCreatePullRequestModel >> titleForWindow [ ^ 'New pull request' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> titleLabel [ ^ titleLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> titlePanel [ ^ titleTextInput ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> updatePresenter [ baseForkList diff --git a/Iceberg-Plugin-GitHub/IceGitHubError.class.st b/Iceberg-Plugin-GitHub/IceGitHubError.class.st index 4050f7bf0e..832ecbb444 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubError.class.st @@ -2,56 +2,58 @@ I'm an error that happens when something fails when performing a GitHub action. " Class { - #name : #IceGitHubError, - #superclass : #Error, + #name : 'IceGitHubError', + #superclass : 'Error', #instVars : [ 'response', 'jsonContents' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #private } +{ #category : 'private' } IceGitHubError class >> errorClassFor: aResponse [ ^ self allSubclasses detect: [ :each | each isAppropriateFor: aResponse ] ifNone: [ self ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubError class >> for: aResponse [ ^ (self errorClassFor: aResponse) new response: aResponse; yourself ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubError class >> isAppropriateFor: aResponse [ ^ false ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubError class >> signalFor: aResponse [ ^ (self for: aResponse) signal ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> code [ ^ self response status ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> contents [ ^ self response contents ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> customError: aDictionary [ ^ aDictionary at: #message ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> errorToString: aDictionary [ (aDictionary at: #code) = 'custom' ifTrue: [ ^ self customError: aDictionary ]. (aDictionary at: #code) = 'invalid' ifTrue: [ ^ self invalidError: aDictionary ]. @@ -59,20 +61,20 @@ IceGitHubError >> errorToString: aDictionary [ ^ self unknownError: aDictionary ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> invalidError: aDictionary [ ^ 'Invalid field: ', (aDictionary at: #field) ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> jsonContents [ ^ jsonContents ifNil: [ jsonContents := STON fromString: self contents ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> messageBody [ | errors | errors := self jsonContents at: #errors ifAbsent: [ ^ '' ]. @@ -82,22 +84,22 @@ IceGitHubError >> messageBody [ separatedBy: [ stream cr ] ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> messageText [ ^ self jsonContents at: #message ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> response [ ^ response ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> response: anObject [ response := anObject ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> unknownError: aDictionary [ ^ String streamContents: [ :stream | (aDictionary associations sorted: [ :a :b | a key < b key ]) diff --git a/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st b/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st index 88aa35a4c1..cc8e5ec297 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st @@ -2,12 +2,14 @@ I'm an error that happens when something went wrong on GitHub API operations. " Class { - #name : #IceGitHubGenericError, - #superclass : #IceGitHubError, - #category : 'Iceberg-Plugin-GitHub-Model' + #name : 'IceGitHubGenericError', + #superclass : 'IceGitHubError', + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubGenericError class >> isAppropriateFor: aResponse [ ^ aResponse status = 422 ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st b/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st index 679432db0c..379544f3ba 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st @@ -3,19 +3,21 @@ I'm a generic datasource to show in a table results of a JSON. I'm intended to be used to show information from GitHub API, but I'm generic enough to be used which any kind of JSON structure. " Class { - #name : #IceGitHubJSONDataSource, - #superclass : #FTSimpleDataSource, - #category : 'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubJSONDataSource', + #superclass : 'FTSimpleDataSource', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> actionColumn: column [ elements := elements sorted: [ :a :b | (a at: column id) < (b at: column id) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> cellColumn: column row: rowIndex [ ^ FTCellMorph new addMorphBack: ((self elementAt: rowIndex) at: column id) asStringMorph; @@ -23,12 +25,12 @@ IceGitHubJSONDataSource >> cellColumn: column row: rowIndex [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubJSONDataSource >> columnTitleFor: column [ ^ column id capitalized ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> headerColumn: column [ column id ifNil: [ ^ nil ]. diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st index 246c06412c..9af63050a6 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st @@ -1,28 +1,30 @@ Class { - #name : #IceGitHubNewBranchFromIssueCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewBranchFromIssueCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand class >> defaultName [ ^ 'Create new branch for issue...' ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand class >> defaultToolbarItemName [ ^ 'New issue' ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> canBeExecuted [ ^ self repositoryModel isNotNil ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewBranchFromIssueCommand >> execute [ (IceTipCheckoutBranchDialog on: self repositoryModel) @@ -30,13 +32,13 @@ IceGitHubNewBranchFromIssueCommand >> execute [ openDialog ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> iconName [ ^ #github ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st index 5e1ddfeea4..33ae0a516f 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st @@ -5,8 +5,8 @@ A GitHub issue will be created in the form: 123-a-github-issue " Class { - #name : #IceGitHubNewBranchFromIssuePanel, - #superclass : #IceTipCheckoutNewBranchPanel, + #name : 'IceGitHubNewBranchFromIssuePanel', + #superclass : 'IceTipCheckoutNewBranchPanel', #instVars : [ 'remotePanel', 'issueNumberText', @@ -18,10 +18,12 @@ Class { 'issueText', 'remoteLabel' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> branchName [ ^ '{1}-{2}' format: { @@ -29,13 +31,13 @@ IceGitHubNewBranchFromIssuePanel >> branchName [ issueText text trim }. ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubNewBranchFromIssuePanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -54,26 +56,26 @@ IceGitHubNewBranchFromIssuePanel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> icon [ ^ (self iconNamed: #github) scaledToSize: 16@16 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initialExtentForWindow [ ^ 800 @ 175 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initialize [ super initialize. fetched := false ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initializePresenters [ super initializePresenters. @@ -102,31 +104,31 @@ IceGitHubNewBranchFromIssuePanel >> initializePresenters [ issueNumberText whenTextChangedDo: [ :text | self validateIssue: text ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueLabel [ ^ issueLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueNumberText [ ^ issueNumberText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueText [ ^ issueText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> remotePanel [ ^ remotePanel ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> sanitizeTitle: aString [ | separators safeSeparator | @@ -140,7 +142,7 @@ IceGitHubNewBranchFromIssuePanel >> sanitizeTitle: aString [ c isAlphaNumeric ifTrue: [ str nextPut: c ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> selectRemoteModel [ ^ selectRemoteModel ifNil: [ @@ -149,43 +151,43 @@ IceGitHubNewBranchFromIssuePanel >> selectRemoteModel [ on: self model entity ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> titleForWindow [ ^ 'New branch from issue' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> unknownTitle [ ^ 'INVALID-ISSUE' ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> updateText: aString [ issueText text: aString. fetched := true ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> useRemote: aRemoteModel [ self selectRemoteModel useRemote: aRemoteModel ] -{ #category : #accessing } +{ #category : 'accessing' } 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 description: 'Please fetch a valid issue number' ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [ | number remote | @@ -213,7 +215,7 @@ IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [ self updateText: self unknownTitle ] ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> wait: time thenDo: aBlock [ "This method avoids to request too many times the github api. It does it in the simplest way possible: it starts a process that waits some diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st index 2a73c8c00a..46bb84e234 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st @@ -2,18 +2,20 @@ I'm an action to create a new pull request. " Class { - #name : #IceGitHubNewPullRequestAction, - #superclass : #IceGitHubAction, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewPullRequestAction', + #superclass : 'IceGitHubAction', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #private } +{ #category : 'private' } IceGitHubNewPullRequestAction >> askRemote: aRepository [ ^ aRepository remotes anyOne ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. @@ -37,7 +39,7 @@ IceGitHubNewPullRequestAction >> basicExecute [ open ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ [ | pullRequestDatas url | @@ -53,7 +55,7 @@ IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ do: [ :e | self reportError: e ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewPullRequestAction >> validateMakePullRequestOn: aRepository [ | status | diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st index 7e69b15818..d6edc030f8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to create a Pull Request " Class { - #name : #IceGitHubNewPullRequestCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewPullRequestCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubNewPullRequestCommand class >> defaultName [ ^ 'Create Pull Request...' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestCommand >> execute [ ^ IceGitHubNewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st b/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st index 3dbc4588c3..0909d8d9a3 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st @@ -5,32 +5,34 @@ Description I am a nil PR that can be used when the user has no PR to see. " Class { - #name : #IceGitHubNilPullRequest, - #superclass : #Object, - #category : 'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubNilPullRequest', + #superclass : 'Object', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> author [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> baseLabel [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> body [ ^ '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> headLabel [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> url [ ^ 'No PR selected' ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st index 46eff77942..567af5269e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st @@ -13,16 +13,18 @@ Internal Representation and Key Implementation Points. " Class { - #name : #IceGitHubOpenOnGithubAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubOpenOnGithubAction', + #superclass : 'IceGitHubAction', #instVars : [ 'organisation', 'projectName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubOpenOnGithubAction class >> organisation: aString projectName: anotherString [ ^ self new organisation: aString; @@ -30,7 +32,7 @@ IceGitHubOpenOnGithubAction class >> organisation: aString projectName: anotherS yourself ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubOpenOnGithubAction >> basicExecute [ [ @@ -59,22 +61,22 @@ IceGitHubOpenOnGithubAction >> basicExecute [ openModal ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> organisation [ ^ organisation ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> organisation: anObject [ organisation := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st index d57849f27a..aead585cd8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st @@ -5,18 +5,20 @@ Description I am a command opening the repository page of the remote on GitHub if possible. " Class { - #name : #IceGitHubOpenOnGithubCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubOpenOnGithubCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubOpenOnGithubCommand class >> defaultName [ ^ 'Open on github' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubOpenOnGithubCommand >> execute [ (IceGitHubOpenOnGithubAction diff --git a/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st b/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st index 478e659b62..d901aa0d09 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st @@ -6,18 +6,20 @@ It just add options to easily handle the creation of branchs with the ""conventi " Class { - #name : #IceGitHubPlugin, - #superclass : #IcePlugin, - #category : #'Iceberg-Plugin-GitHub-Core' + #name : 'IceGitHubPlugin', + #superclass : 'IcePlugin', + #category : 'Iceberg-Plugin-GitHub-Core', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubPlugin class >> isAvailableFor: aRepository [ ^ aRepository remotes anySatisfy: [ :each | each host = 'github.com' ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPlugin >> checkoutBranchPanelsOnModel: aRepositoryModel [ ^ { IceGitHubNewBranchFromIssuePanel on: aRepositoryModel } diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st index f817771784..606d1d5dc0 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st @@ -3,8 +3,8 @@ I'm a pull request from github API. I represent (more or less), what is described here: https://developer.github.com/v3/pulls/#list-pull-requests " Class { - #name : #IceGitHubPullRequest, - #superclass : #Object, + #name : 'IceGitHubPullRequest', + #superclass : 'Object', #instVars : [ 'repository', 'json', @@ -14,17 +14,19 @@ Class { 'status', 'remote' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubPullRequest class >> fromJSON: aDictionary [ ^ self basicNew initializeWithJSON: aDictionary; yourself ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> acceptMessage: messageString type: typeString [ IceGitHubAPI new acceptPullRequest: self owner @@ -41,7 +43,7 @@ IceGitHubPullRequest >> acceptMessage: messageString type: typeString [ #merge_method -> typeString } asDictionary ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> addComment: messageString [ IceGitHubAPI new addComment: self owner @@ -50,103 +52,103 @@ IceGitHubPullRequest >> addComment: messageString [ data: { #body -> messageString } asDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> author [ ^ (self jsonAt: 'user') at: 'login' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseCommit [ ^ repository commitAt: self baseSHA ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseLabel [ ^ (self jsonAt: #base) at: #label ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseSHA [ ^ (self jsonAt: #base) at: #sha ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> body [ ^ self jsonAt: #body ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> branch [ fetched ifFalse: [ self fetch ]. ^ branch ifNil: [ branch := self remote remoteBranchNamed: self headRef ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> branchName [ ^ self branch name ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> commits [ ^ self branch commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> detail [ ^ detail ifNil: [ detail := IceGitHubAPI new get: ((self jsonAt: #url) allButFirst: 23) ] ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> fetch [ ^ [ self remote fetch ] ensure: [ fetched := true ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headLabel [ ^ (self jsonAt: #head) at: #label ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headRef [ ^ (self jsonAt: #head) at: #ref ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headSHA [ ^ (self jsonAt: #head) at: #sha ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> htmlUrl [ ^ self jsonAt: #html_url ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequest >> initialize [ super initialize. fetched := false ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequest >> initializeWithJSON: aDictionary [ json := aDictionary. self initialize ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceGitHubPullRequest >> json [ ^ json ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceGitHubPullRequest >> jsonAt: aKey [ ^ self json at: aKey ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> mergeIntoWorkingCopy [ self repository ensureBranch: self branchName; @@ -154,12 +156,12 @@ IceGitHubPullRequest >> mergeIntoWorkingCopy [ self branch merge ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> number [ ^ self jsonAt: #number ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequest >> obtainRemote [ | remoteCandidate | @@ -175,17 +177,17 @@ IceGitHubPullRequest >> obtainRemote [ remoteCandidate ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> owner [ ^ (((self jsonAt: #base) at: #repo) at: #owner) at: #login ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> projectName [ ^ ((self jsonAt: #base) at: #repo) at: #name ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> rejectMessage: messageString [ messageString trimBoth ifNotEmpty: [ self addComment: messageString ]. @@ -196,40 +198,40 @@ IceGitHubPullRequest >> rejectMessage: messageString [ data: { #state -> #closed } asDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> remote [ ^ remote ifNil: [ remote := self obtainRemote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> repository: anObject [ repository := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> state [ ^ self jsonAt: #state ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> status [ ^ status ifNil: [ status := IceGitHubAPI new get: 'repos/', self owner, '/', self projectName, '/commits/', self headSHA, '/status' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> title [ ^ self jsonAt: #title ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> url [ ^ self jsonAt: #url ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st index 1bd7fed23a..d31145b524 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st @@ -4,19 +4,21 @@ I'm a datasource for pull request status, to be used when showing pull requests See IceGitHubPullRequestDetailModel " Class { - #name : #IceGitHubPullRequestDataSource, - #superclass : #IceGitHubJSONDataSource, - #category : #'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubPullRequestDataSource', + #superclass : 'IceGitHubJSONDataSource', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDataSource >> actionColumn: column [ column id = #target_url ifTrue: [ ^ self ]. ^ super actionColumn: column ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDataSource >> cellColumn: column row: rowIndex [ column id = #target_url ifTrue: [ ^ self targetUrlCellColumn: column rowIndex: rowIndex ]. column id = #state ifTrue: [ ^ self statusCellColumn: column rowIndex: rowIndex ]. @@ -24,13 +26,13 @@ IceGitHubPullRequestDataSource >> cellColumn: column row: rowIndex [ ^ super cellColumn: column row: rowIndex ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> columnTitleFor: column [ column id = #target_url ifTrue: [ ^ '' ]. ^ super columnTitleFor: column ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> contextCellColumn: column rowIndex: rowIndex [ | context | context := (self elementAt: rowIndex) at: column id. @@ -42,17 +44,17 @@ IceGitHubPullRequestDataSource >> contextCellColumn: column rowIndex: rowIndex [ ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequestDataSource >> copyToClipboard: url [ Clipboard clipboardText: url informing: ('Url {1} copied to clipboard' format: {url}) ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> iconForStatus: status [ ^ self iconNamed: (self iconNameForStatus: status) ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> iconNameForStatus: status [ status = 'success' ifTrue: [ ^ #testGreen ]. status = 'failure' ifTrue: [ ^ #testRed ]. @@ -61,7 +63,7 @@ IceGitHubPullRequestDataSource >> iconNameForStatus: status [ ^ #testNotRun ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> statusCellColumn: column rowIndex: rowIndex [ | status | status := (self elementAt: rowIndex) at: column id. @@ -73,7 +75,7 @@ IceGitHubPullRequestDataSource >> statusCellColumn: column rowIndex: rowIndex [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> targetUrlCellColumn: column rowIndex: rowIndex [ | url | url := (self elementAt: rowIndex) at: column id. diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st index b4d31af781..f4367e908b 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st @@ -3,8 +3,8 @@ I am a pull request. I can be sent using ==#sendWithCredentials:== protocol. " Class { - #name : #IceGitHubPullRequestDefinition, - #superclass : #Object, + #name : 'IceGitHubPullRequestDefinition', + #superclass : 'Object', #instVars : [ 'credentials', 'title', @@ -14,70 +14,72 @@ Class { 'headBranchName', 'body' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseBranchName [ ^ baseBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseBranchName: anObject [ baseBranchName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseRemote [ ^ baseRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseRemote: anObject [ baseRemote := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> body [ ^ body ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> body: anObject [ body := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> credentials: anObject [ credentials := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headBranchName [ ^ headBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headBranchName: anObject [ headBranchName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headRemote [ ^ headRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headRemote: anObject [ headRemote := anObject ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequestDefinition >> send [ | pullRequestData | @@ -95,12 +97,12 @@ IceGitHubPullRequestDefinition >> send [ data: pullRequestData ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> title [ ^ title ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> title: anObject [ title := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st index d7ba4b97bc..2c08055388 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st @@ -2,8 +2,8 @@ I'm a spec model to present a detailed view of a Pull Request. " Class { - #name : #IceGitHubPullRequestDetailModel, - #superclass : #SpPresenter, + #name : 'IceGitHubPullRequestDetailModel', + #superclass : 'SpPresenter', #instVars : [ 'urlLabel', 'urlText', @@ -24,10 +24,12 @@ Class { 'statusIcon', 'scheduler' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntance forRoot: rootCommandGroup [ rootCommandGroup register: @@ -35,27 +37,27 @@ IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntanc register: IceTipOpenCheckUrlCommand forSpec) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> authorLabel [ ^ authorLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> authorText [ ^ authorText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> bodyText [ ^ bodyText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> checksTable [ ^ checksTable ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubPullRequestDetailModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -88,23 +90,23 @@ IceGitHubPullRequestDetailModel >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> fromLabel [ ^ fromLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> fromText [ ^ fromText ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> iconForMergeable: mergeable [ mergeable = true ifTrue: [ ^ self iconNamed: #smallOk ]. ^ self iconNamed: #smallCancel ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> iconForStatus: status [ status = 'success' ifTrue: [ ^ self iconNamed: #testGreen ]. status = 'failure' ifTrue: [ ^ self iconNamed: #testRed ]. @@ -113,7 +115,7 @@ IceGitHubPullRequestDetailModel >> iconForStatus: status [ ^ self iconNamed: #testNotRun ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequestDetailModel >> initializePresenters [ urlLabel := self newLabel label: 'Url'. @@ -139,17 +141,17 @@ IceGitHubPullRequestDetailModel >> initializePresenters [ addStyle: 'iceTipReadonly' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> mergeableLabel [ ^ mergeableLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> mergeableMessage [ ^ mergeableMessage ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceGitHubPullRequestDetailModel >> newChecksTable [ ^ self newTable @@ -173,19 +175,19 @@ IceGitHubPullRequestDetailModel >> newChecksTable [ contextMenu: [ (self rootCommandsGroup / 'checks commands') beRoot asMenuPresenter ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDetailModel >> pullRequest [ ^ pullRequest ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDetailModel >> pullRequest: aPullRequest [ pullRequest := aPullRequest. self updatePresenter ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> retrieveDetail [ self mergeableMessage text: (self mergeableMessage text , ' Loading...' ). @@ -202,7 +204,7 @@ IceGitHubPullRequestDetailModel >> retrieveDetail [ mergeableIcon image: ( self iconForMergeable: mergeable) ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> retrieveStatuses [ " self statusPanel widget addMorphBack: 'Loading...' asMorph." self statusMessage text: (statusMessage text , ' Loading...'). @@ -222,13 +224,13 @@ IceGitHubPullRequestDetailModel >> retrieveStatuses [ checksTable defer: [ checksTable items:(statuses ) ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> schedule: aBlock [ self scheduler schedule: aBlock ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> scheduler [ ^ scheduler ifNil: [ @@ -238,22 +240,22 @@ IceGitHubPullRequestDetailModel >> scheduler [ yourself ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusIcon [ ^ statusIcon ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusLabel [ ^ statusLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusMessage [ ^ statusMessage ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> textForMergeable: mergeable [ mergeable = true ifTrue: [ ^ 'Yes' ]. @@ -263,17 +265,17 @@ IceGitHubPullRequestDetailModel >> textForMergeable: mergeable [ ifNil: [ 'Unknown' ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> toLabel [ ^ toLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> toText [ ^ toText ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequestDetailModel >> updatePresenter [ self pullRequest ifNil: [ ^ self ]. @@ -287,12 +289,12 @@ IceGitHubPullRequestDetailModel >> updatePresenter [ self retrieveDetail ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> urlLabel [ ^ urlLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> urlText [ ^ urlText ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st index c8657444fe..29d86d03e1 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st @@ -2,18 +2,20 @@ I'm a dialog to collect data about a pull request rejection. " Class { - #name : #IceGitHubRejectPullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubRejectPullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'messageLabel', 'messageText', 'acceptButton', 'acceptBlock' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubRejectPullRequestModel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ]. @@ -21,19 +23,19 @@ IceGitHubRejectPullRequestModel >> accept [ self closeWindow ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> acceptButton [ ^ acceptButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> availableTypes [ ^ #( 'merge' 'squash' 'rebase' ) ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubRejectPullRequestModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -44,19 +46,19 @@ IceGitHubRejectPullRequestModel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> defaultType [ ^ 'merge' ] -{ #category : #api } +{ #category : 'api' } IceGitHubRejectPullRequestModel >> initialExtentForWindow [ ^ (500 @ 250) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -68,7 +70,7 @@ IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresente presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRejectPullRequestModel >> initializePresenters [ super initializePresenters. @@ -84,13 +86,13 @@ IceGitHubRejectPullRequestModel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> message [ ^ self messageText text asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> messageGhostText [ ^ 'Commit title @@ -98,25 +100,25 @@ IceGitHubRejectPullRequestModel >> messageGhostText [ Add an optional extented description' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> messageLabel [ ^ messageLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> messageText [ ^ messageText ] -{ #category : #events } +{ #category : 'events' } IceGitHubRejectPullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubRejectPullRequestModel >> titleForWindow [ ^ 'Reject pull request' diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st index 9ac0aba650..c20a2f536e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st @@ -2,39 +2,41 @@ I represent the commands that execute on certain repository's remote. " Class { - #name : #IceGitHubRemoteCommand, - #superclass : #IceGitHubCommand, + #name : 'IceGitHubRemoteCommand', + #superclass : 'IceGitHubCommand', #instVars : [ 'remoteModel' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubRemoteCommand class >> isAbstract [ ^ self == IceGitHubRemoteCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remote [ ^ self remoteModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remoteModel [ ^ remoteModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remoteModel: aModel [ remoteModel := aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> repositoryModel [ ^ self remoteModel repositoryModel diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st index 9ba9896429..854ba15eab 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st @@ -2,16 +2,18 @@ I'm an action to remove branches from remotes. " Class { - #name : #IceGitHubRemoveBranchesAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubRemoveBranchesAction', + #superclass : 'IceGitHubAction', #instVars : [ 'branches', 'branchesByName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceGitHubRemoveBranchesAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. UIManager default @@ -27,7 +29,7 @@ IceGitHubRemoveBranchesAction >> basicExecute [ open ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> cacheAllBranches [ self remoteBranches do: [ :each | | branchName | branchName := each at: 'name'. @@ -36,23 +38,23 @@ IceGitHubRemoveBranchesAction >> cacheAllBranches [ ifAbsentPut: [ self remoteBranch: branchName ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesAction >> initialize [ super initialize. branchesByName := OrderedDictionary new ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> remoteBranch: aName [ ^ self requestRemoteBranch: aName ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> remoteBranches [ ^ branches ifNil: [ branches := self requestRemoteBranches ] ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesAction >> removeBranch: json [ | branchName | @@ -67,14 +69,14 @@ IceGitHubRemoveBranchesAction >> removeBranch: json [ openModal ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesAction >> removeBranches: aCollection [ [ aCollection do: [ :each | self removeBranch: each ] ] on: IceGitHubError do: [ :e | self reportError: e ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> requestRemoteBranch: aName [ ^ IceGitHubAPI new getBranch: self remote owner @@ -82,7 +84,7 @@ IceGitHubRemoveBranchesAction >> requestRemoteBranch: aName [ name: aName ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> requestRemoteBranches [ ^ IceGitHubAPI new getBranches: self remote owner diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st index 8cf7f2ef0c..f9bac67a31 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st @@ -2,18 +2,20 @@ I'm a command to remove branches from remotes. " Class { - #name : #IceGitHubRemoveBranchesCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubRemoveBranchesCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubRemoveBranchesCommand class >> defaultName [ ^ 'Remove Branches...' ] -{ #category : #execute } +{ #category : 'execute' } IceGitHubRemoveBranchesCommand >> execute [ ^ IceGitHubRemoveBranchesAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st index 6a03ad61ad..fc8e1b1965 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st @@ -2,8 +2,8 @@ I'm a dialog to select a list of anything (used by branches now). " Class { - #name : #IceGitHubRemoveBranchesModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubRemoveBranchesModel', + #superclass : 'IceTipPresenter', #instVars : [ 'selectedItems', 'listPanel', @@ -11,17 +11,19 @@ Class { 'displayBlock', 'remote' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesModel >> confirmSelection [ acceptBlock ifNotNil: [ acceptBlock value: selectedItems ]. self closeWindow ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubRemoveBranchesModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -30,26 +32,26 @@ IceGitHubRemoveBranchesModel >> defaultLayout [ yourself ] -{ #category : #api } +{ #category : 'api' } IceGitHubRemoveBranchesModel >> displayBlock: aBlock [ displayBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initialExtentForWindow [ ^ 550 @ 500 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initialize [ selectedItems := Set new. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -61,7 +63,7 @@ IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initializePresenters [ listPanel := self newTable. @@ -76,37 +78,37 @@ IceGitHubRemoveBranchesModel >> initializePresenters [ addColumn: (SpStringTableColumn evaluated: [ :branch | self timeSinceLastCommit: branch ]) ] -{ #category : #api } +{ #category : 'api' } IceGitHubRemoveBranchesModel >> items: aCollection [ self listPanel items: aCollection ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRemoveBranchesModel >> listPanel [ ^ listPanel ] -{ #category : #events } +{ #category : 'events' } IceGitHubRemoveBranchesModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> remote: anObject [ remote := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> timeSinceLastCommit: branch [ | lastCommitDate | @@ -115,14 +117,14 @@ IceGitHubRemoveBranchesModel >> timeSinceLastCommit: branch [ ^ '{1} days' format: {(Date today - lastCommitDate) days} ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> titleForWindow [ ^ 'Select branches to remove on remote {1}' format: { self remote name } ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesModel >> triggerAcceptAction [ acceptBlock ifNil: [ ^ self ]. diff --git a/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st b/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st index 98bc78b454..6c88298b43 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st @@ -2,52 +2,54 @@ I'm a helper to keep selected items in a list. " Class { - #name : #IceGitHubSelectItem, - #superclass : #Object, + #name : 'IceGitHubSelectItem', + #superclass : 'Object', #instVars : [ 'list', 'item' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubSelectItem class >> list: selectedItems item: anObject [ ^ self basicNew initializeList: selectedItems item: anObject; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubSelectItem class >> new [ self error: 'Use #list:item:' ] -{ #category : #private } +{ #category : 'private' } IceGitHubSelectItem >> addItem [ (list includes: item) ifTrue: [ ^ self ]. list add: item ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubSelectItem >> initializeList: aCollection item: anObject [ list := aCollection. item := anObject. self initialize ] -{ #category : #private } +{ #category : 'private' } IceGitHubSelectItem >> removeItem [ (list includes: item) ifFalse: [ ^ self ]. list remove: item ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubSelectItem >> value [ ^ list includes: item ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubSelectItem >> value: aBoolean [ aBoolean ifTrue: [ self addItem ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st index 6b69f7f713..dae041341e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st @@ -8,8 +8,8 @@ I display the list of commits of the PR for review, allow the user to merge the " Class { - #name : #IceGitHubTipPullRequestBrowser, - #superclass : #IceTipBrowser, + #name : 'IceGitHubTipPullRequestBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'repositoryModel', 'pullRequest', @@ -20,22 +20,24 @@ Class { 'acceptButton', 'rejectButton' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceGitHubTipPullRequestBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceGitHubTipPullRequestBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubTipPullRequestBrowser class >> newApplication: app model: aModel pullRequest: aPullRequest [ ^ self basicNew @@ -46,19 +48,19 @@ IceGitHubTipPullRequestBrowser class >> newApplication: app model: aModel pullRe yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser class >> taskbarIconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> acceptButton [ ^ acceptButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> acceptPullRequest [ IceGitHubAcceptPullRequestModel new @@ -69,19 +71,19 @@ IceGitHubTipPullRequestBrowser >> acceptPullRequest [ open ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> commitLabel [ ^ commitLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> commits [ ^ commits ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> connectPresenters [ super connectPresenters. @@ -93,7 +95,7 @@ IceGitHubTipPullRequestBrowser >> connectPresenters [ rejectButton action: [ self rejectPullRequest ] ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubTipPullRequestBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -112,19 +114,19 @@ IceGitHubTipPullRequestBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> diff [ ^ diff ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initialExtentForWindow [ ^ (1050 @ 800) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializeCommitsTable [ | textStylingBlock | @@ -165,14 +167,14 @@ IceGitHubTipPullRequestBrowser >> initializeCommitsTable [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializeDiff [ diff beForMerge. ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializePresenters [ super initializePresenters. @@ -201,20 +203,20 @@ IceGitHubTipPullRequestBrowser >> initializePresenters [ icon: (self iconNamed: #testRed) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commits ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> mergeButton [ ^ mergeButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> mergePullRequestIntoImage [ (self confirm: @@ -226,17 +228,17 @@ IceGitHubTipPullRequestBrowser >> mergePullRequestIntoImage [ self pullRequest mergeIntoWorkingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> pullRequest [ ^ pullRequest ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> pullRequest: anObject [ pullRequest := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> refresh [ | commitModels | @@ -250,13 +252,13 @@ IceGitHubTipPullRequestBrowser >> refresh [ commits items: commitModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> rejectButton [ ^ rejectButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> rejectPullRequest [ ((IceGitHubRejectPullRequestModel newApplication: self application) @@ -269,30 +271,30 @@ IceGitHubTipPullRequestBrowser >> rejectPullRequest [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> setModelBeforeInitialization: aModel [ self repositoryModel: aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> titleForWindow [ ^ 'Browsing pull request: #{1} {2}' format: { self pullRequest number. self pullRequest title } ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st index 678fa7d9e0..ea12946868 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st @@ -2,42 +2,44 @@ I represent all the Github commands that work on a Tree item " Class { - #name : #IceGitHubTreeCommand, - #superclass : #IceGitHubCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeCommand', + #superclass : 'IceGitHubCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand class >> isAbstract [ ^ self == IceGitHubTreeCommand ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnBranch: anIceTipTreeBranch [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnTag: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> canBeExecuted [ ^ self item notNil and: [(self item canActivateCommand: self) and: [super canBeExecuted]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTreeCommand >> remote [ ^ self item model entity diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st index 705319f26e..843332c918 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to create a Pull Request " Class { - #name : #IceGitHubTreeNewPullRequestCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeNewPullRequestCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeNewPullRequestCommand class >> defaultName [ ^ 'New Pull Request' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeNewPullRequestCommand >> execute [ ^ IceGitHubNewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st index ab78eb0052..5d9b54362a 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st @@ -5,18 +5,20 @@ Description I am a command opening the repository page of the remote on GitHub if possible. " Class { - #name : #IceGitHubTreeOpenOnGithubCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeOpenOnGithubCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeOpenOnGithubCommand class >> defaultName [ ^ 'Open on github' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeOpenOnGithubCommand >> execute [ (IceGitHubOpenOnGithubAction diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st index 8118e2f7c9..d657e71447 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st @@ -2,18 +2,20 @@ I'm a command to remove branches from remotes. " Class { - #name : #IceGitHubTreeRemoveBranchesCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeRemoveBranchesCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeRemoveBranchesCommand class >> defaultName [ ^ 'Remove Remote Branches' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeRemoveBranchesCommand >> execute [ ^ IceGitHubRemoveBranchesAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st index a8d2ed51fc..7917530343 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to show the pull request review browser. " Class { - #name : #IceGitHubTreeViewPullRequestCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeViewPullRequestCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeViewPullRequestCommand class >> defaultName [ ^ 'View Pull Requests' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeViewPullRequestCommand >> execute [ ^ IceGitHubViewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st index de680c2d32..2a0627cf35 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st @@ -2,12 +2,14 @@ I'm an action to view the open pull Requests. " Class { - #name : #IceGitHubViewPullRequestAction, - #superclass : #IceGitHubAction, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubViewPullRequestAction', + #superclass : 'IceGitHubAction', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceGitHubViewPullRequestAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st index b3e2fa4f79..1cd03b3202 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceGitHubViewPullRequestOnGithubAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubViewPullRequestOnGithubAction', + #superclass : 'IceGitHubAction', #instVars : [ 'organisation', 'projectName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubViewPullRequestOnGithubAction class >> organisation: aString projectName: anotherString [ ^ self new organisation: aString; @@ -16,7 +18,7 @@ IceGitHubViewPullRequestOnGithubAction class >> organisation: aString projectNam yourself ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubViewPullRequestOnGithubAction >> basicExecute [ [ @@ -45,22 +47,22 @@ IceGitHubViewPullRequestOnGithubAction >> basicExecute [ openModal ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> organisation [ ^ organisation ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> organisation: anObject [ organisation := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st index 4568ca6e71..49c03821a8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st @@ -2,18 +2,20 @@ I'm a command to show the pull request review browser. " Class { - #name : #IceGitHubViewPullRequestsCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubViewPullRequestsCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubViewPullRequestsCommand class >> defaultName [ ^ 'View Pull Requests...' ] -{ #category : #execute } +{ #category : 'execute' } IceGitHubViewPullRequestsCommand >> execute [ ^ IceGitHubViewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st b/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st index 4f213015f8..4a9a9a1e1b 100644 --- a/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceHttpsProtocol } +Extension { #name : 'IceHttpsProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceHttpsProtocol class >> githubRequestUrlKey [ ^ #'clone_url' diff --git a/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st b/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st index 7ab271db48..6b4cd0e304 100644 --- a/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextCredentials } +Extension { #name : 'IcePlaintextCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IcePlaintextCredentials >> applyToRequest: aRequest [ aRequest username: self username password: self password diff --git a/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st b/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st index 303dc4c0ea..97d3a6f9c7 100644 --- a/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextOtpCredentials } +Extension { #name : 'IcePlaintextOtpCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IcePlaintextOtpCredentials >> applyToRequest: aRequest [ super applyToRequest: aRequest. self token ifNotNil: [:aToken | diff --git a/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st b/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st index e1416b318b..2123bca7a7 100644 --- a/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceSSHProtocol } +Extension { #name : 'IceSSHProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceSSHProtocol class >> githubRequestUrlKey [ ^ #'ssh_url' diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st index 4516b774f3..9817279f26 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st @@ -14,23 +14,25 @@ Internal Representation and Key Implementation Points. " Class { - #name : #IceTipGitHubPullRequestListBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipGitHubPullRequestListBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'remote', 'pullRequests', 'details' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceTipGitHubPullRequestListBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipRefreshPullRequestsCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipGitHubPullRequestListBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -41,19 +43,19 @@ IceTipGitHubPullRequestListBrowser class >> buildSelectionCommandGroupWith: pres ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipGitHubPullRequestListBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser class >> taskbarIconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> connectPresenters [ super connectPresenters. @@ -65,7 +67,7 @@ IceTipGitHubPullRequestListBrowser >> connectPresenters [ ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitHubPullRequestListBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -75,13 +77,13 @@ IceTipGitHubPullRequestListBrowser >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> details [ ^ details ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> fetchPullRequests [ ^ (IceGitHubAPI new @@ -92,13 +94,13 @@ IceTipGitHubPullRequestListBrowser >> fetchPullRequests [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initialExtentForWindow [ ^ (700 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initializePresenters [ super initializePresenters. @@ -109,7 +111,7 @@ IceTipGitHubPullRequestListBrowser >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initializePullRequestsTable [ pullRequests @@ -140,19 +142,19 @@ IceTipGitHubPullRequestListBrowser >> initializePullRequestsTable [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitHubPullRequestListBrowser >> mainList [ ^ pullRequests ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> pullRequests [ ^ pullRequests ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitHubPullRequestListBrowser >> refreshPullRequests [ self pullRequests @@ -161,44 +163,44 @@ IceTipGitHubPullRequestListBrowser >> refreshPullRequests [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> remote: aRemote [ remote := aRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> repository [ ^ model ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> strongSelection: aSelection [ self viewPullRequest: aSelection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> titleForWindow [ ^ 'Pull requests on {1} ({2})' format: { self remote name. self remote url } ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> updateSelectedPullRequest: aSpSingleSelectionMode [ aSpSingleSelectionMode isEmpty ifFalse: [ self details pullRequest: aSpSingleSelectionMode selectedItem ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitHubPullRequestListBrowser >> viewPullRequest: aPullRequest [ UIManager default diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st index f0555f5701..8979de690d 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st @@ -3,24 +3,26 @@ I'm a presenter to define a new remote repository from a GitHub repository (owne " Class { - #name : #IceTipGitHubRepositoryPanel, - #superclass : #IceTipGitProviderRepositoryPanel, - #category : #'Iceberg-Plugin-GitHub-View' + #name : 'IceTipGitHubRepositoryPanel', + #superclass : 'IceTipGitProviderRepositoryPanel', + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel class >> order [ ^ 100 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> configureBuilder: aBuilder [ aBuilder beGithub ] -{ #category : #'querying - github' } +{ #category : 'querying - github' } IceTipGitHubRepositoryPanel >> getGitHubRepository [ ^ [ [ IceGitHubAPI new @@ -36,13 +38,13 @@ IceTipGitHubRepositoryPanel >> getGitHubRepository [ error pass ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubRepositoryPanel >> iconForWindow [ ^ (self iconNamed: #github) lighter: 0.50 "just to be sure is visible in all themes" ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> newRepository [ | newRepository | @@ -64,13 +66,13 @@ IceTipGitHubRepositoryPanel >> newRepository [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> providerName [ ^ 'GitHub' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubRepositoryPanel >> titleForWindow [ ^ 'Clone from github.com' diff --git a/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st index 4b77df36d1..b13fe12178 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st @@ -3,24 +3,26 @@ I'm a command to open in the native web browser the detail of a GitHub Pull Requ " Class { - #name : #IceTipOpenCheckUrlCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-View' + #name : 'IceTipOpenCheckUrlCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenCheckUrlCommand class >> defaultDescription [ ^ 'Open a internet browser to look for the url of the check' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenCheckUrlCommand class >> defaultName [ ^ 'Open url' ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenCheckUrlCommand >> execute [ "Execute the actions that should be done by the command. This method expect that the context has been put in #context inst.var. if any context is relevant." @@ -29,7 +31,7 @@ IceTipOpenCheckUrlCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenCheckUrlCommand >> targetUrl [ ^ self context checksTable selection selectedItem at: 'target_url' diff --git a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st index 487e8524a6..c6271c0e94 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st @@ -5,36 +5,38 @@ Description I am a simple command to open the PR review tool. " Class { - #name : #IceTipOpenGitHubPullRequestCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipOpenGitHubPullRequestCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestCommand class >> defaultDescription [ ^ 'Open the Pull Request review tool' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestCommand class >> defaultName [ ^ 'Review pull request' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenGitHubPullRequestCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenGitHubPullRequestCommand >> execute [ self tool viewPullRequest: self item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenGitHubPullRequestCommand >> iconName [ ^ #smallFind diff --git a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st index 8c3107e3c1..8a98bfd62c 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st @@ -1,28 +1,30 @@ Class { - #name : #IceTipOpenGitHubPullRequestInBrowserCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipOpenGitHubPullRequestInBrowserCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestInBrowserCommand class >> defaultDescription [ ^ 'Open the Pull Request in your default web browser' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestInBrowserCommand class >> defaultName [ ^ 'Open pull request in GitHub.com' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenGitHubPullRequestInBrowserCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenGitHubPullRequestInBrowserCommand >> execute [ WebBrowser openOn: self item htmlUrl diff --git a/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st b/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st index 8496430a9b..d38b01d222 100644 --- a/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st @@ -5,24 +5,26 @@ Description I am a simple command to refresh the content of the github pull requests browser " Class { - #name : #IceTipRefreshPullRequestsCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipRefreshPullRequestsCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand class >> defaultDescription [ ^ 'Refresh the pull requests availables' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand class >> defaultName [ ^ 'Refresh' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRefreshPullRequestsCommand >> execute [ UIManager default @@ -30,13 +32,13 @@ IceTipRefreshPullRequestsCommand >> execute [ during: [ self tool refreshPullRequests ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand >> iconName [ ^ #glamorousRefresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st b/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st index d5b825e97e..b7a9c95210 100644 --- a/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st +++ b/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTipRepositoriesBrowser } +Extension { #name : 'IceTipRepositoriesBrowser' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubCommandsWith: presenter forRootGroup: aCommandGroup [ @@ -34,7 +34,7 @@ IceTipRepositoriesBrowser class >> githubCommandsWith: presenter forRootGroup: a ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRootGroup: aCommandGroup [ | thisRemoteGroup | @@ -54,7 +54,7 @@ IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRoo ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRootGroup: aCommandGroup context: aPresenter [ | thisRemoteGroup | diff --git a/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st b/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st index 65215bb52e..7fd0036bed 100644 --- a/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTokenCredentials } +Extension { #name : 'IceTokenCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> applyToRequest: aRequest [ token ifNil: [ ^ self ]. @@ -10,13 +10,13 @@ IceTokenCredentials >> applyToRequest: aRequest [ put: self authorizationHeaderValue ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> authorizationHeaderKey [ ^ 'Authorization' ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> authorizationHeaderValue [ ^ 'Bearer ' , token diff --git a/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st b/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st index 25f8d7bcfa..0ba4c281cd 100644 --- a/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceUrlProtocol } +Extension { #name : 'IceUrlProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceUrlProtocol class >> githubRequestUrlKey [ "Return the key used in github REST responses to get the URL with the correct protocol" self subclassResponsibility diff --git a/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st b/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st index ac14d56d9d..912f1b6c53 100644 --- a/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st +++ b/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginGitHub, - #superclass : #PackageManifest, - #category : 'Iceberg-Plugin-GitHub-Manifest' + #name : 'ManifestIcebergPluginGitHub', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-GitHub-Manifest', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergPluginGitHub class >> description [ ^ 'I contains a plugin to ease the integration of Iceberg with GitHub''s services. diff --git a/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st b/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st index f46ec689e8..62a0d92b40 100644 --- a/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st +++ b/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MorphicUIManager } +Extension { #name : 'MorphicUIManager' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } MorphicUIManager >> inform: aStringOrText actionOnClick: aBlock [ "Display a message for the user to read and then dismiss. When clicked, execute an action." diff --git a/Iceberg-Plugin-GitHub/UIManager.extension.st b/Iceberg-Plugin-GitHub/UIManager.extension.st index a067943440..55b5c9d88d 100644 --- a/Iceberg-Plugin-GitHub/UIManager.extension.st +++ b/Iceberg-Plugin-GitHub/UIManager.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #UIManager } +Extension { #name : 'UIManager' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } UIManager >> inform: aString actionOnClick: aBlock [ "Only the MorphicUIManager should make the growl clickable." diff --git a/Iceberg-Plugin-GitHub/package.st b/Iceberg-Plugin-GitHub/package.st index 109b2a8251..bd2c1112e1 100644 --- a/Iceberg-Plugin-GitHub/package.st +++ b/Iceberg-Plugin-GitHub/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-GitHub' } +Package { #name : 'Iceberg-Plugin-GitHub' } diff --git a/Iceberg-TipUI/Clipboard.extension.st b/Iceberg-TipUI/Clipboard.extension.st index c811d6fe5c..21ac6f2c76 100644 --- a/Iceberg-TipUI/Clipboard.extension.st +++ b/Iceberg-TipUI/Clipboard.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Clipboard } +Extension { #name : 'Clipboard' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } Clipboard class >> clipboardText: aText informing: aString [ UIManager inform: aString. ^ self clipboardText: aText diff --git a/Iceberg-TipUI/CmCommandGroup.extension.st b/Iceberg-TipUI/CmCommandGroup.extension.st index 6f36bc0b04..37988d8338 100644 --- a/Iceberg-TipUI/CmCommandGroup.extension.st +++ b/Iceberg-TipUI/CmCommandGroup.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroup } +Extension { #name : 'CmCommandGroup' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroup >> commandOrGroupNamed: aString ifFound: aBlock [ ^ entries diff --git a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st index 8ef6886348..306bf40201 100644 --- a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st +++ b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroupDecorator } +Extension { #name : 'CmCommandGroupDecorator' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroupDecorator >> commandOrGroupNamed: aString ifFound: aBlock [ ^ self decoratedGroup commandOrGroupNamed: aString ifFound: aBlock diff --git a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st index f356aa3469..b0c6cb73fc 100644 --- a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st +++ b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUICommandDisplayStrategy } +Extension { #name : 'CmUICommandDisplayStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUICommandDisplayStrategy >> ifVisible: aCmSpecCommand do: aBlock [ self subclassResponsibility diff --git a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st index 7f1636c79c..a9fb4ab426 100644 --- a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIDisableWhenCantBeRun } +Extension { #name : 'CmUIDisableWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIDisableWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Always visible" diff --git a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st index ff2501af9c..aad5f38218 100644 --- a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIHideWhenCantBeRun } +Extension { #name : 'CmUIHideWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIHideWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Visible if #canBeExecuted" diff --git a/Iceberg-TipUI/FTBasicItem.extension.st b/Iceberg-TipUI/FTBasicItem.extension.st index 889a7a7367..d4e904d427 100644 --- a/Iceberg-TipUI/FTBasicItem.extension.st +++ b/Iceberg-TipUI/FTBasicItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTBasicItem } +Extension { #name : 'FTBasicItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTBasicItem >> toggle [ self isExpanded ifTrue: [ self collapseAndRefresh ] diff --git a/Iceberg-TipUI/FTRootItem.extension.st b/Iceberg-TipUI/FTRootItem.extension.st index 95874a9068..7aa97b2e24 100644 --- a/Iceberg-TipUI/FTRootItem.extension.st +++ b/Iceberg-TipUI/FTRootItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTRootItem } +Extension { #name : 'FTRootItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTRootItem >> isRoot [ ^ true ] diff --git a/Iceberg-TipUI/FTTableMorph.extension.st b/Iceberg-TipUI/FTTableMorph.extension.st index b5f26040a5..9d329d59d1 100644 --- a/Iceberg-TipUI/FTTableMorph.extension.st +++ b/Iceberg-TipUI/FTTableMorph.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTableMorph } +Extension { #name : 'FTTableMorph' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> selectFirstVisibleRow [ ^ self selectIndex: @@ -9,7 +9,7 @@ FTTableMorph >> selectFirstVisibleRow [ ifEmpty: [ 0 ]) ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> useFunction: aFilterFunctionClass do: aBlock [ function := aFilterFunctionClass table: self. aBlock cull: function cull: self diff --git a/Iceberg-TipUI/FTTreeItem.extension.st b/Iceberg-TipUI/FTTreeItem.extension.st index 252972c9d7..9f7286ecfd 100644 --- a/Iceberg-TipUI/FTTreeItem.extension.st +++ b/Iceberg-TipUI/FTTreeItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTreeItem } +Extension { #name : 'FTTreeItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTreeItem >> isRoot [ ^ false ] diff --git a/Iceberg-TipUI/IceAbstractCredentials.extension.st b/Iceberg-TipUI/IceAbstractCredentials.extension.st index 533cab5b40..c305485223 100644 --- a/Iceberg-TipUI/IceAbstractCredentials.extension.st +++ b/Iceberg-TipUI/IceAbstractCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceAbstractCredentials } +Extension { #name : 'IceAbstractCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> askForModelClass [ ^ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> editModelClass [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceAddition.extension.st b/Iceberg-TipUI/IceAddition.extension.st index 37dc983ddf..c38ab65190 100644 --- a/Iceberg-TipUI/IceAddition.extension.st +++ b/Iceberg-TipUI/IceAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceAddition } +Extension { #name : 'IceAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAddition >> icon [ ^ self iconNamed: #changeAdd diff --git a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st index 0771c4e508..d26a6bad1f 100644 --- a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAllPackages } +Extension { #name : 'IceCheckoutAllPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAllPackages class >> description [ ^ 'Checkout ALL packages in the repository' ] diff --git a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st index e08c84d409..5b4216bc8f 100644 --- a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAlreadyLoadedPackages } +Extension { #name : 'IceCheckoutAlreadyLoadedPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAlreadyLoadedPackages class >> description [ ^ 'Checkout packages ALREADY LOADED in the image' ] diff --git a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st index 0a9c967d0c..67ec10aa6a 100644 --- a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutDoNotLoadPackages } +Extension { #name : 'IceCheckoutDoNotLoadPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutDoNotLoadPackages class >> description [ ^ 'DO NOT CHECKOUT any packages, I will load them manually (for experts only)' ] diff --git a/Iceberg-TipUI/IceCheckoutStrategy.extension.st b/Iceberg-TipUI/IceCheckoutStrategy.extension.st index 51de95c72f..ac78658726 100644 --- a/Iceberg-TipUI/IceCheckoutStrategy.extension.st +++ b/Iceberg-TipUI/IceCheckoutStrategy.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceCheckoutStrategy } +Extension { #name : 'IceCheckoutStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy >> description [ ^ self class description ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy class >> description [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceClassDefinition.extension.st b/Iceberg-TipUI/IceClassDefinition.extension.st index e5be73baae..857e7aae8c 100644 --- a/Iceberg-TipUI/IceClassDefinition.extension.st +++ b/Iceberg-TipUI/IceClassDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceClassDefinition } +Extension { #name : 'IceClassDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceClassDefinition >> icon [ ^ self iconNamed: #class ] diff --git a/Iceberg-TipUI/IceConflictingOperation.extension.st b/Iceberg-TipUI/IceConflictingOperation.extension.st index 2a2670af63..fd38d1af90 100644 --- a/Iceberg-TipUI/IceConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceConflictingOperation.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceConflictingOperation } +Extension { #name : 'IceConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> operationIcon [ ^ self iconNamed: #changeUpdate ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceCreateBranchCommand.class.st b/Iceberg-TipUI/IceCreateBranchCommand.class.st index 67b297b6be..decf79bec0 100644 --- a/Iceberg-TipUI/IceCreateBranchCommand.class.st +++ b/Iceberg-TipUI/IceCreateBranchCommand.class.st @@ -3,12 +3,14 @@ I'm a command to create a new branch from a commit. this is usefull in the case of commiting changes in unsync repositories (so you open a branch and you commit there) " Class { - #name : #IceCreateBranchCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceCreateBranchCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceCreateBranchCommand >> execute [ | selection | diff --git a/Iceberg-TipUI/IceDefinition.extension.st b/Iceberg-TipUI/IceDefinition.extension.st index 8b2c9bdb7d..c453e2a0df 100644 --- a/Iceberg-TipUI/IceDefinition.extension.st +++ b/Iceberg-TipUI/IceDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDefinition } +Extension { #name : 'IceDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDefinition >> icon [ self subclassResponsibility diff --git a/Iceberg-TipUI/IceDirectoryDefinition.extension.st b/Iceberg-TipUI/IceDirectoryDefinition.extension.st index e16b919e0d..7ad08d0c15 100644 --- a/Iceberg-TipUI/IceDirectoryDefinition.extension.st +++ b/Iceberg-TipUI/IceDirectoryDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDirectoryDefinition } +Extension { #name : 'IceDirectoryDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDirectoryDefinition >> icon [ ^ self iconNamed: #emptyPackage ] diff --git a/Iceberg-TipUI/IceErrorVisitor.extension.st b/Iceberg-TipUI/IceErrorVisitor.extension.st index a0d887b790..baf0ab6cc2 100644 --- a/Iceberg-TipUI/IceErrorVisitor.extension.st +++ b/Iceberg-TipUI/IceErrorVisitor.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceErrorVisitor } +Extension { #name : 'IceErrorVisitor' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitExperimentalFeature: aWarning [ "By default experimental features are just accepted when we are not in an interactive mode". aWarning resume ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitNoCommitMessage: aWarning [ self visitGenericError: aWarning ] diff --git a/Iceberg-TipUI/IceExperimentalFeature.class.st b/Iceberg-TipUI/IceExperimentalFeature.class.st index ddcaf03e3a..db10719754 100644 --- a/Iceberg-TipUI/IceExperimentalFeature.class.st +++ b/Iceberg-TipUI/IceExperimentalFeature.class.st @@ -4,12 +4,14 @@ Everytime an user tries to use an experimental feature, maybe the UI want to sho This is useful to guarantee the correct keeping of the changes. " Class { - #name : #IceExperimentalFeature, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceExperimentalFeature', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceExperimentalFeature >> acceptError: aVisitor [ aVisitor visitExperimentalFeature: self diff --git a/Iceberg-TipUI/IceExtensionDefinition.extension.st b/Iceberg-TipUI/IceExtensionDefinition.extension.st index 25018c3c79..f16ab89a3f 100644 --- a/Iceberg-TipUI/IceExtensionDefinition.extension.st +++ b/Iceberg-TipUI/IceExtensionDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceExtensionDefinition } +Extension { #name : 'IceExtensionDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceExtensionDefinition >> icon [ ^ self iconNamed: #group ] diff --git a/Iceberg-TipUI/IceFileDefinition.extension.st b/Iceberg-TipUI/IceFileDefinition.extension.st index ec7f3d821f..9ada4d36b9 100644 --- a/Iceberg-TipUI/IceFileDefinition.extension.st +++ b/Iceberg-TipUI/IceFileDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceFileDefinition } +Extension { #name : 'IceFileDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileDefinition >> icon [ ^ self iconNamed: #book ] diff --git a/Iceberg-TipUI/IceFileSystemDefinition.extension.st b/Iceberg-TipUI/IceFileSystemDefinition.extension.st index 6d556411dc..5c26a26b36 100644 --- a/Iceberg-TipUI/IceFileSystemDefinition.extension.st +++ b/Iceberg-TipUI/IceFileSystemDefinition.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceFileSystemDefinition } +Extension { #name : 'IceFileSystemDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBeBrowsed [ "It can always be browsed through the libgit file system" ^ true ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBrowseReferences [ "We do not track file references..." diff --git a/Iceberg-TipUI/IceMergeListWrapper.class.st b/Iceberg-TipUI/IceMergeListWrapper.class.st index e8fb3896b2..3c7447bcfb 100644 --- a/Iceberg-TipUI/IceMergeListWrapper.class.st +++ b/Iceberg-TipUI/IceMergeListWrapper.class.st @@ -2,67 +2,69 @@ I am a morphic list wrapper that wraps iceberg diff tree nodes (potentially with conflicts) " Class { - #name : #IceMergeListWrapper, - #superclass : #ListItemWrapper, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceMergeListWrapper', + #superclass : 'ListItemWrapper', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> = aWrapper [ ^ self item = aWrapper item ] -{ #category : #'morphic-compatibility' } +{ #category : 'morphic-compatibility' } IceMergeListWrapper >> actualClass [ ^ self item value actualClass ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> asString [ ^item value description ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseLocal [ ^ item value selectRight ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseRemote [ ^ item value selectLeft ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> contents [ "Answer the contents of the change from the model." ^ item children collect: [ :each | IceMergeListWrapper with: each model: model ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> hash [ ^ self item hash ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> icon [ ^ item value icon ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> isConflict [ ^ item value isConflict ] -{ #category : #accessing } +{ #category : 'accessing' } IceMergeListWrapper >> preferredColor [ ^ self item value preferredColor diff --git a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st index fd1a3b7e5d..bc9b7f4006 100644 --- a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st +++ b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st @@ -2,12 +2,14 @@ I'm a command to perform a merge of current image sources with head commit. " Class { - #name : #IceMergeWorkingCopyCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceMergeWorkingCopyCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceMergeWorkingCopyCommand >> execute [ | commit | commit := self repository headCommit. diff --git a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st index bed0c4d10d..a8a94cb0b3 100644 --- a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceMethodContainerDefinition } +Extension { #name : 'IceMethodContainerDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> actualClass [ | actualClass | @@ -8,7 +8,7 @@ IceMethodContainerDefinition >> actualClass [ ^ isMeta ifTrue: [ actualClass classSide ] ifFalse: [ actualClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> browse [ | browsed | @@ -17,13 +17,13 @@ IceMethodContainerDefinition >> browse [ browsed browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBeBrowsed [ ^ Smalltalk globals includesKey: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBrowseReferences [ ^ self canBeBrowsed diff --git a/Iceberg-TipUI/IceMethodDefinition.extension.st b/Iceberg-TipUI/IceMethodDefinition.extension.st index 7f8cee63e9..48b2d71867 100644 --- a/Iceberg-TipUI/IceMethodDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodDefinition.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceMethodDefinition } +Extension { #name : 'IceMethodDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> browse [ (self contextClass >> name) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBeBrowsed [ ^ self contextClass @@ -14,13 +14,13 @@ IceMethodDefinition >> canBeBrowsed [ ifNil: [ false ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceModification.extension.st b/Iceberg-TipUI/IceModification.extension.st index 9ecdccb45c..91a3649b5f 100644 --- a/Iceberg-TipUI/IceModification.extension.st +++ b/Iceberg-TipUI/IceModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceModification } +Extension { #name : 'IceModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceModification >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceNoCommitMessage.class.st b/Iceberg-TipUI/IceNoCommitMessage.class.st index 01e8ce6729..7f5ba3de28 100644 --- a/Iceberg-TipUI/IceNoCommitMessage.class.st +++ b/Iceberg-TipUI/IceNoCommitMessage.class.st @@ -3,23 +3,25 @@ I indicate when a commit will be performed without a message comment. This is usually possible, but bad, very bad. Do not do it. " Class { - #name : #IceNoCommitMessage, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceNoCommitMessage', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage class >> defaultMessageText [ ^ 'You are trying to commit without a message! When this is possible, is not a good practice.' ] -{ #category : #visiting } +{ #category : 'visiting' } IceNoCommitMessage >> acceptError: aVisitor [ aVisitor visitNoCommitMessage: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage >> messageText [ ^ messageText ifNil: [ self class defaultMessageText ] ] diff --git a/Iceberg-TipUI/IceNoModification.extension.st b/Iceberg-TipUI/IceNoModification.extension.st index c57e45a902..a49e299b2a 100644 --- a/Iceberg-TipUI/IceNoModification.extension.st +++ b/Iceberg-TipUI/IceNoModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNoModification } +Extension { #name : 'IceNoModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNoModification >> icon [ ^ definition icon diff --git a/Iceberg-TipUI/IceNode.extension.st b/Iceberg-TipUI/IceNode.extension.st index d269a8d67e..cfba09c027 100644 --- a/Iceberg-TipUI/IceNode.extension.st +++ b/Iceberg-TipUI/IceNode.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNode } +Extension { #name : 'IceNode' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNode >> inspectorItems [ diff --git a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st index 790c80f427..a9a5fe9c83 100644 --- a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st +++ b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st @@ -3,47 +3,49 @@ I am a IceNode (containing an IceOperationMerge) visitor meant to update a SpCod with the highlighted code. " Class { - #name : #IceNodeCodeDisplayVisitor, - #superclass : #Object, + #name : 'IceNodeCodeDisplayVisitor', + #superclass : 'Object', #instVars : [ 'codePresenter' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNodeCodeDisplayVisitor class >> onCodePresenter: aSpCodePresenter [ ^ self new codePresenter: aSpCodePresenter ; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter [ ^ codePresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter: aSpCodePresenter [ codePresenter := aSpCodePresenter ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitClassDefinition: anIceClassDefinition [ codePresenter text: anIceClassDefinition contents. codePresenter behavior: nil ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitConflictingOperation: anIceConflictingOperation [ anIceConflictingOperation chosenOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ codePresenter @@ -53,13 +55,13 @@ IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ UndefinedObject ]) ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitPackage: anIcePackageDefinition [ codePresenter diff --git a/Iceberg-TipUI/IceNonConflictingOperation.extension.st b/Iceberg-TipUI/IceNonConflictingOperation.extension.st index a9d80139e9..e1735a623d 100644 --- a/Iceberg-TipUI/IceNonConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceNonConflictingOperation.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceNonConflictingOperation } +Extension { #name : 'IceNonConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> operationIcon [ ^ operation icon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceOperation.extension.st b/Iceberg-TipUI/IceOperation.extension.st index e247689488..bafe10e4da 100644 --- a/Iceberg-TipUI/IceOperation.extension.st +++ b/Iceberg-TipUI/IceOperation.extension.st @@ -1,30 +1,30 @@ -Extension { #name : #IceOperation } +Extension { #name : 'IceOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> browse [ ^ self leftDefinition browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBeBrowsed [ ^ self leftDefinition canBeBrowsed ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> icon [ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> preferredColor [ "Use the default color" diff --git a/Iceberg-TipUI/IceOperationMerge.extension.st b/Iceberg-TipUI/IceOperationMerge.extension.st index 8d9566c0cb..fa98848b61 100644 --- a/Iceberg-TipUI/IceOperationMerge.extension.st +++ b/Iceberg-TipUI/IceOperationMerge.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceOperationMerge } +Extension { #name : 'IceOperationMerge' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> icon [ self isRightChosen ifTrue: [ ^ self iconNamed: #changeBlock ]. @@ -9,7 +9,7 @@ IceOperationMerge >> icon [ ^ self operationIcon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> operationIcon [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IcePackage.extension.st b/Iceberg-TipUI/IcePackage.extension.st index b932cb71e4..d205ceaf37 100644 --- a/Iceberg-TipUI/IcePackage.extension.st +++ b/Iceberg-TipUI/IcePackage.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePackage } +Extension { #name : 'IcePackage' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackage >> browse [ (RPackageOrganizer default packageNamed: self name) browse diff --git a/Iceberg-TipUI/IcePackageDefinition.extension.st b/Iceberg-TipUI/IcePackageDefinition.extension.st index 4839af1d7a..36f9b23914 100644 --- a/Iceberg-TipUI/IcePackageDefinition.extension.st +++ b/Iceberg-TipUI/IcePackageDefinition.extension.st @@ -1,25 +1,25 @@ -Extension { #name : #IcePackageDefinition } +Extension { #name : 'IcePackageDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> browse [ "Open a browser on the package, if it exists." (self packageOrganizer packageNamed: name ifAbsent: [ ^ self ]) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBeBrowsed [ ^ self packageOrganizer hasPackage: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> icon [ ^ self iconNamed: #package ] diff --git a/Iceberg-TipUI/IcePlaintextCredentials.extension.st b/Iceberg-TipUI/IcePlaintextCredentials.extension.st index 2280cbb78b..77fc415434 100644 --- a/Iceberg-TipUI/IcePlaintextCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IcePlaintextCredentials } +Extension { #name : 'IcePlaintextCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClass [ ^ IceTipAskForPlaintextCredentialsPresenter ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClassOn: aString [ ^ (aString includesSubstring: 'github.com' caseSensitive: false) @@ -13,7 +13,7 @@ IcePlaintextCredentials >> askForModelClassOn: aString [ ifFalse: [ self askForModelClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> editModelClass [ ^ IceTipEditPlaintextCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st index c69cf7dd5e..01215e50ad 100644 --- a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextOtpCredentials } +Extension { #name : 'IcePlaintextOtpCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextOtpCredentials >> askForModelClass [ ^ IceTipAskForPlaintextOtpCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePullRemoteCommand.class.st b/Iceberg-TipUI/IcePullRemoteCommand.class.st index 35ba209da8..92f9253947 100644 --- a/Iceberg-TipUI/IcePullRemoteCommand.class.st +++ b/Iceberg-TipUI/IcePullRemoteCommand.class.st @@ -2,27 +2,29 @@ I'm a command to perform a pull from a remote. " Class { - #name : #IcePullRemoteCommand, - #superclass : #IceRepositoryCommand, + #name : 'IcePullRemoteCommand', + #superclass : 'IceRepositoryCommand', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IcePullRemoteCommand >> execute [ self repository branch pullFrom: self remote. self beSuccess ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote: anObject [ remote := anObject ] diff --git a/Iceberg-TipUI/IceRemoval.extension.st b/Iceberg-TipUI/IceRemoval.extension.st index fb9aaa8acc..9887f589e2 100644 --- a/Iceberg-TipUI/IceRemoval.extension.st +++ b/Iceberg-TipUI/IceRemoval.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRemoval } +Extension { #name : 'IceRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRemoval >> icon [ ^ self iconNamed: #changeRemove diff --git a/Iceberg-TipUI/IceRepository.extension.st b/Iceberg-TipUI/IceRepository.extension.st index ce7f0e2d32..17235036b4 100644 --- a/Iceberg-TipUI/IceRepository.extension.st +++ b/Iceberg-TipUI/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRepository >> inspectorItems [ diff --git a/Iceberg-TipUI/IceRepositoryCommand.class.st b/Iceberg-TipUI/IceRepositoryCommand.class.st index 1c769a782e..0e64b96592 100644 --- a/Iceberg-TipUI/IceRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceRepositoryCommand.class.st @@ -2,56 +2,58 @@ I'm a generic command for iceberg repositories. " Class { - #name : #IceRepositoryCommand, - #superclass : #Object, + #name : 'IceRepositoryCommand', + #superclass : 'Object', #instVars : [ 'repository', 'success', 'context' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand class >> isAbstract [ ^ self == IceRepositoryCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> beSuccess [ success := true ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> execute [ self subclassResponsibility ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> executeWithContext: aContext [ context := aContext. self execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCommand >> initialize [ super initialize. success := false ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand >> isSuccess [ ^ success ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceSavedPackageVersion.extension.st b/Iceberg-TipUI/IceSavedPackageVersion.extension.st index b699275f27..66160db0c5 100644 --- a/Iceberg-TipUI/IceSavedPackageVersion.extension.st +++ b/Iceberg-TipUI/IceSavedPackageVersion.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceSavedPackageVersion } +Extension { #name : 'IceSavedPackageVersion' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSavedPackageVersion >> description [ ^ self commit description ] diff --git a/Iceberg-TipUI/IceSortingStrategy.class.st b/Iceberg-TipUI/IceSortingStrategy.class.st index 45945aeaaa..0c9b0ea815 100644 --- a/Iceberg-TipUI/IceSortingStrategy.class.st +++ b/Iceberg-TipUI/IceSortingStrategy.class.st @@ -15,26 +15,28 @@ Internal Representation and Key Implementation Points. last: Represent the entities to display last. " Class { - #name : #IceSortingStrategy, - #superclass : #Object, + #name : 'IceSortingStrategy', + #superclass : 'Object', #instVars : [ 'first', 'last' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy class >> possibleValues [ ^ #(#none #modified #notLoaded) ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first [ ^ first ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first: anObject [ first := anObject. @@ -42,19 +44,19 @@ IceSortingStrategy >> first: anObject [ ifTrue: [ self last: #none ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceSortingStrategy >> initialize [ super initialize. first := #modified. last := #notLoaded ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last [ ^ last ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last: anObject [ last := anObject. @@ -62,7 +64,7 @@ IceSortingStrategy >> last: anObject [ ifTrue: [ self first: #none ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ aSymbol = #modified ifTrue: [ ^ aCollection select: #isModified ]. @@ -71,7 +73,7 @@ IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ self error: 'This sorting is not accepted: ' , aSymbol ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sort: aListOfPackages [ | result packages lasts | packages := aListOfPackages. @@ -85,12 +87,12 @@ IceSortingStrategy >> sort: aListOfPackages [ ^ result ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sortByName: aCollection [ ^ aCollection sorted: #packageName ascending ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> withOthers: aSymbol [ self first = aSymbol ifTrue: [ self first: nil ]. self last = aSymbol ifTrue: [ self last: nil ] diff --git a/Iceberg-TipUI/IceSshCredentials.extension.st b/Iceberg-TipUI/IceSshCredentials.extension.st index e3ad3fed5c..6c5858fbf7 100644 --- a/Iceberg-TipUI/IceSshCredentials.extension.st +++ b/Iceberg-TipUI/IceSshCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceSshCredentials } +Extension { #name : 'IceSshCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> editModelClass [ ^ IceTipEditSSHCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st index 0c1558c81a..1d47f72c91 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st @@ -2,24 +2,26 @@ I am the common class of all the commands over an specific credential. " Class { - #name : #IceTipAbstractCredentialCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> credential [ ^ self item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> store [ ^ self context model diff --git a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st index fdb3e9165c..1742f97fae 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st @@ -2,30 +2,32 @@ I am the abstract class of all the general commands in the credentials list. " Class { - #name : #IceTipAbstractCredentialStoreCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialStoreCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialStoreCommand ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialStoreCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAbstractCredentialStoreCommand >> store [ ^ self context store diff --git a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st index ec0f14565a..ff95d0bfdc 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st @@ -5,8 +5,8 @@ to ask / add / edit credentials. There are subclasses to each of the actions and the types of keys. " Class { - #name : #IceTipAbstractCredentialsPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAbstractCredentialsPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'storeCheckbox', 'credentialStore', @@ -15,10 +15,12 @@ Class { 'credentials', 'askingHostname' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAddAction [ credentials := self newCredentials. @@ -31,7 +33,7 @@ IceTipAbstractCredentialsPresenter >> acceptAddAction [ tool refresh ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAskAction [ credentials := self newCredentials. @@ -45,7 +47,7 @@ IceTipAbstractCredentialsPresenter >> acceptAskAction [ ^ credentials ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptEditAction [ self refreshCredentialsFromPresenter. @@ -55,19 +57,19 @@ IceTipAbstractCredentialsPresenter >> acceptEditAction [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> askingHostname: aString [ askingHostname := aString ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAction [ "Action to execute on cancel." ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAskAction [ accepted := true. @@ -75,43 +77,43 @@ IceTipAbstractCredentialsPresenter >> cancelAskAction [ LGitNoCredentialsProvided signal ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> closeAction [ accepted ifFalse: [ self cancelAction ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentialStore: aStore [ credentialStore := aStore ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials: anIceCredentials [ credentials := anIceCredentials. self refreshPresenterFromCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> hostnameFromInput [ "Answer the remoote hostname for the credentials." ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initialize [ super initialize. accepted := false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPresenter [ super initializeDialogWindow: aDialogWindowPresenter. @@ -121,7 +123,7 @@ IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPrese ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initializePresenters [ storeCheckbox := self newCheckBox @@ -131,27 +133,27 @@ IceTipAbstractCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> isOkEnabled [ "Determite if the user should be enabled to press on the accept button." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> newCredentials [ "Answer a new instance of the credentials using the form inputs." ^ self subclassResponsibility ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> okButton [ ^ self window buttons first ] -{ #category : #'API - opening' } +{ #category : 'API - opening' } IceTipAbstractCredentialsPresenter >> open [ self openModal. @@ -159,36 +161,36 @@ IceTipAbstractCredentialsPresenter >> open [ ^ self credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshCredentialsFromPresenter [ "Hook to update the credentials object from the presenter inputs." ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshPresenterFromCredentials [ "Hook to update the presenter input fields from the credentials object." ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> shouldStoreCredentials [ ^ storeCheckbox state ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> storeCheckbox [ ^ storeCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> tool: aBrowser [ "Set the tool that triggered this dialog, and therefore might need a #refresh after the users accepts the dialog and it produces an effect on the system." tool := aBrowser ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> updateOkButton [ self window ifNil: [ ^ self ]. diff --git a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st index 24f88809b7..654595d3ee 100644 --- a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st @@ -3,18 +3,20 @@ I implement the basic behavior of all the plaintext credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameLabel', 'usernameInput', 'passwordLabel', 'passwordInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractPlaintextCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self password isNotEmpty ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ ^ IcePlaintextCredentials new @@ -47,31 +49,31 @@ IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> password [ ^ passwordInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> passwordInput [ ^ passwordInput ] -{ #category : #private } +{ #category : 'private' } IceTipAbstractPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Password:' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> username [ ^ usernameInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> usernameInput [ ^ usernameInput diff --git a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st index d0f96fe3b3..4b529092fd 100644 --- a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st @@ -3,8 +3,8 @@ I implement the basic behavior of all the ssh credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractSSHCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractSSHCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameInput', 'usernameLabel', @@ -15,10 +15,12 @@ Class { 'publicKeyLabel', 'privateKeyLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -56,20 +58,20 @@ IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractSSHCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self publicKey isNotEmpty and: [ self privateKey isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> passphrase [ ^ passphraseInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> privateKey [ ^ privateKeyInput location @@ -77,7 +79,7 @@ IceTipAbstractSSHCredentialsPresenter >> privateKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> publicKey [ ^ publicKeyInput location @@ -85,7 +87,7 @@ IceTipAbstractSSHCredentialsPresenter >> publicKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> username [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAction.class.st b/Iceberg-TipUI/IceTipAction.class.st index c062c89d67..7f2a1337db 100644 --- a/Iceberg-TipUI/IceTipAction.class.st +++ b/Iceberg-TipUI/IceTipAction.class.st @@ -2,41 +2,43 @@ I'm like a lightweight command, used in general for apply concrete actions. " Class { - #name : #IceTipAction, - #superclass : #Object, + #name : 'IceTipAction', + #superclass : 'Object', #instVars : [ 'context', 'repository', 'successBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipAction class >> isAbstract [ ^ self == IceTipAction ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> basicExecute [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context: aContext [ context := aContext ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> execute [ | result | @@ -48,19 +50,19 @@ IceTipAction >> execute [ ^ result. ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> executeWithContext: aContext [ self context: aContext. ^ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> finishSuccess [ successBlock ifNotNil: [ successBlock value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> onSuccess: aBlock [ "Some actions need to execute something right after finish. Like a refresh of panels, etc. If a block is defined here, it will be evaluated right after the command is executed, if @@ -68,17 +70,17 @@ IceTipAction >> onSuccess: aBlock [ successBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository: anObject [ repository := anObject ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> withErrorHandlingDo: aBlock [ aBlock on: IceError, IceWarning diff --git a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st index 5604783f88..cb70097b35 100644 --- a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st @@ -2,8 +2,8 @@ I am an small dialog to ask the user to select new packages to load. New packages are packages in the commit but not in the image. " Class { - #name : #IceTipAddNewPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddNewPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'packagesList', 'selectedPackages', @@ -12,10 +12,12 @@ Class { 'checkoutModel', 'checkoutPreviewWindow' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterInstance forRoot: rootCommandGroup [ rootCommandGroup register: @@ -25,7 +27,7 @@ IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterIn yourself) ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddNewPackagesDialogPresenter >> accept [ | selectedPackageNames | @@ -42,19 +44,19 @@ IceTipAddNewPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutModel: anIceTipCheckoutModel [ checkoutModel := anIceTipCheckoutModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutPreviewWindow: anIceTipCheckoutPreviewBrowser [ checkoutPreviewWindow := anIceTipCheckoutPreviewBrowser ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddNewPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -63,13 +65,13 @@ IceTipAddNewPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ packagesList @@ -90,7 +92,7 @@ IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ contextMenu: [ (self rootCommandsGroup / 'package list commands') beRoot asMenuPresenter ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -108,49 +110,49 @@ Please select the packages if you wish to load them in the image'. self initializePackagesList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddNewPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages [ ^ selectedPackages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages: anObject [ selectedPackages := anObject ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipAddNewPackagesDialogPresenter >> setModelBeforeInitialization: somePackages [ packages := somePackages ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> titleForWindow [ ^ 'Select New Packages to Load'. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> updatePresenter [ packagesList items: packages ] -{ #category : #validation } +{ #category : 'validation' } IceTipAddNewPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPackageCommand.class.st b/Iceberg-TipUI/IceTipAddPackageCommand.class.st index b426fd154f..abb62edab1 100644 --- a/Iceberg-TipUI/IceTipAddPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPackageCommand.class.st @@ -2,24 +2,26 @@ Command that opens a dialog to add a/many package/s into the selected repository. " Class { - #name : #IceTipAddPackageCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddPackageCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultDescription [ ^ 'Adds an existing package to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultName [ ^ 'Add package' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPackageCommand >> execute [ (IceTipAddPackagesDialogPresenter @@ -30,19 +32,19 @@ IceTipAddPackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPackageCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st index 94800447f8..4b476f9977 100644 --- a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st @@ -2,18 +2,20 @@ I'm a dialog to add packages to a repository. " Class { - #name : #IceTipAddPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'packagesList', 'packageNameText', 'selectedPackages' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddPackagesDialogPresenter >> accept [ "ensure window goes away (in case accept comes from a keybinding and not the ok button)" @@ -25,7 +27,7 @@ IceTipAddPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackages [ ^ RPackageOrganizer default packages @@ -33,7 +35,7 @@ IceTipAddPackagesDialogPresenter >> allPackages [ sort: [ :a :b | a name < b name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ | currentPackagesNames | @@ -42,7 +44,7 @@ IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ currentPackagesNames includes: rPackage name ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,13 +53,13 @@ IceTipAddPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackageNameText [ packageNameText @@ -66,7 +68,7 @@ IceTipAddPackagesDialogPresenter >> initializePackageNameText [ whenTextChangedDo: [ :text | self refresh ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackagesList [ packagesList addColumn: (SpCompositeTableColumn new @@ -86,7 +88,7 @@ IceTipAddPackagesDialogPresenter >> initializePackagesList [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -97,32 +99,32 @@ IceTipAddPackagesDialogPresenter >> initializePresenters [ self initializePackageNameText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model: anObject [ model := anObject. self refresh ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packageNameText [ ^ packageNameText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> refresh [ packagesList items: (packageNameText text @@ -135,31 +137,31 @@ IceTipAddPackagesDialogPresenter >> refresh [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> titleForWindow [ ^ 'Add packages' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> updatePresenter [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st index ff725f569e..0bda874a9b 100644 --- a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st @@ -2,22 +2,24 @@ I create a new plaintext credential on the credential store. " Class { - #name : #IceTipAddPlainTextCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddPlainTextCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultDescription [ ^ 'Add a new plain text credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultName [ ^ 'Plain Text' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPlainTextCredentialCommand >> execute [ ((IceTipAddPlaintextCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st index 34e65aa27d..9d957b8259 100644 --- a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add plaintext credentials. " Class { - #name : #IceTipAddPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, + #name : 'IceTipAddPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -30,20 +32,20 @@ IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPlaintextCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -54,13 +56,13 @@ IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> isOkEnabled [ ^ super isOkEnabled and: [ self hostnameFromInput isNotEmpty ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Add new Plain Text Credential' diff --git a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st index 9664e8295b..4cf7dfdbe0 100644 --- a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st @@ -2,31 +2,33 @@ Command that opens a dialog to add a remote to a repository. " Class { - #name : #IceTipAddRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultDescription [ ^ 'Adds a remote to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultName [ ^ 'Add remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> canBeExecuted [ "Any repository can have more remotes." ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRemoteCommand >> execute [ (IceTipAddRemoteDialogPresenter @@ -37,13 +39,13 @@ IceTipAddRemoteCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st index a7e1f9eb46..acbc999013 100644 --- a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog to add remotes to a repository. " Class { - #name : #IceTipAddRemoteDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddRemoteDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'nameLabel', @@ -12,10 +12,12 @@ Class { 'nameText', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> accept [ self validate. @@ -27,7 +29,7 @@ IceTipAddRemoteDialogPresenter >> accept [ ^ acceptBlock ifNotNil: [ acceptBlock cull: self remoteName ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddRemoteDialogPresenter >> defaultLayout [ ^ SpGridLayout new @@ -41,7 +43,7 @@ IceTipAddRemoteDialogPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -51,7 +53,7 @@ IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -70,80 +72,80 @@ IceTipAddRemoteDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameText [ ^ nameText ] -{ #category : #events } +{ #category : 'events' } IceTipAddRemoteDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteName [ ^ self nameText text trimmed ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteUrl [ ^ self urlText text trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> titleForWindow [ ^ 'Add remote' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlLabel [ ^ urlLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlText [ ^ urlText ] -{ #category : #actions } +{ #category : 'actions' } 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.' ] diff --git a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st index 0aa7d9688d..0ac4f307df 100644 --- a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st @@ -3,31 +3,33 @@ I register Iceberg projects. I will open a dialog to take the new possible repository (from available options) and I will register it into the IceRepository>>#registry list. " Class { - #name : #IceTipAddRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultDescription [ ^ 'Add a repository (new, local, cloned) to your managed repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultName [ ^ 'Add' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRepositoryCommand >> execute [ (IceTipRegisterRepositoryDialogPresenter newApplication: context application) @@ -36,19 +38,19 @@ IceTipAddRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st index 57f671869e..0d5ea539bb 100644 --- a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add SSH credentials. " Class { - #name : #IceTipAddSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, + #name : 'IceTipAddSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddSSHCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -31,20 +33,20 @@ IceTipAddSSHCredentialsPresenter >> defaultLayout [ add: passphraseLabel; add: passphraseInput; nextRow ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 7 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -57,7 +59,7 @@ IceTipAddSSHCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> newCredentials [ ^ IceSshCredentials new @@ -68,7 +70,7 @@ IceTipAddSSHCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> titleForWindow [ ^ 'Add SSH credential' diff --git a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st index db86f547fd..49a17d55b3 100644 --- a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st @@ -2,22 +2,24 @@ I add a new IceSshCredentials to the store " Class { - #name : #IceTipAddSshCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddSshCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultDescription [ ^ 'Add a SSH pair of credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultName [ ^ 'SSH Pair' ] -{ #category : #execution } +{ #category : 'execution' } IceTipAddSshCredentialCommand >> execute [ ((IceTipAddSSHCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st index a1570d8283..6d47533e52 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipAddTokenCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddTokenCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultDescription [ ^ 'Add a new token credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultName [ ^ 'Token' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddTokenCredentialCommand >> execute [ ((IceTipAddTokenCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st index e6b33e71f7..c4931d633d 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st @@ -2,8 +2,8 @@ I am a dialog to add token credentials. " Class { - #name : #IceTipAddTokenCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAddTokenCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'hostInput', 'tokenInput', @@ -12,16 +12,18 @@ Class { 'usernameInput', 'usernameLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddTokenCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -36,19 +38,19 @@ IceTipAddTokenCredentialsPresenter >> defaultLayout [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -80,7 +82,7 @@ IceTipAddTokenCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddTokenCredentialsPresenter >> isOkEnabled [ ^ self usernameFromInput isNotEmpty and: [ @@ -88,7 +90,7 @@ IceTipAddTokenCredentialsPresenter >> isOkEnabled [ self tokenFromInput isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> newCredentials [ ^ IceTokenCredentials new @@ -98,19 +100,19 @@ IceTipAddTokenCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> titleForWindow [ ^ 'Add token credentials' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> tokenFromInput [ ^ tokenInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> usernameFromInput [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st index 7942ae2db3..f6c3ef79f8 100644 --- a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st @@ -5,37 +5,39 @@ I won't modify the loaded code, but will calculate the differences between the loaded packages and the new commit, to mark packages as dirty. " Class { - #name : #IceTipAdoptCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAdoptCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAdoptCommitCommand class >> defaultDescription [ ^ 'Sets this commit as the commit of your working copy. It will not modify your loaded code, but it will calculate the differences between your loaded packages and the the new commit to mark packages as dirty.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> defaultNameFromContext [ ^ 'Adopt commit ' , self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipAdoptCommitCommand >> execute [ self selectedCommitish adopt. Iceberg announcer announce: (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> iconName [ ^ #recoverLostChanges ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAdoptCommitCommand >> name [ "Answer the name for the command. In order to have a specialized string for certain parameters of the context, and given the fact that sometimes the context is nil (e.g. when a context menu is calculated when the selection is empty)." @@ -45,7 +47,7 @@ IceTipAdoptCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipAnnouncement.class.st b/Iceberg-TipUI/IceTipAnnouncement.class.st index dbdedd4dc5..e41c5c55a8 100644 --- a/Iceberg-TipUI/IceTipAnnouncement.class.st +++ b/Iceberg-TipUI/IceTipAnnouncement.class.st @@ -3,7 +3,9 @@ I'm a general announcement for Tip UI events. (the announcements happened here are just for UI consumption) " Class { - #name : #IceTipAnnouncement, - #superclass : #IceAnnouncement, - #category : #'Iceberg-TipUI-Announcements' + #name : 'IceTipAnnouncement', + #superclass : 'IceAnnouncement', + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } diff --git a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st index 365540a064..07247e0c33 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st @@ -3,30 +3,32 @@ I implement the dialog to ask plaintext credentials. This dialog is used when the IceTipInteractiveCredentialsProvider needs to ask a plaintext credential. " Class { - #name : #IceTipAskForPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskForPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancel [ self cancelAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -44,13 +46,13 @@ IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (450 @ 180) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Please log in to ' , askingHostname diff --git a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st index eaa0b052c5..b288110683 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipAskForPlaintextOtpCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, + #name : 'IceTipAskForPlaintextOtpCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', #instVars : [ 'tokenLabel', 'tokenInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -26,13 +28,13 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 210) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -43,7 +45,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ ^ IcePlaintextOtpCredentials new @@ -53,7 +55,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> token [ ^ tokenInput text diff --git a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st index a9c3aba0a3..b99c95dd5d 100644 --- a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipAskGithubForPlaintextCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskGithubForPlaintextCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #private } +{ #category : 'private' } IceTipAskGithubForPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Token:' diff --git a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st index 19347ecf1f..792093d429 100644 --- a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st @@ -2,24 +2,26 @@ I am a dialog to ask for SSH credentials. " Class { - #name : #IceTipAskSSHCredentialsPresenter, - #superclass : #IceTipEditSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskSSHCredentialsPresenter', + #superclass : 'IceTipEditSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskSSHCredentialsPresenter >> newCredentials [ self refreshCredentialsFromPresenter. diff --git a/Iceberg-TipUI/IceTipBranchModel.class.st b/Iceberg-TipUI/IceTipBranchModel.class.st index b12d7e9824..bb754a13e1 100644 --- a/Iceberg-TipUI/IceTipBranchModel.class.st +++ b/Iceberg-TipUI/IceTipBranchModel.class.st @@ -2,17 +2,19 @@ I expose data of a branch. " Class { - #name : #IceTipBranchModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipBranchModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> checkoutStrategies [ ^ IceCheckoutStrategy allStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -24,12 +26,12 @@ IceTipBranchModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commits [ self shouldBeImplemented. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> description [ ^ self entity isRemote @@ -37,49 +39,49 @@ IceTipBranchModel >> description [ ifFalse: [ self name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> descriptionDecorator [ self entity isHead ifTrue: [ ^ IceTipDescriptionDecorator head ]. ^ super descriptionDecorator ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffFromHead [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffToWorkingCopy [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffToWorkingCopy ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> hasUpstream [ ^ entity hasUpstream ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isHead [ ^ self entity isHead ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isLocal [ ^ self entity isLocal ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ @@ -91,7 +93,7 @@ IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDeleteAction [ @@ -103,7 +105,7 @@ IceTipBranchModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDirectMergeAction [ @@ -115,7 +117,7 @@ IceTipBranchModel >> newDirectMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newSwitchAndMergeAction [ @@ -127,7 +129,7 @@ IceTipBranchModel >> newSwitchAndMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before @@ -137,7 +139,7 @@ IceTipBranchModel >> previewCheckout [ (IceTipCheckoutPreviewBrowser onBranch: self) open ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewMerge: aMergeType [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" @@ -147,7 +149,7 @@ IceTipBranchModel >> previewMerge: aMergeType [ open ] -{ #category : #printing } +{ #category : 'printing' } IceTipBranchModel >> printOn: aStream [ super printOn: aStream. aStream @@ -156,12 +158,12 @@ IceTipBranchModel >> printOn: aStream [ nextPut: $] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipBranchModel >> resetToCommit: anIceTipCachedModel [ entity resetToCommit: anIceTipCachedModel entity diff --git a/Iceberg-TipUI/IceTipBranchPanel.class.st b/Iceberg-TipUI/IceTipBranchPanel.class.st index bd527e9559..223476e280 100644 --- a/Iceberg-TipUI/IceTipBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipBranchPanel.class.st @@ -3,22 +3,24 @@ I'm a generic panel to checkout panels. My children will define different strategies to checkout (select an existing branch -local or remote-, or enter a new branch name) " Class { - #name : #IceTipBranchPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipBranchPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipBranchPanel class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> accept [ self validate. @@ -26,49 +28,49 @@ IceTipBranchPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> doAccept [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchPanel >> isNewBranch [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model: anObject [ model := anObject ] -{ #category : #events } +{ #category : 'events' } IceTipBranchPanel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBranchPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> validate [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipBrowseCommand.class.st b/Iceberg-TipUI/IceTipBrowseCommand.class.st index 4f1a7e77d5..0e0dcaef76 100644 --- a/Iceberg-TipUI/IceTipBrowseCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseCommand.class.st @@ -2,43 +2,45 @@ I'm a command to ""browse"" a change definition (method, class or package). " Class { - #name : #IceTipBrowseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultDescription [ ^ 'Browse the selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultName [ ^ 'Browse...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowseCommand >> canBeExecuted [ "In the case of a method removal it is not possible to browse the selected element." ^ self hasSelectedItem and: [ self item value definition canBeBrowsed ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseCommand >> execute [ self item value definition browse ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowseCommand >> iconName [ ^ #smallSystemBrowser ] -{ #category : #activation } +{ #category : 'activation' } IceTipBrowseCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st index 25f9b31ca2..421c10e49f 100644 --- a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st @@ -2,36 +2,38 @@ Command that browses the selected package as it is loaded in the image. " Class { - #name : #IceTipBrowsePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowsePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultDescription [ ^ 'Browse the selected package as it is loaded in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultName [ ^ 'Browse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowsePackageCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isPackageLoaded ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowsePackageCommand >> execute [ self packageModel browsePackage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowsePackageCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st index 47509f917b..94a27379a2 100644 --- a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st @@ -4,24 +4,26 @@ Command that opens a browser on the code of the repository. The current implementation relies on a monticello MCSnapshotBrowser " Class { - #name : #IceTipBrowseRepositoryPackageVersionCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseRepositoryPackageVersionCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultDescription [ ^ 'Browse the version in the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultName [ ^ 'Browse this version in Monticello' ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseRepositoryPackageVersionCommand >> execute [ self packageModel browseRepositoryVersion diff --git a/Iceberg-TipUI/IceTipBrowser.class.st b/Iceberg-TipUI/IceTipBrowser.class.st index dc8780dad2..1ed279f6d2 100644 --- a/Iceberg-TipUI/IceTipBrowser.class.st +++ b/Iceberg-TipUI/IceTipBrowser.class.st @@ -9,16 +9,18 @@ Some design remarks: * Browsers have a context menu on list or table items, that provide commands that are specific for the selection. " Class { - #name : #IceTipBrowser, - #superclass : #IceTipPresenter, + #name : 'IceTipBrowser', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'toolbar' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ | generalCommandGroup selectionCommandGroup selectionExtraCommandGroup | @@ -42,81 +44,81 @@ IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec. aCommandGroup register: IceFiletreeToTonelCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> generalCommandGroupName [ ^ 'General' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionCommandGroupName [ ^ 'Selection' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionExtraCommandGroupName [ ^ 'Extra' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> connectPresenters [ self mainList whenSelectionChangedDo: [ self refreshCommands ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> defaultKeyboardFocus [ ^ self mainList ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowser >> hasSelectedItem [ ^ self mainList selection isEmpty not ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> iconForWindow [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -125,31 +127,31 @@ IceTipBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> refresh [ "Update the UI elements given a possible update in the model." ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshCommands [ | rootGroup | @@ -163,7 +165,7 @@ IceTipBrowser >> refreshCommands [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ "Update context menu (for mainList)." @@ -173,7 +175,7 @@ IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ self mainList contextMenuFromCommandsGroup: subgroup ]. ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshShortcutsWith: rootGroup [ "Update shortcuts with available commands" @@ -184,7 +186,7 @@ IceTipBrowser >> refreshShortcutsWith: rootGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshToolbarWith: rootGroup [ "Update toolbar (in window)." @@ -208,31 +210,31 @@ IceTipBrowser >> refreshToolbarWith: rootGroup [ self window toolbar: toolbar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> repositoryModel [ "Answer the IceTipRepositoryModel associated to this presenter." ^ self model repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> selectedItem [ "Answer the object selected in the main list of this browser. The answer is nil when there isn't a selection." ^ self mainList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> subscribeToAnnouncements [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> toolbar [ ^ toolbar diff --git a/Iceberg-TipUI/IceTipCache.class.st b/Iceberg-TipUI/IceTipCache.class.st index 363621bbfd..cc06b437d3 100644 --- a/Iceberg-TipUI/IceTipCache.class.st +++ b/Iceberg-TipUI/IceTipCache.class.st @@ -5,70 +5,72 @@ I'm used to cache values to be used on the UI. I can be reseted (sending #reset), but responsibility of reset caches belongs to presenters who use them. " Class { - #name : #IceTipCache, - #superclass : #Object, + #name : 'IceTipCache', + #superclass : 'Object', #instVars : [ 'proxy', 'objects' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCache class >> proxy: aProxy [ ^ self new proxy: aProxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsent: anObject [ ^ objects at: aKey ifAbsent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsentPut: anObject [ ^ objects at: aKey ifAbsentPut: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifPresent: anObject [ ^ objects at: aKey ifPresent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey put: anObject [ ^ objects at: aKey put: anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> initialize [ super initialize. self reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> objects [ ^ objects ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy [ ^ proxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy: anObject [ proxy := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> reset [ objects := SmallDictionary new ] diff --git a/Iceberg-TipUI/IceTipCachedModel.class.st b/Iceberg-TipUI/IceTipCachedModel.class.st index f69b645173..b522f0299b 100644 --- a/Iceberg-TipUI/IceTipCachedModel.class.st +++ b/Iceberg-TipUI/IceTipCachedModel.class.st @@ -4,28 +4,30 @@ I take all unary messages sent to my realObject and I cache their values. I keep a cache with rules for reset it, which can be accessedon the #resetOn: family of messages. " Class { - #name : #IceTipCachedModel, - #superclass : #Object, + #name : 'IceTipCachedModel', + #superclass : 'Object', #instVars : [ 'realObject', 'cache' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCachedModel class >> for: anObject [ ^ self basicNew initializeObject: anObject ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> = aObject [ self species ~= aObject species ifTrue: [ ^ false ]. ^ self realObject = aObject realObject ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> doesNotUnderstand: aMessage [ aMessage selector isUnary ifTrue: [ @@ -42,27 +44,27 @@ IceTipCachedModel >> doesNotUnderstand: aMessage [ ^ self forwardMessage: aMessage ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> forwardMessage: aMessage [ ^ realObject perform: aMessage selector withArguments: aMessage arguments ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> hash [ ^ self realObject hash ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCachedModel >> initializeObject: anObject [ realObject := anObject. cache := IceTipCache proxy: self. self initialize ] -{ #category : #printing } +{ #category : 'printing' } IceTipCachedModel >> printOn: aStream [ super printOn: aStream. aStream nextPut: $(. @@ -70,12 +72,12 @@ IceTipCachedModel >> printOn: aStream [ aStream nextPut: $) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> realObject [ ^ realObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> reset [ cache reset ] diff --git a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st index b7408e9fe8..d188d62fe5 100644 --- a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st @@ -2,25 +2,27 @@ I'm a command that makes a working copy to recalculate the dirty packages (via #forceCalculateDirtyPackages). " Class { - #name : #IceTipCalculateDirtyPackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCalculateDirtyPackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCalculateDirtyPackagesCommand class >> defaultName [ ^ 'Recalculate dirty packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCalculateDirtyPackagesCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipCalculateDirtyPackagesCommand >> execute [ IceTipStandardAction new @@ -31,7 +33,7 @@ IceTipCalculateDirtyPackagesCommand >> execute [ executeWithContext: context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCalculateDirtyPackagesCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st index f846b99bd8..790e79a87f 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st @@ -2,36 +2,38 @@ Command that opens a dialog to checkout a (new or already existing) branch. " Class { - #name : #IceTipCheckoutBranchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutBranchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultDescription [ ^ 'Checkout a new or existing branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultToolbarItemName [ ^ 'Branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutBranchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutBranchCommand >> execute [ (IceTipCheckoutBranchDialog @@ -42,7 +44,7 @@ IceTipCheckoutBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st index 8371ddd3c5..4c0ac85745 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st @@ -4,28 +4,30 @@ I'm a dialog to perform a checkout of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipCheckoutBranchDialog, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipCheckoutBranchDialog', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutBranchDialog class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> allTypes [ ^ types ifNil: [ types := self createCheckoutBranchTypes ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ | allTypes | @@ -49,50 +51,50 @@ IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchDialog >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> model [ ^ model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> titleForWindow [ ^ 'Checkout branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withOnlyNewBranch [ types := self allTypes select: #isNewBranch. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withTypes: aCollection [ types := aCollection. typeList items: types. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withoutNewBranch [ types := self allTypes reject: #isNewBranch. typeList items: types. diff --git a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st index a03e98d39b..69d4df247d 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st @@ -2,12 +2,14 @@ I'm a panel to peform the checkout of an existing branch. " Class { - #name : #IceTipCheckoutBranchPanel, - #superclass : #IceTipExistingBranchPanel, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipCheckoutBranchPanel', + #superclass : 'IceTipExistingBranchPanel', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchPanel >> doAccept [ self selectedBranch previewCheckout diff --git a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st index 69cc6b43da..410e447df7 100644 --- a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st @@ -3,37 +3,39 @@ I checkout a specific commit from history. I will let your repository in detach mode! " Class { - #name : #IceTipCheckoutCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultDescription [ ^ 'Set the selected commit as current commit and load the code in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultName [ ^ 'Checkout' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutCommitCommand >> execute [ (IceTipCheckoutPreviewBrowser onBranch: self selectedCommit) open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> iconName [ ^ #refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> selectedCommit [ ^ self context selectedCommit diff --git a/Iceberg-TipUI/IceTipCheckoutModel.class.st b/Iceberg-TipUI/IceTipCheckoutModel.class.st index 50cdb34b4a..c1290c529e 100644 --- a/Iceberg-TipUI/IceTipCheckoutModel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipCheckoutModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipCheckoutModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'checkoutStrategy', 'checkoutStrategies' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> calculateDiff [ ^ commitish entity diffTo: self repository workingCopy ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> checkout [ checkoutStrategy @@ -24,30 +26,30 @@ IceTipCheckoutModel >> checkout [ self commitish checkout: checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategies [ ^ checkoutStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy [ ^ checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy: aStrategy [ checkoutStrategy := aStrategy ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutModel >> hasNewPackages [ ^ diffModel tree anySatisfy:[ :aNode | aNode isAddition and: [ aNode definition isPackageDefinition]] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutModel >> initialize [ super initialize. @@ -55,7 +57,7 @@ IceTipCheckoutModel >> initialize [ checkoutStrategy := checkoutStrategies first. ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> newCheckoutAction [ @@ -67,7 +69,7 @@ IceTipCheckoutModel >> newCheckoutAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> newPackages [ | packageNodes | diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st index e7fa896dcc..c1ba72ea9d 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st @@ -3,24 +3,26 @@ Action to start the creation of a new branch from the selected commit. Then checkout the selected branch. " Class { - #name : #IceTipCheckoutNewBranchCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutNewBranchCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultDescription [ ^ 'Create a new branch from the selected commit and switch to it' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultName [ ^ 'Branch...' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutNewBranchCommand >> execute [ ((IceTipCheckoutNewBranchPanel @@ -33,13 +35,13 @@ IceTipCheckoutNewBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> iconName [ ^ #branch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> selectedCommit [ ^ self item entity diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st index fc93346154..c902606842 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st @@ -2,8 +2,8 @@ I'm a panel to create a new local branch " Class { - #name : #IceTipCheckoutNewBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipCheckoutNewBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'currentBranchLabel', 'branchLabel', @@ -11,40 +11,42 @@ Class { 'branchCommitish', 'callback' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchInputText [ ^ branchInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchLabel [ ^ branchLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> branchName [ ^ self branchInputText text asString trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> commitish: anIceTipModel [ branchCommitish := anIceTipModel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> currentBranchLabel [ ^ currentBranchLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutNewBranchPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -60,7 +62,7 @@ IceTipCheckoutNewBranchPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutNewBranchPanel >> doAccept [ (self model @@ -72,26 +74,26 @@ IceTipCheckoutNewBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializeCurrentBranchLabel [ currentBranchLabel := self newLabel label: 'Current branch: ', self model branchName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -103,13 +105,13 @@ IceTipCheckoutNewBranchPanel >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutNewBranchPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> openDialog [ ^ self asDialogWindow @@ -117,13 +119,13 @@ IceTipCheckoutNewBranchPanel >> openDialog [ open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> titleForWindow [ ^ 'New branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> validate [ self @@ -134,7 +136,7 @@ IceTipCheckoutNewBranchPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCheckoutNewBranchPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st index 6757094f5f..7ce1870ee7 100644 --- a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st @@ -4,23 +4,25 @@ I preview the changes that will be introduced in the image when a checkout occur (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipCheckoutPreviewBrowser, - #superclass : #IceTipPreviewBrowser, + #name : 'IceTipCheckoutPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', #instVars : [ 'checkoutStrategyLabel', 'checkoutStrategyList', 'selectedCheckoutStrategy' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipCheckoutPreviewBrowser class >> maxBranchNameLength [ ^ 32 ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipCheckoutModel new @@ -28,19 +30,19 @@ IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ yourself) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyLabel [ ^ checkoutStrategyLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyList [ ^ checkoutStrategyList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -57,7 +59,7 @@ IceTipCheckoutPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutPreviewBrowser >> doCheckout [ (self model hasNewPackages and: [ self model checkoutStrategy isLoadAlreadyLoadedStrategy ]) @@ -69,7 +71,7 @@ IceTipCheckoutPreviewBrowser >> doCheckout [ executeWithContext: self ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ | checkoutStrategies | @@ -81,7 +83,7 @@ IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ self model checkoutStrategy: aStrategy ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -96,7 +98,7 @@ IceTipCheckoutPreviewBrowser >> initializePresenters [ self initializeCheckoutStrategyList ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutPreviewBrowser >> newActionButton [ ^ self newButton @@ -107,7 +109,7 @@ IceTipCheckoutPreviewBrowser >> newActionButton [ yourself ] -{ #category : #operations } +{ #category : 'operations' } IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ ((IceTipAddNewPackagesDialogPresenter @@ -120,13 +122,13 @@ IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutPreviewBrowser >> selectedCheckoutStrategy [ ^ selectedCheckoutStrategy ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> titleForWindow [ ^ 'Preview checkout of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st index 2dbcfef159..5e9ecbb7d4 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st @@ -2,36 +2,38 @@ Command that checks out the selected branch " Class { - #name : #IceTipCheckoutSelectedBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultDescription [ ^ 'Checkout this branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedBranchCommand >> actsOnBranch: aBranchModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedBranchCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedBranchCommand >> iconName [ ^ #branch ] diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st index c1d25d3348..4d2092de3c 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st @@ -2,35 +2,37 @@ Command that checks out the selected tag " Class { - #name : #IceTipCheckoutSelectedTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultDescription [ ^ 'Checkout this tag for this repository. Repository will then be in Detached Head state!' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultName [ ^ 'Checkout tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedTagCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedTagCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCherryPickCommand.class.st b/Iceberg-TipUI/IceTipCherryPickCommand.class.st index 373462f0e1..d93f271031 100644 --- a/Iceberg-TipUI/IceTipCherryPickCommand.class.st +++ b/Iceberg-TipUI/IceTipCherryPickCommand.class.st @@ -2,38 +2,40 @@ Generic command to cherry pick changes " Class { - #name : #IceTipCherryPickCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCherryPickCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultDescription [ ^ 'Cherrypick this commit and apply changes to the working copy' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultName [ ^ 'Cherrypick' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCherryPickCommand >> canBeExecuted [ self flag: #pharoTodo. "TODO: Still not ready" ^ false ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> execute [ (IceTipCherrypickPreviewBrowser onCommitish: self selectedCommitish) open ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> selectedCommitish [ ^ self context selectedCommit realObject entity diff --git a/Iceberg-TipUI/IceTipCherrypickModel.class.st b/Iceberg-TipUI/IceTipCherrypickModel.class.st index b3ec970b3a..125c2afe8c 100644 --- a/Iceberg-TipUI/IceTipCherrypickModel.class.st +++ b/Iceberg-TipUI/IceTipCherrypickModel.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipCherrypickModel, - #superclass : #IceTipModel, + #name : 'IceTipCherrypickModel', + #superclass : 'IceTipModel', #instVars : [ 'mergeTree', 'commitish' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickModel class >> onCommitish: aCommitish [ ^ self new @@ -16,33 +18,33 @@ IceTipCherrypickModel class >> onCommitish: aCommitish [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish [ ^commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish: aCommistish [ commitish := aCommistish. mergeTree := commitish repository cherryPickFrom: aCommistish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> diff [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> mergeTree [ ^mergeTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> repository [ ^commitish repository. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> treeToShow [ " Return the tree to display in windows " ^ self mergeTree diff --git a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st index 71727fdcec..42dd79ac32 100644 --- a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st @@ -1,39 +1,41 @@ Class { - #name : #IceTipCherrypickPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCherrypickPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'buttonBar' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickPreviewBrowser class >> onCommitish: aCommitish [ ^ self on: (IceTipCherrypickModel onCommitish: aCommitish) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> buttonBar [ ^ buttonBar ] -{ #category : #layout } +{ #category : 'layout' } IceTipCherrypickPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,13 +44,13 @@ IceTipCherrypickPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipCherrypickPreviewBrowser >> doCherryPick [ | root | @@ -58,13 +60,13 @@ IceTipCherrypickPreviewBrowser >> doCherryPick [ self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel := self @@ -76,20 +78,20 @@ IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel rightLabel: ' With Cherrypicked commit ' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickPreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCherrypickPreviewBrowser >> newActionButton [ ^ self newButton @@ -100,7 +102,7 @@ IceTipCherrypickPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> titleForWindow [ ^ 'Preview result of Cherrypick' diff --git a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st index bf24223abd..d97c3a3ad8 100644 --- a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st +++ b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st @@ -3,18 +3,20 @@ I'm a CmVisitor that in one hand, tells each command to be hidden if it can't be " Class { - #name : #IceTipCleanCommandGroupVisitor, - #superclass : #CmVisitor, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCleanCommandGroupVisitor', + #superclass : 'CmVisitor', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommand: aCmCommand [ aCmCommand beHiddenWhenCantBeRun ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommandGroup: aCmCommandsGroup [ super visitCommandGroup: aCmCommandsGroup. diff --git a/Iceberg-TipUI/IceTipCommand.class.st b/Iceberg-TipUI/IceTipCommand.class.st index 5df99320f2..bd90248921 100644 --- a/Iceberg-TipUI/IceTipCommand.class.st +++ b/Iceberg-TipUI/IceTipCommand.class.st @@ -2,31 +2,33 @@ I'm the superclass of all commands of the IceTip UI. " Class { - #name : #IceTipCommand, - #superclass : #CmCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommand', + #superclass : 'CmCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommand class >> defaultToolbarItemName [ ^ self defaultName ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand class >> isAbstract [ ^ self == IceTipCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> application [ ^ SpApplication defaultApplication ] -{ #category : #converting } +{ #category : 'converting' } IceTipCommand >> asSpecCommand [ | spCommand | @@ -45,31 +47,31 @@ IceTipCommand >> asSpecCommand [ ^ spCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> badge [ "Answer a number as extra information in the button. An answer of nil means no information." ^ nil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasRepository [ ^ self repositoryModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasSelectedItem [ ^ self context selectedItem notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasUnbornProject [ ^ self repositoryModel hasUnbornProject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> iconName [ "Answer the icon name (a Symbol) for this command." @@ -77,13 +79,13 @@ IceTipCommand >> iconName [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryDetached [ ^ self repositoryModel isNil or: [ self repositoryModel isDetached ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryMissing [ ^ self hasRepository and: [ @@ -91,32 +93,32 @@ IceTipCommand >> isRepositoryMissing [ self repositoryModel isCodeMissing ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryOperational [ ^ self isRepositoryMissing not and: [ self isRepositoryDetached not and: [ self hasUnbornProject not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommand >> item [ ^ self context selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repositoryModel [ ^ self context repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> shortcutKey [ "Answer the key combination to execute this command. Answer nil if there isn't a key combination." @@ -124,31 +126,31 @@ IceTipCommand >> shortcutKey [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> tool [ ^ self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolAnnouncer [ ^ self tool announcer ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolbarItemName [ ^ self class defaultToolbarItemName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> withErrorHandlingDo: aBlock [ aBlock diff --git a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st index 43fac26d0a..e1963c220c 100644 --- a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st +++ b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st @@ -4,18 +4,20 @@ I'm an abstract strategy to build Spec2 buttons wrapping a IceTipSpCommand. My c " Class { - #name : #IceTipCommandToPresenterBuildingStrategy, - #superclass : #Object, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipCommandToPresenterBuildingStrategy', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipCommandToPresenterBuildingStrategy >> buttonPresenterClass [ ^ self subclassResponsibility ] -{ #category : #public } +{ #category : 'public' } IceTipCommandToPresenterBuildingStrategy >> resultOn: aCommand [ ^ self buttonPresenterClass new diff --git a/Iceberg-TipUI/IceTipCommentPanel.class.st b/Iceberg-TipUI/IceTipCommentPanel.class.st index 593715e413..efad87e23a 100644 --- a/Iceberg-TipUI/IceTipCommentPanel.class.st +++ b/Iceberg-TipUI/IceTipCommentPanel.class.st @@ -3,8 +3,8 @@ I'm a comment panel. I can obtain a comment text and certain ""commit specific"" options. " Class { - #name : #IceTipCommentPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCommentPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'repositoryModel', 'commentText', @@ -15,34 +15,36 @@ Class { 'fixesLabel', 'optionsButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> clear [ commentText text: '' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commentText [ ^ commentText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commitButton [ ^ commitButton ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommentPanel >> defaultLayout [ self flag: #pharoTodo. "FIXES ISSUE NUMBER INPUT is disabled. See below. @@ -63,19 +65,19 @@ IceTipCommentPanel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesField [ ^ fixesField ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesLabel [ ^ fixesLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> initializePresenters [ | fixesHelpString | @@ -132,25 +134,25 @@ IceTipCommentPanel >> initializePresenters [ yourself) ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isPushing [ ^ IceTipCommitSettings pushOnCommit and: [ self repositoryModel branchModel hasUpstream ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isRunningCriticsOnCommit [ ^ IceTipCommitSettings critiquesOnCommit ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isSaving [ ^ IceTipCommitSettings saveImageOnCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> message [ self fixesField text isAllDigits ifFalse: [ @@ -163,7 +165,7 @@ IceTipCommentPanel >> message [ nextPutAll: self fixesField number asString ] ] -{ #category : #events } +{ #category : 'events' } IceTipCommentPanel >> onCommit: aBlock [ commitButton action: [ @@ -172,62 +174,62 @@ IceTipCommentPanel >> onCommit: aBlock [ cull: self isPushing ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> pushCheckbox [ ^ pushCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> pushOnCommit: aBoolean [ IceTipCommitSettings pushOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> refresh [ commitButton help: ('Commit your changes to {1}' format: { self repositoryName }). pushCheckbox label: ('Push changes to {1}' format: { self repositoryRemoteName }) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> repositoryModel [ ^ repositoryModel ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryRemoteName [ ^ self repositoryModel pushRemoteName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> runCriticsOnCommit: aBoolean [ IceTipCommitSettings critiquesOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> saveOnCommit: aBoolean [ IceTipCommitSettings saveImageOnCommit: aBoolean ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> setModelBeforeInitialization: aRepositoryModel [ repositoryModel := aRepositoryModel ] -{ #category : #specs } +{ #category : 'specs' } IceTipCommentPanel >> titleForWindow [ ^ 'Comment' diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index 5feb85f24f..af2aaf285c 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -2,17 +2,19 @@ I perform a commit " Class { - #name : #IceTipCommitAction, - #superclass : #IceTipAction, + #name : 'IceTipCommitAction', + #superclass : 'IceTipAction', #instVars : [ 'diff', 'items', 'message' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipCommitAction >> basicExecute [ self validateCanCommit. UIManager default @@ -25,49 +27,49 @@ IceTipCommitAction >> basicExecute [ Iceberg announcer announce: (IceCommited for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff: anObject [ diff := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items [ ^ items ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items: anObject [ items := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message: anObject [ message := anObject ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateCanCommit [ self validateMessageNotEmpty ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateChangeListNotEmpty [ "If there are no selected changed, no point on commiting :)" items ifEmpty: [ IceNothingToCommit signal ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateMessageNotEmpty [ self message ifEmpty: [ IceNoCommitMessage signal ] ] diff --git a/Iceberg-TipUI/IceTipCommitBrowser.class.st b/Iceberg-TipUI/IceTipCommitBrowser.class.st index f03933e7a0..f763966e4f 100644 --- a/Iceberg-TipUI/IceTipCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCommitBrowser.class.st @@ -4,23 +4,25 @@ I'm a browser to commit changes to a repository. (self onRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipCommitBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCommitBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'commentPanel', 'saveAction' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipRefreshCommitCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -37,31 +39,31 @@ IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCom ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCommitBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> accept [ ^ self doCommit ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel [ ^ commentPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel: aSpPresenter [ commentPanel := aSpPresenter ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommitBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,25 +73,25 @@ IceTipCommitBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel: aSpPresenter [ diffPanel := aSpPresenter ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCollapseSelection [ diffPanel doCollapseSelection ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit [ | selectedItems message isPushing isSaving commitBlock| @@ -111,7 +113,7 @@ IceTipCommitBrowser >> doCommit [ openIfCritiques ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBoolean saving: savingBoolean [ self model newCommitAction @@ -127,26 +129,26 @@ IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBo executeWithContext: self ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doExpandSelection [ diffPanel doExpandSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialize [ super initialize. saveAction := IceTipSaveImageAction new ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeAcceptShortcut [ self @@ -159,7 +161,7 @@ IceTipCommitBrowser >> initializeAcceptShortcut [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffSelectingPanel on: self model workingCopyDiff. @@ -172,27 +174,27 @@ IceTipCommitBrowser >> initializePresenters [ self initializeAcceptShortcut ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> refresh [ diffPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) @@ -201,13 +203,13 @@ IceTipCommitBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> saveAction: anAction [ saveAction := anAction ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> subscribeToAnnouncements [ self announcer @@ -216,7 +218,7 @@ IceTipCommitBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> titleForWindow [ ^ 'Commit on {1} branch {2}' format: { @@ -224,7 +226,7 @@ IceTipCommitBrowser >> titleForWindow [ self model branchName } ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> verifyNeedsRefreshOrClose [ "Verifies if there are remaining changes to commit. In case there are none, close the window." diff --git a/Iceberg-TipUI/IceTipCommitCommand.class.st b/Iceberg-TipUI/IceTipCommitCommand.class.st index 8020364cbb..2f4e759cfa 100644 --- a/Iceberg-TipUI/IceTipCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCommitCommand.class.st @@ -2,30 +2,32 @@ I open a the commit window, with all latest changes. " Class { - #name : #IceTipCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultDescription [ ^ 'Commit changes to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultName [ ^ 'Commit' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommitCommand >> execute [ (IceTipCommitBrowser @@ -34,13 +36,13 @@ IceTipCommitCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> iconName [ ^ #smallOk ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> shortcutKey [ ^ $s meta diff --git a/Iceberg-TipUI/IceTipCommitDiffModel.class.st b/Iceberg-TipUI/IceTipCommitDiffModel.class.st index c9b056036f..4265e1cb76 100644 --- a/Iceberg-TipUI/IceTipCommitDiffModel.class.st +++ b/Iceberg-TipUI/IceTipCommitDiffModel.class.st @@ -3,12 +3,14 @@ I'm a ""static"" diff. I represent a diff between two concrete commits. " Class { - #name : #IceTipCommitDiffModel, - #superclass : #IceTipDiffModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitDiffModel', + #superclass : 'IceTipDiffModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitDiffModel >> diff [ ^ self entity ] diff --git a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st index 55ac9d5b45..43aa07baaf 100644 --- a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st +++ b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st @@ -4,8 +4,8 @@ I'm a panel to show the history of a commitish (usually a branch or a tag). I di I'm usually used as part of an IceTipHistoryBrowser. " Class { - #name : #IceTipCommitInfoPresenter, - #superclass : #SpPresenter, + #name : 'IceTipCommitInfoPresenter', + #superclass : 'SpPresenter', #instVars : [ 'model', 'selectedModel', @@ -16,10 +16,12 @@ Class { 'headPage', 'ancestorPage' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #layout } +{ #category : 'layout' } IceTipCommitInfoPresenter class >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -27,21 +29,21 @@ IceTipCommitInfoPresenter class >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForCommit [ headTabContainer := IceTipHistoryDiffFromHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForMerge [ headTabContainer := IceTipHistoryDiffToHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> commitInfo [ selectedModel ifNil: [ ^ self newEmpty ]. @@ -50,28 +52,28 @@ IceTipCommitInfoPresenter >> commitInfo [ application: self application ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromAncestor [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (ancestorTabContainer diffFor: selectedModel) ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromHead [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (headTabContainer diffFor: selectedModel) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initialize [ self beForCommit. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -87,14 +89,14 @@ IceTipCommitInfoPresenter >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializePresenters [ notebookPanel := self newNotebook. self initializeCommitPanel ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newDiffPage [ ^ SpNotebookPage @@ -103,7 +105,7 @@ IceTipCommitInfoPresenter >> newDiffPage [ provider: [ "It will be overriden" ] ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newEmpty [ ^ self newLabel @@ -111,7 +113,7 @@ IceTipCommitInfoPresenter >> newEmpty [ yourself ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newInfoPage [ ^ SpNotebookPage @@ -120,7 +122,7 @@ IceTipCommitInfoPresenter >> newInfoPage [ provider: [ self commitInfo ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> refresh [ selectedModel ifNil: [ ^ self ]. @@ -130,38 +132,38 @@ IceTipCommitInfoPresenter >> refresh [ notebookPanel resetAllPageContents ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestor [ ancestorTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestorLabel [ ancestorTabContainer updateLabelOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHead [ headTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHeadLabel [ headTabContainer updateLabelOn: selectedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> selectedModel: aModel [ selectedModel := aModel. self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> setModelBeforeInitialization: anObject [ model := anObject diff --git a/Iceberg-TipUI/IceTipCommitModel.class.st b/Iceberg-TipUI/IceTipCommitModel.class.st index 661a5e0c07..dc14b81d9e 100644 --- a/Iceberg-TipUI/IceTipCommitModel.class.st +++ b/Iceberg-TipUI/IceTipCommitModel.class.st @@ -2,42 +2,44 @@ I'm a model for IceCommit entries. " Class { - #name : #IceTipCommitModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitModel', + #superclass : 'IceTipCommitishModel', #traits : 'TIceCopyCommitId', #classTraits : 'TIceCopyCommitId classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipCommitModel >> adopt [ self entity adopt ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortId [ ^ self entity ancestors first shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortIdOrOrigin [ ^ self entity ancestors ifNotEmpty: [ self ancestorShortId ] ifEmpty: [ 'Origin' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestors [ ^ self entity ancestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> author [ ^ self entity author ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> calculateDiff: aBlock [ | diff | @@ -50,18 +52,18 @@ IceTipCommitModel >> calculateDiff: aBlock [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> comment [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -73,18 +75,18 @@ IceTipCommitModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> datetime [ ^ self entity datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> description [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromFirstAncestor [ | diff ancestorCommit | @@ -97,7 +99,7 @@ IceTipCommitModel >> diffFromFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromHead [ | head diff | @@ -108,7 +110,7 @@ IceTipCommitModel >> diffFromHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToFirstAncestor [ | diff ancestorCommit | @@ -121,7 +123,7 @@ IceTipCommitModel >> diffToFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToHead [ | head diff | @@ -132,7 +134,7 @@ IceTipCommitModel >> diffToHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToWorkingCopy [ | diff | diff := self calculateDiff: [ self entity diffToWorkingCopy ]. @@ -141,18 +143,18 @@ IceTipCommitModel >> diffToWorkingCopy [ on: diff ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> hasMultipleAncestors [ ^ self entity hasMultipleAncestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> id [ ^ self entity id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> info [ ^ {('Commit:' -> ('[' , self shortId , '] ' , self id)). ('Parents:' -> (self entity ancestors collect: #shortId) asCommaString). @@ -162,12 +164,12 @@ IceTipCommitModel >> info [ ('Comment:' -> self entity comment)} ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> isMerged [ ^ self entity isMerged ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ ^ (IceTipCommitRangeModel repositoryModel: self repositoryModel @@ -176,44 +178,44 @@ IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitModel >> mergeHistoryFromSecondAncestor [ ^ self mergeHistoryFromAncestor: self entity ancestors second ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> name [ ^ self entity description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> shortId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagDecorator [ ^ IceTipTagDecorator uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagNames [ ^ self entity tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagsDescription [ ^ ', ' join: self tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> timeStamp [ ^ self entity timeStamp ] diff --git a/Iceberg-TipUI/IceTipCommitRangeModel.class.st b/Iceberg-TipUI/IceTipCommitRangeModel.class.st index 7672e2d0dd..b0c9f2c5dd 100644 --- a/Iceberg-TipUI/IceTipCommitRangeModel.class.st +++ b/Iceberg-TipUI/IceTipCommitRangeModel.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipCommitRangeModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitRangeModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'toCommit' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> commitModels [ ^ (self fromCommit newCommitWalk uptoCommit: self toCommit) commits collect: [ :each | @@ -18,24 +20,24 @@ IceTipCommitRangeModel >> commitModels [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> fromCommit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> name [ ^ 'Commits from {1} to {2}' format: { self fromCommit shortId. self toCommit shortId } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit [ ^ toCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit: anObject [ toCommit := anObject ] diff --git a/Iceberg-TipUI/IceTipCommitishModel.class.st b/Iceberg-TipUI/IceTipCommitishModel.class.st index d861e067e4..608716641e 100644 --- a/Iceberg-TipUI/IceTipCommitishModel.class.st +++ b/Iceberg-TipUI/IceTipCommitishModel.class.st @@ -3,35 +3,37 @@ I'm a base model for all commitish models to be used. I can provide #commitModels which changes depending on concrete model. " Class { - #name : #IceTipCommitishModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitishModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitId [ ^ self entity commit id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitModels [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitishModel >> isCommitish [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> shortCommitId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> tagModels [ ^ self repositoryModel tagModels diff --git a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st index 34a2e6480d..3806ee454a 100644 --- a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st +++ b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st @@ -2,36 +2,38 @@ Command that copies the selected entity short commit ID to the clipboard " Class { - #name : #IceTipCopyCommitishCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCopyCommitishCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultDescription [ ^ 'Copy the selected short commit ID (7 characters long) to the clipboard' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultName [ ^ 'Copy commitish ID' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCopyCommitishCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item commitId isNotNil ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCopyCommitishCommand >> execute [ self item copyCommitIDToClipboard ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCopyCommitishCommand >> iconName [ ^ #book diff --git a/Iceberg-TipUI/IceTipCreateTagCommand.class.st b/Iceberg-TipUI/IceTipCreateTagCommand.class.st index 025f5e7a76..9d82bf01e3 100644 --- a/Iceberg-TipUI/IceTipCreateTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCreateTagCommand.class.st @@ -2,30 +2,32 @@ I an a commander command that will be activated on any commitish or repository and ask the selected item to create a tag on itself. " Class { - #name : #IceTipCreateTagCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCreateTagCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultDescription [ ^ 'Creates a tag for the selected commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultName [ ^ 'Create tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagCommand >> canBeExecuted [ ^ self repositoryModel isNotNil ] -{ #category : #executing } +{ #category : 'executing' } IceTipCreateTagCommand >> execute [ (IceTipCreateTagPanel @@ -36,7 +38,7 @@ IceTipCreateTagCommand >> execute [ open ] -{ #category : #activation } +{ #category : 'activation' } IceTipCreateTagCommand >> iconName [ ^ #glamorousBookmark diff --git a/Iceberg-TipUI/IceTipCreateTagPanel.class.st b/Iceberg-TipUI/IceTipCreateTagPanel.class.st index 665f1d5753..4784ee9aa5 100644 --- a/Iceberg-TipUI/IceTipCreateTagPanel.class.st +++ b/Iceberg-TipUI/IceTipCreateTagPanel.class.st @@ -5,8 +5,8 @@ I have a form with a label and an input, and the commitish to tag. I'm done to be embedded in a dialog, so I implement doAccept to execute my action. " Class { - #name : #IceTipCreateTagPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCreateTagPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'callback', 'tagNameInputText', @@ -19,10 +19,12 @@ Class { 'minorButton', 'patchButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> accept [ self validate. @@ -30,25 +32,25 @@ IceTipCreateTagPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitish: anIceTipCachedModel [ commitishToTag := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitishToTag [ ^ commitishToTag ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> currentCommitishLabel [ ^ currentCommitishLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCreateTagPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -72,7 +74,7 @@ IceTipCreateTagPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCreateTagPanel >> doAccept [ self validate. @@ -85,19 +87,19 @@ IceTipCreateTagPanel >> doAccept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> existingTagsList [ ^ existingTagsList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeCurrentBranchLabel [ currentCommitishLabel := self newLabel @@ -106,7 +108,7 @@ IceTipCreateTagPanel >> initializeCurrentBranchLabel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeExistingTagsList [ existingTagsList := self newList. @@ -117,7 +119,7 @@ IceTipCreateTagPanel >> initializeExistingTagsList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeNextTagPanel [ | parts prefix nextMajor nextMinor nextPatch toString | @@ -142,7 +144,7 @@ IceTipCreateTagPanel >> initializeNextTagPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -159,18 +161,18 @@ IceTipCreateTagPanel >> initializePresenters [ self initializeExistingTagsList ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagParts [ ^ self latestTagPartsIn: (commitishToTag tagModels collect: #name) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ | prefix parts | @@ -191,17 +193,17 @@ IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ ^ parts ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> majorButton [ ^ majorButton ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> minorButton [ ^ minorButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> openDialog [ ^ self asDialogWindow @@ -209,43 +211,43 @@ IceTipCreateTagPanel >> openDialog [ open ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> patchButton [ ^ patchButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> setModelBeforeInitialization: aCommitish [ self commitish: aCommitish ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagName [ ^ self tagNameInputText text asString trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameInputText [ ^ tagNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameLabel [ ^ tagNameLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> titleForWindow [ ^ 'New tag of ' , commitishToTag name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> validate [ self @@ -256,7 +258,7 @@ IceTipCreateTagPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCreateTagPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCredentialsSettings.class.st b/Iceberg-TipUI/IceTipCredentialsSettings.class.st index 7e39ca364c..ee86be1c80 100644 --- a/Iceberg-TipUI/IceTipCredentialsSettings.class.st +++ b/Iceberg-TipUI/IceTipCredentialsSettings.class.st @@ -1,26 +1,28 @@ Class { - #name : #IceTipCredentialsSettings, - #superclass : #Object, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipCredentialsSettings', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonAction [ IceTipCredentialsStoreBrowser new open. ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonLabel [ ^ 'Edit' ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonState [ ^ true ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> settingsOn: aBuilder [ diff --git a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st index 8bfeb9a0f4..7c0ffb3388 100644 --- a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st +++ b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st @@ -2,15 +2,17 @@ I am the browser used to show a credentials store. " Class { - #name : #IceTipCredentialsStoreBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCredentialsStoreBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'credentialsList' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddPlainTextCredentialCommand. @@ -20,7 +22,7 @@ IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter f aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipEditCredentialCommand. @@ -29,19 +31,19 @@ IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> credentialsList [ ^ credentialsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCredentialsStoreBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -49,14 +51,14 @@ IceTipCredentialsStoreBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initialize [ model ifNil: [ model := IceCredentialStore current ]. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializeCredentialsList [ credentialsList @@ -78,32 +80,32 @@ IceTipCredentialsStoreBrowser >> initializeCredentialsList [ evaluated: #description) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializePresenters [ credentialsList := self newTable. self initializeCredentialsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCredentialsStoreBrowser >> mainList [ ^ credentialsList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> refresh [ credentialsList items: self model allCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> store [ ^ self model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> titleForWindow [ ^ model isCurrent @@ -111,7 +113,7 @@ IceTipCredentialsStoreBrowser >> titleForWindow [ ifFalse: [ 'Credentials of ' , model printString ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st index f96e633058..7b82ab06f0 100644 --- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st @@ -2,8 +2,8 @@ I am a dialog to be used before commit so we can check if the code to commit has critiques on it " Class { - #name : #IceTipCritiquesBeforeCommitBrowser, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipCritiquesBeforeCommitBrowser', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'commitModel', 'onAcceptAction', @@ -15,41 +15,43 @@ Class { 'browseButton', 'autofixButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> accept [ self closeWindow. onAcceptAction value ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel [ ^ commitModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel: anObject [ commitModel := anObject ] -{ #category : #layout } +{ #category : 'layout' } IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -67,7 +69,7 @@ IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ yourself ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ self withWindowDo: [ :window | @@ -77,7 +79,7 @@ IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ window buttons third label: 'Close' ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doAutofix [ critiquesList selectedItem ifNotNil: [ :aCritique | @@ -98,13 +100,13 @@ IceTipCritiquesBeforeCommitBrowser >> doAutofix [ centered ]) actOnCritic: aCritique ofEntity: aCritique entity ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doBrowse [ critiquesList selectedItem ifNotNil: [ :aCritique | aCritique entity browse ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ critiquesList := self newTable. @@ -128,7 +130,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ whenSelectionChangedDo: (MessageSend receiver: self selector: #updateSelectedCritique) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ detailPanel := self newText @@ -139,7 +141,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -161,7 +163,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ browseButton := self newButton. @@ -179,7 +181,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ self initializeDetailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeReasonPanel [ reasonPanel := self newText @@ -193,18 +195,18 @@ Select each critique to see a detailed message of each critique.'. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> onAccept: aFullBlockClosure [ onAcceptAction := aFullBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ "If the setting is disabled we just commit" @@ -220,13 +222,13 @@ IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipCritiquesBeforeCommitBrowser >> setModelBeforeInitialization: someNodes [ model := someNodes ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ ^ 'Critiques for Commit on {1} branch {2}' format: { @@ -234,7 +236,7 @@ IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ commitModel branchName } ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ super updatePresenter. @@ -250,7 +252,7 @@ IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> updateSelectedCritique [ critiquesList selectedItem diff --git a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st index e6e7553bd8..d811fc6fa2 100644 --- a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st @@ -2,36 +2,38 @@ Command that deletes the selected branch " Class { - #name : #IceTipDeleteBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultDescription [ ^ 'Delete this branch for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultName [ ^ 'Delete branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteBranchCommand >> actsOnBranch: aBranchModel [ ^ aBranchModel isLocal ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteBranchCommand >> execute [ self item newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteBranchCommand >> iconName [ ^ #delete diff --git a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st index 2ceedd53fe..72ade8f5c3 100644 --- a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected remote " Class { - #name : #IceTipDeleteRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultDescription [ ^ 'Delete this remote for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultName [ ^ 'Delete remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> execute [ self remoteModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteRemoteCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st index dbbcff7b76..33a461bf49 100644 --- a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected tag " Class { - #name : #IceTipDeleteTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultDescription [ ^ 'Delete this tag for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultName [ ^ 'Delete tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> execute [ self tagModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteTagCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> tagModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st index cb9e666a4f..7fb84e4e1e 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceTipDescriptionDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> head [ ^ IceTipDescriptionDecoratorHead uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> modified [ ^ IceTipDescriptionDecoratorModified uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> notLoaded [ ^ IceTipDescriptionDecoratorNotLoaded uniqueInstance diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st index 719dc586a1..2197e5dc20 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorHead, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorHead', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceTipDescriptionDecoratorHead >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st index 47b9c2c22d..cb74929623 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorModified, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorModified', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorModified >> color [ ^ Smalltalk ui theme successTextColor diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st index 8092e02645..47ff354917 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorNotLoaded, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorNotLoaded', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorNotLoaded >> color [ ^ Smalltalk ui theme disabledTextColor diff --git a/Iceberg-TipUI/IceTipDialogPresenter.class.st b/Iceberg-TipUI/IceTipDialogPresenter.class.st index 28f57f6119..701c18a670 100644 --- a/Iceberg-TipUI/IceTipDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipDialogPresenter.class.st @@ -3,24 +3,26 @@ I'm a general dialog. I implement a default accept method that needs to be overriden my children and some utility methods to easier build a dialog. " Class { - #name : #IceTipDialogPresenter, - #superclass : #IceTipPresenter, - #category : #'Iceberg-TipUI-View' + #name : 'IceTipDialogPresenter', + #superclass : 'IceTipPresenter', + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> accept [ "override this if you want a dialog" ] -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> cancel [ "override this if you want a dialog" self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. diff --git a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st index 8538e7c551..533808c3ad 100644 --- a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st +++ b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st @@ -4,25 +4,27 @@ I announce when an entry (a method, a class or a package) has been reverted. I'm used to refresh diff panels without recalculate everything again. " Class { - #name : #IceTipDiffEntryRemoved, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffEntryRemoved', + #superclass : 'IceTipAnnouncement', #instVars : [ 'entry' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffEntryRemoved class >> entry: anObject [ ^ self new entry: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry [ ^ entry ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry: anObject [ entry := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffModel.class.st b/Iceberg-TipUI/IceTipDiffModel.class.st index 6d62e59e96..e58cbf43a8 100644 --- a/Iceberg-TipUI/IceTipDiffModel.class.st +++ b/Iceberg-TipUI/IceTipDiffModel.class.st @@ -2,34 +2,36 @@ I'm a base model to present diffs. " Class { - #name : #IceTipDiffModel, - #superclass : #IceTipEntityModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipDiffModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> new [ ^ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> on: aDiff [ ^ self basicNew initializeEntity: aDiff; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> copyWithOnly: aCollection [ ^ self diff copyWithOnly: aCollection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> diff [ ^ self subclassResponsibility ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffModel >> reset [ UIManager default informUser: 'Refreshing changes' @@ -39,17 +41,17 @@ IceTipDiffModel >> reset [ self diff ] ] -{ #category : #private } +{ #category : 'private' } IceTipDiffModel >> resetDiff [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> tree [ ^ self diff treeToShow ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> treeRoots [ ^ self tree children ] diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st index 1a9898f73b..6a999df1f2 100644 --- a/Iceberg-TipUI/IceTipDiffPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffPanel.class.st @@ -7,23 +7,25 @@ also #elements answer should be a collection of elements that also understand el (IceTipDiffPanel onDiff: (IceRepository registry first workingCopyDiff)) openWithSpec " Class { - #name : #IceTipDiffPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipDiffPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'diffPanel', 'iceNodesTree' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffPanel class >> onDiff: aDiff [ ^ self on: (IceTipCommitDiffModel on: aDiff) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> basicRefresh [ self resetDiffContents. @@ -32,7 +34,7 @@ IceTipDiffPanel >> basicRefresh [ expandAll ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeDescriptionColumn [ ^ SpStringTableColumn new @@ -40,7 +42,7 @@ IceTipDiffPanel >> changeDescriptionColumn [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -52,7 +54,7 @@ IceTipDiffPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> collapsePath: aPath [ iceNodesTree @@ -60,7 +62,7 @@ IceTipDiffPanel >> collapsePath: aPath [ selectPath: aPath ] -{ #category : #layout } +{ #category : 'layout' } IceTipDiffPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -70,7 +72,7 @@ IceTipDiffPanel >> defaultLayout [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ diffPanel @@ -82,25 +84,25 @@ IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ rightText: rightString ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doCollapseSelection [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doExpandSelection [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> expandPath: aPath [ iceNodesTree @@ -108,38 +110,38 @@ IceTipDiffPanel >> expandPath: aPath [ selectPath: aPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowLeft [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowRight [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> iceNodesTree [ ^ iceNodesTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeDiffPanel [ diffPanel showOptions: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializePresenters [ iceNodesTree := self newTreeTable. @@ -149,7 +151,7 @@ IceTipDiffPanel >> initializePresenters [ self initializeDiffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeTree [ iceNodesTree @@ -163,19 +165,19 @@ IceTipDiffPanel >> initializeTree [ toAction: [ self handleArrowRight ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> leftLabel: aString [ diffPanel leftLabel: aString. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> refresh [ self model reset. @@ -183,25 +185,25 @@ IceTipDiffPanel >> refresh [ ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> resetDiffContents [ self diffContentsLeft: '' right: '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> rightLabel: aString [ diffPanel rightLabel: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> selectedItem [ ^ iceNodesTree selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> selectionChanged [ | itemValue | @@ -212,13 +214,13 @@ IceTipDiffPanel >> selectionChanged [ right: itemValue leftContents ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> subscribeToAnnouncements [ self announcer @@ -228,13 +230,13 @@ IceTipDiffPanel >> subscribeToAnnouncements [ ] -{ #category : #specs } +{ #category : 'specs' } IceTipDiffPanel >> titleForWindow [ ^ 'Diff' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> updatePresenter [ self basicRefresh diff --git a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st index c59d12d568..c783d8158d 100644 --- a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st +++ b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st @@ -1,31 +1,33 @@ Class { - #name : #IceTipDiffPreviewModel, - #superclass : #IceTipModel, + #name : 'IceTipDiffPreviewModel', + #superclass : 'IceTipModel', #instVars : [ 'commitish', 'diffModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> calculateDiff [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish [ ^ commitish entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish: aCommitish [ commitish := aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> diff [ ^ diffModel ifNil: [ | diff | @@ -37,19 +39,19 @@ IceTipDiffPreviewModel >> diff [ on: diff ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repository [ ^ commitish repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repositoryName [ ^ self repository name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> targetName [ ^ commitish name diff --git a/Iceberg-TipUI/IceTipDiffRefreshed.class.st b/Iceberg-TipUI/IceTipDiffRefreshed.class.st index 4be166e6fd..0f5ae0833b 100644 --- a/Iceberg-TipUI/IceTipDiffRefreshed.class.st +++ b/Iceberg-TipUI/IceTipDiffRefreshed.class.st @@ -2,25 +2,27 @@ I announce when a diff has been refreshed. " Class { - #name : #IceTipDiffRefreshed, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffRefreshed', + #superclass : 'IceTipAnnouncement', #instVars : [ 'repository' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffRefreshed class >> for: aRepository [ ^ self new repository: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st index 2d1fad7eff..ccdc9c09d8 100644 --- a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st @@ -10,15 +10,17 @@ also #elements answer should be a collection of elements that also understand el " Class { - #name : #IceTipDiffSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipDiffSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> activateItem: iceNode [ checkedIceNodes add: iceNode. @@ -31,7 +33,7 @@ IceTipDiffSelectingPanel >> activateItem: iceNode [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -49,7 +51,7 @@ IceTipDiffSelectingPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> deactivateItem: iceNode [ checkedIceNodes remove: iceNode. @@ -61,7 +63,7 @@ IceTipDiffSelectingPanel >> deactivateItem: iceNode [ self refreshCheckbox. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initialize [ super initialize. @@ -72,7 +74,7 @@ IceTipDiffSelectingPanel >> initialize [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initializeTree [ super initializeTree. @@ -81,7 +83,7 @@ IceTipDiffSelectingPanel >> initializeTree [ toAction: [ self toggleActivationItem: iceNodesTree selectedItem ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refresh [ super refresh. @@ -89,20 +91,20 @@ IceTipDiffSelectingPanel >> refresh [ root withAllChildrenDo: [ :each | checkedIceNodes add: each ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refreshCheckbox [ "Refresh after a checkbox state has changed. When a node with children changes this state, all children might change too. That's the reason of this special refresh. When a leave node changed such state, this refresh is redundant." iceNodesTree refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> toggleActivationItem: iceNode [ (checkedIceNodes includes: iceNode) diff --git a/Iceberg-TipUI/IceTipDirectMergeType.class.st b/Iceberg-TipUI/IceTipDirectMergeType.class.st index 496b7b0bef..435ef190da 100644 --- a/Iceberg-TipUI/IceTipDirectMergeType.class.st +++ b/Iceberg-TipUI/IceTipDirectMergeType.class.st @@ -7,12 +7,14 @@ I will perform a simple merge: This is the default merge mechanism (what users do most of the time) " Class { - #name : #IceTipDirectMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDirectMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipDirectMergeType >> newMergeAction: aModel [ ^ aModel newDirectMergeAction diff --git a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st index 1ce6ddf7df..dd3ef54559 100644 --- a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st +++ b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose directories. " Class { - #name : #IceTipDirectoryPresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipDirectoryPresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipDirectoryPresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st index 6c0db8b7a6..e3adc08fca 100644 --- a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDiscardAllChangesPreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDiscardAllChangesPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepository [ ^ self on: (IceTipDiscardAllModel new @@ -13,7 +15,7 @@ IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepositor yourself) ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ self model newDiscardAction @@ -21,13 +23,13 @@ IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ executeWithContext: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initialExtentForWindow [ ^ (900 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -37,7 +39,7 @@ IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ rightLabel: 'Commit to load: ', self loadCommitShortId ] -{ #category : #private } +{ #category : 'private' } IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ | shortId | @@ -47,7 +49,7 @@ IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ ifFalse: [ shortId ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ ^ self newButton @@ -58,7 +60,7 @@ IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> titleForWindow [ ^ 'Preview Changes to Discard' diff --git a/Iceberg-TipUI/IceTipDiscardAllModel.class.st b/Iceberg-TipUI/IceTipDiscardAllModel.class.st index ebba7aa80c..67acf77adc 100644 --- a/Iceberg-TipUI/IceTipDiscardAllModel.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllModel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipDiscardAllModel, - #superclass : #IceTipModel, + #name : 'IceTipDiscardAllModel', + #superclass : 'IceTipModel', #instVars : [ 'workingCopy', 'diffModel', 'repository' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> calculateDiff [ ^ workingCopy referenceCommit diffTo: workingCopy ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> diff [ ^ diffModel ifNil: [ @@ -28,13 +30,13 @@ IceTipDiscardAllModel >> diff [ on: diff ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> discardAll [ workingCopy discardChanges ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> newDiscardAction [ @@ -46,24 +48,24 @@ IceTipDiscardAllModel >> newDiscardAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository: anIceTipCachedModel [ repository := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy [ ^ workingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy: anObject [ workingCopy := anObject diff --git a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st index 187f996cb8..a6ba03553b 100644 --- a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st +++ b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st @@ -2,24 +2,26 @@ Command that discard all changes in the repository " Class { - #name : #IceTipDiscardChangesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDiscardChangesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultDescription [ ^ 'Discard all changes in this working copy.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultName [ ^ 'Discard all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> canBeExecuted [ ^ self isRepositoryMissing not and: [ @@ -28,7 +30,7 @@ IceTipDiscardChangesCommand >> canBeExecuted [ aCommit isCollection not and: [ aCommit isUnknownCommit not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipDiscardChangesCommand >> execute [ (IceTipDiscardAllChangesPreviewBrowser onRepository: self repositoryModel) @@ -37,13 +39,13 @@ IceTipDiscardChangesCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardChangesCommand >> iconName [ ^ #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st index faab93d8da..bce29f97be 100644 --- a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st @@ -4,24 +4,26 @@ I colaborate with the credential to know the specific class of the dialog model. Check #editModelClass in IceSshCredentials and IcePlaintextCredentials " Class { - #name : #IceTipEditCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultDescription [ ^ 'Edits the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultName [ ^ 'Edit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditCredentialCommand >> execute [ ((self item editModelClass newApplication: context application) @@ -33,13 +35,13 @@ IceTipEditCredentialCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> iconName [ ^ #edit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> shortcutKey [ ^ $e meta diff --git a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st index e05dfb7673..962f411b2d 100644 --- a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit plaintext credentials. " Class { - #name : #IceTipEditPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 160) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -39,14 +41,14 @@ IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ password: self password ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditPlaintextCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. passwordInput text: credentials password ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Edit credential for ' , credentials host diff --git a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st index 3694af7c87..0f08da0b7f 100644 --- a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipEditProjectDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipEditProjectDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -18,10 +18,12 @@ Class { 'removeButton', 'addButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> accept [ IceTipStandardAction new @@ -43,13 +45,13 @@ IceTipEditProjectDialogPresenter >> accept [ acceptCallback value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> acceptCallback [ ^ acceptCallback ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> addDirectory [ | newDirectoryName newDirectory previousSelection | @@ -70,7 +72,7 @@ IceTipEditProjectDialogPresenter >> addDirectory [ self expandAndSelect: previousSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> connectPresenters [ super connectPresenters. @@ -87,13 +89,13 @@ IceTipEditProjectDialogPresenter >> connectPresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> defaultFormat [ ^ defaultFormat ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditProjectDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -128,7 +130,7 @@ IceTipEditProjectDialogPresenter >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ @@ -155,25 +157,25 @@ IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatLabel [ ^ formatLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatList [ ^ formatList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> formats [ ^ formats ] -{ #category : #'format-management' } +{ #category : 'format-management' } IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ "We take as guinea pig a sub-directory to guess what format it is on. @@ -192,13 +194,13 @@ IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ ifNone: [ ^ defaultFormat ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> hasToShowWarning [ ^ model repository workingCopy packages isNotEmpty ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ^ self hasToShowWarning @@ -213,7 +215,7 @@ IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialize [ selectedDirectoryPath := RelativePath new. @@ -223,7 +225,7 @@ IceTipEditProjectDialogPresenter >> initialize [ super initialize. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ sourceDirectoryTree @@ -241,7 +243,7 @@ IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ self sourceDirectorySelectionChanged: announcement selectedPaths ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeMessagePanel [ | icon | @@ -254,7 +256,7 @@ IceTipEditProjectDialogPresenter >> initializeMessagePanel [ messageText text: self warningMessage ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -292,43 +294,43 @@ IceTipEditProjectDialogPresenter >> initializePresenters [ self initializeDirectoryTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageIcon [ ^ messageIcon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageText [ ^ messageText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> removeDirectory [ | toRemove newSelection | @@ -346,31 +348,31 @@ IceTipEditProjectDialogPresenter >> removeDirectory [ self expandAndSelect: newSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> selectedDirectoryPath [ ^ selectedDirectoryPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> selectedFileFormat [ ^ formatList selectedItem ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryLabel [ ^ sourceDirectoryLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPaths [ | selection | @@ -386,25 +388,25 @@ IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPat selectedDirectoryPath := selection relativeTo: self model fileSystem. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryTree [ ^ sourceDirectoryTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> titleForWindow [ ^ 'Edit Project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> username [ ^ self nameInput text trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> warningMessage [ ^ 'Be careful. You should choose the actual format of the current repository. diff --git a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st index c0b67c816d..10013324e4 100644 --- a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to edit a repository meta-data " Class { - #name : #IceTipEditRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipEditRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultDescription [ ^ 'Edit repository data' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultName [ ^ 'Edit...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipEditRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditRepositoryCommand >> execute [ self flag: #TODO. "Demeter's law" @@ -37,7 +39,7 @@ IceTipEditRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditRepositoryCommand >> iconName [ ^ #edit diff --git a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st index b7d805fe72..6ba89b4467 100644 --- a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit SSH credentials. " Class { - #name : #IceTipEditSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -27,13 +29,13 @@ IceTipEditSSHCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> initialExtentForWindow [ ^ (500@230) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -43,7 +45,7 @@ IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ keyPassphrase: self passphrase ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -52,7 +54,7 @@ IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ publicKeyInput location: credentials publicKey ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> titleForWindow [ ^ 'Edit SSH keys for ' , self credentials hostDescription diff --git a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st index 3d3b8c23a9..d42a7e3b60 100644 --- a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I am a dialog to edit token credentials. " Class { - #name : #IceTipEditTokenCredentialsPresenter, - #superclass : #IceTipAddTokenCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditTokenCredentialsPresenter', + #superclass : 'IceTipAddTokenCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -23,7 +25,7 @@ IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -32,7 +34,7 @@ IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditTokenCredentialsPresenter >> titleForWindow [ ^ 'Edit token credentials' diff --git a/Iceberg-TipUI/IceTipEntityModel.class.st b/Iceberg-TipUI/IceTipEntityModel.class.st index 49b9933bf4..7c9c4c177d 100644 --- a/Iceberg-TipUI/IceTipEntityModel.class.st +++ b/Iceberg-TipUI/IceTipEntityModel.class.st @@ -2,28 +2,30 @@ I'm a generic model for Iceberg entities (tipically, repositories, commits, packages, etc., etc., etc.) " Class { - #name : #IceTipEntityModel, - #superclass : #IceTipModel, + #name : 'IceTipEntityModel', + #superclass : 'IceTipModel', #instVars : [ 'entity', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> new [ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> on: anObject [ ^ self basicNew initializeEntity: anObject; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ ^ self basicNew initializeEntity: anObject; @@ -31,54 +33,54 @@ IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> description [ "A decorated description of this entity. It can return a text (in case decorations apply) or a simple string." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> descriptionDecorator [ ^ IceTipTextDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> displayString [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> entity [ ^ entity ] -{ #category : #fetching } +{ #category : 'fetching' } IceTipEntityModel >> fetch [ self entity fetch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEntityModel >> initializeEntity: anObject [ entity := anObject. self initialize ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isCommitish [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isModelOf: anObject [ ^ self entity = anObject ] -{ #category : #tagging } +{ #category : 'tagging' } IceTipEntityModel >> newCreateTagAction: aString [ @@ -90,17 +92,17 @@ IceTipEntityModel >> newCreateTagAction: aString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> shortDescription [ ^ self description asString diff --git a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st index dc2d41d517..6e52aea96d 100644 --- a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st @@ -7,24 +7,26 @@ My model is an exception that I'll freeze for further debugging. (IceTipErrorDialog on: anError) openDialogWithSpec " Class { - #name : #IceTipErrorDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipErrorDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'exception', 'errorLabel', 'iconPanel' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> accept [ self closeWindow. exception debug. ] -{ #category : #layout } +{ #category : 'layout' } IceTipErrorDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -35,31 +37,31 @@ IceTipErrorDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> errorLabel [ ^ errorLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception [ ^ exception ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception: anException [ exception := anException freeze ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -69,7 +71,7 @@ IceTipErrorDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ aWindow @@ -80,7 +82,7 @@ IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ do: [ :presenter | presenter close ]. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializePresenters [ iconPanel := self newImage. @@ -91,13 +93,13 @@ IceTipErrorDialogPresenter >> initializePresenters [ errorLabel editable: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> setModelBeforeInitialization: aDomainObject [ self exception: aDomainObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> titleForWindow [ ^ 'Error' diff --git a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st index eae8c778d0..e7254a06fa 100644 --- a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st @@ -3,29 +3,31 @@ I'm a panel (that will be part of a dialog) to perform actions on existing panel Actions themselves needs to be defined by my children. " Class { - #name : #IceTipExistingBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipExistingBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'branchesList', 'title', 'icon' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> branchModels [ ^ self model branchModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> branchesList [ ^ branchesList ] -{ #category : #layout } +{ #category : 'layout' } IceTipExistingBranchPanel >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -33,25 +35,25 @@ IceTipExistingBranchPanel >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon [ ^ icon ifNil: [ self iconNamed: #branch ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon: anIcon [ icon := anIcon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializeBranchesList [ branchesList @@ -68,32 +70,32 @@ IceTipExistingBranchPanel >> initializeBranchesList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializePresenters [ branchesList := self newTable. self initializeBranchesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> selectedBranch [ ^ self branchesList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> titleForWindow [ ^ title ifNil: [ self model name ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> titleForWindow: aString [ title := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> validate [ self selectedBranch ifNil: [ diff --git a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st index 738ba20fd4..d026f08d94 100644 --- a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st @@ -2,31 +2,33 @@ I'm a command to perform a fetch operation on all registered projects. " Class { - #name : #IceTipFetchAllProjectCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchAllProjectCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from all repositories in your list.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultName [ ^ 'Fetch all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchAllProjectCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> execute [ | repositories | @@ -47,13 +49,13 @@ IceTipFetchAllProjectCommand >> execute [ Iceberg announcer announce: IceRepositoryModified new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchAllProjectCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> isConfirmed [ ^ self application newConfirm diff --git a/Iceberg-TipUI/IceTipFetchCommand.class.st b/Iceberg-TipUI/IceTipFetchCommand.class.st index faf109579a..d878f30cc3 100644 --- a/Iceberg-TipUI/IceTipFetchCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchCommand.class.st @@ -2,24 +2,26 @@ I'm a command to perform a fetch operation on selected project. " Class { - #name : #IceTipFetchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from this repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ @@ -27,19 +29,19 @@ IceTipFetchCommand >> canBeExecuted [ self repositoryModel hasRemotes ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchCommand >> execute [ self repositoryModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> iconName [ ^ #smallUpdate ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> shortcutKey [ ^ $f meta diff --git a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st index 119d3c33b9..630fd29e06 100644 --- a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st @@ -1,29 +1,31 @@ Class { - #name : #IceTipFetchInPullCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchInPullCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultDescription [ ^ 'Fetch from the selected remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchInPullCommand >> execute [ context model remoteModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchInPullCommand >> iconName [ ^ #smallUpdate diff --git a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st index 7c1b56024b..0c722b8509 100644 --- a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that fetches from remote repositories " Class { - #name : #IceTipFetchRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultDescription [ ^ 'Fetch commits from this remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultName [ ^ 'Fetch remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> execute [ self remoteModel fetch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchRemoteCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipFilePresenter.class.st b/Iceberg-TipUI/IceTipFilePresenter.class.st index 721985a143..a0e7c32f33 100644 --- a/Iceberg-TipUI/IceTipFilePresenter.class.st +++ b/Iceberg-TipUI/IceTipFilePresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose files. " Class { - #name : #IceTipFilePresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipFilePresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipFilePresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st index bf9876ab0d..413d50a79f 100644 --- a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st @@ -3,24 +3,26 @@ I will allow the ""forget"" of a repository (remote it from list of registered r I also add the possibility of remove the repository from file system. " Class { - #name : #IceTipForgetRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipForgetRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultDescription [ ^ 'Removes this repository from the list of managed repositories (it will not remove any local repository)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultName [ ^ 'Forget repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipForgetRepositoryCommand >> execute [ (IceTipRemoveRepositoryDialogPresenter @@ -31,13 +33,13 @@ IceTipForgetRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st index 49ac8a3bc4..977e81d533 100644 --- a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st @@ -6,8 +6,8 @@ for each provider. " Class { - #name : #IceTipGitProviderRepositoryPanel, - #superclass : #IceTipGitRepositoryPanel, + #name : 'IceTipGitProviderRepositoryPanel', + #superclass : 'IceTipGitRepositoryPanel', #instVars : [ 'userNameLabel', 'userNameInputText', @@ -16,22 +16,24 @@ Class { 'protocolDropList', 'protocolLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipGitProviderRepositoryPanel class >> isAbstract [ ^ super isAbstract or: [ self = IceTipGitProviderRepositoryPanel ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitProviderRepositoryPanel >> configureBuilder: aBuilder [ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitProviderRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -45,7 +47,7 @@ IceTipGitProviderRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitProviderRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -79,7 +81,7 @@ IceTipGitProviderRepositoryPanel >> initializePresenters [ ] -{ #category : #private } +{ #category : 'private' } IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ^ (self userName isEmpty and: [ self projectName isEmpty ]) @@ -88,43 +90,43 @@ IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> projectName [ ^ self projectNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolDropList [ ^ protocolDropList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolLabel [ ^ protocolLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> providerName [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> remoteUrl [ | builder | @@ -135,31 +137,31 @@ IceTipGitProviderRepositoryPanel >> remoteUrl [ ^ builder buildUrl ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> selectedProtocol [ ^ self protocolDropList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> userName [ ^ self userNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameInputText [ ^ userNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameLabel [ ^ userNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st index 4408387fe1..fdd7ef3847 100644 --- a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st @@ -3,18 +3,20 @@ I'm a presenter to define remote repositories. Repositories needs to have a valid url (one that can be parsed by IceRemote) and a valid location (where to place the clone) " Class { - #name : #IceTipGitRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipGitRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel class >> order [ ^ 1000 "to the end" ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -26,7 +28,7 @@ IceTipGitRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipGitRepositoryPanel >> extractProjectName: aString [ ^ [ (IceGitRemote url: aString) projectName ] @@ -34,13 +36,13 @@ IceTipGitRepositoryPanel >> extractProjectName: aString [ do: [ 'invalid-url' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> iconForWindow [ ^ self iconNamed: #git ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -53,7 +55,7 @@ IceTipGitRepositoryPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> newRepository [ UIManager default @@ -66,19 +68,19 @@ IceTipGitRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> remoteUrl [ ^ self remoteInputText text asString trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> titleForWindow [ ^ 'Clone remote repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> validate [ | remoteString | diff --git a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st index 7103019d4a..17a42bdec6 100644 --- a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog for asking ""user.name"" and ""user.email"" . " Class { - #name : #IceTipGitUsernameAndEmailDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipGitUsernameAndEmailDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -13,10 +13,12 @@ Class { 'model', 'acceptCallback' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipGitUsernameAndEmailDialogPresenter >> accept [ self username isEmptyOrNil ifTrue: [ ^ self window alert: 'user.name is required.' ]. @@ -32,7 +34,7 @@ IceTipGitUsernameAndEmailDialogPresenter >> accept [ acceptCallback value ]. ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -50,36 +52,36 @@ IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> email [ ^ self emailInput text trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailInput [ ^ emailInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailLabel [ ^ emailLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> globalCheckbox [ ^ globalCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initialExtentForWindow [ ^ (400@200) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -102,43 +104,43 @@ IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipGitUsernameAndEmailDialogPresenter >> isGlobal [ ^ self globalCheckbox state ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> titleForWindow [ ^ 'Please provide Git missing properties' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> username [ ^ self nameInput text trimBoth diff --git a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st index e78130b7b5..c23045931f 100644 --- a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltComponentHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltComponentHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,13 +29,13 @@ IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeCommitList [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -62,7 +64,7 @@ IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ commitList := self newComponentList. @@ -73,13 +75,13 @@ IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ self initializeHiedraColumn ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -87,20 +89,20 @@ IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ | commitModels | @@ -111,7 +113,7 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ commitInfoTabs selectedModel: (commitModels ifNotEmpty: #first ifEmpty: [ nil ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -133,19 +135,19 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ifNotNil: #item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st index 28565664db..73df2f5bef 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,7 +29,7 @@ IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeCommitList [ commitList @@ -63,7 +65,7 @@ IceTipHiedraAltHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -92,7 +94,7 @@ IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -104,13 +106,13 @@ IceTipHiedraAltHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -118,20 +120,20 @@ IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -153,13 +155,13 @@ IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st index b4d9f6b312..e2b6ea1bc2 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st @@ -1,12 +1,14 @@ Class { - #name : #IceTipHiedraAltHistoryRowPresenter, - #superclass : #SpPresenter, + #name : 'IceTipHiedraAltHistoryRowPresenter', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ | tagNames tagLayout | @@ -30,13 +32,13 @@ IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ aLayout add: tagLayout expand: false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> form [ ^ self model first ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ self layout: (SpBoxLayout newLeftToRight @@ -51,7 +53,7 @@ IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ yourself). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> item [ ^ self model second diff --git a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st index f481a468c0..dc81c98649 100644 --- a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st @@ -2,15 +2,17 @@ I add a Hiedra column to the browser defined by my superclass. This column visualizes the relationship between commits in the history list. " Class { - #name : #IceTipHiedraHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeCommitList [ "Add the Hiedra column at the beginning. The Datasource has the logic to render it." @@ -23,7 +25,7 @@ IceTipHiedraHistoryBrowser >> initializeCommitList [ super initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -50,21 +52,21 @@ IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ cellWidth: 5.25 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializePresenters [ super initializePresenters. self initializeHiedraColumn ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refreshHiedraColumn [ | ancestorIds | diff --git a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st index 16ad2d0857..63008dd9c3 100644 --- a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st @@ -2,47 +2,49 @@ I'm a base browser for pull/push action browser. " Class { - #name : #IceTipHistoryActionBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryActionBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitsPanel', 'actionButtonBar', 'button' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> accept [ button performAction ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel [ ^ commitsPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel: aSpPresenter [ commitsPanel := aSpPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initializePresenters [ commitsPanel := self instantiate: IceTipHistoryBrowser on: self model. @@ -50,7 +52,7 @@ IceTipHistoryActionBrowser >> initializePresenters [ actionButtonBar add: (button := self newActionButton) ] -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ aRemoteModel ifNil: [ ^ self ]. @@ -61,26 +63,26 @@ IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ self updateTitle ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipHistoryActionBrowser >> newActionButton [ "Answer a new instance of SpButton to be placed at bottom, as the main action of the window." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refresh [ self refreshCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refreshCommits [ commitsPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ (self model repositoryModel isModelOf: ann repository) @@ -89,7 +91,7 @@ IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> subscribeToAnnouncements [ self announcer diff --git a/Iceberg-TipUI/IceTipHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHistoryBrowser.class.st index 3c5dfdee58..71a6d22f46 100644 --- a/Iceberg-TipUI/IceTipHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryBrowser.class.st @@ -5,22 +5,24 @@ I'm usually used as part of an IceTipRepositoryBrowser. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'commitInfoTabs' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipAdoptCommitCommand. @@ -35,7 +37,7 @@ IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCo ] -{ #category : #specs } +{ #category : 'specs' } IceTipHistoryBrowser class >> panelSpec [ ^ SpPanedLayout newTopToBottom @@ -44,25 +46,25 @@ IceTipHistoryBrowser class >> panelSpec [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> beForMerge [ self commitInfoTabs beForMerge ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitInfoTabs [ ^ commitInfoTabs ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,13 +73,13 @@ IceTipHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initialExtentForWindow [ ^ (700 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializeCommitList [ commitList @@ -102,7 +104,7 @@ IceTipHistoryBrowser >> initializeCommitList [ whenSelectionChangedDo: [ :aSelection | self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -111,27 +113,27 @@ IceTipHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refresh [ self refreshCommitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refreshCommitList [ | commitModels | @@ -141,19 +143,19 @@ IceTipHistoryBrowser >> refreshCommitList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipHistoryBrowser >> selectionChanged: anElement [ commitInfoTabs selectedModel: anElement ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> titleForWindow [ ^ self model @@ -162,13 +164,13 @@ IceTipHistoryBrowser >> titleForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> updatePresenter [ self refresh ] -{ #category : #events } +{ #category : 'events' } IceTipHistoryBrowser >> whenSelectionChangedDo: aBlock [ commitList whenSelectionChangedDo: aBlock diff --git a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st index 16b04a9a5b..06ef203e2b 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st @@ -3,17 +3,19 @@ I keep a diff from HEAD to WorkingCopy. " Class { - #name : #IceTipHistoryDiffFromHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffFromHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> diffFor: aCommitModel [ ^ aCommitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> labelFor: aCommitModel [ ^ 'HEAD to {1}' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st index d0b9344fa1..12aab5b16c 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st @@ -2,17 +2,19 @@ I keep a diff from a commit to his mail parent. " Class { - #name : #IceTipHistoryDiffToAncestor, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToAncestor', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> diffFor: aCommitModel [ ^ aCommitModel diffToFirstAncestor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> labelFor: aCommitModel [ ^ '{1} to {2}' format: { aCommitModel shortId. diff --git a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st index d1dcb6fca4..2bff338b13 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st @@ -3,17 +3,19 @@ I keep a diff from WorkingCopy to HEAD. " Class { - #name : #IceTipHistoryDiffToHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> diffFor: aCommitModel [ ^ aCommitModel diffToHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> labelFor: aCommitModel [ ^ '{1} to HEAD' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st index 0cfc0e00fc..2c33f2fa79 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st @@ -4,64 +4,66 @@ Since orders may change for different operations, I need a different approach fo " Class { - #name : #IceTipHistoryDiffUpdater, - #superclass : #Object, + #name : 'IceTipHistoryDiffUpdater', + #superclass : 'Object', #instVars : [ 'tab' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #testing } +{ #category : 'testing' } IceTipHistoryDiffUpdater class >> isAbstract [ ^ self == IceTipHistoryDiffUpdater ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipHistoryDiffUpdater class >> tab: aTab [ ^ self new tab: aTab; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> diffFor: aCommitModel [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> labelFor: aCommitModel [ ^ self subclassResponsibility ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipHistoryDiffUpdater >> newDiffPanelFor: aDiffModel [ ^ IceTipDiffPanel on: aDiffModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab [ ^ tab ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab: anObject [ tab := anObject ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateContentsOn: aCommitModel [ aCommitModel ifNil: [ ^ self ]. self tab contents: (self newDiffPanelFor: (self diffFor: aCommitModel)) build ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateLabelOn: aCommitModel [ self tab label: (self labelFor: aCommitModel) ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateOn: aCommitModel [ self updateLabelOn: aCommitModel. self updateContentsOn: aCommitModel diff --git a/Iceberg-TipUI/IceTipInspectCommand.class.st b/Iceberg-TipUI/IceTipInspectCommand.class.st index d50a4ee13d..f5ef0d83c4 100644 --- a/Iceberg-TipUI/IceTipInspectCommand.class.st +++ b/Iceberg-TipUI/IceTipInspectCommand.class.st @@ -2,42 +2,44 @@ I am a command implementing the inspect option. I have several context activations to be able to inspect different objects in Iceberg's UI " Class { - #name : #IceTipInspectCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInspectCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultDescription [ ^ 'Inspect the selected element' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultName [ ^ 'Inspect...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipInspectCommand >> canBeExecuted [ ^ self context hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipInspectCommand >> execute [ self item inspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> iconName [ ^ #glamorousInspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> item [ | maybeCachedObject | diff --git a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st index a11c718b99..fbbaad2497 100644 --- a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st @@ -3,36 +3,38 @@ Command used in the version browser, inside the code browser. This command takes the selected version and installs it (also called revert). " Class { - #name : #IceTipInstallVersionCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInstallVersionCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultDescription [ ^ 'Revert to the selected version' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultName [ ^ 'Install this version' ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> execute [ self version install ] -{ #category : #activation } +{ #category : 'activation' } IceTipInstallVersionCommand >> iconName [ ^ #smallRedo ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> version [ ^ self context selectedItem diff --git a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st index e74a3465c0..e76f8c4c84 100644 --- a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st +++ b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st @@ -2,23 +2,25 @@ I am a credential provider that requires the missing plaintext credential to the user. " Class { - #name : #IceTipInteractiveCredentialsProvider, - #superclass : #IceCredentialsProvider, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipInteractiveCredentialsProvider', + #superclass : 'IceCredentialsProvider', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceTipInteractiveCredentialsProvider class >> initialize [ self providerType: nil ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider class >> isDefault [ ^ true ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ | returnedCred | @@ -30,7 +32,7 @@ IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsToReturn [ | returnedCred | @@ -43,7 +45,7 @@ IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsT credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainSshCredentials: credentialsToReturn [ | returnedCred | diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index b345444f61..1fe0a37770 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -3,22 +3,24 @@ I'm a visitor to provide users with an interactive way to react to iceberg error " Class { - #name : #IceTipInteractiveErrorVisitor, - #superclass : #IceErrorVisitor, + #name : 'IceTipInteractiveErrorVisitor', + #superclass : 'IceErrorVisitor', #instVars : [ 'context', 'repository' ], - #category : #'Iceberg-TipUI-Exceptions' + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext [ ^ self newContext: aContext repository: nil ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ ^ self new @@ -27,40 +29,40 @@ IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> on: aModel [ ^ self new repository: aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context: anObject [ context := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository: anObject [ repository := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ self defaultApplication label: anError messageText; @@ -68,7 +70,7 @@ IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ self defaultApplication @@ -77,7 +79,7 @@ IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ self defaultApplication @@ -88,7 +90,7 @@ IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ self defaultApplication @@ -98,7 +100,7 @@ IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ | proceed | @@ -112,7 +114,7 @@ IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitGenericError: anError [ (IceTipErrorDialogPresenter @@ -123,7 +125,7 @@ IceTipInteractiveErrorVisitor >> visitGenericError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMergeAborted: anError [ self defaultApplication @@ -135,7 +137,7 @@ WARNING: If you have external files, you may need to verify the conflicts there. openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ ((IceTipGitUsernameAndEmailDialogPresenter @@ -147,7 +149,7 @@ IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ | proceed | @@ -162,7 +164,7 @@ IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoRemote: anError [ self defaultApplication @@ -172,7 +174,7 @@ Add one before continue.'; openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ self defaultApplication newInform @@ -180,7 +182,7 @@ IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ self defaultApplication newInform @@ -189,7 +191,7 @@ IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteDesynchronizedError: anError [ | continue command | @@ -222,7 +224,7 @@ You need to pull remote changes before continue and push your changes.' anError retry ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitShouldCommitBeforePullError: anError [ | continue | @@ -239,7 +241,7 @@ We recommend that you commit first and then pull incoming changes again.'; anError resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitWorkingCopyDesynchronizedError: anError [ | solveStrategy command | diff --git a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st index 577cf69282..c2d502942e 100644 --- a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that loads the current non-loaded selected package " Class { - #name : #IceTipLoadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipLoadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultDescription [ ^ 'Load selected package in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultName [ ^ 'Load' ] -{ #category : #testing } +{ #category : 'testing' } IceTipLoadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded not ] -{ #category : #executing } +{ #category : 'executing' } IceTipLoadPackageCommand >> execute [ self packageModel newLoadAction executeWithContext: self context. @@ -33,7 +35,7 @@ IceTipLoadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLoadPackageCommand >> iconName [ ^ #add diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 9e3bcd9b5d..73ba56fba6 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -3,18 +3,20 @@ I will define a repository that already exists. " Class { - #name : #IceTipLocalRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipLocalRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel class >> order [ ^ 20 ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocalRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipLocalRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallOpen ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> initialExtentForWindow [ ^ (500@( @@ -41,25 +43,25 @@ IceTipLocalRepositoryPanel >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #testing } +{ #category : 'testing' } IceTipLocalRepositoryPanel >> isLocalRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location [ ^ self projectLocation location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location: aReferenceOrString [ ^ self projectLocation location: aReferenceOrString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> newRepository [ UIManager default @@ -71,13 +73,13 @@ IceTipLocalRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> titleForWindow [ ^ 'Import from existing clone' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipLocationPresenter.class.st b/Iceberg-TipUI/IceTipLocationPresenter.class.st index b62a028a13..7278835716 100644 --- a/Iceberg-TipUI/IceTipLocationPresenter.class.st +++ b/Iceberg-TipUI/IceTipLocationPresenter.class.st @@ -3,8 +3,8 @@ I'm an abstract model to provide locations (directories or files). I need to be included in other components (search references to my children for examples) " Class { - #name : #IceTipLocationPresenter, - #superclass : #SpPresenter, + #name : 'IceTipLocationPresenter', + #superclass : 'SpPresenter', #instVars : [ 'locationInput', 'chooseButton', @@ -12,16 +12,18 @@ Class { 'chooseBlock', 'keptLocation' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipLocationPresenter class >> isAbstract [ ^ self == IceTipLocationPresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> appendPath: aString [ keptLocation ifNil: [ keptLocation := self location ]. @@ -31,13 +33,13 @@ IceTipLocationPresenter >> appendPath: aString [ ifEmpty: [ keptLocation ]). ] -{ #category : #private } +{ #category : 'private' } IceTipLocationPresenter >> basicLocation: aReference [ locationInput text: aReference pathString ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> choose [ self chooseReference ifNotNil: [ :reference | @@ -45,43 +47,43 @@ IceTipLocationPresenter >> choose [ self onChoose ifNotNil: #value ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> chooseButton [ ^ chooseButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> chooseReference [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle [ ^ chooseTitle ifNil: [ self defaultChooseDialogTitle ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle: aString [ chooseTitle := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultChooseDialogTitle [ ^ 'Choose directory' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultLabel [ ^ 'Directory' ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocationPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -93,13 +95,13 @@ IceTipLocationPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> icon [ ^ self iconNamed: #open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocationPresenter >> initializePresenters [ locationInput := self newTextInput @@ -113,7 +115,7 @@ IceTipLocationPresenter >> initializePresenters [ chooseButton action: [ self choose ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location [ "This method return the location to use in the repository If the location is relative to IceLibgitRepository >> #localRepositoriesLocation @@ -135,7 +137,7 @@ IceTipLocationPresenter >> location [ ^ IceLibgitRepository localRepositoriesLocation resolvePath: relativePath ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location: aReferenceOrString [ | ref | @@ -152,26 +154,26 @@ IceTipLocationPresenter >> location: aReferenceOrString [ self basicLocation: ref ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> locationInput [ ^ locationInput ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose [ ^ chooseBlock ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose: aBlockClosure [ "I allow to set a hook to execute when the user select a location." chooseBlock := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipLocationPresenter >> whenTextChanged: aBlockClosure [ self locationInput whenTextChangedDo: aBlockClosure diff --git a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st index 10c1f65a81..e0f99435cf 100644 --- a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st @@ -2,24 +2,26 @@ I'm a command to open the package manager browser for a project. " Class { - #name : #IceTipManagePackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManagePackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultDescription [ ^ 'Open packages manager browser for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultName [ ^ 'Packages' ] -{ #category : #executing } +{ #category : 'executing' } IceTipManagePackagesCommand >> execute [ (IceTipWorkingCopyBrowser @@ -28,13 +30,13 @@ IceTipManagePackagesCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> iconName [ ^ #package ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> shortcutKey [ ^ $p meta diff --git a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st index 25acd74669..4d0185f541 100644 --- a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st @@ -3,36 +3,38 @@ I'm a command to show the repository manager for a repository model. " Class { - #name : #IceTipManageRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManageRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultDescription [ ^ 'Open repository manager browser for this repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultName [ ^ 'Open Repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultToolbarItemName [ ^ 'Repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipManageRepositoryCommand >> execute [ (IceTipRepositoryBrowser @@ -41,19 +43,19 @@ IceTipManageRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> iconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> shortcutKey [ ^ $r meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st index fbd509f795..9a1252f105 100644 --- a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st @@ -4,34 +4,36 @@ I'm a dialog to perform a merge of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipMergeBranchDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipMergeBranchDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeBranchDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> allTypes [ ^ types ifNil: [ types := self createMergeBranchTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> beSwitchAndMerge [ self allTypes do: #beSwitchAndMerge ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ | allTypes | @@ -54,44 +56,44 @@ IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchDialogPresenter >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model: anObject [ model := anObject. self allTypes do: [ :each | each model: anObject ] ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipMergeBranchDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> titleForWindow [ ^ 'Select branch to merge into ' , (self model branchName contractTo: 45) ] -{ #category : #activation } +{ #category : 'activation' } IceTipMergeBranchDialogPresenter >> updateWindowTitle [ self window title: self titleForWindow diff --git a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st index 24bd011621..608f005030 100644 --- a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st @@ -2,21 +2,23 @@ I'm a panel to peform the merge of an existing branch. " Class { - #name : #IceTipMergeBranchPanel, - #superclass : #IceTipExistingBranchPanel, + #name : 'IceTipMergeBranchPanel', + #superclass : 'IceTipExistingBranchPanel', #instVars : [ 'mergeType' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> beSwitchAndMerge [ self mergeType: IceTipMergeType switchAndMerge ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchPanel >> doAccept [ IceTipStandardAction new @@ -27,19 +29,19 @@ IceTipMergeBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType [ ^ mergeType ifNil: [ IceTipMergeType default ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType: anObject [ mergeType := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> withoutHead [ self branchesList items: (self branchModels reject: #isHead). diff --git a/Iceberg-TipUI/IceTipMergeCommand.class.st b/Iceberg-TipUI/IceTipMergeCommand.class.st index 11c5c49cdd..b5345488ef 100644 --- a/Iceberg-TipUI/IceTipMergeCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to select a branch to merge in the current merge " Class { - #name : #IceTipMergeCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultDescription [ ^ 'Merge a given branch into your current branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultName [ ^ 'Merge to current' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeCommand >> execute [ (IceTipMergeBranchDialogPresenter @@ -36,7 +38,7 @@ IceTipMergeCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeCommand >> iconName [ ^ #merge diff --git a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st index 1d70eeb9d7..bfe81e157f 100644 --- a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st @@ -2,36 +2,38 @@ Command that opens a window showing the history of the selected merged branch. " Class { - #name : #IceTipMergeHistoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeHistoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultDescription [ ^ 'Show the merged history of the selected merge commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultName [ ^ 'Browse merge history' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeHistoryCommand >> canBeExecuted [ ^ self commitModel hasMultipleAncestors ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> commitModel [ ^ self context selectedCommit ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> execute [ (IceTipHistoryBrowser on: diff --git a/Iceberg-TipUI/IceTipMergeModel.class.st b/Iceberg-TipUI/IceTipMergeModel.class.st index 249baca4a0..3a2be87af4 100644 --- a/Iceberg-TipUI/IceTipMergeModel.class.st +++ b/Iceberg-TipUI/IceTipMergeModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipMergeModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipMergeModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'mergeType', 'mergeAction' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> calculateDiff [ ^ self mergeAction ] -{ #category : #private } +{ #category : 'private' } IceTipMergeModel >> mergeAction [ ^ mergeAction ifNil: [ @@ -24,13 +26,13 @@ IceTipMergeModel >> mergeAction [ yourself ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> mergeType: aMergeType [ mergeType := aMergeType ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newExecuteMergeAction [ @@ -42,13 +44,13 @@ IceTipMergeModel >> newExecuteMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newMergeAction [ ^ mergeType newMergeAction: commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> repositoryModel [ ^ commitish repositoryModel ] diff --git a/Iceberg-TipUI/IceTipMergeMorph.class.st b/Iceberg-TipUI/IceTipMergeMorph.class.st index f45def3de7..4dc7b9b9f2 100644 --- a/Iceberg-TipUI/IceTipMergeMorph.class.st +++ b/Iceberg-TipUI/IceTipMergeMorph.class.st @@ -2,19 +2,21 @@ I redefine PSMCMergeMorph to be able to use an IceMergePatchMorph as patch morph " Class { - #name : #IceTipMergeMorph, - #superclass : #PSMCMergeMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergeMorph', + #superclass : 'PSMCMergeMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeMorph >> conflictCount [ "Answer the number of conflicts that are unresolved." ^(self model ifNil: [^0]) unresolvedConflictCount ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeMorph >> model: aMerger [ "Set the model and update the window." @@ -26,7 +28,7 @@ IceTipMergeMorph >> model: aMerger [ self patchMorph model: aMerger ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeMorph >> newPatchMorph [ "Answer a new patch morph." diff --git a/Iceberg-TipUI/IceTipMergePatchMorph.class.st b/Iceberg-TipUI/IceTipMergePatchMorph.class.st index 534efa39a0..6a05a76fb0 100644 --- a/Iceberg-TipUI/IceTipMergePatchMorph.class.st +++ b/Iceberg-TipUI/IceTipMergePatchMorph.class.st @@ -2,19 +2,21 @@ I redefine part of monticello's PSMCMergePatchMorph to not require to rebuild a tree but use Iceberg's one directly. I also adapt the patch morph to handle files and several packages at the same time. " Class { - #name : #IceTipMergePatchMorph, - #superclass : #PSMCMergePatchMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergePatchMorph', + #superclass : 'PSMCMergePatchMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> changes [ "Answer the changes tree roots." ^ model ifNotNil: [ model mergeTree children collect: [ :each | IceMergeListWrapper with: each model: model ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ "Answer whether there are any conflicts not marked as a conflict." @@ -22,7 +24,7 @@ IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ conflict isConflict and: [ conflict isResolved ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ "Answer whether there are any conflicts not marked as incoming." @@ -31,7 +33,7 @@ IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ conflict isResolved not or: [conflict isLeftChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ "Answer whether there are any conflicts not marked as keep." @@ -40,7 +42,7 @@ IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ conflict isResolved not or: [conflict isRightChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasConflicts [ "Answer whether there are any conflicts." @@ -48,7 +50,7 @@ IceTipMergePatchMorph >> hasConflicts [ conflict isConflict ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> keepAllCurrentVersion [ "Mark all conflicts as local." @@ -58,7 +60,7 @@ IceTipMergePatchMorph >> keepAllCurrentVersion [ self updateSource ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> markAllAsConflict [ "Mark all conflicts as unresolved." @@ -68,7 +70,7 @@ IceTipMergePatchMorph >> markAllAsConflict [ self updateSource ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> markAsConflict [ "Mark the operation as unresolved conflict." @@ -77,7 +79,7 @@ IceTipMergePatchMorph >> markAsConflict [ self updateSource. ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> nextConflict [ "Answer the next (unresolved) conflict or, nil if none." @@ -92,7 +94,7 @@ IceTipMergePatchMorph >> nextConflict [ ^ IceMergeListWrapper with: node model: model. ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> notAllConflictsResolved [ "Answer whether any conflicts are unresolved." @@ -100,7 +102,7 @@ IceTipMergePatchMorph >> notAllConflictsResolved [ item isConflict and: [item isResolved not]] ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> selectNextConflict [ "Select the next conflict after the current selection, if any." @@ -109,14 +111,14 @@ IceTipMergePatchMorph >> selectNextConflict [ self changed: {#openPath}, next item path segments ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> selectedChange [ "Answer the selected change." ^(self selectedChangeWrapper ifNil: [^nil]) item value ] -{ #category : #private } +{ #category : 'private' } IceTipMergePatchMorph >> selectionHasActualClass [ "Answer whether the currently selected change has an actual class in the image." @@ -126,14 +128,14 @@ IceTipMergePatchMorph >> selectionHasActualClass [ ifNotNil: [:w | w item value contextClass notNil] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> selectionIsRemoteChosen [ self selectedChange ifNil: [ ^ false]. ^ self selectedChange isConflict and: [ self selectedChange isRightChosen ] ] -{ #category : #updating } +{ #category : 'updating' } IceTipMergePatchMorph >> updateSource [ "Update the source difference morph." @@ -159,7 +161,7 @@ IceTipMergePatchMorph >> updateSource [ ifFalse: [self diffMorph indicateSrc] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> useAllIncomingVersion [ "Mark all conflicts as remote." diff --git a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st index 5d9d18d743..83535956d8 100644 --- a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st @@ -4,12 +4,14 @@ I preview the changes that will be introduced in the image when a merge occurs. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipMergePreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipMergePreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergePreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipMergeModel new commitish: aBranch; @@ -17,14 +19,14 @@ IceTipMergePreviewBrowser class >> onBranch: aBranch [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePreviewBrowser >> doMerge [ self model newExecuteMergeAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipMergePreviewBrowser >> initializePresenters [ diffPanel rightLabel: 'Merge with ', model targetName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergePreviewBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipMergePreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> titleForWindow [ ^ 'Preview merge of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st index 3f8a4eec31..776d7f4610 100644 --- a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipMergeSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipMergeSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'codePanel', 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> basicRefresh [ super basicRefresh. self refreshCodePanel. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -26,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 ]. @@ -46,13 +48,13 @@ IceTipMergeSelectingPanel >> changeListColumn [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> codePanel [ ^ codePanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipMergeSelectingPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -66,7 +68,7 @@ IceTipMergeSelectingPanel >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initialize [ super initialize. @@ -77,7 +79,7 @@ IceTipMergeSelectingPanel >> initialize [ child value isConflict ifTrue: [ child value selectLeft ] ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initializePresenters [ codePanel := self newCode. @@ -87,7 +89,7 @@ IceTipMergeSelectingPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> refresh [ super refresh. @@ -96,7 +98,7 @@ IceTipMergeSelectingPanel >> refresh [ self refreshCodePanel ] -{ #category : #private } +{ #category : 'private' } IceTipMergeSelectingPanel >> refreshCodePanel [ | visitor mergeNode | @@ -107,13 +109,13 @@ IceTipMergeSelectingPanel >> refreshCodePanel [ ifNotNil: [ mergeNode accept: visitor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipMergeSelectingPanel >> selectionChanged [ super selectionChanged. diff --git a/Iceberg-TipUI/IceTipMergeType.class.st b/Iceberg-TipUI/IceTipMergeType.class.st index 3fa3830c87..6d96c48bec 100644 --- a/Iceberg-TipUI/IceTipMergeType.class.st +++ b/Iceberg-TipUI/IceTipMergeType.class.st @@ -5,47 +5,49 @@ My children define strategies of how to merge two commitish. " Class { - #name : #IceTipMergeType, - #superclass : #Object, + #name : 'IceTipMergeType', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> default [ ^ self direct ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> direct [ ^ IceTipDirectMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> switchAndMerge [ ^ IceTipSwitchAndMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> uniqueInstance [ self = IceTipMergeType ifTrue: [ self error: 'I''m an abstract type. Use one of my children' ]. ^ uniqueInstance ifNil: [ uniqueInstance := self basicNew initialize ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> mergeOn: aModel then: aBlock [ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> newMergeAction: aModel [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st index dd81696941..0639cde03a 100644 --- a/Iceberg-TipUI/IceTipModel.class.st +++ b/Iceberg-TipUI/IceTipModel.class.st @@ -4,35 +4,37 @@ Each tip component refers to one (and just one) model, which will provide model Models can be cached using #beCached. " Class { - #name : #IceTipModel, - #superclass : #Object, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipModel', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #converting } +{ #category : 'converting' } IceTipModel >> beCached [ ^ IceTipCachedModel for: self ] -{ #category : #private } +{ #category : 'private' } IceTipModel >> colorForError [ ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipModel >> matches: aString [ "Override this if you want to make this model discoverable" ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> repositoryModel [ "this model does not provides a repository model" ^ nil ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> reset [ "to provide polymorphism with cached version" ] diff --git a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st index 8d00759a46..e5d2698279 100644 --- a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st @@ -5,24 +5,26 @@ Usually, I'm part of an IceTipRegisterProjectPresenter. I will define location, name and source subdirectory and I will use that to create a #newRepository. " Class { - #name : #IceTipNewRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, + #name : 'IceTipNewRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', #instVars : [ 'projectNameLabel', 'projectNameInputText', 'subdirectoryLabel', 'subdirectoryInputText' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel class >> order [ ^ 10 ] -{ #category : #layout } +{ #category : 'layout' } IceTipNewRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -35,13 +37,13 @@ IceTipNewRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -58,7 +60,7 @@ IceTipNewRepositoryPanel >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializeSourceDirectory [ subdirectoryLabel := self newLabel @@ -72,13 +74,13 @@ IceTipNewRepositoryPanel >> initializeSourceDirectory [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipNewRepositoryPanel >> isNewRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> newRepository [ | repositoryName location subdirectory | @@ -96,37 +98,37 @@ IceTipNewRepositoryPanel >> newRepository [ createNewRepositoryNamed: repositoryName ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryInputText [ ^ subdirectoryInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryLabel [ ^ subdirectoryLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> titleForWindow [ ^ 'New repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st index 046c3d4e94..51f0260a57 100644 --- a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st +++ b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st @@ -2,24 +2,26 @@ I am a command that, once executed, will open the native file browser on the directory containing the local repository of the git project. " Class { - #name : #IceTipOpenNativelyCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipOpenNativelyCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultDescription [ ^ 'Open the native file browser on the local repository of this project.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultName [ ^ 'Open in native file browser' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenNativelyCommand >> canBeExecuted [ | location | @@ -28,13 +30,13 @@ IceTipOpenNativelyCommand >> canBeExecuted [ ^ location isNotNil and: [ location exists ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenNativelyCommand >> execute [ self item location openInOSFileBrowser ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenNativelyCommand >> iconName [ ^ #smallWindow diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st index 2f6133367c..c63a4618b6 100644 --- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st @@ -7,17 +7,19 @@ I'm kind of a ""tabbed"" dialog, but my options are ""mac style"": lateral and n This is useful to keep a variable number of options. " Class { - #name : #IceTipOptionDialogPresenter, - #superclass : #IceTipPresenter, + #name : 'IceTipOptionDialogPresenter', + #superclass : 'IceTipPresenter', #instVars : [ 'typeList', 'type', 'contentLayout' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> accept [ [ @@ -28,19 +30,19 @@ IceTipOptionDialogPresenter >> accept [ e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> allTypes [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> contextSelection [ ^ type ] -{ #category : #layout } +{ #category : 'layout' } IceTipOptionDialogPresenter >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -50,19 +52,19 @@ IceTipOptionDialogPresenter >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> doAccept [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter @@ -72,14 +74,14 @@ IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter whenOpenedDo: [ self typeList selectIndex: 1 ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializePresenters [ contentLayout := SpBoxLayout newTopToBottom. self initializeTypeList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeTypeList [ (typeList := self newList) @@ -90,7 +92,7 @@ IceTipOptionDialogPresenter >> initializeTypeList [ self selectionChanged: selection selectedItem ] ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> replacePanelWith: aType [ contentLayout @@ -98,13 +100,13 @@ IceTipOptionDialogPresenter >> replacePanelWith: aType [ add: aType ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> selectedType [ ^ type ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> selectionChanged: aType [ type := aType. @@ -113,13 +115,13 @@ IceTipOptionDialogPresenter >> selectionChanged: aType [ self replacePanelWith: type ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipOptionDialogPresenter >> typeList [ ^ typeList ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> updateWindowTitle [ self window title: type titleForWindow diff --git a/Iceberg-TipUI/IceTipPackageCommand.class.st b/Iceberg-TipUI/IceTipPackageCommand.class.st index 2f48f71553..72c5cc9e02 100644 --- a/Iceberg-TipUI/IceTipPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipPackageCommand.class.st @@ -2,45 +2,47 @@ Abstract class representing commands to be applied on top of packages. " Class { - #name : #IceTipPackageCommand, - #superclass : #IceTipCommand, + #name : 'IceTipPackageCommand', + #superclass : 'IceTipCommand', #instVars : [ 'packageModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand class >> isAbstract [ ^ self == IceTipPackageCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> hasPackageModel [ ^ self packageModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> isPackageLoaded [ ^ self hasPackageModel and: [ self packageModel isLoaded ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> package [ ^ self packageModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel [ ^ packageModel ifNil: [self context packageModel] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel: anIceTipPackageModel [ packageModel := anIceTipPackageModel diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index 769de7dc50..a71afe257c 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -2,19 +2,21 @@ I'm a model for IcePackage entries. " Class { - #name : #IceTipPackageModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPackageModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browsePackage [ self entity browse ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browseRepositoryVersion [ | snapshot | @@ -24,7 +26,7 @@ IceTipPackageModel >> browseRepositoryVersion [ showLabelled: 'Snapshot for ', self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> description [ | text | @@ -34,7 +36,7 @@ IceTipPackageModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> descriptionDecorator [ self entity isModified @@ -45,22 +47,22 @@ IceTipPackageModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isLoaded [ ^ self entity isLoaded ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isModified [ ^ self entity isModified ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> newLoadAction [ @@ -75,12 +77,12 @@ IceTipPackageModel >> newLoadAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> packageName [ ^ self entity packageName ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> reload [ @@ -94,7 +96,7 @@ IceTipPackageModel >> reload [ while: [ self entity reload ] ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> remove [ @@ -108,7 +110,7 @@ IceTipPackageModel >> remove [ while: [ self entity remove ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> status [ "entity could be a repository or a package" [ @@ -120,7 +122,7 @@ IceTipPackageModel >> status [ ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> statusDecorator [ self entity isLoaded @@ -128,7 +130,7 @@ IceTipPackageModel >> statusDecorator [ ^ super statusDecorator ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> unload [ diff --git a/Iceberg-TipUI/IceTipPresenter.class.st b/Iceberg-TipUI/IceTipPresenter.class.st index bd03d7bd41..e6fa418d83 100644 --- a/Iceberg-TipUI/IceTipPresenter.class.st +++ b/Iceberg-TipUI/IceTipPresenter.class.st @@ -2,54 +2,56 @@ I'm a SpPresenter that is prepared to be wrapped in a window (or a dialog). The way it is prepared is through a system of hooks (template method pattern), but also providing some convenience API. " Class { - #name : #IceTipPresenter, - #superclass : #SpPresenter, + #name : 'IceTipPresenter', + #superclass : 'SpPresenter', #instVars : [ 'decorations' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #decorating } +{ #category : 'decorating' } IceTipPresenter class >> buildDecorations [ ^ (Pragma allNamed: #extensionDecorators in: self class) flatCollect: [ :pragma | self perform: pragma methodSelector ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter class >> currentApplication [ ^ StPresenter currentApplication ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPresenter class >> new [ ^ self newApplication: self currentApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter >> closeWindow [ "Close the window of this presenter" self window close ] -{ #category : #private } +{ #category : 'private' } IceTipPresenter >> decorations [ ^ decorations ifNil: [ decorations := self class buildDecorations ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> iconForWindow [ "Answer a Form to be used during initialization when opening in a SpWindowPresenter." ^ self iconNamed: #smallWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initialExtentForWindow [ "Answer either nil or a Point representing the initial extent of this presenter. It is used during initialization if this presenter is opened inside a SpWindowPresenter. @@ -58,7 +60,7 @@ IceTipPresenter >> initialExtentForWindow [ ^ nil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -70,25 +72,25 @@ IceTipPresenter >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setInitialExtentTo: aSpWindowPresenter [ aSpWindowPresenter initialExtent: self initialExtentForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setTitleTo: aSpWindowPresenter [ aSpWindowPresenter title: self titleForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setWindowIconTo: aSpWindowPresenter [ aSpWindowPresenter windowIcon: self iconForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> titleForWindow [ "Answer the title to use during initialization when this presenter is being opened in a SpWindowPresenter." @@ -97,7 +99,7 @@ IceTipPresenter >> titleForWindow [ ] -{ #category : #extensions } +{ #category : 'extensions' } IceTipPresenter >> updateTitle [ self withWindowDo: [ :aWindow | aWindow title: self titleForWindow ] diff --git a/Iceberg-TipUI/IceTipPreviewBrowser.class.st b/Iceberg-TipUI/IceTipPreviewBrowser.class.st index 7623877b11..50cb8b30d1 100644 --- a/Iceberg-TipUI/IceTipPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipPreviewBrowser.class.st @@ -3,35 +3,37 @@ I'm a browser to show a preview of an operation that can be made right after. Tipically, I'm using through my chldren, to do a checkout or merge. " Class { - #name : #IceTipPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'actionPanel', 'button' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> actionPanel [ ^ actionPanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,19 +44,19 @@ IceTipPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffPanel on: self model diff. @@ -62,14 +64,14 @@ IceTipPreviewBrowser >> initializePresenters [ actionPanel add: (button := self newActionButton) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPreviewBrowser >> newActionButton [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipPullBrowser.class.st b/Iceberg-TipUI/IceTipPullBrowser.class.st index 8337cf3717..2f61669678 100644 --- a/Iceberg-TipUI/IceTipPullBrowser.class.st +++ b/Iceberg-TipUI/IceTipPullBrowser.class.st @@ -3,18 +3,20 @@ I perform a pull of incoming commits. " Class { - #name : #IceTipPullBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPullBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPullBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipFetchInPullCommand forSpec ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPullBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPullModel @@ -24,20 +26,20 @@ IceTipPullBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullBrowser >> doPull [ self model newPullAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> labelForRemotePanel [ ^ 'Pull from remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPullBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipPullBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> titleForWindow [ ^ 'Pull {1}/{2} from {3}' format: { diff --git a/Iceberg-TipUI/IceTipPullCommand.class.st b/Iceberg-TipUI/IceTipPullCommand.class.st index 52249626c8..f51c0503b4 100644 --- a/Iceberg-TipUI/IceTipPullCommand.class.st +++ b/Iceberg-TipUI/IceTipPullCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a pull of incomming commits. I open a pull view window. " Class { - #name : #IceTipPullCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPullCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultDescription [ ^ 'Pulls into image all commits from your version to the origin remote HEAD' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultName [ ^ 'Pull' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> badge [ | result | @@ -33,7 +35,7 @@ IceTipPullCommand >> badge [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPullCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullCommand >> iconName [ ^ #down diff --git a/Iceberg-TipUI/IceTipPullModel.class.st b/Iceberg-TipUI/IceTipPullModel.class.st index 1dc3fc02fc..a539dc84d4 100644 --- a/Iceberg-TipUI/IceTipPullModel.class.st +++ b/Iceberg-TipUI/IceTipPullModel.class.st @@ -2,12 +2,14 @@ I'm a model to present pull commits and operations. " Class { - #name : #IceTipPullModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPullModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullModel >> commitModels [ ^ (self entity branch incomingCommitsFrom: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPullModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullModel >> newPullAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipPushAction.class.st b/Iceberg-TipUI/IceTipPushAction.class.st index 25ab9149af..63e2530b17 100644 --- a/Iceberg-TipUI/IceTipPushAction.class.st +++ b/Iceberg-TipUI/IceTipPushAction.class.st @@ -2,12 +2,14 @@ I perform a push. " Class { - #name : #IceTipPushAction, - #superclass : #IceTipAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushAction', + #superclass : 'IceTipAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipPushAction >> basicExecute [ UIManager default diff --git a/Iceberg-TipUI/IceTipPushBrowser.class.st b/Iceberg-TipUI/IceTipPushBrowser.class.st index 9947a1bdbc..a9fd2695c0 100644 --- a/Iceberg-TipUI/IceTipPushBrowser.class.st +++ b/Iceberg-TipUI/IceTipPushBrowser.class.st @@ -3,18 +3,20 @@ I perform a push of outgoing commits. " Class { - #name : #IceTipPushBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPushBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPushBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "No commands to add." ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPushBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPushModel @@ -24,21 +26,21 @@ IceTipPushBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushBrowser >> doPush [ self model newPushAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> labelForRemotePanel [ ^ 'Push to remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPushBrowser >> newActionButton [ ^ self newButton @@ -50,7 +52,7 @@ IceTipPushBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> titleForWindow [ ^ 'Push {1}/{2} to {3}' format: { diff --git a/Iceberg-TipUI/IceTipPushCommand.class.st b/Iceberg-TipUI/IceTipPushCommand.class.st index 282cc6f6e2..4c8aebefd0 100644 --- a/Iceberg-TipUI/IceTipPushCommand.class.st +++ b/Iceberg-TipUI/IceTipPushCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a push of outgoing commits. I open a push view window. " Class { - #name : #IceTipPushCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultDescription [ ^ 'Pushes pending commits to the origin repository (in current branch)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultName [ ^ 'Push' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> badge [ | result | @@ -34,7 +36,7 @@ IceTipPushCommand >> badge [ ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPushCommand >> execute [ (IceTipPushBrowser onRepositoryModel: self repositoryModel) open ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushCommand >> iconName [ ^ #up diff --git a/Iceberg-TipUI/IceTipPushModel.class.st b/Iceberg-TipUI/IceTipPushModel.class.st index 888cfbeccf..c41a476ead 100644 --- a/Iceberg-TipUI/IceTipPushModel.class.st +++ b/Iceberg-TipUI/IceTipPushModel.class.st @@ -2,12 +2,14 @@ I'm a model to present push commits and operations. " Class { - #name : #IceTipPushModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPushModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushModel >> commitModels [ ^ (self entity outgoingCommitsTo: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPushModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushModel >> newPushAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st index c0ff3c884f..a5791aa76d 100644 --- a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st +++ b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st @@ -15,8 +15,8 @@ IceTipReadOnlyForm new " Class { - #name : #IceTipReadOnlyFormBuilder, - #superclass : #Object, + #name : 'IceTipReadOnlyFormBuilder', + #superclass : 'Object', #instVars : [ 'labelColor', 'labelWidth', @@ -25,10 +25,12 @@ Class { 'spApplication', 'presenter' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpApplication [ "If you want to keep order, just send an OrderedDictionary" @@ -39,13 +41,13 @@ IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpAppl build ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> application: aSpApplication [ spApplication := aSpApplication ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> build [ presenter := spApplication newPresenter: SpPresenter. @@ -53,7 +55,7 @@ IceTipReadOnlyFormBuilder >> build [ ^ presenter ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> buildLayout [ | lastLabel fieldPresenter | lastLabel := items associations last key. @@ -84,26 +86,26 @@ IceTipReadOnlyFormBuilder >> buildLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultLabelWidth [ ^ 100 * self currentWorld displayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultRowHeight [ ^ 30 * self currentWorld displayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipReadOnlyFormBuilder >> initialize [ items := OrderedDictionary new. super initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> items: aDictionary [ items removeAll. @@ -111,37 +113,37 @@ IceTipReadOnlyFormBuilder >> items: aDictionary [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor [ ^ labelColor ifNil: [ labelColor := Smalltalk ui theme textColor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor: aColor [ ^ labelColor := aColor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth [ ^ labelWidth ifNil: [ self defaultLabelWidth ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth: aNumber [ ^ labelWidth := aNumber ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight [ ^ rowHeight ifNil: [ rowHeight := self defaultRowHeight ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight: aNumber [ rowHeight := aNumber diff --git a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st index 5ac1bb6832..d96de2a584 100644 --- a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st @@ -2,24 +2,26 @@ Command that launches a refresh of the commit tree during commit " Class { - #name : #IceTipRefreshCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRefreshCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultDescription [ ^ 'Refresh this change tree' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultName [ ^ 'Refresh' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRefreshCommitCommand >> execute [ self repositoryModel reset. @@ -28,13 +30,13 @@ IceTipRefreshCommitCommand >> execute [ self toolAnnouncer announce: (IceTipDiffRefreshed for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> iconName [ ^ #glamorousRefresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st index b93531803d..2388a31c59 100644 --- a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st @@ -7,23 +7,25 @@ self new openDialogWithSpec " Class { - #name : #IceTipRegisterRepositoryDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipRegisterRepositoryDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'types', 'repository', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> allTypes [ ^ types ifNil: [ types := IceTipRepositoryTypePanel allTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ self withoutNewRepository. @@ -31,7 +33,7 @@ IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ repository := aRepository ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doAccept [ | newRepository | @@ -42,7 +44,7 @@ IceTipRegisterRepositoryDialogPresenter >> doAccept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ repository @@ -50,32 +52,32 @@ IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ subdirectory: aRepository subdirectory ] -{ #category : #testing } +{ #category : 'testing' } IceTipRegisterRepositoryDialogPresenter >> isEditing [ ^ repository isNotNil ] -{ #category : #events } +{ #category : 'events' } IceTipRegisterRepositoryDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRegisterRepositoryDialogPresenter >> titleForWindow [ ^ 'Register project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutLocalRepository [ types := self allTypes reject: #isLocalRepository. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutNewRepository [ types := self allTypes reject: #isNewRepository. diff --git a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st index 197067b52f..e09b6bdb88 100644 --- a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that reloads the code of an already loaded package, discarding all changes done in the meantime that were not committed. " Class { - #name : #IceTipReloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipReloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultDescription [ ^ 'Reload selected package, discarding all changes.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultName [ ^ 'Reload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipReloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipReloadPackageCommand >> execute [ self packageModel reload. @@ -33,7 +35,7 @@ IceTipReloadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReloadPackageCommand >> iconName [ ^ #refresh diff --git a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st index 34937c7b68..ae2706a1ef 100644 --- a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st @@ -1,25 +1,27 @@ Class { - #name : #IceTipRemoteActionBrowser, - #superclass : #IceTipHistoryActionBrowser, + #name : 'IceTipRemoteActionBrowser', + #superclass : 'IceTipHistoryActionBrowser', #instVars : [ 'remotePanel', 'remoteLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRemoteActionBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "No commands to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRemoteActionBrowser class >> onRepositoryModel: aRepository [ ^ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoteActionBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -36,7 +38,7 @@ IceTipRemoteActionBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializePresenters [ super initializePresenters. @@ -51,7 +53,7 @@ IceTipRemoteActionBrowser >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. @@ -59,25 +61,25 @@ IceTipRemoteActionBrowser >> initializeWindow: aWindow [ aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> labelForRemotePanel [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> mainList [ ^ commitsPanel commitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel [ ^ remotePanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel: aSpPresenter [ remotePanel := aSpPresenter diff --git a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st index 88a28a1881..db2bb3ddd6 100644 --- a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st @@ -2,24 +2,26 @@ I'm a the abstract superclass of commands that act on remotes. " Class { - #name : #IceTipRemoteActionCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoteActionCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand class >> isAbstract [ ^ self == IceTipRemoteActionCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand >> canBeExecuted [ ^ self isRepositoryOperational and: [ self repositoryModel hasRemotes ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipRemoteActionCommand >> validateRemotesPresent [ self repositoryModel hasRemotes diff --git a/Iceberg-TipUI/IceTipRemoteActionModel.class.st b/Iceberg-TipUI/IceTipRemoteActionModel.class.st index 20b9262471..bac204af2f 100644 --- a/Iceberg-TipUI/IceTipRemoteActionModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionModel.class.st @@ -1,24 +1,26 @@ Class { - #name : #IceTipRemoteActionModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipRemoteActionModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> branchName [ ^ entity branchName ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionModel >> isRepositoryDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remote [ ^ remote ifNil: [ | head | head := self repositoryModel entity head. @@ -27,27 +29,27 @@ IceTipRemoteActionModel >> remote [ ifFalse: [ self remoteModels first entity ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModel [ ^ repositoryModel remoteModels detect: [ :e | e entity = self remote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModels [ ^ self repositoryModel remoteModels ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteName [ ^ self remote name, '/', self entity branch name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> useRemote: aRemoteModel [ remote := aRemoteModel entity. ] diff --git a/Iceberg-TipUI/IceTipRemoteModel.class.st b/Iceberg-TipUI/IceTipRemoteModel.class.st index 88688143f4..520a10d1cd 100644 --- a/Iceberg-TipUI/IceTipRemoteModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteModel.class.st @@ -2,14 +2,16 @@ I'm a model for IceRemote entries. " Class { - #name : #IceTipRemoteModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRemoteModel', + #superclass : 'IceTipEntityModel', #traits : 'TWithBranchModel', #classTraits : 'TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #comparing } +{ #category : 'comparing' } IceTipRemoteModel >> = anotherModel [ self species = anotherModel species ifFalse: [ ^ false ]. @@ -17,23 +19,23 @@ IceTipRemoteModel >> = anotherModel [ ^ entity = anotherModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> branches [ ^ self entity branches ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> description [ ^ '{1} <{2}>' format: { self name. self entity url } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newDeleteAction [ @@ -45,7 +47,7 @@ IceTipRemoteModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newFetchAction [ diff --git a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st index 8007441af0..67ab450880 100644 --- a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st +++ b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st @@ -2,36 +2,38 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRemotesTreeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemotesTreeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand class >> isAbstract [ ^ self == IceTipRemotesTreeCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item canActivateCommand: self ] diff --git a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st index e2b78de9dc..fbf5514850 100644 --- a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st @@ -2,43 +2,45 @@ I remove a credential from the credential store. " Class { - #name : #IceTipRemoveCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipRemoveCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultDescription [ ^ 'Removes the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultName [ ^ 'Remove' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoveCredentialCommand >> canBeExecuted [ ^ self item isDefault not ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveCredentialCommand >> execute [ self store removeCredential: self item. self tool refresh. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st index be305dcb9b..371f2f2475 100644 --- a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st @@ -2,30 +2,32 @@ Command that removes a package from the repository, without removing it from the system. " Class { - #name : #IceTipRemoveFromRepositoryPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoveFromRepositoryPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultDescription [ ^ 'Removes the current repository from the repository, without removing it from the system' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultName [ ^ 'Remove from repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveFromRepositoryPackageCommand >> execute [ self packageModel remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveFromRepositoryPackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st index c1872aeb06..23317b3c2b 100644 --- a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRemovePackageDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemovePackageDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', @@ -8,10 +8,12 @@ Class { 'removeFromRepositoryCheckbox', 'unloadFromImageCheckbox' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemovePackageDialogPresenter >> accept [ self removeFromRepositoryCheckbox state @@ -20,19 +22,19 @@ IceTipRemovePackageDialogPresenter >> accept [ ifTrue: [ self model unload ]. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove package {1}?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemovePackageDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -48,13 +50,13 @@ IceTipRemovePackageDialogPresenter >> defaultLayout [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ ^ (500 @@ -62,7 +64,7 @@ IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ scaledByDisplayScaleFactor "Yes, a magic number" ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -81,37 +83,37 @@ IceTipRemovePackageDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> removeFromRepositoryCheckbox [ ^ removeFromRepositoryCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> titleForWindow [ ^ 'Remove Package' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> unloadFromImageCheckbox [ ^ unloadFromImageCheckbox diff --git a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st index 448a16e9ed..71fe70061b 100644 --- a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRemoveRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemoveRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', 'confirmLabel', 'removeFileSystemCheckbox' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemoveRepositoryDialogPresenter >> accept [ (self removeFileSystemCheckbox state @@ -19,18 +21,18 @@ IceTipRemoveRepositoryDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove your repository {1} from your image?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -44,13 +46,13 @@ IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -60,7 +62,7 @@ IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -74,36 +76,36 @@ IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> removeFileSystemCheckbox [ ^ removeFileSystemCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> removeMessage [ ^ 'Also remove repository from file system' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> titleForWindow [ ^ 'Remove repository' diff --git a/Iceberg-TipUI/IceTipRepairAction.class.st b/Iceberg-TipUI/IceTipRepairAction.class.st index 32ed347aa6..787abea3ae 100644 --- a/Iceberg-TipUI/IceTipRepairAction.class.st +++ b/Iceberg-TipUI/IceTipRepairAction.class.st @@ -3,15 +3,17 @@ I'm a repair option. Repositories can be broken in several ways. My children will describe them and take the actions needed to perform the re-alignment of an image with its repository. " Class { - #name : #IceTipRepairAction, - #superclass : #IceTipAction, + #name : 'IceTipRepairAction', + #superclass : 'IceTipAction', #instVars : [ 'repositoryModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> allAvailableFor: aRepository [ ^ ((self allSubclasses select: [ :each | each isAvailableFor: aRepository ]) @@ -19,38 +21,38 @@ IceTipRepairAction class >> allAvailableFor: aRepository [ collect: #new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> help [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAbstract [ ^ self == IceTipRepairAction ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAvailableFor: aRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> order [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> title [ ^ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self context: aContext. @@ -58,7 +60,7 @@ IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> fetchAllRemotes [ | remotes | remotes := self repository remotes. @@ -72,32 +74,32 @@ IceTipRepairAction >> fetchAllRemotes [ self repository fetchFrom: each ] ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> help [ ^ self class help ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> icon [ ^ self class icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repositoryModel [ ^ repositoryModel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> title [ ^ self class title ] diff --git a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st index dd5395e074..cb040b7b29 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> help [ ^ 'Discard all changes in your image and checkout an existing branch. This action will checkout the branch in the repository and synchronize your image with your repository. @@ -23,12 +25,12 @@ This action opens a preview window before doing any change. This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> icon [ ^ self iconNamed: #branch ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -38,17 +40,17 @@ IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ and: [ aRepository project isUnborn or: [ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> title [ ^ 'Checkout an existing branch discarding image changes' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st index fa85dd2b84..f843cc3782 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st @@ -7,12 +7,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutNewBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutNewBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> help [ ^ 'It creates a new branch from the commit your image is pointing to. This will not lose any change in the image. @@ -22,12 +24,12 @@ This situation happens because the code loaded in your image does not correspond This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> title [ ^ 'Create a new branch pointing to your image commit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutNewBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st index 2bbf694e4d..229ce41e08 100644 --- a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairCloneRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCloneRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> help [ ^ 'Clone again the repository into a new location. @@ -23,29 +25,29 @@ So, this action will very probably let you in a detached status. You will need to re-synchronize your repository with another repair action.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> icon [ ^ self iconNamed: #smallAdd ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCloneRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> title [ ^ 'Clone again this repository in a new location' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCloneRepository >> basicExecute [ ((IceTipRegisterRepositoryDialogPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipRepairCommand.class.st b/Iceberg-TipUI/IceTipRepairCommand.class.st index ad3f612190..1ea3fd269e 100644 --- a/Iceberg-TipUI/IceTipRepairCommand.class.st +++ b/Iceberg-TipUI/IceTipRepairCommand.class.st @@ -2,36 +2,38 @@ Command that opens the repair window on a repository " Class { - #name : #IceTipRepairCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultDescription [ ^ 'Helps you to repair your repository when it is detached.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultName [ ^ 'Repair repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultToolbarItemName [ ^ 'Repair' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCommand >> execute [ ((IceTipRepairRepositoryDialogPresenter @@ -42,7 +44,7 @@ IceTipRepairCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st index 71012bf783..a0d2a6921c 100644 --- a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st +++ b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairCreateSubdirectory, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCreateSubdirectory', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> help [ ^ 'Create a new subdirectory for the code. @@ -20,28 +22,28 @@ It is possible that the directory has been deleted or never commited after creat This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCreateSubdirectory class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> title [ ^ 'Create code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCreateSubdirectory >> basicExecute [ self repositoryModel createSourceDirectory. diff --git a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st index 6a06d6a430..3fc00951ed 100644 --- a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st +++ b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairDiscardAndLoad, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairDiscardAndLoad', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> help [ ^ 'Discard all changes in your image and checkout the current commit (HEAD) in the repository. @@ -24,12 +26,12 @@ This situation happens because loaded code in your image is from a different com Opens a preview window with the incoming changes before doing any change.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> icon [ ^ self iconNamed: #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ and: [ aRepository head isDetached not ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> order [ ^ 40 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> title [ ^ 'Discard image changes and load repository version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairDiscardAndLoad >> basicExecute [ (IceTipCheckoutPreviewBrowser onBranch: self repositoryModel branchModel) @@ -58,7 +60,7 @@ IceTipRepairDiscardAndLoad >> basicExecute [ open ] -{ #category : #private } +{ #category : 'private' } IceTipRepairDiscardAndLoad >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairEditRepository.class.st b/Iceberg-TipUI/IceTipRepairEditRepository.class.st index 8850faf7bf..44a93839e4 100644 --- a/Iceberg-TipUI/IceTipRepairEditRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairEditRepository.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairEditRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairEditRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> help [ ^ 'You can edit the repository to inform another subdirectory name. Once the new subdirectory is updated, the packages in the repository are available. @@ -20,28 +22,28 @@ This happens because the source code directory has been moved or renamed. ' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> icon [ ^ self iconNamed: #edit ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairEditRepository class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> title [ ^ 'Edit the repository to select the correct code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairEditRepository >> basicExecute [ (IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st index c12b889730..74e0a17e52 100644 --- a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st @@ -6,12 +6,14 @@ matches if: " Class { - #name : #IceTipRepairFetchRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairFetchRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> help [ ^ 'You can fetch commits from a remote to find your image commit in your repository. This will not lose any change in the image or the repository. @@ -23,12 +25,12 @@ After doing the fetch, it is required to create a new branch to commit into the A second repair action will help you.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> icon [ ^ self iconNamed: #smallUpdate ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy referenceCommit isUnknownCommit" @@ -37,24 +39,24 @@ IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy referenceCommit isUnknownCommit ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> order [ ^ 15 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> title [ ^ 'Fetch remote commits including the commits of the image version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" self fetchAllRemotes ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st index 232abefec4..985b9b5f55 100644 --- a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairLocateRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairLocateRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> help [ ^ 'Locate this repository in your file system. @@ -23,29 +25,29 @@ You will need to re-synchronize your repository with another repair action. This happens if the repository has been removed from the disk or the image was pointing to a repository in another machine (For example, when sharing images with other machines / people).' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> icon [ ^ self iconNamed: #glamorousFolder ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairLocateRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> title [ ^ 'Locate this repository in your file system' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> basicExecute [ | dialog | @@ -61,12 +63,12 @@ IceTipRepairLocateRepository >> basicExecute [ open. ] -{ #category : #private } +{ #category : 'private' } IceTipRepairLocateRepository >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] diff --git a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st index 3ee897f53c..0f258921e7 100644 --- a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairMergeWithBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairMergeWithBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> help [ ^ 'This action checkouts an existing branch and loads the code in your image without discarding any change. This will not lose any change in the image but may lead to conflicts. If there are conflicts it opens a merge view. @@ -21,12 +23,12 @@ This situation happens because loaded code in your image is from a different com This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-commited changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> icon [ ^ self iconNamed: #merge ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -39,17 +41,17 @@ IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ aRepository head isDetached not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> title [ ^ 'Checkout an existing branch and merge the changes into the image (without discarding image changes)' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairMergeWithBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairProject.class.st b/Iceberg-TipUI/IceTipRepairProject.class.st index ce164f63e0..92caae1ec9 100644 --- a/Iceberg-TipUI/IceTipRepairProject.class.st +++ b/Iceberg-TipUI/IceTipRepairProject.class.st @@ -2,12 +2,14 @@ I'm an action to repair a project, which is useful when it answers true to #isUnborn. " Class { - #name : #IceTipRepairProject, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairProject', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> help [ ^ 'Edit the repository to add project meta-data. This action will create a .project file in the root of your repository adding meta information such as source code directory, project name, format and so on. @@ -15,12 +17,12 @@ This action will create a .project file in the root of your repository adding me This situation happens because your project does not have project meta-data and Iceberg does not know how to correctly interpret its data.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> icon [ ^ self iconNamed: #config ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairProject class >> isAvailableFor: aRepository [ "matches if: - workingCopy is atached @@ -32,17 +34,17 @@ IceTipRepairProject class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy project isUnborn ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> title [ ^ 'Create project meta-data' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairProject >> basicExecute [ ((IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st index 65432e1357..8ace58c44b 100644 --- a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st @@ -5,12 +5,14 @@ matches if: - workingCopy is detached AND there is no commit in the current available commits " Class { - #name : #IceTipRepairPullRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairPullRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> help [ ^ 'You can pull commits from a remote to put your image and your repository in sync. This will not lose any change in the image. @@ -20,12 +22,12 @@ This situation happens because the code loaded in your image is not in the branc This operation will modify the state of your working copy in disk. All non-commited changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> icon [ ^ self iconNamed: #down ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached AND there is no commit in the current available commits" @@ -37,17 +39,17 @@ IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ (aRepository includesCommit: aRepository workingCopy referenceCommit) not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> title [ ^ 'Pull remote commits to put your repository in sync' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairPullRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st index 9284c8ae2d..c67813e158 100644 --- a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRepairRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRepairRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'optionsList', 'detailPanel', @@ -8,16 +8,18 @@ Class { 'selectedOption', 'reasonPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepairRepositoryDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepairRepositoryDialogPresenter >> accept [ self closeWindow. @@ -26,13 +28,13 @@ IceTipRepairRepositoryDialogPresenter >> accept [ model: self model ] -{ #category : #'api - focus' } +{ #category : 'api - focus' } IceTipRepairRepositoryDialogPresenter >> defaultKeyboardFocus [ ^ optionsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepairRepositoryDialogPresenter >> defaultLayout [ self flag: #TODO. "Replace the fixed height with a correct style" @@ -44,19 +46,19 @@ IceTipRepairRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> detailPanel [ ^ detailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -70,7 +72,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ optionsList @@ -89,7 +91,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ whenActivatedDo: [ :selection | selection ifNotNil: [ self accept ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializePresenters [ reasonPanel := self newText @@ -108,31 +110,31 @@ IceTipRepairRepositoryDialogPresenter >> initializePresenters [ self initializeOptionsList ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> initializeReasonPanel [ reasonPanel text: self model longStatus ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> optionsList [ ^ optionsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> reasonPanel [ ^ reasonPanel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ selectedOption ifNotNil: [ @@ -141,14 +143,14 @@ IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> refreshDialogButtons [ self window ifNotNil: [ :aWindow | aWindow buttons first enabled: (selectedOption isNotNil) ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ selectedOption := selectedItem. @@ -157,13 +159,13 @@ IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> titleForWindow [ ^ 'Repair repository' diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 0bf3a8bff7..f10f85f4ff 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -5,17 +5,19 @@ I define basic actions and an entry point to manage each repository individually IceTipRepositoriesBrowser new open. " Class { - #name : #IceTipRepositoriesBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoriesBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'currentGroupPanel', 'repositoryNotebook', 'notifyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipFetchAllProjectCommand. @@ -26,7 +28,7 @@ IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -47,7 +49,7 @@ IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ super buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup. @@ -60,13 +62,13 @@ IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presente ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser class >> iconForWorldMenu [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #'world menu' } +{ #category : 'world menu' } IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ "Add a custom menu item to the world menu" @@ -80,13 +82,13 @@ IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ action: [ self new open ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> new [ ^ self newOnRepositoryProvider: IceRepository ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ | application | @@ -104,7 +106,7 @@ IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ notifyPanel layout add: (notifyPanel newLabel @@ -112,7 +114,7 @@ IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> connectPresenters [ repositoryNotebook whenSelectedPageChangedDo: [ :newPage | @@ -120,19 +122,19 @@ IceTipRepositoriesBrowser >> connectPresenters [ aPresenter updatePresenter ] ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> currentGroupPanel [ ^ currentGroupPanel ifNil: [ currentGroupPanel := self layout children first ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> defaultKeyboardFocus [ ^ repositoryNotebook ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoriesBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -141,7 +143,7 @@ IceTipRepositoriesBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> hasSelectedItem [ ^ repositoryNotebook selectedPage @@ -150,19 +152,19 @@ IceTipRepositoriesBrowser >> hasSelectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> iconForWindow [ ^ self class iconForWorldMenu ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initialExtentForWindow [ ^ (600 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initializePresenters [ notifyPanel := self newPresenter. @@ -172,14 +174,14 @@ IceTipRepositoriesBrowser >> initializePresenters [ repositoryNotebook := self newNotebook ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> mainList [ "should not arrive here" ^ nil ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -187,20 +189,20 @@ IceTipRepositoriesBrowser >> openManagePackagesWindow [ execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanel [ "this method is using exclusively for testing." ^ repositoryNotebook pages first activePresenter ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelIsShowingRepository: anIceLibgitRepository [ ^ self projectsPanel isShowingRepository: anIceLibgitRepository ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ "this method is using exclusively for testing. it will answer the repository list form the projects page" @@ -208,21 +210,21 @@ IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ ^ self projectsPanel repositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryModels [ "this method is used exclusively for testing" ^ self projectsPanelRepositoryList items ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> refresh [ repositoryNotebook selectedPage ifNil: [ ^ self ]. repositoryNotebook selectedPage activePresenter updatePresenter ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> refreshCommands [ | rootGroup | @@ -233,13 +235,13 @@ IceTipRepositoriesBrowser >> refreshCommands [ refreshToolbarWith: rootGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> selectedItem [ ^ repositoryNotebook selectedPage @@ -247,7 +249,7 @@ IceTipRepositoriesBrowser >> selectedItem [ ifNil: [ nil ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -255,7 +257,7 @@ IceTipRepositoriesBrowser >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -264,13 +266,13 @@ IceTipRepositoriesBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> titleForWindow [ ^ 'Repositories' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> updatePresenter [ LGitLibrary uniqueInstance isAvailable @@ -287,7 +289,7 @@ IceTipRepositoriesBrowser >> updatePresenter [ self refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoriesModel.class.st b/Iceberg-TipUI/IceTipRepositoriesModel.class.st index 363bd7ed9a..8d3cf107d6 100644 --- a/Iceberg-TipUI/IceTipRepositoriesModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesModel.class.st @@ -2,21 +2,23 @@ I'm a model to provide access to all repositories registered. " Class { - #name : #IceTipRepositoriesModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoriesModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositories [ ^ repositoryProvider repositories collect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryGroups [ | sortGroup groups | @@ -46,7 +48,7 @@ IceTipRepositoriesModel >> repositoryGroups [ group: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st index 3932c52a2d..d4c3e05009 100644 --- a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st @@ -3,16 +3,18 @@ I'm a browser to show the internals of a repository. I will show remotes, branches, tags and all possible operations in low level repository (pull, push, branch. But all edit remotes, etc.) " Class { - #name : #IceTipRepositoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'sidebarTree', 'historyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddRemoteCommand. @@ -24,7 +26,7 @@ IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aC aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ | aGroup | @@ -50,30 +52,30 @@ IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> new [ self error: 'Use #onRepository:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepositoryNamed: aString [ ^ self onRepository: (IceRepository registry detect: [ :each | each name = aString ]) ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipRepositoryBrowser >> commitishSelected: ann [ historyPanel model: ann ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryBrowser >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -83,19 +85,19 @@ IceTipRepositoryBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> historyPanel [ ^ historyPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initialExtentForWindow [ ^ (1000 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializePresenters [ sidebarTree := self newTreeTable. @@ -109,7 +111,7 @@ IceTipRepositoryBrowser >> initializePresenters [ self initializeSidebarTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializeSidebarTree [ sidebarTree @@ -129,14 +131,14 @@ IceTipRepositoryBrowser >> initializeSidebarTree [ ifTrue: [ self commitishSelected: selection selectedItem ] ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ sidebarTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryBrowser >> refresh [ self refreshCommands. @@ -145,7 +147,7 @@ IceTipRepositoryBrowser >> refresh [ self selectCurrentBranch ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) ifFalse: [ ^ self ]. @@ -153,7 +155,7 @@ IceTipRepositoryBrowser >> refreshWhenRepository: ann [ self updatePresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> selectCurrentBranch [ | branch | @@ -166,13 +168,13 @@ IceTipRepositoryBrowser >> selectCurrentBranch [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> sidebarTree [ ^ sidebarTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -181,13 +183,13 @@ IceTipRepositoryBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> titleForWindow [ ^ 'Repository of ' , self model name ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipRepositoryCommand.class.st b/Iceberg-TipUI/IceTipRepositoryCommand.class.st index 31cfa04b4c..42a298249b 100644 --- a/Iceberg-TipUI/IceTipRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipRepositoryCommand.class.st @@ -2,42 +2,44 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRepositoryCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepositoryCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand class >> isAbstract [ ^ self == IceTipRepositoryCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryCommand >> announcer [ ^ self context toolAnnouncer ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> canBeExecuted [ ^ self repositoryModel isNotNil diff --git a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st index d8aec6c69b..a31676a85a 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st @@ -4,23 +4,25 @@ Repository groups are taken from tags added to the repository metadata (usually NOTICE: first tag will be taken as the group. " Class { - #name : #IceTipRepositoryGroupModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoryGroupModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider', 'repositories', 'group' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel class >> defaultLabel [ ^ 'Projects' ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryGroupModel >> containsRepository: aRepository [ (self group isEmpty and: [ aRepository project tags isEmpty ]) @@ -29,19 +31,19 @@ IceTipRepositoryGroupModel >> containsRepository: aRepository [ ^ aRepository project tags includes: self group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group [ ^ group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group: aGroup [ group := aGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> label [ ^ self group @@ -49,7 +51,7 @@ IceTipRepositoryGroupModel >> label [ ifEmpty: [ self class defaultLabel ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositories [ ^ repositories := repositoryProvider repositories @@ -57,7 +59,7 @@ IceTipRepositoryGroupModel >> repositories [ thenCollect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st index 783b0f3295..fd61359ed0 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRepositoryGroupPanel, - #superclass : #SpPresenter, + #name : 'IceTipRepositoryGroupPanel', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', #instVars : [ 'repositoryList', 'repositoryFilter' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ self flag: #HACK. "I extracted this panel from IceTipRepositoriesBrowser, @@ -21,7 +23,7 @@ IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: a forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ | rootCommandGroup | @@ -36,13 +38,13 @@ IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ ^ rootCommandGroup ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> allListItems [ ^ self model repositories ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryGroupPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,26 +53,26 @@ IceTipRepositoryGroupPanel >> defaultLayout [ yourself ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> defaultOutputPort [ ^ self outputSelectionPort ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryGroupPanel >> hasSelectedItem [ ^ repositoryList selectedItem notNil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializePresenters [ repositoryList := self newTable. @@ -78,7 +80,7 @@ IceTipRepositoryGroupPanel >> initializePresenters [ self initializeRepositoryFilter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ repositoryFilter := self newTextInput. @@ -88,7 +90,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryList [ repositoryList @@ -122,7 +124,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryList [ whenActivatedDo: [ self openManagePackagesWindow ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ "this method is using just for test" @@ -130,7 +132,7 @@ IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ aRepositoryModel entity = anIceLibgitRepository ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ^ self rootCommandsGroup @@ -138,7 +140,7 @@ IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ifNone: [ nil ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryGroupPanel >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -146,7 +148,7 @@ IceTipRepositoryGroupPanel >> openManagePackagesWindow [ execute ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> outputSelectionPort [ ^ (SpSelectionPort newPresenter: self) @@ -154,7 +156,7 @@ IceTipRepositoryGroupPanel >> outputSelectionPort [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> refreshRepositoryList [ repositoryList updateItemsKeepingSelection: (repositoryFilter text @@ -163,25 +165,25 @@ IceTipRepositoryGroupPanel >> refreshRepositoryList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryList [ ^ repositoryList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> selectedItem [ ^ repositoryList selectedItem ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -189,13 +191,13 @@ IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> updatePresenter [ self refreshRepositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st index 5d75754d1b..69a2e5be73 100644 --- a/Iceberg-TipUI/IceTipRepositoryModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryModel.class.st @@ -2,26 +2,28 @@ I'm a model for IceRepository entries. " Class { - #name : #IceTipRepositoryModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRepositoryModel', + #superclass : 'IceTipEntityModel', #traits : 'TIceCopyCommitId + TWithBranchModel', #classTraits : 'TIceCopyCommitId classTrait + TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel class >> unknownBranchLabel [ ^ 'Unknown' ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> = other [ ^ self species = other species and: [ self entity = other entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> allBranchModels [ ^ self entity allBranches collect: [ :each | @@ -31,14 +33,14 @@ IceTipRepositoryModel >> allBranchModels [ beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> availableRepairOptions [ ^ IceTipRepairAction allAvailableFor: self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModel [ ^ (IceTipBranchModel @@ -47,7 +49,7 @@ IceTipRepositoryModel >> branchModel [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModelFor: aBranch [ ^ (IceTipBranchModel repositoryModel: self @@ -55,7 +57,7 @@ IceTipRepositoryModel >> branchModelFor: aBranch [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchName [ (self isLibGitAvailable not or: [ self entity isMissing ]) @@ -64,36 +66,36 @@ IceTipRepositoryModel >> branchName [ ^ self entity head description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchNamed: aString [ ^ self entity branchNamed: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branches [ ^ self entity localBranches ] -{ #category : #checking } +{ #category : 'checking' } IceTipRepositoryModel >> checkMissing [ self isMissing ifTrue: [ IceError signal: ('You have no repository attached to project "{1}"' format: { self name }) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commit [ ^ self entity workingCopy referenceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitId [ ^ [ self entity headCommit id ] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitModelFor: aCommit [ ^ (IceTipCommitModel repositoryModel: self @@ -101,13 +103,13 @@ IceTipRepositoryModel >> commitModelFor: aCommit [ beCached ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> createSourceDirectory [ entity createSourceDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> description [ | text | @@ -117,7 +119,7 @@ IceTipRepositoryModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> descriptionDecorator [ (self isLibGitAvailable and: [ self entity isModified ]) @@ -125,24 +127,24 @@ IceTipRepositoryModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasRemotes [ - ^ self entity remotes notEmpty + ^ self entity remotes isNotEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasUnbornProject [ ^ self entity workingCopy project isUnborn ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> hash [ ^ self species hash bitXor: self entity hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> headModel [ | head | @@ -152,12 +154,12 @@ IceTipRepositoryModel >> headModel [ ifFalse: [ self commitModelFor: head ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> incomingCommits [ ^ self entity incomingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> info [ ^ { 'Branch' -> self entity branch name. @@ -166,46 +168,46 @@ IceTipRepositoryModel >> info [ } ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isCodeMissing [ ^ entity isCodeMissing ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLibGitAvailable [ ^ LGitLibrary uniqueInstance isAvailable ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLoaded [ - ^ self entity loadedPackages notEmpty + ^ self entity loadedPackages isNotEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isMissing [ ^ self entity isMissing ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> localRepositoryMissing [ ^ 'Local repository missing' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> location [ ^ entity location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> longStatus [ (entity isMissing and: [ entity location isNil ]) @@ -229,17 +231,17 @@ IceTipRepositoryModel >> longStatus [ ^ 'Your repository seems ok. Please report a ticket in Iceberg''s issue tracker. If you can, please send us a backup of your image in this state for debugging.' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> matches: aString [ ^ self entity name matchesRegexIgnoringCase: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddPackagesAction: aCollection [ @@ -253,7 +255,7 @@ IceTipRepositoryModel >> newAddPackagesAction: aCollection [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ @@ -268,7 +270,7 @@ IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ @@ -279,7 +281,7 @@ IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ action: [ self entity createBranch: aString inCommit: aCommit ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCommitAction [ ^ IceTipCommitAction new @@ -287,7 +289,7 @@ IceTipRepositoryModel >> newCommitAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDeleteAction [ @@ -298,7 +300,7 @@ IceTipRepositoryModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDiscardChangesAction [ @@ -312,7 +314,7 @@ IceTipRepositoryModel >> newDiscardChangesAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newFetchAction [ @@ -324,7 +326,7 @@ IceTipRepositoryModel >> newFetchAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newForgetAction [ @@ -335,12 +337,12 @@ IceTipRepositoryModel >> newForgetAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfIncomingCommits [ ^ self incomingCommits size ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfOutgoingCommits [ ^ [ | size | self entity branch hasUpstream ifFalse: [ ^ '*' ]. @@ -351,40 +353,40 @@ IceTipRepositoryModel >> numberOfOutgoingCommits [ on: IceNotInBranch do: [ :e | '0' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> outgoingCommits [ ^ self entity outgoingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> packages [ ^ self entity workingCopy packages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> pushRemoteName [ ^ self entity branch upstream name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remoteModels [ ^ self entity remotes collect: [ :each | (IceTipRemoteModel repositoryModel: self on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remotes [ ^ entity remotes ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModel [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModelsByGroup [ | branches tags | branches := self allBranchModels. @@ -422,12 +424,12 @@ IceTipRepositoryModel >> repositoryModelsByGroup [ } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> shortCommitId [ ^ [self entity headCommit shortId] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> status [ [ | status incoming outgoing | @@ -439,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' ]. @@ -465,7 +467,7 @@ IceTipRepositoryModel >> status [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusDecorator [ [ @@ -475,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 ]. @@ -488,7 +490,7 @@ IceTipRepositoryModel >> statusDecorator [ ^ IceTipStatusDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusString [ [ | status incoming outgoing | @@ -499,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' ]. @@ -525,13 +527,13 @@ IceTipRepositoryModel >> statusString [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> subdirectory [ ^ self entity subdirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> tagModels [ ^ self entity tags @@ -542,7 +544,7 @@ IceTipRepositoryModel >> tagModels [ beCached ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> updateLocation: aReference [ "change location" @@ -552,18 +554,18 @@ IceTipRepositoryModel >> updateLocation: aReference [ Iceberg announcer announce: (IceRepositoryModified for: self entity) ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> verifyDirectoryStructureIfMissing: aBlock [ self entity isMissing ifTrue: [ ^ aBlock value: self localRepositoryMissing ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopy [ ^ IceTipWorkingCopyModel on: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopyDiff [ diff --git a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st index 5d7d48dc7e..a5bff37e31 100644 --- a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st @@ -3,8 +3,8 @@ I'm a generic repository type panel. I'm used as part of the creation dialog and to edit repository properties. " Class { - #name : #IceTipRepositoryTypePanel, - #superclass : #IceTipPresenter, + #name : 'IceTipRepositoryTypePanel', + #superclass : 'IceTipPresenter', #instVars : [ 'projectLocationLabel', 'projectLocation', @@ -12,10 +12,12 @@ Class { 'remoteInputText', 'repository' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> allTypes [ ^ ((self allSubclasses reject: #isAbstract) @@ -23,37 +25,37 @@ IceTipRepositoryTypePanel class >> allTypes [ collect: #new ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel class >> isAbstract [ ^ self = IceTipRepositoryTypePanel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> order [ ^ 0 ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryTypePanel >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation pathString ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializePresenters [ self initializeProjectLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeProjectLocation [ projectLocationLabel := self newLabel label: 'Local directory'. @@ -63,7 +65,7 @@ IceTipRepositoryTypePanel >> initializeProjectLocation [ location: self defaultLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeRemoteURL [ remoteLabel := self newLabel label: 'Remote URL'; yourself. @@ -73,50 +75,50 @@ IceTipRepositoryTypePanel >> initializeRemoteURL [ yourself. ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isLocalRepository [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isNewRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> newRepository [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> projectLocation [ ^ projectLocation ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteInputText [ ^ remoteInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteLabel [ ^ remoteLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> repository: aRepository [ "Used if editing an existing repository" repository := aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> validate [ ^ self subclassResponsibility diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index a92054e657..fe4979489e 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -2,37 +2,39 @@ I'm a command to reset the selected branch to the selected commit. It does not modify the working copy. " Class { - #name : #IceTipResetBranchToThisCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipResetBranchToThisCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipResetBranchToThisCommitCommand class >> defaultDescription [ ^ 'Resets the selected branch to the selected commit. It does not modify the working copy (!!).' ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [ ^ 'Reset ', self selectedBranch name, ' to commit ', self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> execute [ self selectedBranch resetToCommit: self selectedCommitish. Iceberg announcer announce: (IceRepositoryModified for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> iconName [ ^ #bottom ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipResetBranchToThisCommitCommand >> name [ ^ self context @@ -40,13 +42,13 @@ IceTipResetBranchToThisCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedBranch [ ^ self context model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st index 2a35d1e302..32620f7057 100644 --- a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st +++ b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st @@ -3,24 +3,26 @@ I'm a command to install a chunk of code from a commit (shown in a diff) into th ""chunk"" can be a package, class or single method. " Class { - #name : #IceTipRevertChangeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRevertChangeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultDescription [ ^ 'Revert selected change in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultName [ ^ 'Revert change' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> execute [ UIManager default @@ -33,13 +35,13 @@ IceTipRevertChangeCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRevertChangeCommand >> iconName [ ^ #smallUndo ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> tool [ "We consider the diffPanel of the context as our tool. This is important because we have to announce in the same Announcer instance that is subscribed for our news." diff --git a/Iceberg-TipUI/IceTipSaveImageAction.class.st b/Iceberg-TipUI/IceTipSaveImageAction.class.st index a60893f771..0dc8f6057b 100644 --- a/Iceberg-TipUI/IceTipSaveImageAction.class.st +++ b/Iceberg-TipUI/IceTipSaveImageAction.class.st @@ -4,12 +4,14 @@ I implement the action of saving the image. I'm used by the presenter that prepares the commit. " Class { - #name : #IceTipSaveImageAction, - #superclass : #Object, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSaveImageAction', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execution } +{ #category : 'execution' } IceTipSaveImageAction >> execute [ Smalltalk saveSession. diff --git a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st index 69334d31e0..66fcd9e72c 100644 --- a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st @@ -3,34 +3,36 @@ Implements the select all option behavior in the ""Select New Packages to Load"" " Class { - #name : #IceTipSelectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultName [ ^ 'Select all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSelectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display and they are not all selected " | 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 } +{ #category : 'executing' } IceTipSelectAllPackagesCommand >> execute [ " Private - Select all the receiver's packages " @@ -38,7 +40,7 @@ IceTipSelectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectAllPackagesCommand >> iconName [ ^ #checkboxSelected diff --git a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st index c8218a5b92..25f6293bb2 100644 --- a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st @@ -2,12 +2,14 @@ Provides common behavior to accesing the packages list presenters in its context. " Class { - #name : #IceTipSelectPackagesCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectPackagesCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipSelectPackagesCommand >> packagesList [ " Answer a including the receiver's packages " diff --git a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st index 51ece93142..9ed3ec2535 100644 --- a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st +++ b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipSelectRemotePresenter, - #superclass : #SpPresenter, + #name : 'IceTipSelectRemotePresenter', + #superclass : 'SpPresenter', #instVars : [ 'remoteList', 'addButton', 'model' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> addButton [ ^ addButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipSelectRemotePresenter >> addRemote [ ((IceTipAddRemoteDialogPresenter @@ -30,7 +32,7 @@ IceTipSelectRemotePresenter >> addRemote [ open ] -{ #category : #layout } +{ #category : 'layout' } IceTipSelectRemotePresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -40,13 +42,13 @@ IceTipSelectRemotePresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> icon [ ^ self iconNamed: #add ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> initializePresenters [ remoteList := self newDropList @@ -60,44 +62,44 @@ IceTipSelectRemotePresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> label: aString [ self remoteLabel label: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> refresh [ remoteList items: self model remoteModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> remoteList [ ^ remoteList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> selectRemoteNamed: aString [ remoteList selectItem: (self model remoteModels detect: [ :each | each name = aString ]) ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipSelectRemotePresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> updatePresenter [ self refresh. diff --git a/Iceberg-TipUI/IceTipSettingsCommand.class.st b/Iceberg-TipUI/IceTipSettingsCommand.class.st index 7fd84a78c0..487cfeffdc 100644 --- a/Iceberg-TipUI/IceTipSettingsCommand.class.st +++ b/Iceberg-TipUI/IceTipSettingsCommand.class.st @@ -2,31 +2,33 @@ Command that opens the settings on a repository " Class { - #name : #IceTipSettingsCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSettingsCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultDescription [ ^ 'Open settings browser to configure Iceberg' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultName [ ^ 'Settings' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSettingsCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipSettingsCommand >> execute [ | browser window path | @@ -41,19 +43,19 @@ IceTipSettingsCommand >> execute [ browser expandNodePath: path first contents first contents first path. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> iconName [ ^ #configuration ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shortcutKey [ ^ $n meta ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipSpCommand.class.st b/Iceberg-TipUI/IceTipSpCommand.class.st index 41ad221c73..02907cc53e 100644 --- a/Iceberg-TipUI/IceTipSpCommand.class.st +++ b/Iceberg-TipUI/IceTipSpCommand.class.st @@ -4,27 +4,29 @@ I am a CmUICommand that is specialized for Iceberg UI. In particular, I'm used to wrap instances of IceTipCommand in a IceTipBrowser. " Class { - #name : #IceTipSpCommand, - #superclass : #CmUICommand, + #name : 'IceTipSpCommand', + #superclass : 'CmUICommand', #instVars : [ 'presenterBuildingStrategy' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> buildPresenter [ ^ self presenterBuildingStrategy resultOn: self ] -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> configureAsToolbarButton [ self presenterBuildingStrategy: IceTipToolbarButtonStrategy new ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ self displayStrategy @@ -33,30 +35,30 @@ IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ do: aBlock ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> ifVisible: aBlock [ self displayStrategy ifVisible: self do: aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSpCommand >> initialize [ super initialize. self configureAsToolbarButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy [ ^ presenterBuildingStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy: aStrategy [ presenterBuildingStrategy := aStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> toolbarItemName [ ^ self decoratedCommand toolbarItemName diff --git a/Iceberg-TipUI/IceTipStandardAction.class.st b/Iceberg-TipUI/IceTipStandardAction.class.st index 6d97da6496..205c3bf83c 100644 --- a/Iceberg-TipUI/IceTipStandardAction.class.st +++ b/Iceberg-TipUI/IceTipStandardAction.class.st @@ -4,27 +4,29 @@ I will perform an action by informing user what's happening. I will also check for errors happening while performing the task and try to recover from them. " Class { - #name : #IceTipStandardAction, - #superclass : #IceTipAction, + #name : 'IceTipStandardAction', + #superclass : 'IceTipAction', #instVars : [ 'message', 'successAnnounceBlock', 'actionBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action [ ^ actionBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action: aBlock [ actionBlock := aBlock ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> basicExecute [ | result | @@ -38,35 +40,35 @@ IceTipStandardAction >> basicExecute [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> do: aBlock [ self action: aBlock. self execute ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> execute: aBlock [ self action: aBlock. self execute ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message: anObject [ message := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessAnnounce: aValuable [ successAnnounceBlock := aValuable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessRepositoryModified [ ^ self onSuccessAnnounce: [ IceRepositoryModified for: self repository ] ] diff --git a/Iceberg-TipUI/IceTipStatusDecorator.class.st b/Iceberg-TipUI/IceTipStatusDecorator.class.st index ba1f418e96..47bd5ea718 100644 --- a/Iceberg-TipUI/IceTipStatusDecorator.class.st +++ b/Iceberg-TipUI/IceTipStatusDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> error [ ^ IceTipStatusDecoratorError uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> warning [ ^ IceTipStatusDecoratorWarning uniqueInstance diff --git a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st index c68d74a199..b17b0b0531 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecoratorError, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorError', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorError >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipStatusDecoratorError >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st index 4ab0410f00..27b044612c 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipStatusDecoratorWarning, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorWarning', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorWarning >> color [ ^ Smalltalk ui theme warningTextColor diff --git a/Iceberg-TipUI/IceTipStyleContributor.class.st b/Iceberg-TipUI/IceTipStyleContributor.class.st index 57fadcd53a..85cad5d70c 100644 --- a/Iceberg-TipUI/IceTipStyleContributor.class.st +++ b/Iceberg-TipUI/IceTipStyleContributor.class.st @@ -4,12 +4,14 @@ This class is call by Spec2 to extend the default stylesheet. Check its superclass to understand the way of working. " Class { - #name : #IceTipStyleContributor, - #superclass : #StPharoStyleContributor, - #category : #'Iceberg-TipUI-Styles' + #name : 'IceTipStyleContributor', + #superclass : 'StPharoStyleContributor', + #category : 'Iceberg-TipUI-Styles', + #package : 'Iceberg-TipUI', + #tag : 'Styles' } -{ #category : #styles } +{ #category : 'styles' } IceTipStyleContributor >> styleSheetContribution [ ^ SpStyle newApplication diff --git a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st index 20245a7b30..2cf032c786 100644 --- a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st +++ b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st @@ -8,12 +8,14 @@ I will switch first to the new branch, and then I will perform a merge with curr This strategy is used to re-attach image when it is detached from current development branch. " Class { - #name : #IceTipSwitchAndMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipSwitchAndMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipSwitchAndMergeType >> newMergeAction: aModel [ ^ aModel newSwitchAndMergeAction diff --git a/Iceberg-TipUI/IceTipTagDecorator.class.st b/Iceberg-TipUI/IceTipTagDecorator.class.st index 695df71986..52aafff355 100644 --- a/Iceberg-TipUI/IceTipTagDecorator.class.st +++ b/Iceberg-TipUI/IceTipTagDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipTagDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagDecorator >> color [ ^ Smalltalk ui theme disabledColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTagDecorator >> isItalic [ ^ true diff --git a/Iceberg-TipUI/IceTipTagModel.class.st b/Iceberg-TipUI/IceTipTagModel.class.st index cfd67df83a..cc72af64a0 100644 --- a/Iceberg-TipUI/IceTipTagModel.class.st +++ b/Iceberg-TipUI/IceTipTagModel.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTagModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> commitModels [ | commits | @@ -17,7 +19,7 @@ IceTipTagModel >> commitModels [ ^ commits ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> delete [ @@ -28,19 +30,19 @@ IceTipTagModel >> delete [ do: [ self repositoryModel entity removeTag: self entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> description [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" diff --git a/Iceberg-TipUI/IceTipTextDecorator.class.st b/Iceberg-TipUI/IceTipTextDecorator.class.st index 879c33d06a..0530538c8a 100644 --- a/Iceberg-TipUI/IceTipTextDecorator.class.st +++ b/Iceberg-TipUI/IceTipTextDecorator.class.st @@ -1,44 +1,46 @@ Class { - #name : #IceTipTextDecorator, - #superclass : #Object, + #name : 'IceTipTextDecorator', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator class >> none [ ^ IceTipTextDecoratorNone uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> uniqueInstance [ self = IceTipTextDecorator ifTrue: [ ^ self error: 'I''m abstract, use one of my children.' ]. ^ uniqueInstance ifNil: [ uniqueInstance := super new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme textColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isBold [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isItalic [ ^ false diff --git a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st index 5bfcdfb1db..79c406d278 100644 --- a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st +++ b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTextDecoratorNone, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTextDecoratorNone', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } diff --git a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st index 610e84556c..ceb50f8d8a 100644 --- a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st +++ b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st @@ -3,18 +3,20 @@ I'm a strategy to build Spec2 buttons foro a toolar wrapping a IceTipSpCommand. " Class { - #name : #IceTipToolbarButtonStrategy, - #superclass : #IceTipCommandToPresenterBuildingStrategy, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarButtonStrategy', + #superclass : 'IceTipCommandToPresenterBuildingStrategy', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipToolbarButtonStrategy >> buttonPresenterClass [ ^ SpToolbarButtonPresenter ] -{ #category : #public } +{ #category : 'public' } IceTipToolbarButtonStrategy >> resultOn: aCommand [ | aButtonPresenter | diff --git a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st index 67f6838fb7..91cc8f7fce 100644 --- a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st +++ b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st @@ -3,12 +3,14 @@ I'm a SpToolbarPresenterBuilder that delegates to the command the decision to ac " Class { - #name : #IceTipToolbarPresenterBuilder, - #superclass : #SpToolbarPresenterBuilder, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarPresenterBuilder', + #superclass : 'SpToolbarPresenterBuilder', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipToolbarPresenterBuilder >> visitCommand: anEntry [ anEntry ifVisible: [ super visitCommand: anEntry ] diff --git a/Iceberg-TipUI/IceTipTreeBranch.class.st b/Iceberg-TipUI/IceTipTreeBranch.class.st index 2c2c76c0ba..048ef0aeb2 100644 --- a/Iceberg-TipUI/IceTipTreeBranch.class.st +++ b/Iceberg-TipUI/IceTipTreeBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeBranch, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeBranch', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeBranch >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnBranch: self ] diff --git a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st index abe4c6c3f2..6d6c8e77c2 100644 --- a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st @@ -3,31 +3,33 @@ A generic command to collapse a tree. It sends `doCollapseSelection` message to its context. " Class { - #name : #IceTipTreeCollapseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeCollapseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultDescription [ ^ 'Collapse selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultName [ ^ 'Collapse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeCollapseCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeCollapseCommand >> execute [ self context doCollapseSelection diff --git a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st index b3e6aab770..c7ff5ac195 100644 --- a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st @@ -2,37 +2,39 @@ A generic command to expand tree items within a tree. " Class { - #name : #IceTipTreeExpandCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeExpandCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultDescription [ ^ 'Expand selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultName [ ^ 'Expand' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeExpandCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeExpandCommand >> execute [ self context doExpandSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeExpandCommand >> iconName [ ^ nil diff --git a/Iceberg-TipUI/IceTipTreeGroup.class.st b/Iceberg-TipUI/IceTipTreeGroup.class.st index bf0b91e110..3de0ec917c 100644 --- a/Iceberg-TipUI/IceTipTreeGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeGroup.class.st @@ -4,16 +4,18 @@ I keep groups with elements. I can provide also a contexts for menu operations and other kind of options to be associated with group. " Class { - #name : #IceTipTreeGroup, - #superclass : #IceTipTreeNode, + #name : 'IceTipTreeGroup', + #superclass : 'IceTipTreeNode', #instVars : [ 'name', 'children' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName children: aCollection [ ^ self new name: aName; @@ -21,7 +23,7 @@ IceTipTreeGroup class >> name: aName children: aCollection [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ ^ self new name: aName; @@ -30,7 +32,7 @@ IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> addChild: anObject [ children ifNil: [ children := OrderedCollection new ]. children add: anObject. @@ -38,23 +40,23 @@ IceTipTreeGroup >> addChild: anObject [ ^ anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children [ ^ children ifNil: [ #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children: aCollection [ children := aCollection. children do: [ :each | each parent: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> ensurePath: aPath [ | first next | @@ -67,34 +69,34 @@ IceTipTreeGroup >> ensurePath: aPath [ ifEmpty: [ next ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isGroup [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isSameAs: aNode [ ^ aNode species = self species and: [ self name = aNode name and: [ aNode name notNil ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name: anObject [ name := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock [ ^ self traversingDo: aBlock parents: #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray. self children do: [ :each | diff --git a/Iceberg-TipUI/IceTipTreeItem.class.st b/Iceberg-TipUI/IceTipTreeItem.class.st index bea3c80b69..62ce9f9737 100644 --- a/Iceberg-TipUI/IceTipTreeItem.class.st +++ b/Iceberg-TipUI/IceTipTreeItem.class.st @@ -2,36 +2,38 @@ I'm a leaf element of a tree. " Class { - #name : #IceTipTreeItem, - #superclass : #IceTipTreeNode, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeItem', + #superclass : 'IceTipTreeNode', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> description [ ^ self model description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> descriptionDecorator [ ^ self model descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeItem >> isSameAs: aNode [ ^ aNode species = self species and: [ self model = aNode model ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> shortDescription [ ^ self model shortDescription ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray diff --git a/Iceberg-TipUI/IceTipTreeNode.class.st b/Iceberg-TipUI/IceTipTreeNode.class.st index 43b31c752c..932a612b46 100644 --- a/Iceberg-TipUI/IceTipTreeNode.class.st +++ b/Iceberg-TipUI/IceTipTreeNode.class.st @@ -5,38 +5,40 @@ I understand - icon " Class { - #name : #IceTipTreeNode, - #superclass : #Object, + #name : 'IceTipTreeNode', + #superclass : 'Object', #instVars : [ 'model', 'parent', 'icon' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeNode class >> on: aModel [ ^ self new model: aModel ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> canActivateCommand: aCommandClass [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> children [ ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> description [ ^ self subclassResponsibility ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipTreeNode >> doesNotUnderstand: aMessage [ "redirect to model to provide polymorphism." self flag: #pharoTodo. "I'm not sure this is good practice... we'll see how it works" @@ -44,59 +46,59 @@ IceTipTreeNode >> doesNotUnderstand: aMessage [ ^ aMessage sendTo: self model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon [ ^ icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon: anIcon [ icon := anIcon ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isGroup [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isLeaf [ ^ self isGroup not ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isSameAs: aNode [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent [ ^ parent ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent: anObject [ parent := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> path [ ^ self parent ifNotNil: [ :p | p path, { self } ] ifNil: [ { self } ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> traversingDo: aBlock parents: anArray [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipTreeRemote.class.st b/Iceberg-TipUI/IceTipTreeRemote.class.st index ca4a7d6761..df832c0592 100644 --- a/Iceberg-TipUI/IceTipTreeRemote.class.st +++ b/Iceberg-TipUI/IceTipTreeRemote.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeRemote, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRemote', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeRemote >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnRemote: self ] diff --git a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st index 641cdf415b..34b4cacef9 100644 --- a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTreeRepositoryGroup, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRepositoryGroup', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } diff --git a/Iceberg-TipUI/IceTipTreeTag.class.st b/Iceberg-TipUI/IceTipTreeTag.class.st index 1f930e5759..5369001c4b 100644 --- a/Iceberg-TipUI/IceTipTreeTag.class.st +++ b/Iceberg-TipUI/IceTipTreeTag.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeTag, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeTag', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeTag >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnTag: self ] diff --git a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st index 799a7e886a..95664d05d8 100644 --- a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st @@ -7,30 +7,32 @@ It gives the user with two checkboxes to choose: Right now this is only shown for loaded packages. " Class { - #name : #IceTipUnloadAndRemovePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadAndRemovePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultDescription [ ^ 'Opens a dialog to choose between unloading from system and/or removing a package from the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultName [ ^ 'Unload and/or remove from repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadAndRemovePackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadAndRemovePackageCommand >> execute [ (IceTipRemovePackageDialogPresenter @@ -41,7 +43,7 @@ IceTipUnloadAndRemovePackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadAndRemovePackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st index 6ca10d560f..ba89f54d03 100644 --- a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st @@ -2,36 +2,38 @@ Command to unload a package from the system, keeping it in the repository " Class { - #name : #IceTipUnloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultDescription [ ^ 'Unload selected package from the system, but keep it in the repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultName [ ^ 'Unload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadPackageCommand >> execute [ self packageModel unload ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadPackageCommand >> iconName [ ^ #smallCancel diff --git a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st index 9527d0f50e..d538977a5f 100644 --- a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st @@ -3,34 +3,36 @@ Implements the unselect all option behavior in the ""Select New Packages to Load " Class { - #name : #IceTipUnselectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnselectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnselectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipUnselectAllPackagesCommand class >> defaultName [ ^ 'Unselect all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnselectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display " | pkgList | pkgList := self context packagesList. - ^ pkgList items notEmpty + ^ pkgList items isNotEmpty ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnselectAllPackagesCommand >> execute [ " Private - Unselect all the receiver's packages " @@ -38,7 +40,7 @@ IceTipUnselectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnselectAllPackagesCommand >> iconName [ ^ #checkboxUnselected diff --git a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st index c21462781d..57a7aa7cd3 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st @@ -8,8 +8,8 @@ For versions, I show the same commands of a regular history browser, but add som " Class { - #name : #IceTipVersionHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipVersionHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'selectedModel', @@ -17,16 +17,18 @@ Class { 'diffPage', 'commitPanel' ], - #category : #'Iceberg-TipUI-View-Versions' + #category : 'Iceberg-TipUI-View-Versions', + #package : 'Iceberg-TipUI', + #tag : 'View-Versions' } -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipInstallVersionCommand } @@ -35,7 +37,7 @@ IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter f ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ ^ self on: (IceTipVersionHistoryModel @@ -44,13 +46,13 @@ IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipVersionHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -59,13 +61,13 @@ IceTipVersionHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initialExtentForWindow [ ^ (700@700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitList [ commitList @@ -94,7 +96,7 @@ IceTipVersionHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -106,7 +108,7 @@ IceTipVersionHistoryBrowser >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -116,21 +118,21 @@ IceTipVersionHistoryBrowser >> initializePresenters [ self initializeCommitPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipVersionHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPage [ ^ SpNotebookPage @@ -139,7 +141,7 @@ IceTipVersionHistoryBrowser >> newDiffPage [ provider: [ self newDiffPresenter ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ ^ (self instantiate: SpDiffPresenter) @@ -148,7 +150,7 @@ IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ showOptions: false ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newDiffPresenter [ selectedModel ifNil: [ ^ self ]. @@ -159,7 +161,7 @@ IceTipVersionHistoryBrowser >> newDiffPresenter [ right: selectedModel source ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newInfoPage [ ^ SpNotebookPage @@ -169,14 +171,14 @@ IceTipVersionHistoryBrowser >> newInfoPage [ ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newVersionInfoPresenter [ selectedModel ifNil: [ ^ self ]. ^ IceTipReadOnlyFormBuilder newBuiltFor: selectedModel info application: self application ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> refresh [ commitList items: self model commitModels. @@ -186,7 +188,7 @@ IceTipVersionHistoryBrowser >> refresh [ self refreshCommitTabPanel ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ selectedModel ifNil: [ ^ self ]. @@ -198,14 +200,14 @@ IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ commitPanel resetAllPageContents ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipVersionHistoryBrowser >> selectionChanged: aSelectedItem [ selectedModel := aSelectedItem. self refreshCommitTabPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> titleForWindow [ ^ self model @@ -213,7 +215,7 @@ IceTipVersionHistoryBrowser >> titleForWindow [ ifNil: [ 'Versions' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st index 59bfc94f75..b5fd22c176 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st @@ -2,22 +2,24 @@ I'm a model to provide the history of a method. " Class { - #name : #IceTipVersionHistoryModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipVersionHistoryModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'commitModels' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModelAfter: aModel [ ^ self commitModels after: aModel ifAbsent: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModels [ ^ commitModels ifNil: [ commitModels := self retrieveHistory collect: [ :each | @@ -27,18 +29,18 @@ IceTipVersionHistoryModel >> commitModels [ beCached ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> name [ ^ '{1}>>{2}' format: { self entity origin name. self entity selector } ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryModel >> retrieveHistory [ self repositoryModel checkMissing. diff --git a/Iceberg-TipUI/IceTipVersionModel.class.st b/Iceberg-TipUI/IceTipVersionModel.class.st index a416351dc2..4382df60ce 100644 --- a/Iceberg-TipUI/IceTipVersionModel.class.st +++ b/Iceberg-TipUI/IceTipVersionModel.class.st @@ -5,12 +5,14 @@ I'm a model for IceLogVersion entries. - I can install a certain method version. " Class { - #name : #IceTipVersionModel, - #superclass : #IceTipCommitModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipVersionModel', + #superclass : 'IceTipCommitModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #private } +{ #category : 'private' } IceTipVersionModel >> basicInstall [ | definition | @@ -20,12 +22,12 @@ IceTipVersionModel >> basicInstall [ classified: definition category ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> commit [ ^ self entity commit ] -{ #category : #actions } +{ #category : 'actions' } IceTipVersionModel >> install [ @@ -36,7 +38,7 @@ IceTipVersionModel >> install [ execute: [ self basicInstall ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> source [ ^ self entity source ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st index ebf9dd35c6..e9379df0ba 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st @@ -5,17 +5,19 @@ I show the packages managed by this repository and a series of actions to proper (IceTipPackagesBrowser forRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipWorkingCopyBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipWorkingCopyBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'statusBar', 'packagesTable', 'filterInput' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipRepairCommand. @@ -33,7 +35,7 @@ IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: a ] -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipBrowsePackageCommand. @@ -47,19 +49,19 @@ IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> allListItems [ ^ self model packageModels ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ | commandClass | @@ -72,7 +74,7 @@ IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> connectPresenters [ super connectPresenters. @@ -82,7 +84,7 @@ IceTipWorkingCopyBrowser >> connectPresenters [ ] -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -91,20 +93,20 @@ IceTipWorkingCopyBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> filterInput [ ^ filterInput ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> iconFor: aPackage [ self decorations do: [ :each | @@ -114,13 +116,13 @@ IceTipWorkingCopyBrowser >> iconFor: aPackage [ ^ self iconNamed: #package ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePackagesTable [ packagesTable @@ -147,7 +149,7 @@ IceTipWorkingCopyBrowser >> initializePackagesTable [ whenActivatedDo: [ :selection | self browsePackage: selection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePresenters [ filterInput := self newTextInput. @@ -156,7 +158,7 @@ IceTipWorkingCopyBrowser >> initializePresenters [ statusBar := self instantiate: IceTipWorkingCopyStatusBarPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -165,25 +167,25 @@ IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> mainList [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> packageModel [ ^ packagesTable selectedItem ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> packagesTable [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> refresh [ self refreshCommands. @@ -191,7 +193,7 @@ IceTipWorkingCopyBrowser >> refresh [ self refreshPackagesTable ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshPackagesTable [ packagesTable items: (filterInput text @@ -200,13 +202,13 @@ IceTipWorkingCopyBrowser >> refreshPackagesTable [ ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshStatusBar [ statusBar model: self model ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ (ann repository isNil or: [ @@ -217,25 +219,25 @@ IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipWorkingCopyBrowser >> setModelBeforeInitialization: aRepositoryModel [ self model: ( IceTipWorkingCopyModel on: aRepositoryModel ) ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyBrowser >> showsPackageNamed: aString [ ^ packagesTable items anySatisfy: [ :packageModel | packageModel name = aString ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> statusBar [ ^ statusBar ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -244,13 +246,13 @@ IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> titleForWindow [ ^ 'Working copy of ', self model repositoryName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st index e116fd4bcb..507b1e2c59 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st @@ -2,30 +2,32 @@ I'm a diff model that represents a diff between the HEAD commit and the image working copy. " Class { - #name : #IceTipWorkingCopyDiffModel, - #superclass : #IceTipDiffModel, + #name : 'IceTipWorkingCopyDiffModel', + #superclass : 'IceTipDiffModel', #instVars : [ 'diff' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyDiffModel >> diff [ ^ diff ifNil: [ diff := self newDiff ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyDiffModel >> isEmpty [ ^ self diff isEmpty ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipWorkingCopyDiffModel >> newDiff [ ^ self entity workingCopyDiff ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyDiffModel >> resetDiff [ diff := nil ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st index 21b5734be7..201e8943a9 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st @@ -2,51 +2,53 @@ I'm a model to for IceWorkingCopy entries. " Class { - #name : #IceTipWorkingCopyModel, - #superclass : #IceTipModel, + #name : 'IceTipWorkingCopyModel', + #superclass : 'IceTipModel', #instVars : [ 'sortingStrategy', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> new [ self error: 'use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> on: aRepositoryModel [ ^ self basicNew initializeRepositoryModel: aRepositoryModel; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> branchName [ ^ self repositoryModel branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> commitId [ ^ repositoryModel commitId ] -{ #category : #operations } +{ #category : 'operations' } IceTipWorkingCopyModel >> copyCommitIDToClipboard [ repositoryModel copyCommitIDToClipboard ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyModel >> initializeRepositoryModel: aRepositoryModel [ repositoryModel := aRepositoryModel. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> packageModels [ ^ self sortingStrategy sort: (self repositoryModel entity workingCopy packages collect: [ :each | @@ -56,37 +58,37 @@ IceTipWorkingCopyModel >> packageModels [ beCached ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> reset [ self repositoryModel reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> shortCommitId [ ^ repositoryModel shortCommitId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> sortingStrategy [ ^ sortingStrategy ifNil: [ sortingStrategy := IceSortingStrategy new first: #modified ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> status [ ^ self repositoryModel status ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> statusDecorator [ ^ self repositoryModel statusDecorator diff --git a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st index 03e34062ab..8cbcf3dfce 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st @@ -2,17 +2,19 @@ I'm the status bar for a IceTipWorkingCopyBrowser. " Class { - #name : #IceTipWorkingCopyStatusBarPresenter, - #superclass : #SpPresenter, + #name : 'IceTipWorkingCopyStatusBarPresenter', + #superclass : 'SpPresenter', #instVars : [ 'branchLabel', 'commitLink', 'statusLabel' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -25,20 +27,20 @@ IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyStatusBarPresenter >> canTakeKeyboardFocus [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyStatusBarPresenter >> initializePresenters [ branchLabel := self newLabel. statusLabel := self newLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> model: aModel [ "Fill labels from a IceTipWorkingCopyModel." @@ -52,7 +54,7 @@ IceTipWorkingCopyStatusBarPresenter >> model: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ branchLabel label: ('{1} at ' format: { aModel branchName }). @@ -64,7 +66,7 @@ IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithoutCommitId: aModel [ branchLabel label: aModel branchName. diff --git a/Iceberg-TipUI/IceTokenCredentials.extension.st b/Iceberg-TipUI/IceTokenCredentials.extension.st index 5b476eeb69..7164335fb8 100644 --- a/Iceberg-TipUI/IceTokenCredentials.extension.st +++ b/Iceberg-TipUI/IceTokenCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceTokenCredentials } +Extension { #name : 'IceTokenCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> editModelClass [ ^ IceTipEditTokenCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTraitDefinition.extension.st b/Iceberg-TipUI/IceTraitDefinition.extension.st index d072826557..03b023e483 100644 --- a/Iceberg-TipUI/IceTraitDefinition.extension.st +++ b/Iceberg-TipUI/IceTraitDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTraitDefinition } +Extension { #name : 'IceTraitDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTraitDefinition >> icon [ ^ self iconNamed: #trait ] diff --git a/Iceberg-TipUI/IceWarning.class.st b/Iceberg-TipUI/IceWarning.class.st index 2015f64db3..9b64da1319 100644 --- a/Iceberg-TipUI/IceWarning.class.st +++ b/Iceberg-TipUI/IceWarning.class.st @@ -2,12 +2,14 @@ I'm a general warning in the context of iceberg UI. " Class { - #name : #IceWarning, - #superclass : #Warning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceWarning', + #superclass : 'Warning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceWarning >> acceptError: aVisitor [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceWorkingCopy.extension.st b/Iceberg-TipUI/IceWorkingCopy.extension.st index 77e8f52665..c95aa1cc69 100644 --- a/Iceberg-TipUI/IceWorkingCopy.extension.st +++ b/Iceberg-TipUI/IceWorkingCopy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceWorkingCopy } +Extension { #name : 'IceWorkingCopy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceWorkingCopy >> description [ ^ self workingCopyState description diff --git a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st index 6806b57051..13901f838c 100644 --- a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st +++ b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitCredentialsPlaintext } +Extension { #name : 'LGitCredentialsPlaintext' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } LGitCredentialsPlaintext >> askForModelClassOn: aString [ ^ IceTipAskForPlaintextCredentialsPresenter diff --git a/Iceberg-TipUI/MCAddition.extension.st b/Iceberg-TipUI/MCAddition.extension.st index 86d577821e..eb93d60d68 100644 --- a/Iceberg-TipUI/MCAddition.extension.st +++ b/Iceberg-TipUI/MCAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCAddition } +Extension { #name : 'MCAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCAddition >> icon [ ^ self iconNamed: #changeAdd ] diff --git a/Iceberg-TipUI/MCModification.extension.st b/Iceberg-TipUI/MCModification.extension.st index e38d6d6886..2e6b693643 100644 --- a/Iceberg-TipUI/MCModification.extension.st +++ b/Iceberg-TipUI/MCModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCModification } +Extension { #name : 'MCModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCModification >> icon [ ^ self iconNamed: #changeUpdate ] diff --git a/Iceberg-TipUI/MCPatchOperation.extension.st b/Iceberg-TipUI/MCPatchOperation.extension.st index 8c55a52b83..e1f00ea122 100644 --- a/Iceberg-TipUI/MCPatchOperation.extension.st +++ b/Iceberg-TipUI/MCPatchOperation.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCPatchOperation } +Extension { #name : 'MCPatchOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCPatchOperation >> canBeBrowsed [ ^ true ] diff --git a/Iceberg-TipUI/MCRemoval.extension.st b/Iceberg-TipUI/MCRemoval.extension.st index 0eb55e9bd1..64ad429fed 100644 --- a/Iceberg-TipUI/MCRemoval.extension.st +++ b/Iceberg-TipUI/MCRemoval.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #MCRemoval } +Extension { #name : 'MCRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> canBeBrowsed [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> icon [ ^ self iconNamed: #changeRemove ] diff --git a/Iceberg-TipUI/ManifestIcebergTipUI.class.st b/Iceberg-TipUI/ManifestIcebergTipUI.class.st index a47a98479d..22b6f421f0 100644 --- a/Iceberg-TipUI/ManifestIcebergTipUI.class.st +++ b/Iceberg-TipUI/ManifestIcebergTipUI.class.st @@ -2,22 +2,24 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergTipUI, - #superclass : #PackageManifest, - #category : #'Iceberg-TipUI-Manifest' + #name : 'ManifestIcebergTipUI', + #superclass : 'PackageManifest', + #category : 'Iceberg-TipUI-Manifest', + #package : 'Iceberg-TipUI', + #tag : 'Manifest' } -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleAnySatisfyRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #guessFormatFromDirectory: #false)) #'2021-01-05T16:19:22.932793-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleNotEliminationRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipBrowser #hasSelectedItem #false)) #'2020-12-17T18:54:45.342746-03:00') #(#(#RGMethodDefinition #(#IceTipRepositoryBrowser #initializeSidebarTree #false)) #'2021-01-05T16:19:22.920159-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleReGuardClauseRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #initializeMessagePanel #false)) #'2021-01-05T16:19:22.928248-03:00') ) ] diff --git a/Iceberg-TipUI/PharoDarkTheme.extension.st b/Iceberg-TipUI/PharoDarkTheme.extension.st index 197cd482cc..25b3e1736e 100644 --- a/Iceberg-TipUI/PharoDarkTheme.extension.st +++ b/Iceberg-TipUI/PharoDarkTheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #PharoDarkTheme } +Extension { #name : 'PharoDarkTheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeColor [ ^ Color red alpha: 0.5 ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeTextColor [ ^ self textColor ] diff --git a/Iceberg-TipUI/PharoShortcuts.extension.st b/Iceberg-TipUI/PharoShortcuts.extension.st index df7e450e6d..fa394b6cfb 100644 --- a/Iceberg-TipUI/PharoShortcuts.extension.st +++ b/Iceberg-TipUI/PharoShortcuts.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #PharoShortcuts } +Extension { #name : 'PharoShortcuts' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoShortcuts >> openIcebergShortcut [ ^ $o meta, $i meta ] diff --git a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st index d61a72635f..2f13adf7b3 100644 --- a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st +++ b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #SpToolbarButtonPresenter } +Extension { #name : 'SpToolbarButtonPresenter' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } SpToolbarButtonPresenter >> hasBadge [ ^ badge isNotNil ] diff --git a/Iceberg-TipUI/TIceCopyCommitId.trait.st b/Iceberg-TipUI/TIceCopyCommitId.trait.st index 66a989ae08..ad1849ee58 100644 --- a/Iceberg-TipUI/TIceCopyCommitId.trait.st +++ b/Iceberg-TipUI/TIceCopyCommitId.trait.st @@ -5,17 +5,19 @@ Description I am a simple Trait allowing to copy a commit ID to the clipboard without duplicating the code in Iceberg. " Trait { - #name : #TIceCopyCommitId, - #category : #'Iceberg-TipUI-Model' + #name : 'TIceCopyCommitId', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyCommitIDToClipboard [ self copyToClipboardId: self commitId ] -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyToClipboardId: id [ Clipboard clipboardText: id informing: ('Commitish ID copied to clipboard ({1})' format: {id}) ] diff --git a/Iceberg-TipUI/TWithBranchModel.trait.st b/Iceberg-TipUI/TWithBranchModel.trait.st index 9b2a646f4a..836a8e7053 100644 --- a/Iceberg-TipUI/TWithBranchModel.trait.st +++ b/Iceberg-TipUI/TWithBranchModel.trait.st @@ -1,19 +1,21 @@ Trait { - #name : #TWithBranchModel, - #category : #'Iceberg-TipUI-Model' + #name : 'TWithBranchModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branchModels [ ^ self branches collect: [ :each | (IceTipBranchModel repositoryModel: self repositoryModel on: each) beCached ] ] -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branches [ ^ self explicitRequirement ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> defaultBranchSelection [ ^ self branchModels detect: #isHead @@ -21,12 +23,12 @@ TWithBranchModel >> defaultBranchSelection [ ifTrue: [ self branchModels ifNotEmpty: #anyOne ] ] ] -{ #category : #testing } +{ #category : 'testing' } TWithBranchModel >> hasBranches [ ^ self branches isNotEmpty ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> repositoryModel [ ^ self explicitRequirement ] diff --git a/Iceberg-TipUI/Text.extension.st b/Iceberg-TipUI/Text.extension.st index 74d7bfde6c..0ae90973d7 100644 --- a/Iceberg-TipUI/Text.extension.st +++ b/Iceberg-TipUI/Text.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Text } +Extension { #name : 'Text' } -{ #category : #'*Iceberg-TipUI-Spec' } +{ #category : '*Iceberg-TipUI-Spec' } Text >> threeWayCompareTo: anotherText [ ^ self asString threeWayCompareTo: anotherText asString diff --git a/Iceberg-TipUI/ToolShortcutsCategory.extension.st b/Iceberg-TipUI/ToolShortcutsCategory.extension.st index 39e8ed6bf0..22fbb318cc 100644 --- a/Iceberg-TipUI/ToolShortcutsCategory.extension.st +++ b/Iceberg-TipUI/ToolShortcutsCategory.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #ToolShortcutsCategory } +Extension { #name : 'ToolShortcutsCategory' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } ToolShortcutsCategory >> openIceberg [ diff --git a/Iceberg-TipUI/UITheme.extension.st b/Iceberg-TipUI/UITheme.extension.st index 45eef9230e..b1aee015ae 100644 --- a/Iceberg-TipUI/UITheme.extension.st +++ b/Iceberg-TipUI/UITheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #UITheme } +Extension { #name : 'UITheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeColor [ ^ Color red ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeTextColor [ ^ Color white ] diff --git a/Iceberg-TipUI/package.st b/Iceberg-TipUI/package.st index 34a4b630d6..c1b5ad7667 100644 --- a/Iceberg-TipUI/package.st +++ b/Iceberg-TipUI/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-TipUI' } +Package { #name : 'Iceberg-TipUI' } diff --git a/Iceberg/IceRepository.class.st b/Iceberg/IceRepository.class.st index 3cbaa58929..4e38cecce2 100644 --- a/Iceberg/IceRepository.class.st +++ b/Iceberg/IceRepository.class.st @@ -507,7 +507,7 @@ IceRepository >> hasIncomingCommitsFrom: aRemote [ { #category : 'testing' } IceRepository >> hasLoadedPackages [ - ^ self loadedPackages notEmpty + ^ self loadedPackages isNotEmpty ] { #category : 'API - branches' } diff --git a/Iceberg/IceSshCredentials.class.st b/Iceberg/IceSshCredentials.class.st index 6f3dd01c33..0f5e3bdea9 100644 --- a/Iceberg/IceSshCredentials.class.st +++ b/Iceberg/IceSshCredentials.class.st @@ -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' } diff --git a/Iceberg/IceTokenCredentials.class.st b/Iceberg/IceTokenCredentials.class.st index 2f31bb936b..5bb6463b3d 100644 --- a/Iceberg/IceTokenCredentials.class.st +++ b/Iceberg/IceTokenCredentials.class.st @@ -31,7 +31,7 @@ IceTokenCredentials >> hostDescription [ { #category : 'accessing' } IceTokenCredentials >> isPresent [ - ^ self token notEmpty + ^ self token isNotEmpty ] { #category : 'accessing' } From 0967ad7dfa5f8bb663408e8c48b5f4e8d8af0e7d Mon Sep 17 00:00:00 2001 From: Kris <1611248+Rinzwind@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:55:58 +0100 Subject: [PATCH 40/83] =?UTF-8?q?Fixed=20misspellings=20of=20=E2=80=98comm?= =?UTF-8?q?itting=E2=80=99,=20=E2=80=98committed=E2=80=99=20and=20?= =?UTF-8?q?=E2=80=98uncommitted=E2=80=99=20in=20literal=20strings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IceGitHubNewPullRequestAction.class.st | 2 +- Iceberg-Tests/IceGitMergeTest.class.st | 2 +- Iceberg-TipUI/IceTipCommentPanel.class.st | 6 +++--- Iceberg-TipUI/IceTipCommitAction.class.st | 2 +- Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st | 2 +- Iceberg-TipUI/IceTipPackageModel.class.st | 2 +- Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st | 2 +- Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st | 2 +- Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st | 4 ++-- Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st | 2 +- Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st | 2 +- Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st | 2 +- Iceberg-TipUI/IceTipRepositoryModel.class.st | 4 ++-- Iceberg/IceTipCommitSettings.class.st | 6 +++--- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st index 2a73c8c00a..7748441a94 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st @@ -58,7 +58,7 @@ IceGitHubNewPullRequestAction >> validateMakePullRequestOn: aRepository [ | status | status := OrderedCollection new: 2. - aRepository isModified ifTrue: [ status add: 'Uncommited changes' ]. + aRepository isModified ifTrue: [ status add: 'Uncommitted changes' ]. (aRepository outgoingCommitsTo: remote) ifNotEmpty: [ :commits | '{1} not published' format: { commits size } ]. status ifEmpty: [ ^ true ]. diff --git a/Iceberg-Tests/IceGitMergeTest.class.st b/Iceberg-Tests/IceGitMergeTest.class.st index ae8b7c26b7..b0e1239310 100644 --- a/Iceberg-Tests/IceGitMergeTest.class.st +++ b/Iceberg-Tests/IceGitMergeTest.class.st @@ -327,7 +327,7 @@ IceGitMergeTest >> testMergeWithMissingProjectFile [ fileRef := self repository location / 'test1.txt'. fileRef writeStreamDo: [ :stream | stream << 'test1' ]. self repository index addPath: (fileRef relativeTo: self repository location). - self repository commitWithMessage: 'commiting something'. + self repository commitWithMessage: 'committing something'. incomingBranch := self repository branch. self repository checkoutBranch: 'master'. diff --git a/Iceberg-TipUI/IceTipCommentPanel.class.st b/Iceberg-TipUI/IceTipCommentPanel.class.st index 593715e413..77166b9f7b 100644 --- a/Iceberg-TipUI/IceTipCommentPanel.class.st +++ b/Iceberg-TipUI/IceTipCommentPanel.class.st @@ -85,14 +85,14 @@ IceTipCommentPanel >> initializePresenters [ add: (self newToolbarToggleButton icon: (self application iconNamed: #smallSave); label: 'Save image'; - help: 'Save image when commiting'; + help: 'Save image when committing'; state: self isSaving; whenChangedDo: [ :aBoolean | self saveOnCommit: aBoolean ]; yourself); add: (self newToolbarToggleButton icon: (self application iconNamed: #smallError); label: 'Run critics'; - help: 'Run critics when commiting'; + help: 'Run critics when committing'; state: self isRunningCriticsOnCommit; whenChangedDo: [ :aBoolean | self runCriticsOnCommit: aBoolean ]; yourself); @@ -113,7 +113,7 @@ IceTipCommentPanel >> initializePresenters [ placeholder: 'A comment for your commit'; yourself. - fixesHelpString := 'Enter the number of the issue that you fixed. Github will close it when it will be commited or merged in the default branch'. + fixesHelpString := 'Enter the number of the issue that you fixed. Github will close it when it will be committed or merged in the default branch'. fixesLabel := self newLabel label: 'Fixes #'; help: fixesHelpString; diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index 5feb85f24f..094b708f93 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -16,7 +16,7 @@ Class { IceTipCommitAction >> basicExecute [ self validateCanCommit. UIManager default - informUser: 'Commiting...' + informUser: 'Committing...' during: [ self repository commitChanges: (diff copyWithOnly: items) diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index b345444f61..533f52c029 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -228,7 +228,7 @@ IceTipInteractiveErrorVisitor >> visitShouldCommitBeforePullError: anError [ | continue | continue := context application newConfirm label: - 'Your repository has uncommited changes. Merging incoming commits will change + 'Your repository has uncommitted changes. Merging incoming commits will change your current working copy and your current state will not be recoverable. We recommend that you commit first and then pull incoming changes again.'; title: 'You might loose your current changes!'; diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index 769de7dc50..e37bfc6d98 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -114,7 +114,7 @@ IceTipPackageModel >> status [ [ self entity repository isMissing ifTrue: [ ^ 'Local repository missing' ]. self entity isLoaded ifFalse: [ ^ 'Not loaded' ]. - self entity isModified ifTrue: [ ^ 'Uncommited changes' ]. + self entity isModified ifTrue: [ ^ 'Uncommitted changes' ]. ^ 'Up to date' ] on: Error do: [ :e | ^ e description ] diff --git a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st index dd5395e074..cd6c84405b 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st @@ -20,7 +20,7 @@ This situation happens because the code loaded in your image does not correspond This action opens a preview window before doing any change. -This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] { #category : #accessing } diff --git a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st index fa85dd2b84..086cfc6cb7 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st @@ -19,7 +19,7 @@ This will not lose any change in the image. This situation happens because the code loaded in your image does not correspond with the status of your repository. -This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] { #category : #accessing } diff --git a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st index 71012bf783..db3a15c9fa 100644 --- a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st +++ b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st @@ -15,9 +15,9 @@ IceTipRepairCreateSubdirectory class >> help [ ^ 'Create a new subdirectory for the code. The configured source directory does not exist in the repository. -It is possible that the directory has been deleted or never commited after creating the meta-data. +It is possible that the directory has been deleted or never committed after creating the meta-data. -This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] { #category : #accessing } diff --git a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st index 6a06d6a430..fe32425ac2 100644 --- a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st +++ b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st @@ -17,7 +17,7 @@ IceTipRepairDiscardAndLoad class >> help [ This action will synchronize your image with the code in the repository. -All the changes in the image that have not been commited will be lost. +All the changes in the image that have not been committed will be lost. This situation happens because loaded code in your image is from a different commit than the current commit (HEAD) in the repository. diff --git a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st index 3ee897f53c..13cae27f81 100644 --- a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st @@ -18,7 +18,7 @@ This will not lose any change in the image but may lead to conflicts. If there a This situation happens because loaded code in your image is from a different commit than the current commit (HEAD) in the repository. -This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-commited changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-committed changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' ] { #category : #accessing } diff --git a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st index 65432e1357..bd5358853b 100644 --- a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st @@ -17,7 +17,7 @@ This will not lose any change in the image. This situation happens because the code loaded in your image is not in the branch currently selected on your repository. -This operation will modify the state of your working copy in disk. All non-commited changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy in disk. All non-committed changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' ] { #category : #accessing } diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st index 5d75754d1b..9f59fb91b9 100644 --- a/Iceberg-TipUI/IceTipRepositoryModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryModel.class.st @@ -450,7 +450,7 @@ IceTipRepositoryModel >> status [ self isLoaded ifFalse: [ ^ 'Not loaded' ]. status := OrderedCollection new. - entity isModified ifTrue: [ status add: 'Uncommited changes' ]. + entity isModified ifTrue: [ status add: 'Uncommitted changes' ]. incoming := self incomingCommits size. incoming > 0 ifTrue: [ status add: ('{1} incoming' format: { incoming })]. @@ -510,7 +510,7 @@ IceTipRepositoryModel >> statusString [ self isLoaded ifFalse: [ ^ 'Not loaded' ]. status := OrderedCollection new. - entity isModified ifTrue: [ status add: 'Uncommited changes' ]. + entity isModified ifTrue: [ status add: 'Uncommitted changes' ]. incoming := self incomingCommits size. incoming > 0 ifTrue: [ status add: ('{1} incoming' format: { incoming })]. diff --git a/Iceberg/IceTipCommitSettings.class.st b/Iceberg/IceTipCommitSettings.class.st index 55041b99bf..fa9ee01677 100644 --- a/Iceberg/IceTipCommitSettings.class.st +++ b/Iceberg/IceTipCommitSettings.class.st @@ -80,21 +80,21 @@ IceTipCommitSettings class >> settingsOn: aBuilder [ noOrdering; target: self; default: self critiquesOnCommitDefaultValue; - label: 'Run Code Critiques when commiting'; + label: 'Run Code Critiques when committing'; description: 'Check if you want to run the code critiques on the changes each time you commit them'. (aBuilder setting: #saveImageOnCommit) noOrdering; target: self; default: self saveImageOnCommitDefaultValue; - label: 'Save the image when commiting'; + label: 'Save the image when committing'; description: 'Check if you want to save the image each time you commit something'. (aBuilder setting: #pushOnCommit) noOrdering; target: self; default: self pushOnCommitDefaultValue; - label: 'Push when commiting'; + label: 'Push when committing'; description: 'Check if you want to push your changes each time you commit something' ] ] From 48291cdfb7f0114bd27a7af07f648512fc15e848 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Mon, 13 Nov 2023 17:01:16 +0100 Subject: [PATCH 41/83] Small cleanups - MetacelloPharoPlatform got deprecated: fix IceMetacelloPharoPlatform - Remove dead code marking lot of classes as abstract wrongly :( --- .../IceBitbucketRepositoryType.class.st | 10 +++-- .../IceGitLocalRepositoryType.class.st | 16 ++++---- .../IceGitRepositoryType.class.st | 12 +++--- .../IceGithubRepositoryType.class.st | 12 +++--- .../IceGitlabRepositoryType.class.st | 10 +++-- .../IceMetacelloLoadChoice.class.st | 26 +++++++------ .../IceMetacelloLoadSession.class.st | 14 ++++--- .../IceMetacelloLoadSessionContext.class.st | 8 ++-- .../IceMetacelloPharoPlatform.class.st | 18 +++++---- .../IceMetacelloRepositoryType.class.st | 32 ++++++++-------- .../IceProviderRepositoryType.class.st | 20 +++++----- .../IceRepository.extension.st | 4 +- .../MCGitRemoteRepository.class.st | 38 ++++++++++--------- ...nifestIcebergMetacelloIntegration.class.st | 10 +++-- .../MetacelloPlatform.extension.st | 4 +- .../MetacelloScriptApiExecutor.extension.st | 4 +- Iceberg-Metacello-Integration/package.st | 2 +- Iceberg/MCDefinition.extension.st | 6 --- Iceberg/MCMethodDefinition.extension.st | 5 --- 19 files changed, 133 insertions(+), 118 deletions(-) diff --git a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st index 9f4ffef342..fb260621cb 100644 --- a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Bitbucket repositories " Class { - #name : #IceBitbucketRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceBitbucketRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceBitbucketRepositoryType class >> type [ ^ 'bitbucket' ] diff --git a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st index 1c2f49f152..bf150ca7e2 100644 --- a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st @@ -20,22 +20,24 @@ Metacello new " Class { - #name : #IceGitLocalRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitLocalRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType class >> type [ ^ 'gitlocal' ] -{ #category : #testing } +{ #category : 'testing' } IceGitLocalRepositoryType >> isGitRoot: aReference [ ^ IceRepositoryCreator isGitRoot: aReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType >> mcRepository [ | repository tuple extractedLocation | @@ -57,7 +59,7 @@ IceGitLocalRepositoryType >> mcRepository [ ^ repository metacelloAdapter: repository head description. ] -{ #category : #private } +{ #category : 'private' } IceGitLocalRepositoryType >> splitRootAndSubdirectoryFromLocation [ | root subDir | (self location beginsWith: (self class type, '://')) diff --git a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st index d8f91b3b32..2b2b031127 100644 --- a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st @@ -7,18 +7,20 @@ git:https://github.com/user/project.git git:git@github.com:user/project.git " Class { - #name : #IceGitRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType class >> type [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType >> mcRepositoryClass [ ^ MCGitRemoteRepository diff --git a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st index 3d42910506..00b3bf513c 100644 --- a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st @@ -2,17 +2,19 @@ I resolve Github repositories " Class { - #name : #IceGithubRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGithubRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType class >> type [ ^ 'github' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType >> mcRepository [ | baseRepo | diff --git a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st index 597dcee6da..620b0f0811 100644 --- a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Gilab repositories " Class { - #name : #IceGitlabRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitlabRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitlabRepositoryType class >> type [ ^ 'gitlab' ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st index 3ab968801a..2f7b4b760e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st @@ -3,60 +3,62 @@ I'm a recorded choice when installing a metacello baseline/configuration. A choice is created whenever there is a conflict between two project versions (loaded and incomming). Due the nature of Matacello, this choice can be asked several times... A choice keeps track of what user selected to avoid asking him every time. " Class { - #name : #IceMetacelloLoadChoice, - #superclass : #Object, + #name : 'IceMetacelloLoadChoice', + #superclass : 'Object', #instVars : [ 'projectName', 'optionA', 'optionB', 'choosen' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen [ ^ choosen ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen: anObject [ choosen := anObject ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloLoadChoice >> isChoiceBetween: firstOption and: secondOption [ ^ (self optionA = firstOption) and: [ self optionB = secondOption ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA [ ^ optionA ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA: anObject [ optionA := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB [ ^ optionB ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB: anObject [ optionB := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st index 71cd94a286..1e0f8d7831 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st @@ -5,28 +5,30 @@ I will be active during the context of a ""metacello load"" command, and it will Tipically, I will be used to keep some state needed during the full execution, like a choice of what whas selected when conflicting or upgraded versions acts. " Class { - #name : #IceMetacelloLoadSession, - #superclass : #Object, + #name : 'IceMetacelloLoadSession', + #superclass : 'Object', #instVars : [ 'choices' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloLoadSession >> initialize [ super initialize. choices := Set new ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoice: anIceMetacelloLoadChoice [ ^ choices add: anIceMetacelloLoadChoice ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoiceProject: projectName optionA: optionA optionB: optionB ifAbsentAnswer: aBlock [ ^ choices diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st index 20c708ea70..ff4a76cf1a 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st @@ -2,7 +2,9 @@ I'm a dynamic variable to keep a load session. " Class { - #name : #IceMetacelloLoadSessionContext, - #superclass : #DynamicVariable, - #category : #'Iceberg-Metacello-Integration-Session' + #name : 'IceMetacelloLoadSessionContext', + #superclass : 'DynamicVariable', + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index 84a2c88bbf..e1fdfb097e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -2,23 +2,25 @@ I'm a class to add support for iceberg to metacello. " Class { - #name : #IceMetacelloPharoPlatform, - #superclass : #MetacelloPharoPlatform, - #category : #'Iceberg-Metacello-Integration-Platform' + #name : 'IceMetacelloPharoPlatform', + #superclass : 'MetacelloPlatform', + #category : 'Iceberg-Metacello-Integration-Platform', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Platform' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceMetacelloPharoPlatform class >> initialize [ self select ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloPharoPlatform >> canHandleType: type [ ^ Iceberg enableMetacelloIntegration and: [ IceMetacelloRepositoryType canHandleType: type ] ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ (self canHandleType: aRepositorySpec type) ifTrue: [ ^ Iceberg mcRepositoryFor: aRepositorySpec description ]. @@ -26,7 +28,7 @@ IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ ^ super createRepository: aRepositorySpec ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ (description beginsWith: 'ftp://') ifTrue: [ ^'ftp' ]. @@ -36,7 +38,7 @@ IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ ^ super extractTypeFromDescription: description ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceMetacelloPharoPlatform >> withMetacelloLoadSessionDo: aBlock [ | context | diff --git a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st index ad7653c809..57f5b0a2c1 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st @@ -3,21 +3,23 @@ I'm a base class to provide different type of MCRepositories from iceberg, so me My children define specific types, visit them to have more details of what you can do. " Class { - #name : #IceMetacelloRepositoryType, - #superclass : #Object, + #name : 'IceMetacelloRepositoryType', + #superclass : 'Object', #instVars : [ 'location' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> allTypes [ ^ self allSubclasses reject: [ :each | each isAbstract ] ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> canHandleType: aType [ ^ self allTypes @@ -25,35 +27,35 @@ IceMetacelloRepositoryType class >> canHandleType: aType [ ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> extractTypeOf: aString [ ^ aString copyUpTo: $: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMetacelloRepositoryType class >> for: aLocationString [ ^ (self allTypes detect: [ :each | each isSuitableForLocation: aLocationString ]) location: aLocationString ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isAbstract [ ^ self = IceMetacelloRepositoryType ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForLocation: aLocationString [ ^ self isSuitableForType: (self extractTypeOf: aLocationString) ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForType: aType [ ^ self type = aType ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> location: aLocationString [ self = IceMetacelloRepositoryType ifTrue: [ self error: 'I''m an abstract class, use one of my children instead.' ]. @@ -63,23 +65,23 @@ IceMetacelloRepositoryType class >> location: aLocationString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> type [ ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloRepositoryType >> initializeLocation: aString [ location := aString. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> mcRepository [ self subclassResponsibility ] diff --git a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st index ae7b35ddbb..4036cf4c81 100644 --- a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st @@ -20,18 +20,20 @@ Metacello new load: 'mongo tests'. " Class { - #name : #IceProviderRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceProviderRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #testing } +{ #category : 'testing' } IceProviderRepositoryType class >> isAbstract [ ^ super isAbstract or: [ self = IceProviderRepositoryType ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> guessRegisteredRepository [ "I get the project name and try to find it into the already registered projects. If I find it, I will use this instead cloning a new one." @@ -41,7 +43,7 @@ IceProviderRepositoryType >> guessRegisteredRepository [ ifNone: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepository [ | baseRepo | @@ -55,7 +57,7 @@ IceProviderRepositoryType >> mcRepository [ ^ baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepositoryClass [ ^ (MCGitBasedNetworkRepository allSubclasses @@ -63,13 +65,13 @@ IceProviderRepositoryType >> mcRepositoryClass [ detect: [ :each | each basicDescription = self class type ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectName [ ^ (self location substrings: '/') third copyUpTo: $: ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectVersion [ ^ (location substrings: '/') third copyAfter: $: diff --git a/Iceberg-Metacello-Integration/IceRepository.extension.st b/Iceberg-Metacello-Integration/IceRepository.extension.st index fcb43e92a5..e9f60ebc90 100644 --- a/Iceberg-Metacello-Integration/IceRepository.extension.st +++ b/Iceberg-Metacello-Integration/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } IceRepository >> metacelloAdapter: version [ ^ IceMetacelloRepositoryAdapter for: self withVersion: version ] diff --git a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st index a698e9d6d7..6874e90140 100644 --- a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st +++ b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st @@ -9,30 +9,32 @@ git@github.com:user/project.git WARNING: This repository is meant to be used with iceberg and it will not work with plain Monticello/Metacello (because there is no way to know how to download a zip) " Class { - #name : #MCGitRemoteRepository, - #superclass : #MCGitBasedNetworkRepository, + #name : 'MCGitRemoteRepository', + #superclass : 'MCGitBasedNetworkRepository', #instVars : [ 'host', 'port', 'path', 'user' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> basicDescription [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> description [ ^ self basicDescription , ':' ] -{ #category : #private } +{ #category : 'private' } MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ ^ self new @@ -40,13 +42,13 @@ MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> host [ ^ host ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> httpsUrl [ ^ 'https://{1}{2}/{3}.git' format: { @@ -57,13 +59,13 @@ MCGitRemoteRepository >> httpsUrl [ self path } ] -{ #category : #initialization } +{ #category : 'initialization' } MCGitRemoteRepository >> initialize [ super initialize. ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseHTTPLocation: aString [ | url | @@ -73,7 +75,7 @@ MCGitRemoteRepository >> parseHTTPLocation: aString [ path := self pathFrom: url path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseLocation: aString [ (#('http:' 'https:') @@ -82,7 +84,7 @@ MCGitRemoteRepository >> parseLocation: aString [ ifFalse: [ self parseSSHLocation: aString ] ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseSSHLocation: aString [ | segments | @@ -92,13 +94,13 @@ MCGitRemoteRepository >> parseSSHLocation: aString [ path := self pathFrom: segments third ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> path [ ^ path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> pathFrom: aString [ ^ (aString endsWith: '.git') @@ -106,19 +108,19 @@ MCGitRemoteRepository >> pathFrom: aString [ ifFalse: [ aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> port [ ^ port ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> projectPath [ ^ self path ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> scpUrl [ ^ '{1}@{2}/{3}.git' format: { @@ -127,7 +129,7 @@ MCGitRemoteRepository >> scpUrl [ self path } ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> user [ ^ user diff --git a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st index db10aae91b..d60493f9b4 100644 --- a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st +++ b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergMetacelloIntegration, - #superclass : #PackageManifest, - #category : 'Iceberg-Metacello-Integration-Manifest' + #name : 'ManifestIcebergMetacelloIntegration', + #superclass : 'PackageManifest', + #category : 'Iceberg-Metacello-Integration-Manifest', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergMetacelloIntegration class >> description [ ^ 'I contains the code related to the Metacello integration of Iceberg. diff --git a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st index 6c833fb9fe..28bb44563a 100644 --- a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloPlatform } +Extension { #name : 'MetacelloPlatform' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloPlatform >> withMetacelloLoadSessionDo: aBlock [ aBlock value diff --git a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st index 00384fd4ac..74c3d4eb18 100644 --- a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloScriptApiExecutor } +Extension { #name : 'MetacelloScriptApiExecutor' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloScriptApiExecutor >> execute: statements [ MetacelloPlatform current withMetacelloLoadSessionDo: [ diff --git a/Iceberg-Metacello-Integration/package.st b/Iceberg-Metacello-Integration/package.st index c5a00f7fb1..228e3a9d15 100644 --- a/Iceberg-Metacello-Integration/package.st +++ b/Iceberg-Metacello-Integration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Metacello-Integration' } +Package { #name : 'Iceberg-Metacello-Integration' } diff --git a/Iceberg/MCDefinition.extension.st b/Iceberg/MCDefinition.extension.st index 8ffd5440ce..3ad3333f24 100644 --- a/Iceberg/MCDefinition.extension.st +++ b/Iceberg/MCDefinition.extension.st @@ -5,12 +5,6 @@ MCDefinition >> addAnalysisToPackageChangeSet: aPackageChangeSet change: aChange aPackageChangeSet addChange: aChange ] -{ #category : '*Iceberg-Changes' } -MCDefinition >> buildOn: anIceDiffBuilder [ - - self subclassResponsibility -] - { #category : '*Iceberg-changes' } MCDefinition >> isFileDefinition [ diff --git a/Iceberg/MCMethodDefinition.extension.st b/Iceberg/MCMethodDefinition.extension.st index 11c41461d0..a0ba563cce 100644 --- a/Iceberg/MCMethodDefinition.extension.st +++ b/Iceberg/MCMethodDefinition.extension.st @@ -1,10 +1,5 @@ Extension { #name : 'MCMethodDefinition' } -{ #category : '*Iceberg-Changes' } -MCMethodDefinition >> buildOn: anIcePackageDiff [ - self shouldBeImplemented. -] - { #category : '*Iceberg-Adapters' } MCMethodDefinition >> classCategory [ ^ self actualClass ifNotNil: #category ifNil: [ RPackage defaultPackageName ] From fc04a38204c7e183cf8a86a1c381e5e78a817c1f Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 16 Nov 2023 15:05:50 +0100 Subject: [PATCH 42/83] Avoid RPackage extension Iceberg extends RPackage to add #iceRepository but this method is used only once in some really specific code. RPackage will be renamed into Package so we will have to update Iceberg and I think it is not worth having an extension here --- Iceberg/Iceberg.class.st | 2 +- Iceberg/RPackage.extension.st | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 Iceberg/RPackage.extension.st diff --git a/Iceberg/Iceberg.class.st b/Iceberg/Iceberg.class.st index 3227b7b320..8927314c45 100644 --- a/Iceberg/Iceberg.class.st +++ b/Iceberg/Iceberg.class.st @@ -221,5 +221,5 @@ Iceberg class >> update [ #(Iceberg LGitRepository MCFileTreeGitRepository) do: [:className | Smalltalk at: className - ifPresent: [ :class | class package iceRepository pull ] ] + ifPresent: [ :class | ( self class repositoryForPackage:class package) pull ] ] ] diff --git a/Iceberg/RPackage.extension.st b/Iceberg/RPackage.extension.st deleted file mode 100644 index 1a6e62a79a..0000000000 --- a/Iceberg/RPackage.extension.st +++ /dev/null @@ -1,7 +0,0 @@ -Extension { #name : 'RPackage' } - -{ #category : '*Iceberg-Core' } -RPackage >> iceRepository [ - ^ Iceberg repositoryForPackage: self - -] From cbdf20d0ecb612caedfabf89b50666f0b1c8fd74 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 17 Nov 2023 00:02:53 +0100 Subject: [PATCH 43/83] Clean packages usage - Remove dead #classCategory (we do not want categories anymore!) - Replace references to RPackageOrganizer for PackageOrganizer - Remove usage of RPackageSet. Monticello does not use the cache anymore! So we can remove everything about it (especially since RPackageSet will be deprecated) --- .github/scripts/preLoading.st | 2 +- ...eSinglePackageLocalRepositoryTest.class.st | 4 +- Iceberg-TipUI/Clipboard.extension.st | 4 +- Iceberg-TipUI/CmCommandGroup.extension.st | 4 +- .../CmCommandGroupDecorator.extension.st | 4 +- .../CmUICommandDisplayStrategy.extension.st | 4 +- .../CmUIDisableWhenCantBeRun.extension.st | 4 +- .../CmUIHideWhenCantBeRun.extension.st | 4 +- Iceberg-TipUI/FTBasicItem.extension.st | 4 +- Iceberg-TipUI/FTRootItem.extension.st | 4 +- Iceberg-TipUI/FTTableMorph.extension.st | 6 +- Iceberg-TipUI/FTTreeItem.extension.st | 4 +- .../IceAbstractCredentials.extension.st | 6 +- Iceberg-TipUI/IceAddition.extension.st | 4 +- .../IceCheckoutAllPackages.extension.st | 4 +- ...CheckoutAlreadyLoadedPackages.extension.st | 4 +- .../IceCheckoutDoNotLoadPackages.extension.st | 4 +- .../IceCheckoutStrategy.extension.st | 6 +- Iceberg-TipUI/IceClassDefinition.extension.st | 4 +- .../IceConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceCreateBranchCommand.class.st | 10 +- Iceberg-TipUI/IceDefinition.extension.st | 4 +- .../IceDirectoryDefinition.extension.st | 4 +- Iceberg-TipUI/IceErrorVisitor.extension.st | 6 +- Iceberg-TipUI/IceExperimentalFeature.class.st | 10 +- .../IceExtensionDefinition.extension.st | 4 +- Iceberg-TipUI/IceFileDefinition.extension.st | 4 +- .../IceFileSystemDefinition.extension.st | 6 +- Iceberg-TipUI/IceMergeListWrapper.class.st | 28 ++-- .../IceMergeWorkingCopyCommand.class.st | 10 +- .../IceMethodContainerDefinition.extension.st | 10 +- .../IceMethodDefinition.extension.st | 10 +- Iceberg-TipUI/IceModification.extension.st | 4 +- Iceberg-TipUI/IceNoCommitMessage.class.st | 14 +- Iceberg-TipUI/IceNoModification.extension.st | 4 +- Iceberg-TipUI/IceNode.extension.st | 4 +- .../IceNodeCodeDisplayVisitor.class.st | 24 ++-- .../IceNonConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceOperation.extension.st | 12 +- Iceberg-TipUI/IceOperationMerge.extension.st | 6 +- Iceberg-TipUI/IcePackage.extension.st | 6 +- .../IcePackageDefinition.extension.st | 10 +- .../IcePlaintextCredentials.extension.st | 8 +- .../IcePlaintextOtpCredentials.extension.st | 4 +- Iceberg-TipUI/IcePullRemoteCommand.class.st | 14 +- Iceberg-TipUI/IceRemoval.extension.st | 4 +- Iceberg-TipUI/IceRepository.extension.st | 4 +- Iceberg-TipUI/IceRepositoryCommand.class.st | 24 ++-- .../IceSavedPackageVersion.extension.st | 4 +- Iceberg-TipUI/IceSortingStrategy.class.st | 28 ++-- Iceberg-TipUI/IceSshCredentials.extension.st | 6 +- .../IceTipAbstractCredentialCommand.class.st | 14 +- ...TipAbstractCredentialStoreCommand.class.st | 16 ++- ...ceTipAbstractCredentialsPresenter.class.st | 56 ++++---- ...ractPlaintextCredentialsPresenter.class.st | 24 ++-- ...ipAbstractSSHCredentialsPresenter.class.st | 20 +-- Iceberg-TipUI/IceTipAction.class.st | 30 +++-- ...eTipAddNewPackagesDialogPresenter.class.st | 40 +++--- .../IceTipAddPackageCommand.class.st | 20 +-- .../IceTipAddPackagesDialogPresenter.class.st | 48 +++---- ...eTipAddPlainTextCredentialCommand.class.st | 14 +- ...pAddPlaintextCredentialsPresenter.class.st | 22 +-- Iceberg-TipUI/IceTipAddRemoteCommand.class.st | 20 +-- .../IceTipAddRemoteDialogPresenter.class.st | 40 +++--- .../IceTipAddRepositoryCommand.class.st | 22 +-- .../IceTipAddSSHCredentialsPresenter.class.st | 22 +-- .../IceTipAddSshCredentialCommand.class.st | 14 +- .../IceTipAddTokenCredentialCommand.class.st | 14 +- ...ceTipAddTokenCredentialsPresenter.class.st | 28 ++-- .../IceTipAdoptCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipAnnouncement.class.st | 8 +- ...kForPlaintextCredentialsPresenter.class.st | 20 +-- ...rPlaintextOtpCredentialsPresenter.class.st | 18 +-- ...bForPlaintextCredentialsPresenter.class.st | 10 +- .../IceTipAskSSHCredentialsPresenter.class.st | 14 +- Iceberg-TipUI/IceTipBranchModel.class.st | 48 +++---- Iceberg-TipUI/IceTipBranchPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipBrowseCommand.class.st | 20 +-- .../IceTipBrowsePackageCommand.class.st | 18 +-- ...seRepositoryPackageVersionCommand.class.st | 14 +- Iceberg-TipUI/IceTipBrowser.class.st | 62 ++++----- Iceberg-TipUI/IceTipCache.class.st | 28 ++-- Iceberg-TipUI/IceTipCachedModel.class.st | 26 ++-- ...eTipCalculateDirtyPackagesCommand.class.st | 16 ++- .../IceTipCheckoutBranchCommand.class.st | 20 +-- .../IceTipCheckoutBranchDialog.class.st | 30 +++-- .../IceTipCheckoutBranchPanel.class.st | 10 +- .../IceTipCheckoutCommitCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCheckoutModel.class.st | 26 ++-- .../IceTipCheckoutNewBranchCommand.class.st | 18 +-- .../IceTipCheckoutNewBranchPanel.class.st | 40 +++--- .../IceTipCheckoutPreviewBrowser.class.st | 32 ++--- ...eTipCheckoutSelectedBranchCommand.class.st | 18 +-- .../IceTipCheckoutSelectedTagCommand.class.st | 18 +-- .../IceTipCherryPickCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCherrypickModel.class.st | 22 +-- .../IceTipCherrypickPreviewBrowser.class.st | 34 ++--- .../IceTipCleanCommandGroupVisitor.class.st | 12 +- Iceberg-TipUI/IceTipCommand.class.st | 50 +++---- ...ommandToPresenterBuildingStrategy.class.st | 12 +- Iceberg-TipUI/IceTipCommentPanel.class.st | 54 ++++---- Iceberg-TipUI/IceTipCommitAction.class.st | 28 ++-- Iceberg-TipUI/IceTipCommitBrowser.class.st | 58 ++++---- Iceberg-TipUI/IceTipCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipCommitDiffModel.class.st | 10 +- .../IceTipCommitInfoPresenter.class.st | 46 ++++--- Iceberg-TipUI/IceTipCommitModel.class.st | 64 ++++----- Iceberg-TipUI/IceTipCommitRangeModel.class.st | 18 +-- Iceberg-TipUI/IceTipCommitishModel.class.st | 18 +-- .../IceTipCopyCommitishCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagPanel.class.st | 60 +++++---- .../IceTipCredentialsSettings.class.st | 16 ++- .../IceTipCredentialsStoreBrowser.class.st | 34 ++--- ...ceTipCritiquesBeforeCommitBrowser.class.st | 50 +++---- .../IceTipDeleteBranchCommand.class.st | 18 +-- .../IceTipDeleteRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipDeleteTagCommand.class.st | 20 +-- .../IceTipDescriptionDecorator.class.st | 14 +- .../IceTipDescriptionDecoratorHead.class.st | 10 +- ...ceTipDescriptionDecoratorModified.class.st | 10 +- ...eTipDescriptionDecoratorNotLoaded.class.st | 10 +- Iceberg-TipUI/IceTipDialogPresenter.class.st | 14 +- Iceberg-TipUI/IceTipDiffEntryRemoved.class.st | 14 +- Iceberg-TipUI/IceTipDiffModel.class.st | 24 ++-- Iceberg-TipUI/IceTipDiffPanel.class.st | 66 ++++----- Iceberg-TipUI/IceTipDiffPreviewModel.class.st | 22 +-- Iceberg-TipUI/IceTipDiffRefreshed.class.st | 14 +- .../IceTipDiffSelectingPanel.class.st | 26 ++-- Iceberg-TipUI/IceTipDirectMergeType.class.st | 10 +- .../IceTipDirectoryPresenter.class.st | 10 +- ...ipDiscardAllChangesPreviewBrowser.class.st | 22 +-- Iceberg-TipUI/IceTipDiscardAllModel.class.st | 24 ++-- .../IceTipDiscardChangesCommand.class.st | 20 +-- .../IceTipEditCredentialCommand.class.st | 18 +-- ...EditPlaintextCredentialsPresenter.class.st | 20 +-- .../IceTipEditProjectDialogPresenter.class.st | 74 +++++----- .../IceTipEditRepositoryCommand.class.st | 18 +-- ...IceTipEditSSHCredentialsPresenter.class.st | 20 +-- ...eTipEditTokenCredentialsPresenter.class.st | 16 ++- Iceberg-TipUI/IceTipEntityModel.class.st | 38 +++--- .../IceTipErrorDialogPresenter.class.st | 30 +++-- .../IceTipExistingBranchPanel.class.st | 32 ++--- .../IceTipFetchAllProjectCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFetchCommand.class.st | 20 +-- .../IceTipFetchInPullCommand.class.st | 16 ++- .../IceTipFetchRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFilePresenter.class.st | 10 +- .../IceTipForgetRepositoryCommand.class.st | 18 +-- .../IceTipGitProviderRepositoryPanel.class.st | 42 +++--- .../IceTipGitRepositoryPanel.class.st | 26 ++-- ...itUsernameAndEmailDialogPresenter.class.st | 38 +++--- ...pHiedraAltComponentHistoryBrowser.class.st | 36 ++--- .../IceTipHiedraAltHistoryBrowser.class.st | 32 ++--- ...ceTipHiedraAltHistoryRowPresenter.class.st | 16 ++- .../IceTipHiedraHistoryBrowser.class.st | 18 +-- .../IceTipHistoryActionBrowser.class.st | 32 ++--- Iceberg-TipUI/IceTipHistoryBrowser.class.st | 46 ++++--- .../IceTipHistoryDiffFromHead.class.st | 12 +- .../IceTipHistoryDiffToAncestor.class.st | 12 +- .../IceTipHistoryDiffToHead.class.st | 12 +- .../IceTipHistoryDiffUpdater.class.st | 28 ++-- Iceberg-TipUI/IceTipInspectCommand.class.st | 20 +-- .../IceTipInstallVersionCommand.class.st | 18 +-- ...TipInteractiveCredentialsProvider.class.st | 18 +-- .../IceTipInteractiveErrorVisitor.class.st | 54 ++++---- .../IceTipLoadPackageCommand.class.st | 18 +-- .../IceTipLocalRepositoryPanel.class.st | 28 ++-- .../IceTipLocationPresenter.class.st | 46 ++++--- .../IceTipManagePackagesCommand.class.st | 18 +-- .../IceTipManageRepositoryCommand.class.st | 24 ++-- .../IceTipMergeBranchDialogPresenter.class.st | 30 +++-- Iceberg-TipUI/IceTipMergeBranchPanel.class.st | 18 +-- Iceberg-TipUI/IceTipMergeCommand.class.st | 18 +-- .../IceTipMergeHistoryCommand.class.st | 18 +-- Iceberg-TipUI/IceTipMergeModel.class.st | 20 +-- Iceberg-TipUI/IceTipMergeMorph.class.st | 14 +- Iceberg-TipUI/IceTipMergePatchMorph.class.st | 40 +++--- .../IceTipMergePreviewBrowser.class.st | 20 +-- .../IceTipMergeSelectingPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipMergeType.class.st | 22 +-- Iceberg-TipUI/IceTipModel.class.st | 18 +-- .../IceTipNewRepositoryPanel.class.st | 34 ++--- .../IceTipOpenNativelyCommand.class.st | 18 +-- .../IceTipOptionDialogPresenter.class.st | 36 ++--- Iceberg-TipUI/IceTipPackageCommand.class.st | 20 +-- Iceberg-TipUI/IceTipPackageModel.class.st | 36 ++--- Iceberg-TipUI/IceTipPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipPreviewBrowser.class.st | 26 ++-- Iceberg-TipUI/IceTipPullBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPullCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPullModel.class.st | 12 +- Iceberg-TipUI/IceTipPushAction.class.st | 10 +- Iceberg-TipUI/IceTipPushBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPushCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPushModel.class.st | 12 +- .../IceTipReadOnlyFormBuilder.class.st | 36 ++--- .../IceTipRefreshCommitCommand.class.st | 18 +-- ...RegisterRepositoryDialogPresenter.class.st | 26 ++-- .../IceTipReloadPackageCommand.class.st | 18 +-- .../IceTipRemoteActionBrowser.class.st | 26 ++-- .../IceTipRemoteActionCommand.class.st | 14 +- .../IceTipRemoteActionModel.class.st | 24 ++-- Iceberg-TipUI/IceTipRemoteModel.class.st | 20 +-- .../IceTipRemotesTreeCommand.class.st | 18 +-- .../IceTipRemoveCredentialCommand.class.st | 20 +-- ...emoveFromRepositoryPackageCommand.class.st | 16 ++- ...ceTipRemovePackageDialogPresenter.class.st | 34 ++--- ...ipRemoveRepositoryDialogPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipRepairAction.class.st | 38 +++--- .../IceTipRepairCheckoutBranch.class.st | 20 +-- .../IceTipRepairCheckoutNewBranch.class.st | 20 +-- .../IceTipRepairCloneRepository.class.st | 20 +-- Iceberg-TipUI/IceTipRepairCommand.class.st | 20 +-- .../IceTipRepairCreateSubdirectory.class.st | 20 +-- .../IceTipRepairDiscardAndLoad.class.st | 22 +-- .../IceTipRepairEditRepository.class.st | 20 +-- .../IceTipRepairFetchRemoteBranch.class.st | 22 +-- .../IceTipRepairLocateRepository.class.st | 24 ++-- .../IceTipRepairMergeWithBranch.class.st | 20 +-- Iceberg-TipUI/IceTipRepairProject.class.st | 20 +-- .../IceTipRepairPullRemoteBranch.class.st | 20 +-- ...ipRepairRepositoryDialogPresenter.class.st | 44 +++--- .../IceTipRepositoriesBrowser.class.st | 70 +++++----- .../IceTipRepositoriesModel.class.st | 14 +- .../IceTipRepositoryBrowser.class.st | 46 ++++--- .../IceTipRepositoryCommand.class.st | 20 +-- .../IceTipRepositoryGroupModel.class.st | 22 +-- .../IceTipRepositoryGroupPanel.class.st | 50 +++---- Iceberg-TipUI/IceTipRepositoryModel.class.st | 126 +++++++++--------- .../IceTipRepositoryTypePanel.class.st | 40 +++--- ...TipResetBranchToThisCommitCommand.class.st | 22 +-- .../IceTipRevertChangeCommand.class.st | 18 +-- Iceberg-TipUI/IceTipSaveImageAction.class.st | 10 +- .../IceTipSelectAllPackagesCommand.class.st | 18 +-- .../IceTipSelectPackagesCommand.class.st | 10 +- .../IceTipSelectRemotePresenter.class.st | 32 ++--- Iceberg-TipUI/IceTipSettingsCommand.class.st | 22 +-- Iceberg-TipUI/IceTipSpCommand.class.st | 24 ++-- Iceberg-TipUI/IceTipStandardAction.class.st | 26 ++-- Iceberg-TipUI/IceTipStatusDecorator.class.st | 12 +- .../IceTipStatusDecoratorError.class.st | 12 +- .../IceTipStatusDecoratorWarning.class.st | 10 +- Iceberg-TipUI/IceTipStyleContributor.class.st | 10 +- .../IceTipSwitchAndMergeType.class.st | 10 +- Iceberg-TipUI/IceTipTagDecorator.class.st | 12 +- Iceberg-TipUI/IceTipTagModel.class.st | 18 +-- Iceberg-TipUI/IceTipTextDecorator.class.st | 20 +-- .../IceTipTextDecoratorNone.class.st | 8 +- .../IceTipToolbarButtonStrategy.class.st | 12 +- .../IceTipToolbarPresenterBuilder.class.st | 10 +- Iceberg-TipUI/IceTipTreeBranch.class.st | 10 +- .../IceTipTreeCollapseCommand.class.st | 16 ++- .../IceTipTreeExpandCommand.class.st | 18 +-- Iceberg-TipUI/IceTipTreeGroup.class.st | 34 ++--- Iceberg-TipUI/IceTipTreeItem.class.st | 18 +-- Iceberg-TipUI/IceTipTreeNode.class.st | 40 +++--- Iceberg-TipUI/IceTipTreeRemote.class.st | 10 +- .../IceTipTreeRepositoryGroup.class.st | 8 +- Iceberg-TipUI/IceTipTreeTag.class.st | 10 +- ...eTipUnloadAndRemovePackageCommand.class.st | 18 +-- .../IceTipUnloadPackageCommand.class.st | 18 +-- .../IceTipUnselectAllPackagesCommand.class.st | 18 +-- .../IceTipVersionHistoryBrowser.class.st | 50 +++---- .../IceTipVersionHistoryModel.class.st | 18 +-- Iceberg-TipUI/IceTipVersionModel.class.st | 16 ++- .../IceTipWorkingCopyBrowser.class.st | 62 ++++----- .../IceTipWorkingCopyDiffModel.class.st | 16 ++- Iceberg-TipUI/IceTipWorkingCopyModel.class.st | 36 ++--- ...eTipWorkingCopyStatusBarPresenter.class.st | 20 +-- .../IceTokenCredentials.extension.st | 6 +- Iceberg-TipUI/IceTraitDefinition.extension.st | 4 +- Iceberg-TipUI/IceWarning.class.st | 10 +- Iceberg-TipUI/IceWorkingCopy.extension.st | 4 +- .../LGitCredentialsPlaintext.extension.st | 4 +- Iceberg-TipUI/MCAddition.extension.st | 4 +- Iceberg-TipUI/MCModification.extension.st | 4 +- Iceberg-TipUI/MCPatchOperation.extension.st | 4 +- Iceberg-TipUI/MCRemoval.extension.st | 6 +- Iceberg-TipUI/ManifestIcebergTipUI.class.st | 14 +- Iceberg-TipUI/PharoDarkTheme.extension.st | 6 +- Iceberg-TipUI/PharoShortcuts.extension.st | 4 +- .../SpToolbarButtonPresenter.extension.st | 4 +- Iceberg-TipUI/TIceCopyCommitId.trait.st | 10 +- Iceberg-TipUI/TWithBranchModel.trait.st | 16 ++- Iceberg-TipUI/Text.extension.st | 4 +- .../ToolShortcutsCategory.extension.st | 4 +- Iceberg-TipUI/UITheme.extension.st | 6 +- Iceberg-TipUI/package.st | 2 +- Iceberg/IceSystemEventListener.class.st | 39 +++--- Iceberg/Iceberg.class.st | 6 +- Iceberg/MCClassDefinition.extension.st | 7 - Iceberg/MCClassTraitDefinition.extension.st | 5 - Iceberg/MCMethodDefinition.extension.st | 6 - Iceberg/RPackageSet.extension.st | 10 -- 295 files changed, 3185 insertions(+), 2752 deletions(-) delete mode 100644 Iceberg/RPackageSet.extension.st diff --git a/.github/scripts/preLoading.st b/.github/scripts/preLoading.st index 3eb1cbe92e..f9256bda11 100644 --- a/.github/scripts/preLoading.st +++ b/.github/scripts/preLoading.st @@ -1,3 +1,3 @@ #( 'BaselineOfLibGit' 'BaselineOfIceberg' ) do: [ :each | - (RPackageOrganizer default packageNamed: each ifAbsent: [ nil ]) + (PackageOrganizer default packageNamed: each ifAbsent: [ nil ]) ifNotNil: [ :aPackage | aPackage removeFromSystem ] ] diff --git a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st index 15e4c35637..0a8bce3418 100644 --- a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st @@ -430,7 +430,7 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInI self repository commitWithMessage: message. self repository unload. - self deny: (RPackageOrganizer default includesPackageNamed: self packageName1). + self deny: (PackageOrganizer default includesPackageNamed: self packageName1). self repository head checkoutAllPackages. self assertClassExists: #IceGeneratedClassForTesting. @@ -458,7 +458,7 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ self repository commitWithMessage: message. self repository unload. - self deny: (RPackageOrganizer default includesPackageNamed: self packageName1). + self deny: (PackageOrganizer default includesPackageNamed: self packageName1). self repository branch commit checkoutAllPackages. self assertClassExists: #IceGeneratedClassForTesting. diff --git a/Iceberg-TipUI/Clipboard.extension.st b/Iceberg-TipUI/Clipboard.extension.st index c811d6fe5c..21ac6f2c76 100644 --- a/Iceberg-TipUI/Clipboard.extension.st +++ b/Iceberg-TipUI/Clipboard.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Clipboard } +Extension { #name : 'Clipboard' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } Clipboard class >> clipboardText: aText informing: aString [ UIManager inform: aString. ^ self clipboardText: aText diff --git a/Iceberg-TipUI/CmCommandGroup.extension.st b/Iceberg-TipUI/CmCommandGroup.extension.st index 6f36bc0b04..37988d8338 100644 --- a/Iceberg-TipUI/CmCommandGroup.extension.st +++ b/Iceberg-TipUI/CmCommandGroup.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroup } +Extension { #name : 'CmCommandGroup' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroup >> commandOrGroupNamed: aString ifFound: aBlock [ ^ entries diff --git a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st index 8ef6886348..306bf40201 100644 --- a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st +++ b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroupDecorator } +Extension { #name : 'CmCommandGroupDecorator' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroupDecorator >> commandOrGroupNamed: aString ifFound: aBlock [ ^ self decoratedGroup commandOrGroupNamed: aString ifFound: aBlock diff --git a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st index f356aa3469..b0c6cb73fc 100644 --- a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st +++ b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUICommandDisplayStrategy } +Extension { #name : 'CmUICommandDisplayStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUICommandDisplayStrategy >> ifVisible: aCmSpecCommand do: aBlock [ self subclassResponsibility diff --git a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st index 7f1636c79c..a9fb4ab426 100644 --- a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIDisableWhenCantBeRun } +Extension { #name : 'CmUIDisableWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIDisableWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Always visible" diff --git a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st index ff2501af9c..aad5f38218 100644 --- a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIHideWhenCantBeRun } +Extension { #name : 'CmUIHideWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIHideWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Visible if #canBeExecuted" diff --git a/Iceberg-TipUI/FTBasicItem.extension.st b/Iceberg-TipUI/FTBasicItem.extension.st index 889a7a7367..d4e904d427 100644 --- a/Iceberg-TipUI/FTBasicItem.extension.st +++ b/Iceberg-TipUI/FTBasicItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTBasicItem } +Extension { #name : 'FTBasicItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTBasicItem >> toggle [ self isExpanded ifTrue: [ self collapseAndRefresh ] diff --git a/Iceberg-TipUI/FTRootItem.extension.st b/Iceberg-TipUI/FTRootItem.extension.st index 95874a9068..7aa97b2e24 100644 --- a/Iceberg-TipUI/FTRootItem.extension.st +++ b/Iceberg-TipUI/FTRootItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTRootItem } +Extension { #name : 'FTRootItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTRootItem >> isRoot [ ^ true ] diff --git a/Iceberg-TipUI/FTTableMorph.extension.st b/Iceberg-TipUI/FTTableMorph.extension.st index b5f26040a5..9d329d59d1 100644 --- a/Iceberg-TipUI/FTTableMorph.extension.st +++ b/Iceberg-TipUI/FTTableMorph.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTableMorph } +Extension { #name : 'FTTableMorph' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> selectFirstVisibleRow [ ^ self selectIndex: @@ -9,7 +9,7 @@ FTTableMorph >> selectFirstVisibleRow [ ifEmpty: [ 0 ]) ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> useFunction: aFilterFunctionClass do: aBlock [ function := aFilterFunctionClass table: self. aBlock cull: function cull: self diff --git a/Iceberg-TipUI/FTTreeItem.extension.st b/Iceberg-TipUI/FTTreeItem.extension.st index 252972c9d7..9f7286ecfd 100644 --- a/Iceberg-TipUI/FTTreeItem.extension.st +++ b/Iceberg-TipUI/FTTreeItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTreeItem } +Extension { #name : 'FTTreeItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTreeItem >> isRoot [ ^ false ] diff --git a/Iceberg-TipUI/IceAbstractCredentials.extension.st b/Iceberg-TipUI/IceAbstractCredentials.extension.st index 533cab5b40..c305485223 100644 --- a/Iceberg-TipUI/IceAbstractCredentials.extension.st +++ b/Iceberg-TipUI/IceAbstractCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceAbstractCredentials } +Extension { #name : 'IceAbstractCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> askForModelClass [ ^ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> editModelClass [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceAddition.extension.st b/Iceberg-TipUI/IceAddition.extension.st index 37dc983ddf..c38ab65190 100644 --- a/Iceberg-TipUI/IceAddition.extension.st +++ b/Iceberg-TipUI/IceAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceAddition } +Extension { #name : 'IceAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAddition >> icon [ ^ self iconNamed: #changeAdd diff --git a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st index 0771c4e508..d26a6bad1f 100644 --- a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAllPackages } +Extension { #name : 'IceCheckoutAllPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAllPackages class >> description [ ^ 'Checkout ALL packages in the repository' ] diff --git a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st index e08c84d409..5b4216bc8f 100644 --- a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAlreadyLoadedPackages } +Extension { #name : 'IceCheckoutAlreadyLoadedPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAlreadyLoadedPackages class >> description [ ^ 'Checkout packages ALREADY LOADED in the image' ] diff --git a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st index 0a9c967d0c..67ec10aa6a 100644 --- a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutDoNotLoadPackages } +Extension { #name : 'IceCheckoutDoNotLoadPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutDoNotLoadPackages class >> description [ ^ 'DO NOT CHECKOUT any packages, I will load them manually (for experts only)' ] diff --git a/Iceberg-TipUI/IceCheckoutStrategy.extension.st b/Iceberg-TipUI/IceCheckoutStrategy.extension.st index 51de95c72f..ac78658726 100644 --- a/Iceberg-TipUI/IceCheckoutStrategy.extension.st +++ b/Iceberg-TipUI/IceCheckoutStrategy.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceCheckoutStrategy } +Extension { #name : 'IceCheckoutStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy >> description [ ^ self class description ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy class >> description [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceClassDefinition.extension.st b/Iceberg-TipUI/IceClassDefinition.extension.st index e5be73baae..857e7aae8c 100644 --- a/Iceberg-TipUI/IceClassDefinition.extension.st +++ b/Iceberg-TipUI/IceClassDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceClassDefinition } +Extension { #name : 'IceClassDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceClassDefinition >> icon [ ^ self iconNamed: #class ] diff --git a/Iceberg-TipUI/IceConflictingOperation.extension.st b/Iceberg-TipUI/IceConflictingOperation.extension.st index 2a2670af63..fd38d1af90 100644 --- a/Iceberg-TipUI/IceConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceConflictingOperation.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceConflictingOperation } +Extension { #name : 'IceConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> operationIcon [ ^ self iconNamed: #changeUpdate ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceCreateBranchCommand.class.st b/Iceberg-TipUI/IceCreateBranchCommand.class.st index 67b297b6be..decf79bec0 100644 --- a/Iceberg-TipUI/IceCreateBranchCommand.class.st +++ b/Iceberg-TipUI/IceCreateBranchCommand.class.st @@ -3,12 +3,14 @@ I'm a command to create a new branch from a commit. this is usefull in the case of commiting changes in unsync repositories (so you open a branch and you commit there) " Class { - #name : #IceCreateBranchCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceCreateBranchCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceCreateBranchCommand >> execute [ | selection | diff --git a/Iceberg-TipUI/IceDefinition.extension.st b/Iceberg-TipUI/IceDefinition.extension.st index 8b2c9bdb7d..c453e2a0df 100644 --- a/Iceberg-TipUI/IceDefinition.extension.st +++ b/Iceberg-TipUI/IceDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDefinition } +Extension { #name : 'IceDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDefinition >> icon [ self subclassResponsibility diff --git a/Iceberg-TipUI/IceDirectoryDefinition.extension.st b/Iceberg-TipUI/IceDirectoryDefinition.extension.st index e16b919e0d..7ad08d0c15 100644 --- a/Iceberg-TipUI/IceDirectoryDefinition.extension.st +++ b/Iceberg-TipUI/IceDirectoryDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDirectoryDefinition } +Extension { #name : 'IceDirectoryDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDirectoryDefinition >> icon [ ^ self iconNamed: #emptyPackage ] diff --git a/Iceberg-TipUI/IceErrorVisitor.extension.st b/Iceberg-TipUI/IceErrorVisitor.extension.st index a0d887b790..baf0ab6cc2 100644 --- a/Iceberg-TipUI/IceErrorVisitor.extension.st +++ b/Iceberg-TipUI/IceErrorVisitor.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceErrorVisitor } +Extension { #name : 'IceErrorVisitor' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitExperimentalFeature: aWarning [ "By default experimental features are just accepted when we are not in an interactive mode". aWarning resume ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitNoCommitMessage: aWarning [ self visitGenericError: aWarning ] diff --git a/Iceberg-TipUI/IceExperimentalFeature.class.st b/Iceberg-TipUI/IceExperimentalFeature.class.st index ddcaf03e3a..db10719754 100644 --- a/Iceberg-TipUI/IceExperimentalFeature.class.st +++ b/Iceberg-TipUI/IceExperimentalFeature.class.st @@ -4,12 +4,14 @@ Everytime an user tries to use an experimental feature, maybe the UI want to sho This is useful to guarantee the correct keeping of the changes. " Class { - #name : #IceExperimentalFeature, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceExperimentalFeature', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceExperimentalFeature >> acceptError: aVisitor [ aVisitor visitExperimentalFeature: self diff --git a/Iceberg-TipUI/IceExtensionDefinition.extension.st b/Iceberg-TipUI/IceExtensionDefinition.extension.st index 25018c3c79..f16ab89a3f 100644 --- a/Iceberg-TipUI/IceExtensionDefinition.extension.st +++ b/Iceberg-TipUI/IceExtensionDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceExtensionDefinition } +Extension { #name : 'IceExtensionDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceExtensionDefinition >> icon [ ^ self iconNamed: #group ] diff --git a/Iceberg-TipUI/IceFileDefinition.extension.st b/Iceberg-TipUI/IceFileDefinition.extension.st index ec7f3d821f..9ada4d36b9 100644 --- a/Iceberg-TipUI/IceFileDefinition.extension.st +++ b/Iceberg-TipUI/IceFileDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceFileDefinition } +Extension { #name : 'IceFileDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileDefinition >> icon [ ^ self iconNamed: #book ] diff --git a/Iceberg-TipUI/IceFileSystemDefinition.extension.st b/Iceberg-TipUI/IceFileSystemDefinition.extension.st index 6d556411dc..5c26a26b36 100644 --- a/Iceberg-TipUI/IceFileSystemDefinition.extension.st +++ b/Iceberg-TipUI/IceFileSystemDefinition.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceFileSystemDefinition } +Extension { #name : 'IceFileSystemDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBeBrowsed [ "It can always be browsed through the libgit file system" ^ true ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBrowseReferences [ "We do not track file references..." diff --git a/Iceberg-TipUI/IceMergeListWrapper.class.st b/Iceberg-TipUI/IceMergeListWrapper.class.st index e8fb3896b2..3c7447bcfb 100644 --- a/Iceberg-TipUI/IceMergeListWrapper.class.st +++ b/Iceberg-TipUI/IceMergeListWrapper.class.st @@ -2,67 +2,69 @@ I am a morphic list wrapper that wraps iceberg diff tree nodes (potentially with conflicts) " Class { - #name : #IceMergeListWrapper, - #superclass : #ListItemWrapper, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceMergeListWrapper', + #superclass : 'ListItemWrapper', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> = aWrapper [ ^ self item = aWrapper item ] -{ #category : #'morphic-compatibility' } +{ #category : 'morphic-compatibility' } IceMergeListWrapper >> actualClass [ ^ self item value actualClass ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> asString [ ^item value description ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseLocal [ ^ item value selectRight ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseRemote [ ^ item value selectLeft ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> contents [ "Answer the contents of the change from the model." ^ item children collect: [ :each | IceMergeListWrapper with: each model: model ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> hash [ ^ self item hash ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> icon [ ^ item value icon ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> isConflict [ ^ item value isConflict ] -{ #category : #accessing } +{ #category : 'accessing' } IceMergeListWrapper >> preferredColor [ ^ self item value preferredColor diff --git a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st index fd1a3b7e5d..bc9b7f4006 100644 --- a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st +++ b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st @@ -2,12 +2,14 @@ I'm a command to perform a merge of current image sources with head commit. " Class { - #name : #IceMergeWorkingCopyCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceMergeWorkingCopyCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceMergeWorkingCopyCommand >> execute [ | commit | commit := self repository headCommit. diff --git a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st index bed0c4d10d..a8a94cb0b3 100644 --- a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceMethodContainerDefinition } +Extension { #name : 'IceMethodContainerDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> actualClass [ | actualClass | @@ -8,7 +8,7 @@ IceMethodContainerDefinition >> actualClass [ ^ isMeta ifTrue: [ actualClass classSide ] ifFalse: [ actualClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> browse [ | browsed | @@ -17,13 +17,13 @@ IceMethodContainerDefinition >> browse [ browsed browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBeBrowsed [ ^ Smalltalk globals includesKey: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBrowseReferences [ ^ self canBeBrowsed diff --git a/Iceberg-TipUI/IceMethodDefinition.extension.st b/Iceberg-TipUI/IceMethodDefinition.extension.st index 7f8cee63e9..48b2d71867 100644 --- a/Iceberg-TipUI/IceMethodDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodDefinition.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceMethodDefinition } +Extension { #name : 'IceMethodDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> browse [ (self contextClass >> name) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBeBrowsed [ ^ self contextClass @@ -14,13 +14,13 @@ IceMethodDefinition >> canBeBrowsed [ ifNil: [ false ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceModification.extension.st b/Iceberg-TipUI/IceModification.extension.st index 9ecdccb45c..91a3649b5f 100644 --- a/Iceberg-TipUI/IceModification.extension.st +++ b/Iceberg-TipUI/IceModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceModification } +Extension { #name : 'IceModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceModification >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceNoCommitMessage.class.st b/Iceberg-TipUI/IceNoCommitMessage.class.st index 01e8ce6729..7f5ba3de28 100644 --- a/Iceberg-TipUI/IceNoCommitMessage.class.st +++ b/Iceberg-TipUI/IceNoCommitMessage.class.st @@ -3,23 +3,25 @@ I indicate when a commit will be performed without a message comment. This is usually possible, but bad, very bad. Do not do it. " Class { - #name : #IceNoCommitMessage, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceNoCommitMessage', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage class >> defaultMessageText [ ^ 'You are trying to commit without a message! When this is possible, is not a good practice.' ] -{ #category : #visiting } +{ #category : 'visiting' } IceNoCommitMessage >> acceptError: aVisitor [ aVisitor visitNoCommitMessage: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage >> messageText [ ^ messageText ifNil: [ self class defaultMessageText ] ] diff --git a/Iceberg-TipUI/IceNoModification.extension.st b/Iceberg-TipUI/IceNoModification.extension.st index c57e45a902..a49e299b2a 100644 --- a/Iceberg-TipUI/IceNoModification.extension.st +++ b/Iceberg-TipUI/IceNoModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNoModification } +Extension { #name : 'IceNoModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNoModification >> icon [ ^ definition icon diff --git a/Iceberg-TipUI/IceNode.extension.st b/Iceberg-TipUI/IceNode.extension.st index d269a8d67e..cfba09c027 100644 --- a/Iceberg-TipUI/IceNode.extension.st +++ b/Iceberg-TipUI/IceNode.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNode } +Extension { #name : 'IceNode' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNode >> inspectorItems [ diff --git a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st index 790c80f427..a9a5fe9c83 100644 --- a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st +++ b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st @@ -3,47 +3,49 @@ I am a IceNode (containing an IceOperationMerge) visitor meant to update a SpCod with the highlighted code. " Class { - #name : #IceNodeCodeDisplayVisitor, - #superclass : #Object, + #name : 'IceNodeCodeDisplayVisitor', + #superclass : 'Object', #instVars : [ 'codePresenter' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNodeCodeDisplayVisitor class >> onCodePresenter: aSpCodePresenter [ ^ self new codePresenter: aSpCodePresenter ; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter [ ^ codePresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter: aSpCodePresenter [ codePresenter := aSpCodePresenter ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitClassDefinition: anIceClassDefinition [ codePresenter text: anIceClassDefinition contents. codePresenter behavior: nil ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitConflictingOperation: anIceConflictingOperation [ anIceConflictingOperation chosenOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ codePresenter @@ -53,13 +55,13 @@ IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ UndefinedObject ]) ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitPackage: anIcePackageDefinition [ codePresenter diff --git a/Iceberg-TipUI/IceNonConflictingOperation.extension.st b/Iceberg-TipUI/IceNonConflictingOperation.extension.st index a9d80139e9..e1735a623d 100644 --- a/Iceberg-TipUI/IceNonConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceNonConflictingOperation.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceNonConflictingOperation } +Extension { #name : 'IceNonConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> operationIcon [ ^ operation icon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceOperation.extension.st b/Iceberg-TipUI/IceOperation.extension.st index e247689488..bafe10e4da 100644 --- a/Iceberg-TipUI/IceOperation.extension.st +++ b/Iceberg-TipUI/IceOperation.extension.st @@ -1,30 +1,30 @@ -Extension { #name : #IceOperation } +Extension { #name : 'IceOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> browse [ ^ self leftDefinition browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBeBrowsed [ ^ self leftDefinition canBeBrowsed ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> icon [ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> preferredColor [ "Use the default color" diff --git a/Iceberg-TipUI/IceOperationMerge.extension.st b/Iceberg-TipUI/IceOperationMerge.extension.st index 8d9566c0cb..fa98848b61 100644 --- a/Iceberg-TipUI/IceOperationMerge.extension.st +++ b/Iceberg-TipUI/IceOperationMerge.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceOperationMerge } +Extension { #name : 'IceOperationMerge' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> icon [ self isRightChosen ifTrue: [ ^ self iconNamed: #changeBlock ]. @@ -9,7 +9,7 @@ IceOperationMerge >> icon [ ^ self operationIcon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> operationIcon [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IcePackage.extension.st b/Iceberg-TipUI/IcePackage.extension.st index b932cb71e4..43d5054bcc 100644 --- a/Iceberg-TipUI/IcePackage.extension.st +++ b/Iceberg-TipUI/IcePackage.extension.st @@ -1,7 +1,7 @@ -Extension { #name : #IcePackage } +Extension { #name : 'IcePackage' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackage >> browse [ - (RPackageOrganizer default packageNamed: self name) browse + (PackageOrganizer default packageNamed: self name) browse ] diff --git a/Iceberg-TipUI/IcePackageDefinition.extension.st b/Iceberg-TipUI/IcePackageDefinition.extension.st index 4839af1d7a..36f9b23914 100644 --- a/Iceberg-TipUI/IcePackageDefinition.extension.st +++ b/Iceberg-TipUI/IcePackageDefinition.extension.st @@ -1,25 +1,25 @@ -Extension { #name : #IcePackageDefinition } +Extension { #name : 'IcePackageDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> browse [ "Open a browser on the package, if it exists." (self packageOrganizer packageNamed: name ifAbsent: [ ^ self ]) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBeBrowsed [ ^ self packageOrganizer hasPackage: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> icon [ ^ self iconNamed: #package ] diff --git a/Iceberg-TipUI/IcePlaintextCredentials.extension.st b/Iceberg-TipUI/IcePlaintextCredentials.extension.st index 2280cbb78b..77fc415434 100644 --- a/Iceberg-TipUI/IcePlaintextCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IcePlaintextCredentials } +Extension { #name : 'IcePlaintextCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClass [ ^ IceTipAskForPlaintextCredentialsPresenter ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClassOn: aString [ ^ (aString includesSubstring: 'github.com' caseSensitive: false) @@ -13,7 +13,7 @@ IcePlaintextCredentials >> askForModelClassOn: aString [ ifFalse: [ self askForModelClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> editModelClass [ ^ IceTipEditPlaintextCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st index c69cf7dd5e..01215e50ad 100644 --- a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextOtpCredentials } +Extension { #name : 'IcePlaintextOtpCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextOtpCredentials >> askForModelClass [ ^ IceTipAskForPlaintextOtpCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePullRemoteCommand.class.st b/Iceberg-TipUI/IcePullRemoteCommand.class.st index 35ba209da8..92f9253947 100644 --- a/Iceberg-TipUI/IcePullRemoteCommand.class.st +++ b/Iceberg-TipUI/IcePullRemoteCommand.class.st @@ -2,27 +2,29 @@ I'm a command to perform a pull from a remote. " Class { - #name : #IcePullRemoteCommand, - #superclass : #IceRepositoryCommand, + #name : 'IcePullRemoteCommand', + #superclass : 'IceRepositoryCommand', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IcePullRemoteCommand >> execute [ self repository branch pullFrom: self remote. self beSuccess ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote: anObject [ remote := anObject ] diff --git a/Iceberg-TipUI/IceRemoval.extension.st b/Iceberg-TipUI/IceRemoval.extension.st index fb9aaa8acc..9887f589e2 100644 --- a/Iceberg-TipUI/IceRemoval.extension.st +++ b/Iceberg-TipUI/IceRemoval.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRemoval } +Extension { #name : 'IceRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRemoval >> icon [ ^ self iconNamed: #changeRemove diff --git a/Iceberg-TipUI/IceRepository.extension.st b/Iceberg-TipUI/IceRepository.extension.st index ce7f0e2d32..17235036b4 100644 --- a/Iceberg-TipUI/IceRepository.extension.st +++ b/Iceberg-TipUI/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRepository >> inspectorItems [ diff --git a/Iceberg-TipUI/IceRepositoryCommand.class.st b/Iceberg-TipUI/IceRepositoryCommand.class.st index 1c769a782e..0e64b96592 100644 --- a/Iceberg-TipUI/IceRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceRepositoryCommand.class.st @@ -2,56 +2,58 @@ I'm a generic command for iceberg repositories. " Class { - #name : #IceRepositoryCommand, - #superclass : #Object, + #name : 'IceRepositoryCommand', + #superclass : 'Object', #instVars : [ 'repository', 'success', 'context' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand class >> isAbstract [ ^ self == IceRepositoryCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> beSuccess [ success := true ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> execute [ self subclassResponsibility ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> executeWithContext: aContext [ context := aContext. self execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCommand >> initialize [ super initialize. success := false ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand >> isSuccess [ ^ success ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceSavedPackageVersion.extension.st b/Iceberg-TipUI/IceSavedPackageVersion.extension.st index b699275f27..66160db0c5 100644 --- a/Iceberg-TipUI/IceSavedPackageVersion.extension.st +++ b/Iceberg-TipUI/IceSavedPackageVersion.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceSavedPackageVersion } +Extension { #name : 'IceSavedPackageVersion' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSavedPackageVersion >> description [ ^ self commit description ] diff --git a/Iceberg-TipUI/IceSortingStrategy.class.st b/Iceberg-TipUI/IceSortingStrategy.class.st index 45945aeaaa..0c9b0ea815 100644 --- a/Iceberg-TipUI/IceSortingStrategy.class.st +++ b/Iceberg-TipUI/IceSortingStrategy.class.st @@ -15,26 +15,28 @@ Internal Representation and Key Implementation Points. last: Represent the entities to display last. " Class { - #name : #IceSortingStrategy, - #superclass : #Object, + #name : 'IceSortingStrategy', + #superclass : 'Object', #instVars : [ 'first', 'last' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy class >> possibleValues [ ^ #(#none #modified #notLoaded) ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first [ ^ first ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first: anObject [ first := anObject. @@ -42,19 +44,19 @@ IceSortingStrategy >> first: anObject [ ifTrue: [ self last: #none ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceSortingStrategy >> initialize [ super initialize. first := #modified. last := #notLoaded ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last [ ^ last ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last: anObject [ last := anObject. @@ -62,7 +64,7 @@ IceSortingStrategy >> last: anObject [ ifTrue: [ self first: #none ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ aSymbol = #modified ifTrue: [ ^ aCollection select: #isModified ]. @@ -71,7 +73,7 @@ IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ self error: 'This sorting is not accepted: ' , aSymbol ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sort: aListOfPackages [ | result packages lasts | packages := aListOfPackages. @@ -85,12 +87,12 @@ IceSortingStrategy >> sort: aListOfPackages [ ^ result ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sortByName: aCollection [ ^ aCollection sorted: #packageName ascending ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> withOthers: aSymbol [ self first = aSymbol ifTrue: [ self first: nil ]. self last = aSymbol ifTrue: [ self last: nil ] diff --git a/Iceberg-TipUI/IceSshCredentials.extension.st b/Iceberg-TipUI/IceSshCredentials.extension.st index e3ad3fed5c..6c5858fbf7 100644 --- a/Iceberg-TipUI/IceSshCredentials.extension.st +++ b/Iceberg-TipUI/IceSshCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceSshCredentials } +Extension { #name : 'IceSshCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> editModelClass [ ^ IceTipEditSSHCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st index 0c1558c81a..1d47f72c91 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st @@ -2,24 +2,26 @@ I am the common class of all the commands over an specific credential. " Class { - #name : #IceTipAbstractCredentialCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> credential [ ^ self item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> store [ ^ self context model diff --git a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st index fdb3e9165c..1742f97fae 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st @@ -2,30 +2,32 @@ I am the abstract class of all the general commands in the credentials list. " Class { - #name : #IceTipAbstractCredentialStoreCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialStoreCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialStoreCommand ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialStoreCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAbstractCredentialStoreCommand >> store [ ^ self context store diff --git a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st index ec0f14565a..ff95d0bfdc 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st @@ -5,8 +5,8 @@ to ask / add / edit credentials. There are subclasses to each of the actions and the types of keys. " Class { - #name : #IceTipAbstractCredentialsPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAbstractCredentialsPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'storeCheckbox', 'credentialStore', @@ -15,10 +15,12 @@ Class { 'credentials', 'askingHostname' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAddAction [ credentials := self newCredentials. @@ -31,7 +33,7 @@ IceTipAbstractCredentialsPresenter >> acceptAddAction [ tool refresh ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAskAction [ credentials := self newCredentials. @@ -45,7 +47,7 @@ IceTipAbstractCredentialsPresenter >> acceptAskAction [ ^ credentials ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptEditAction [ self refreshCredentialsFromPresenter. @@ -55,19 +57,19 @@ IceTipAbstractCredentialsPresenter >> acceptEditAction [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> askingHostname: aString [ askingHostname := aString ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAction [ "Action to execute on cancel." ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAskAction [ accepted := true. @@ -75,43 +77,43 @@ IceTipAbstractCredentialsPresenter >> cancelAskAction [ LGitNoCredentialsProvided signal ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> closeAction [ accepted ifFalse: [ self cancelAction ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentialStore: aStore [ credentialStore := aStore ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials: anIceCredentials [ credentials := anIceCredentials. self refreshPresenterFromCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> hostnameFromInput [ "Answer the remoote hostname for the credentials." ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initialize [ super initialize. accepted := false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPresenter [ super initializeDialogWindow: aDialogWindowPresenter. @@ -121,7 +123,7 @@ IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPrese ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initializePresenters [ storeCheckbox := self newCheckBox @@ -131,27 +133,27 @@ IceTipAbstractCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> isOkEnabled [ "Determite if the user should be enabled to press on the accept button." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> newCredentials [ "Answer a new instance of the credentials using the form inputs." ^ self subclassResponsibility ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> okButton [ ^ self window buttons first ] -{ #category : #'API - opening' } +{ #category : 'API - opening' } IceTipAbstractCredentialsPresenter >> open [ self openModal. @@ -159,36 +161,36 @@ IceTipAbstractCredentialsPresenter >> open [ ^ self credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshCredentialsFromPresenter [ "Hook to update the credentials object from the presenter inputs." ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshPresenterFromCredentials [ "Hook to update the presenter input fields from the credentials object." ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> shouldStoreCredentials [ ^ storeCheckbox state ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> storeCheckbox [ ^ storeCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> tool: aBrowser [ "Set the tool that triggered this dialog, and therefore might need a #refresh after the users accepts the dialog and it produces an effect on the system." tool := aBrowser ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> updateOkButton [ self window ifNil: [ ^ self ]. diff --git a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st index 24f88809b7..654595d3ee 100644 --- a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st @@ -3,18 +3,20 @@ I implement the basic behavior of all the plaintext credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameLabel', 'usernameInput', 'passwordLabel', 'passwordInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractPlaintextCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self password isNotEmpty ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ ^ IcePlaintextCredentials new @@ -47,31 +49,31 @@ IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> password [ ^ passwordInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> passwordInput [ ^ passwordInput ] -{ #category : #private } +{ #category : 'private' } IceTipAbstractPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Password:' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> username [ ^ usernameInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> usernameInput [ ^ usernameInput diff --git a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st index d0f96fe3b3..4b529092fd 100644 --- a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st @@ -3,8 +3,8 @@ I implement the basic behavior of all the ssh credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractSSHCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractSSHCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameInput', 'usernameLabel', @@ -15,10 +15,12 @@ Class { 'publicKeyLabel', 'privateKeyLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -56,20 +58,20 @@ IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractSSHCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self publicKey isNotEmpty and: [ self privateKey isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> passphrase [ ^ passphraseInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> privateKey [ ^ privateKeyInput location @@ -77,7 +79,7 @@ IceTipAbstractSSHCredentialsPresenter >> privateKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> publicKey [ ^ publicKeyInput location @@ -85,7 +87,7 @@ IceTipAbstractSSHCredentialsPresenter >> publicKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> username [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAction.class.st b/Iceberg-TipUI/IceTipAction.class.st index c062c89d67..7f2a1337db 100644 --- a/Iceberg-TipUI/IceTipAction.class.st +++ b/Iceberg-TipUI/IceTipAction.class.st @@ -2,41 +2,43 @@ I'm like a lightweight command, used in general for apply concrete actions. " Class { - #name : #IceTipAction, - #superclass : #Object, + #name : 'IceTipAction', + #superclass : 'Object', #instVars : [ 'context', 'repository', 'successBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipAction class >> isAbstract [ ^ self == IceTipAction ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> basicExecute [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context: aContext [ context := aContext ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> execute [ | result | @@ -48,19 +50,19 @@ IceTipAction >> execute [ ^ result. ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> executeWithContext: aContext [ self context: aContext. ^ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> finishSuccess [ successBlock ifNotNil: [ successBlock value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> onSuccess: aBlock [ "Some actions need to execute something right after finish. Like a refresh of panels, etc. If a block is defined here, it will be evaluated right after the command is executed, if @@ -68,17 +70,17 @@ IceTipAction >> onSuccess: aBlock [ successBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository: anObject [ repository := anObject ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> withErrorHandlingDo: aBlock [ aBlock on: IceError, IceWarning diff --git a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st index 5604783f88..cb70097b35 100644 --- a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st @@ -2,8 +2,8 @@ I am an small dialog to ask the user to select new packages to load. New packages are packages in the commit but not in the image. " Class { - #name : #IceTipAddNewPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddNewPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'packagesList', 'selectedPackages', @@ -12,10 +12,12 @@ Class { 'checkoutModel', 'checkoutPreviewWindow' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterInstance forRoot: rootCommandGroup [ rootCommandGroup register: @@ -25,7 +27,7 @@ IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterIn yourself) ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddNewPackagesDialogPresenter >> accept [ | selectedPackageNames | @@ -42,19 +44,19 @@ IceTipAddNewPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutModel: anIceTipCheckoutModel [ checkoutModel := anIceTipCheckoutModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutPreviewWindow: anIceTipCheckoutPreviewBrowser [ checkoutPreviewWindow := anIceTipCheckoutPreviewBrowser ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddNewPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -63,13 +65,13 @@ IceTipAddNewPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ packagesList @@ -90,7 +92,7 @@ IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ contextMenu: [ (self rootCommandsGroup / 'package list commands') beRoot asMenuPresenter ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -108,49 +110,49 @@ Please select the packages if you wish to load them in the image'. self initializePackagesList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddNewPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages [ ^ selectedPackages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages: anObject [ selectedPackages := anObject ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipAddNewPackagesDialogPresenter >> setModelBeforeInitialization: somePackages [ packages := somePackages ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> titleForWindow [ ^ 'Select New Packages to Load'. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> updatePresenter [ packagesList items: packages ] -{ #category : #validation } +{ #category : 'validation' } IceTipAddNewPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPackageCommand.class.st b/Iceberg-TipUI/IceTipAddPackageCommand.class.st index b426fd154f..abb62edab1 100644 --- a/Iceberg-TipUI/IceTipAddPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPackageCommand.class.st @@ -2,24 +2,26 @@ Command that opens a dialog to add a/many package/s into the selected repository. " Class { - #name : #IceTipAddPackageCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddPackageCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultDescription [ ^ 'Adds an existing package to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultName [ ^ 'Add package' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPackageCommand >> execute [ (IceTipAddPackagesDialogPresenter @@ -30,19 +32,19 @@ IceTipAddPackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPackageCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st index 94800447f8..00b95cc901 100644 --- a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st @@ -2,18 +2,20 @@ I'm a dialog to add packages to a repository. " Class { - #name : #IceTipAddPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'packagesList', 'packageNameText', 'selectedPackages' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddPackagesDialogPresenter >> accept [ "ensure window goes away (in case accept comes from a keybinding and not the ok button)" @@ -25,15 +27,13 @@ IceTipAddPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackages [ - ^ RPackageOrganizer default packages - asOrderedCollection - sort: [ :a :b | a name < b name ] + ^ self packageOrganizer packages asOrderedCollection sort: [ :a :b | a name < b name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ | currentPackagesNames | @@ -42,7 +42,7 @@ IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ currentPackagesNames includes: rPackage name ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,13 +51,13 @@ IceTipAddPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackageNameText [ packageNameText @@ -66,7 +66,7 @@ IceTipAddPackagesDialogPresenter >> initializePackageNameText [ whenTextChangedDo: [ :text | self refresh ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackagesList [ packagesList addColumn: (SpCompositeTableColumn new @@ -86,7 +86,7 @@ IceTipAddPackagesDialogPresenter >> initializePackagesList [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -97,32 +97,32 @@ IceTipAddPackagesDialogPresenter >> initializePresenters [ self initializePackageNameText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model: anObject [ model := anObject. self refresh ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packageNameText [ ^ packageNameText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> refresh [ packagesList items: (packageNameText text @@ -135,31 +135,31 @@ IceTipAddPackagesDialogPresenter >> refresh [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> titleForWindow [ ^ 'Add packages' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> updatePresenter [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st index ff725f569e..0bda874a9b 100644 --- a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st @@ -2,22 +2,24 @@ I create a new plaintext credential on the credential store. " Class { - #name : #IceTipAddPlainTextCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddPlainTextCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultDescription [ ^ 'Add a new plain text credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultName [ ^ 'Plain Text' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPlainTextCredentialCommand >> execute [ ((IceTipAddPlaintextCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st index 34e65aa27d..9d957b8259 100644 --- a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add plaintext credentials. " Class { - #name : #IceTipAddPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, + #name : 'IceTipAddPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -30,20 +32,20 @@ IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPlaintextCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -54,13 +56,13 @@ IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> isOkEnabled [ ^ super isOkEnabled and: [ self hostnameFromInput isNotEmpty ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Add new Plain Text Credential' diff --git a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st index 9664e8295b..4cf7dfdbe0 100644 --- a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st @@ -2,31 +2,33 @@ Command that opens a dialog to add a remote to a repository. " Class { - #name : #IceTipAddRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultDescription [ ^ 'Adds a remote to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultName [ ^ 'Add remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> canBeExecuted [ "Any repository can have more remotes." ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRemoteCommand >> execute [ (IceTipAddRemoteDialogPresenter @@ -37,13 +39,13 @@ IceTipAddRemoteCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st index a7e1f9eb46..a5964fae34 100644 --- a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog to add remotes to a repository. " Class { - #name : #IceTipAddRemoteDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddRemoteDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'nameLabel', @@ -12,10 +12,12 @@ Class { 'nameText', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> accept [ self validate. @@ -27,7 +29,7 @@ IceTipAddRemoteDialogPresenter >> accept [ ^ acceptBlock ifNotNil: [ acceptBlock cull: self remoteName ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddRemoteDialogPresenter >> defaultLayout [ ^ SpGridLayout new @@ -41,7 +43,7 @@ IceTipAddRemoteDialogPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -51,7 +53,7 @@ IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -70,73 +72,73 @@ IceTipAddRemoteDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameText [ ^ nameText ] -{ #category : #events } +{ #category : 'events' } IceTipAddRemoteDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteName [ ^ self nameText text trimmed ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteUrl [ ^ self urlText text trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> titleForWindow [ ^ 'Add remote' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlLabel [ ^ urlLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlText [ ^ urlText ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st index 0aa7d9688d..0ac4f307df 100644 --- a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st @@ -3,31 +3,33 @@ I register Iceberg projects. I will open a dialog to take the new possible repository (from available options) and I will register it into the IceRepository>>#registry list. " Class { - #name : #IceTipAddRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultDescription [ ^ 'Add a repository (new, local, cloned) to your managed repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultName [ ^ 'Add' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRepositoryCommand >> execute [ (IceTipRegisterRepositoryDialogPresenter newApplication: context application) @@ -36,19 +38,19 @@ IceTipAddRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st index 57f671869e..0d5ea539bb 100644 --- a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add SSH credentials. " Class { - #name : #IceTipAddSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, + #name : 'IceTipAddSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddSSHCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -31,20 +33,20 @@ IceTipAddSSHCredentialsPresenter >> defaultLayout [ add: passphraseLabel; add: passphraseInput; nextRow ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 7 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -57,7 +59,7 @@ IceTipAddSSHCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> newCredentials [ ^ IceSshCredentials new @@ -68,7 +70,7 @@ IceTipAddSSHCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> titleForWindow [ ^ 'Add SSH credential' diff --git a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st index db86f547fd..49a17d55b3 100644 --- a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st @@ -2,22 +2,24 @@ I add a new IceSshCredentials to the store " Class { - #name : #IceTipAddSshCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddSshCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultDescription [ ^ 'Add a SSH pair of credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultName [ ^ 'SSH Pair' ] -{ #category : #execution } +{ #category : 'execution' } IceTipAddSshCredentialCommand >> execute [ ((IceTipAddSSHCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st index a1570d8283..6d47533e52 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipAddTokenCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddTokenCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultDescription [ ^ 'Add a new token credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultName [ ^ 'Token' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddTokenCredentialCommand >> execute [ ((IceTipAddTokenCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st index e6b33e71f7..c4931d633d 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st @@ -2,8 +2,8 @@ I am a dialog to add token credentials. " Class { - #name : #IceTipAddTokenCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAddTokenCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'hostInput', 'tokenInput', @@ -12,16 +12,18 @@ Class { 'usernameInput', 'usernameLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddTokenCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -36,19 +38,19 @@ IceTipAddTokenCredentialsPresenter >> defaultLayout [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -80,7 +82,7 @@ IceTipAddTokenCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddTokenCredentialsPresenter >> isOkEnabled [ ^ self usernameFromInput isNotEmpty and: [ @@ -88,7 +90,7 @@ IceTipAddTokenCredentialsPresenter >> isOkEnabled [ self tokenFromInput isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> newCredentials [ ^ IceTokenCredentials new @@ -98,19 +100,19 @@ IceTipAddTokenCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> titleForWindow [ ^ 'Add token credentials' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> tokenFromInput [ ^ tokenInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> usernameFromInput [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st index 7942ae2db3..f6c3ef79f8 100644 --- a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st @@ -5,37 +5,39 @@ I won't modify the loaded code, but will calculate the differences between the loaded packages and the new commit, to mark packages as dirty. " Class { - #name : #IceTipAdoptCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAdoptCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAdoptCommitCommand class >> defaultDescription [ ^ 'Sets this commit as the commit of your working copy. It will not modify your loaded code, but it will calculate the differences between your loaded packages and the the new commit to mark packages as dirty.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> defaultNameFromContext [ ^ 'Adopt commit ' , self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipAdoptCommitCommand >> execute [ self selectedCommitish adopt. Iceberg announcer announce: (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> iconName [ ^ #recoverLostChanges ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAdoptCommitCommand >> name [ "Answer the name for the command. In order to have a specialized string for certain parameters of the context, and given the fact that sometimes the context is nil (e.g. when a context menu is calculated when the selection is empty)." @@ -45,7 +47,7 @@ IceTipAdoptCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipAnnouncement.class.st b/Iceberg-TipUI/IceTipAnnouncement.class.st index dbdedd4dc5..e41c5c55a8 100644 --- a/Iceberg-TipUI/IceTipAnnouncement.class.st +++ b/Iceberg-TipUI/IceTipAnnouncement.class.st @@ -3,7 +3,9 @@ I'm a general announcement for Tip UI events. (the announcements happened here are just for UI consumption) " Class { - #name : #IceTipAnnouncement, - #superclass : #IceAnnouncement, - #category : #'Iceberg-TipUI-Announcements' + #name : 'IceTipAnnouncement', + #superclass : 'IceAnnouncement', + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } diff --git a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st index 365540a064..07247e0c33 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st @@ -3,30 +3,32 @@ I implement the dialog to ask plaintext credentials. This dialog is used when the IceTipInteractiveCredentialsProvider needs to ask a plaintext credential. " Class { - #name : #IceTipAskForPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskForPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancel [ self cancelAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -44,13 +46,13 @@ IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (450 @ 180) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Please log in to ' , askingHostname diff --git a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st index eaa0b052c5..b288110683 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipAskForPlaintextOtpCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, + #name : 'IceTipAskForPlaintextOtpCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', #instVars : [ 'tokenLabel', 'tokenInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -26,13 +28,13 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 210) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -43,7 +45,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ ^ IcePlaintextOtpCredentials new @@ -53,7 +55,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> token [ ^ tokenInput text diff --git a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st index a9c3aba0a3..b99c95dd5d 100644 --- a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipAskGithubForPlaintextCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskGithubForPlaintextCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #private } +{ #category : 'private' } IceTipAskGithubForPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Token:' diff --git a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st index 19347ecf1f..792093d429 100644 --- a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st @@ -2,24 +2,26 @@ I am a dialog to ask for SSH credentials. " Class { - #name : #IceTipAskSSHCredentialsPresenter, - #superclass : #IceTipEditSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskSSHCredentialsPresenter', + #superclass : 'IceTipEditSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskSSHCredentialsPresenter >> newCredentials [ self refreshCredentialsFromPresenter. diff --git a/Iceberg-TipUI/IceTipBranchModel.class.st b/Iceberg-TipUI/IceTipBranchModel.class.st index b12d7e9824..bb754a13e1 100644 --- a/Iceberg-TipUI/IceTipBranchModel.class.st +++ b/Iceberg-TipUI/IceTipBranchModel.class.st @@ -2,17 +2,19 @@ I expose data of a branch. " Class { - #name : #IceTipBranchModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipBranchModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> checkoutStrategies [ ^ IceCheckoutStrategy allStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -24,12 +26,12 @@ IceTipBranchModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commits [ self shouldBeImplemented. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> description [ ^ self entity isRemote @@ -37,49 +39,49 @@ IceTipBranchModel >> description [ ifFalse: [ self name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> descriptionDecorator [ self entity isHead ifTrue: [ ^ IceTipDescriptionDecorator head ]. ^ super descriptionDecorator ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffFromHead [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffToWorkingCopy [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffToWorkingCopy ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> hasUpstream [ ^ entity hasUpstream ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isHead [ ^ self entity isHead ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isLocal [ ^ self entity isLocal ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ @@ -91,7 +93,7 @@ IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDeleteAction [ @@ -103,7 +105,7 @@ IceTipBranchModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDirectMergeAction [ @@ -115,7 +117,7 @@ IceTipBranchModel >> newDirectMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newSwitchAndMergeAction [ @@ -127,7 +129,7 @@ IceTipBranchModel >> newSwitchAndMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before @@ -137,7 +139,7 @@ IceTipBranchModel >> previewCheckout [ (IceTipCheckoutPreviewBrowser onBranch: self) open ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewMerge: aMergeType [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" @@ -147,7 +149,7 @@ IceTipBranchModel >> previewMerge: aMergeType [ open ] -{ #category : #printing } +{ #category : 'printing' } IceTipBranchModel >> printOn: aStream [ super printOn: aStream. aStream @@ -156,12 +158,12 @@ IceTipBranchModel >> printOn: aStream [ nextPut: $] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipBranchModel >> resetToCommit: anIceTipCachedModel [ entity resetToCommit: anIceTipCachedModel entity diff --git a/Iceberg-TipUI/IceTipBranchPanel.class.st b/Iceberg-TipUI/IceTipBranchPanel.class.st index bd527e9559..223476e280 100644 --- a/Iceberg-TipUI/IceTipBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipBranchPanel.class.st @@ -3,22 +3,24 @@ I'm a generic panel to checkout panels. My children will define different strategies to checkout (select an existing branch -local or remote-, or enter a new branch name) " Class { - #name : #IceTipBranchPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipBranchPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipBranchPanel class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> accept [ self validate. @@ -26,49 +28,49 @@ IceTipBranchPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> doAccept [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchPanel >> isNewBranch [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model: anObject [ model := anObject ] -{ #category : #events } +{ #category : 'events' } IceTipBranchPanel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBranchPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> validate [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipBrowseCommand.class.st b/Iceberg-TipUI/IceTipBrowseCommand.class.st index 4f1a7e77d5..0e0dcaef76 100644 --- a/Iceberg-TipUI/IceTipBrowseCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseCommand.class.st @@ -2,43 +2,45 @@ I'm a command to ""browse"" a change definition (method, class or package). " Class { - #name : #IceTipBrowseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultDescription [ ^ 'Browse the selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultName [ ^ 'Browse...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowseCommand >> canBeExecuted [ "In the case of a method removal it is not possible to browse the selected element." ^ self hasSelectedItem and: [ self item value definition canBeBrowsed ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseCommand >> execute [ self item value definition browse ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowseCommand >> iconName [ ^ #smallSystemBrowser ] -{ #category : #activation } +{ #category : 'activation' } IceTipBrowseCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st index 25f9b31ca2..421c10e49f 100644 --- a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st @@ -2,36 +2,38 @@ Command that browses the selected package as it is loaded in the image. " Class { - #name : #IceTipBrowsePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowsePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultDescription [ ^ 'Browse the selected package as it is loaded in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultName [ ^ 'Browse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowsePackageCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isPackageLoaded ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowsePackageCommand >> execute [ self packageModel browsePackage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowsePackageCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st index 47509f917b..94a27379a2 100644 --- a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st @@ -4,24 +4,26 @@ Command that opens a browser on the code of the repository. The current implementation relies on a monticello MCSnapshotBrowser " Class { - #name : #IceTipBrowseRepositoryPackageVersionCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseRepositoryPackageVersionCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultDescription [ ^ 'Browse the version in the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultName [ ^ 'Browse this version in Monticello' ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseRepositoryPackageVersionCommand >> execute [ self packageModel browseRepositoryVersion diff --git a/Iceberg-TipUI/IceTipBrowser.class.st b/Iceberg-TipUI/IceTipBrowser.class.st index dc8780dad2..1ed279f6d2 100644 --- a/Iceberg-TipUI/IceTipBrowser.class.st +++ b/Iceberg-TipUI/IceTipBrowser.class.st @@ -9,16 +9,18 @@ Some design remarks: * Browsers have a context menu on list or table items, that provide commands that are specific for the selection. " Class { - #name : #IceTipBrowser, - #superclass : #IceTipPresenter, + #name : 'IceTipBrowser', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'toolbar' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ | generalCommandGroup selectionCommandGroup selectionExtraCommandGroup | @@ -42,81 +44,81 @@ IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec. aCommandGroup register: IceFiletreeToTonelCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> generalCommandGroupName [ ^ 'General' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionCommandGroupName [ ^ 'Selection' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionExtraCommandGroupName [ ^ 'Extra' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> connectPresenters [ self mainList whenSelectionChangedDo: [ self refreshCommands ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> defaultKeyboardFocus [ ^ self mainList ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowser >> hasSelectedItem [ ^ self mainList selection isEmpty not ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> iconForWindow [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -125,31 +127,31 @@ IceTipBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> refresh [ "Update the UI elements given a possible update in the model." ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshCommands [ | rootGroup | @@ -163,7 +165,7 @@ IceTipBrowser >> refreshCommands [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ "Update context menu (for mainList)." @@ -173,7 +175,7 @@ IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ self mainList contextMenuFromCommandsGroup: subgroup ]. ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshShortcutsWith: rootGroup [ "Update shortcuts with available commands" @@ -184,7 +186,7 @@ IceTipBrowser >> refreshShortcutsWith: rootGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshToolbarWith: rootGroup [ "Update toolbar (in window)." @@ -208,31 +210,31 @@ IceTipBrowser >> refreshToolbarWith: rootGroup [ self window toolbar: toolbar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> repositoryModel [ "Answer the IceTipRepositoryModel associated to this presenter." ^ self model repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> selectedItem [ "Answer the object selected in the main list of this browser. The answer is nil when there isn't a selection." ^ self mainList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> subscribeToAnnouncements [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> toolbar [ ^ toolbar diff --git a/Iceberg-TipUI/IceTipCache.class.st b/Iceberg-TipUI/IceTipCache.class.st index 363621bbfd..cc06b437d3 100644 --- a/Iceberg-TipUI/IceTipCache.class.st +++ b/Iceberg-TipUI/IceTipCache.class.st @@ -5,70 +5,72 @@ I'm used to cache values to be used on the UI. I can be reseted (sending #reset), but responsibility of reset caches belongs to presenters who use them. " Class { - #name : #IceTipCache, - #superclass : #Object, + #name : 'IceTipCache', + #superclass : 'Object', #instVars : [ 'proxy', 'objects' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCache class >> proxy: aProxy [ ^ self new proxy: aProxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsent: anObject [ ^ objects at: aKey ifAbsent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsentPut: anObject [ ^ objects at: aKey ifAbsentPut: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifPresent: anObject [ ^ objects at: aKey ifPresent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey put: anObject [ ^ objects at: aKey put: anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> initialize [ super initialize. self reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> objects [ ^ objects ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy [ ^ proxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy: anObject [ proxy := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> reset [ objects := SmallDictionary new ] diff --git a/Iceberg-TipUI/IceTipCachedModel.class.st b/Iceberg-TipUI/IceTipCachedModel.class.st index f69b645173..b522f0299b 100644 --- a/Iceberg-TipUI/IceTipCachedModel.class.st +++ b/Iceberg-TipUI/IceTipCachedModel.class.st @@ -4,28 +4,30 @@ I take all unary messages sent to my realObject and I cache their values. I keep a cache with rules for reset it, which can be accessedon the #resetOn: family of messages. " Class { - #name : #IceTipCachedModel, - #superclass : #Object, + #name : 'IceTipCachedModel', + #superclass : 'Object', #instVars : [ 'realObject', 'cache' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCachedModel class >> for: anObject [ ^ self basicNew initializeObject: anObject ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> = aObject [ self species ~= aObject species ifTrue: [ ^ false ]. ^ self realObject = aObject realObject ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> doesNotUnderstand: aMessage [ aMessage selector isUnary ifTrue: [ @@ -42,27 +44,27 @@ IceTipCachedModel >> doesNotUnderstand: aMessage [ ^ self forwardMessage: aMessage ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> forwardMessage: aMessage [ ^ realObject perform: aMessage selector withArguments: aMessage arguments ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> hash [ ^ self realObject hash ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCachedModel >> initializeObject: anObject [ realObject := anObject. cache := IceTipCache proxy: self. self initialize ] -{ #category : #printing } +{ #category : 'printing' } IceTipCachedModel >> printOn: aStream [ super printOn: aStream. aStream nextPut: $(. @@ -70,12 +72,12 @@ IceTipCachedModel >> printOn: aStream [ aStream nextPut: $) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> realObject [ ^ realObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> reset [ cache reset ] diff --git a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st index b7408e9fe8..d188d62fe5 100644 --- a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st @@ -2,25 +2,27 @@ I'm a command that makes a working copy to recalculate the dirty packages (via #forceCalculateDirtyPackages). " Class { - #name : #IceTipCalculateDirtyPackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCalculateDirtyPackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCalculateDirtyPackagesCommand class >> defaultName [ ^ 'Recalculate dirty packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCalculateDirtyPackagesCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipCalculateDirtyPackagesCommand >> execute [ IceTipStandardAction new @@ -31,7 +33,7 @@ IceTipCalculateDirtyPackagesCommand >> execute [ executeWithContext: context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCalculateDirtyPackagesCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st index f846b99bd8..790e79a87f 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st @@ -2,36 +2,38 @@ Command that opens a dialog to checkout a (new or already existing) branch. " Class { - #name : #IceTipCheckoutBranchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutBranchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultDescription [ ^ 'Checkout a new or existing branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultToolbarItemName [ ^ 'Branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutBranchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutBranchCommand >> execute [ (IceTipCheckoutBranchDialog @@ -42,7 +44,7 @@ IceTipCheckoutBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st index 8371ddd3c5..4c0ac85745 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st @@ -4,28 +4,30 @@ I'm a dialog to perform a checkout of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipCheckoutBranchDialog, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipCheckoutBranchDialog', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutBranchDialog class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> allTypes [ ^ types ifNil: [ types := self createCheckoutBranchTypes ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ | allTypes | @@ -49,50 +51,50 @@ IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchDialog >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> model [ ^ model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> titleForWindow [ ^ 'Checkout branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withOnlyNewBranch [ types := self allTypes select: #isNewBranch. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withTypes: aCollection [ types := aCollection. typeList items: types. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withoutNewBranch [ types := self allTypes reject: #isNewBranch. typeList items: types. diff --git a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st index a03e98d39b..69d4df247d 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st @@ -2,12 +2,14 @@ I'm a panel to peform the checkout of an existing branch. " Class { - #name : #IceTipCheckoutBranchPanel, - #superclass : #IceTipExistingBranchPanel, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipCheckoutBranchPanel', + #superclass : 'IceTipExistingBranchPanel', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchPanel >> doAccept [ self selectedBranch previewCheckout diff --git a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st index 69cc6b43da..410e447df7 100644 --- a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st @@ -3,37 +3,39 @@ I checkout a specific commit from history. I will let your repository in detach mode! " Class { - #name : #IceTipCheckoutCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultDescription [ ^ 'Set the selected commit as current commit and load the code in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultName [ ^ 'Checkout' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutCommitCommand >> execute [ (IceTipCheckoutPreviewBrowser onBranch: self selectedCommit) open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> iconName [ ^ #refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> selectedCommit [ ^ self context selectedCommit diff --git a/Iceberg-TipUI/IceTipCheckoutModel.class.st b/Iceberg-TipUI/IceTipCheckoutModel.class.st index 50cdb34b4a..c1290c529e 100644 --- a/Iceberg-TipUI/IceTipCheckoutModel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipCheckoutModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipCheckoutModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'checkoutStrategy', 'checkoutStrategies' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> calculateDiff [ ^ commitish entity diffTo: self repository workingCopy ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> checkout [ checkoutStrategy @@ -24,30 +26,30 @@ IceTipCheckoutModel >> checkout [ self commitish checkout: checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategies [ ^ checkoutStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy [ ^ checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy: aStrategy [ checkoutStrategy := aStrategy ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutModel >> hasNewPackages [ ^ diffModel tree anySatisfy:[ :aNode | aNode isAddition and: [ aNode definition isPackageDefinition]] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutModel >> initialize [ super initialize. @@ -55,7 +57,7 @@ IceTipCheckoutModel >> initialize [ checkoutStrategy := checkoutStrategies first. ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> newCheckoutAction [ @@ -67,7 +69,7 @@ IceTipCheckoutModel >> newCheckoutAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> newPackages [ | packageNodes | diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st index e7fa896dcc..c1ba72ea9d 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st @@ -3,24 +3,26 @@ Action to start the creation of a new branch from the selected commit. Then checkout the selected branch. " Class { - #name : #IceTipCheckoutNewBranchCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutNewBranchCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultDescription [ ^ 'Create a new branch from the selected commit and switch to it' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultName [ ^ 'Branch...' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutNewBranchCommand >> execute [ ((IceTipCheckoutNewBranchPanel @@ -33,13 +35,13 @@ IceTipCheckoutNewBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> iconName [ ^ #branch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> selectedCommit [ ^ self item entity diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st index fc93346154..c902606842 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st @@ -2,8 +2,8 @@ I'm a panel to create a new local branch " Class { - #name : #IceTipCheckoutNewBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipCheckoutNewBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'currentBranchLabel', 'branchLabel', @@ -11,40 +11,42 @@ Class { 'branchCommitish', 'callback' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchInputText [ ^ branchInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchLabel [ ^ branchLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> branchName [ ^ self branchInputText text asString trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> commitish: anIceTipModel [ branchCommitish := anIceTipModel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> currentBranchLabel [ ^ currentBranchLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutNewBranchPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -60,7 +62,7 @@ IceTipCheckoutNewBranchPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutNewBranchPanel >> doAccept [ (self model @@ -72,26 +74,26 @@ IceTipCheckoutNewBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializeCurrentBranchLabel [ currentBranchLabel := self newLabel label: 'Current branch: ', self model branchName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -103,13 +105,13 @@ IceTipCheckoutNewBranchPanel >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutNewBranchPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> openDialog [ ^ self asDialogWindow @@ -117,13 +119,13 @@ IceTipCheckoutNewBranchPanel >> openDialog [ open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> titleForWindow [ ^ 'New branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> validate [ self @@ -134,7 +136,7 @@ IceTipCheckoutNewBranchPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCheckoutNewBranchPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st index 6757094f5f..7ce1870ee7 100644 --- a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st @@ -4,23 +4,25 @@ I preview the changes that will be introduced in the image when a checkout occur (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipCheckoutPreviewBrowser, - #superclass : #IceTipPreviewBrowser, + #name : 'IceTipCheckoutPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', #instVars : [ 'checkoutStrategyLabel', 'checkoutStrategyList', 'selectedCheckoutStrategy' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipCheckoutPreviewBrowser class >> maxBranchNameLength [ ^ 32 ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipCheckoutModel new @@ -28,19 +30,19 @@ IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ yourself) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyLabel [ ^ checkoutStrategyLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyList [ ^ checkoutStrategyList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -57,7 +59,7 @@ IceTipCheckoutPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutPreviewBrowser >> doCheckout [ (self model hasNewPackages and: [ self model checkoutStrategy isLoadAlreadyLoadedStrategy ]) @@ -69,7 +71,7 @@ IceTipCheckoutPreviewBrowser >> doCheckout [ executeWithContext: self ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ | checkoutStrategies | @@ -81,7 +83,7 @@ IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ self model checkoutStrategy: aStrategy ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -96,7 +98,7 @@ IceTipCheckoutPreviewBrowser >> initializePresenters [ self initializeCheckoutStrategyList ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutPreviewBrowser >> newActionButton [ ^ self newButton @@ -107,7 +109,7 @@ IceTipCheckoutPreviewBrowser >> newActionButton [ yourself ] -{ #category : #operations } +{ #category : 'operations' } IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ ((IceTipAddNewPackagesDialogPresenter @@ -120,13 +122,13 @@ IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutPreviewBrowser >> selectedCheckoutStrategy [ ^ selectedCheckoutStrategy ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> titleForWindow [ ^ 'Preview checkout of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st index 2dbcfef159..5e9ecbb7d4 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st @@ -2,36 +2,38 @@ Command that checks out the selected branch " Class { - #name : #IceTipCheckoutSelectedBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultDescription [ ^ 'Checkout this branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedBranchCommand >> actsOnBranch: aBranchModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedBranchCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedBranchCommand >> iconName [ ^ #branch ] diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st index c1d25d3348..4d2092de3c 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st @@ -2,35 +2,37 @@ Command that checks out the selected tag " Class { - #name : #IceTipCheckoutSelectedTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultDescription [ ^ 'Checkout this tag for this repository. Repository will then be in Detached Head state!' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultName [ ^ 'Checkout tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedTagCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedTagCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCherryPickCommand.class.st b/Iceberg-TipUI/IceTipCherryPickCommand.class.st index 373462f0e1..d93f271031 100644 --- a/Iceberg-TipUI/IceTipCherryPickCommand.class.st +++ b/Iceberg-TipUI/IceTipCherryPickCommand.class.st @@ -2,38 +2,40 @@ Generic command to cherry pick changes " Class { - #name : #IceTipCherryPickCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCherryPickCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultDescription [ ^ 'Cherrypick this commit and apply changes to the working copy' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultName [ ^ 'Cherrypick' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCherryPickCommand >> canBeExecuted [ self flag: #pharoTodo. "TODO: Still not ready" ^ false ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> execute [ (IceTipCherrypickPreviewBrowser onCommitish: self selectedCommitish) open ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> selectedCommitish [ ^ self context selectedCommit realObject entity diff --git a/Iceberg-TipUI/IceTipCherrypickModel.class.st b/Iceberg-TipUI/IceTipCherrypickModel.class.st index b3ec970b3a..125c2afe8c 100644 --- a/Iceberg-TipUI/IceTipCherrypickModel.class.st +++ b/Iceberg-TipUI/IceTipCherrypickModel.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipCherrypickModel, - #superclass : #IceTipModel, + #name : 'IceTipCherrypickModel', + #superclass : 'IceTipModel', #instVars : [ 'mergeTree', 'commitish' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickModel class >> onCommitish: aCommitish [ ^ self new @@ -16,33 +18,33 @@ IceTipCherrypickModel class >> onCommitish: aCommitish [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish [ ^commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish: aCommistish [ commitish := aCommistish. mergeTree := commitish repository cherryPickFrom: aCommistish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> diff [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> mergeTree [ ^mergeTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> repository [ ^commitish repository. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> treeToShow [ " Return the tree to display in windows " ^ self mergeTree diff --git a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st index 71727fdcec..42dd79ac32 100644 --- a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st @@ -1,39 +1,41 @@ Class { - #name : #IceTipCherrypickPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCherrypickPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'buttonBar' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickPreviewBrowser class >> onCommitish: aCommitish [ ^ self on: (IceTipCherrypickModel onCommitish: aCommitish) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> buttonBar [ ^ buttonBar ] -{ #category : #layout } +{ #category : 'layout' } IceTipCherrypickPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,13 +44,13 @@ IceTipCherrypickPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipCherrypickPreviewBrowser >> doCherryPick [ | root | @@ -58,13 +60,13 @@ IceTipCherrypickPreviewBrowser >> doCherryPick [ self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel := self @@ -76,20 +78,20 @@ IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel rightLabel: ' With Cherrypicked commit ' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickPreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCherrypickPreviewBrowser >> newActionButton [ ^ self newButton @@ -100,7 +102,7 @@ IceTipCherrypickPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> titleForWindow [ ^ 'Preview result of Cherrypick' diff --git a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st index bf24223abd..d97c3a3ad8 100644 --- a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st +++ b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st @@ -3,18 +3,20 @@ I'm a CmVisitor that in one hand, tells each command to be hidden if it can't be " Class { - #name : #IceTipCleanCommandGroupVisitor, - #superclass : #CmVisitor, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCleanCommandGroupVisitor', + #superclass : 'CmVisitor', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommand: aCmCommand [ aCmCommand beHiddenWhenCantBeRun ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommandGroup: aCmCommandsGroup [ super visitCommandGroup: aCmCommandsGroup. diff --git a/Iceberg-TipUI/IceTipCommand.class.st b/Iceberg-TipUI/IceTipCommand.class.st index 5df99320f2..bd90248921 100644 --- a/Iceberg-TipUI/IceTipCommand.class.st +++ b/Iceberg-TipUI/IceTipCommand.class.st @@ -2,31 +2,33 @@ I'm the superclass of all commands of the IceTip UI. " Class { - #name : #IceTipCommand, - #superclass : #CmCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommand', + #superclass : 'CmCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommand class >> defaultToolbarItemName [ ^ self defaultName ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand class >> isAbstract [ ^ self == IceTipCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> application [ ^ SpApplication defaultApplication ] -{ #category : #converting } +{ #category : 'converting' } IceTipCommand >> asSpecCommand [ | spCommand | @@ -45,31 +47,31 @@ IceTipCommand >> asSpecCommand [ ^ spCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> badge [ "Answer a number as extra information in the button. An answer of nil means no information." ^ nil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasRepository [ ^ self repositoryModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasSelectedItem [ ^ self context selectedItem notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasUnbornProject [ ^ self repositoryModel hasUnbornProject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> iconName [ "Answer the icon name (a Symbol) for this command." @@ -77,13 +79,13 @@ IceTipCommand >> iconName [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryDetached [ ^ self repositoryModel isNil or: [ self repositoryModel isDetached ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryMissing [ ^ self hasRepository and: [ @@ -91,32 +93,32 @@ IceTipCommand >> isRepositoryMissing [ self repositoryModel isCodeMissing ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryOperational [ ^ self isRepositoryMissing not and: [ self isRepositoryDetached not and: [ self hasUnbornProject not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommand >> item [ ^ self context selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repositoryModel [ ^ self context repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> shortcutKey [ "Answer the key combination to execute this command. Answer nil if there isn't a key combination." @@ -124,31 +126,31 @@ IceTipCommand >> shortcutKey [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> tool [ ^ self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolAnnouncer [ ^ self tool announcer ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolbarItemName [ ^ self class defaultToolbarItemName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> withErrorHandlingDo: aBlock [ aBlock diff --git a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st index 43fac26d0a..e1963c220c 100644 --- a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st +++ b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st @@ -4,18 +4,20 @@ I'm an abstract strategy to build Spec2 buttons wrapping a IceTipSpCommand. My c " Class { - #name : #IceTipCommandToPresenterBuildingStrategy, - #superclass : #Object, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipCommandToPresenterBuildingStrategy', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipCommandToPresenterBuildingStrategy >> buttonPresenterClass [ ^ self subclassResponsibility ] -{ #category : #public } +{ #category : 'public' } IceTipCommandToPresenterBuildingStrategy >> resultOn: aCommand [ ^ self buttonPresenterClass new diff --git a/Iceberg-TipUI/IceTipCommentPanel.class.st b/Iceberg-TipUI/IceTipCommentPanel.class.st index 77166b9f7b..49adb26e1c 100644 --- a/Iceberg-TipUI/IceTipCommentPanel.class.st +++ b/Iceberg-TipUI/IceTipCommentPanel.class.st @@ -3,8 +3,8 @@ I'm a comment panel. I can obtain a comment text and certain ""commit specific"" options. " Class { - #name : #IceTipCommentPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCommentPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'repositoryModel', 'commentText', @@ -15,34 +15,36 @@ Class { 'fixesLabel', 'optionsButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> clear [ commentText text: '' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commentText [ ^ commentText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commitButton [ ^ commitButton ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommentPanel >> defaultLayout [ self flag: #pharoTodo. "FIXES ISSUE NUMBER INPUT is disabled. See below. @@ -63,19 +65,19 @@ IceTipCommentPanel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesField [ ^ fixesField ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesLabel [ ^ fixesLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> initializePresenters [ | fixesHelpString | @@ -132,25 +134,25 @@ IceTipCommentPanel >> initializePresenters [ yourself) ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isPushing [ ^ IceTipCommitSettings pushOnCommit and: [ self repositoryModel branchModel hasUpstream ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isRunningCriticsOnCommit [ ^ IceTipCommitSettings critiquesOnCommit ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isSaving [ ^ IceTipCommitSettings saveImageOnCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> message [ self fixesField text isAllDigits ifFalse: [ @@ -163,7 +165,7 @@ IceTipCommentPanel >> message [ nextPutAll: self fixesField number asString ] ] -{ #category : #events } +{ #category : 'events' } IceTipCommentPanel >> onCommit: aBlock [ commitButton action: [ @@ -172,62 +174,62 @@ IceTipCommentPanel >> onCommit: aBlock [ cull: self isPushing ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> pushCheckbox [ ^ pushCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> pushOnCommit: aBoolean [ IceTipCommitSettings pushOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> refresh [ commitButton help: ('Commit your changes to {1}' format: { self repositoryName }). pushCheckbox label: ('Push changes to {1}' format: { self repositoryRemoteName }) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> repositoryModel [ ^ repositoryModel ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryRemoteName [ ^ self repositoryModel pushRemoteName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> runCriticsOnCommit: aBoolean [ IceTipCommitSettings critiquesOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> saveOnCommit: aBoolean [ IceTipCommitSettings saveImageOnCommit: aBoolean ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> setModelBeforeInitialization: aRepositoryModel [ repositoryModel := aRepositoryModel ] -{ #category : #specs } +{ #category : 'specs' } IceTipCommentPanel >> titleForWindow [ ^ 'Comment' diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index 094b708f93..de9362e209 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -2,17 +2,19 @@ I perform a commit " Class { - #name : #IceTipCommitAction, - #superclass : #IceTipAction, + #name : 'IceTipCommitAction', + #superclass : 'IceTipAction', #instVars : [ 'diff', 'items', 'message' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipCommitAction >> basicExecute [ self validateCanCommit. UIManager default @@ -25,49 +27,49 @@ IceTipCommitAction >> basicExecute [ Iceberg announcer announce: (IceCommited for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff: anObject [ diff := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items [ ^ items ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items: anObject [ items := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message: anObject [ message := anObject ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateCanCommit [ self validateMessageNotEmpty ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateChangeListNotEmpty [ "If there are no selected changed, no point on commiting :)" items ifEmpty: [ IceNothingToCommit signal ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateMessageNotEmpty [ self message ifEmpty: [ IceNoCommitMessage signal ] ] diff --git a/Iceberg-TipUI/IceTipCommitBrowser.class.st b/Iceberg-TipUI/IceTipCommitBrowser.class.st index f03933e7a0..f763966e4f 100644 --- a/Iceberg-TipUI/IceTipCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCommitBrowser.class.st @@ -4,23 +4,25 @@ I'm a browser to commit changes to a repository. (self onRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipCommitBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCommitBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'commentPanel', 'saveAction' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipRefreshCommitCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -37,31 +39,31 @@ IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCom ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCommitBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> accept [ ^ self doCommit ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel [ ^ commentPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel: aSpPresenter [ commentPanel := aSpPresenter ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommitBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,25 +73,25 @@ IceTipCommitBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel: aSpPresenter [ diffPanel := aSpPresenter ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCollapseSelection [ diffPanel doCollapseSelection ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit [ | selectedItems message isPushing isSaving commitBlock| @@ -111,7 +113,7 @@ IceTipCommitBrowser >> doCommit [ openIfCritiques ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBoolean saving: savingBoolean [ self model newCommitAction @@ -127,26 +129,26 @@ IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBo executeWithContext: self ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doExpandSelection [ diffPanel doExpandSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialize [ super initialize. saveAction := IceTipSaveImageAction new ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeAcceptShortcut [ self @@ -159,7 +161,7 @@ IceTipCommitBrowser >> initializeAcceptShortcut [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffSelectingPanel on: self model workingCopyDiff. @@ -172,27 +174,27 @@ IceTipCommitBrowser >> initializePresenters [ self initializeAcceptShortcut ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> refresh [ diffPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) @@ -201,13 +203,13 @@ IceTipCommitBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> saveAction: anAction [ saveAction := anAction ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> subscribeToAnnouncements [ self announcer @@ -216,7 +218,7 @@ IceTipCommitBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> titleForWindow [ ^ 'Commit on {1} branch {2}' format: { @@ -224,7 +226,7 @@ IceTipCommitBrowser >> titleForWindow [ self model branchName } ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> verifyNeedsRefreshOrClose [ "Verifies if there are remaining changes to commit. In case there are none, close the window." diff --git a/Iceberg-TipUI/IceTipCommitCommand.class.st b/Iceberg-TipUI/IceTipCommitCommand.class.st index 8020364cbb..2f4e759cfa 100644 --- a/Iceberg-TipUI/IceTipCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCommitCommand.class.st @@ -2,30 +2,32 @@ I open a the commit window, with all latest changes. " Class { - #name : #IceTipCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultDescription [ ^ 'Commit changes to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultName [ ^ 'Commit' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommitCommand >> execute [ (IceTipCommitBrowser @@ -34,13 +36,13 @@ IceTipCommitCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> iconName [ ^ #smallOk ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> shortcutKey [ ^ $s meta diff --git a/Iceberg-TipUI/IceTipCommitDiffModel.class.st b/Iceberg-TipUI/IceTipCommitDiffModel.class.st index c9b056036f..4265e1cb76 100644 --- a/Iceberg-TipUI/IceTipCommitDiffModel.class.st +++ b/Iceberg-TipUI/IceTipCommitDiffModel.class.st @@ -3,12 +3,14 @@ I'm a ""static"" diff. I represent a diff between two concrete commits. " Class { - #name : #IceTipCommitDiffModel, - #superclass : #IceTipDiffModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitDiffModel', + #superclass : 'IceTipDiffModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitDiffModel >> diff [ ^ self entity ] diff --git a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st index 55ac9d5b45..43aa07baaf 100644 --- a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st +++ b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st @@ -4,8 +4,8 @@ I'm a panel to show the history of a commitish (usually a branch or a tag). I di I'm usually used as part of an IceTipHistoryBrowser. " Class { - #name : #IceTipCommitInfoPresenter, - #superclass : #SpPresenter, + #name : 'IceTipCommitInfoPresenter', + #superclass : 'SpPresenter', #instVars : [ 'model', 'selectedModel', @@ -16,10 +16,12 @@ Class { 'headPage', 'ancestorPage' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #layout } +{ #category : 'layout' } IceTipCommitInfoPresenter class >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -27,21 +29,21 @@ IceTipCommitInfoPresenter class >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForCommit [ headTabContainer := IceTipHistoryDiffFromHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForMerge [ headTabContainer := IceTipHistoryDiffToHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> commitInfo [ selectedModel ifNil: [ ^ self newEmpty ]. @@ -50,28 +52,28 @@ IceTipCommitInfoPresenter >> commitInfo [ application: self application ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromAncestor [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (ancestorTabContainer diffFor: selectedModel) ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromHead [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (headTabContainer diffFor: selectedModel) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initialize [ self beForCommit. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -87,14 +89,14 @@ IceTipCommitInfoPresenter >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializePresenters [ notebookPanel := self newNotebook. self initializeCommitPanel ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newDiffPage [ ^ SpNotebookPage @@ -103,7 +105,7 @@ IceTipCommitInfoPresenter >> newDiffPage [ provider: [ "It will be overriden" ] ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newEmpty [ ^ self newLabel @@ -111,7 +113,7 @@ IceTipCommitInfoPresenter >> newEmpty [ yourself ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newInfoPage [ ^ SpNotebookPage @@ -120,7 +122,7 @@ IceTipCommitInfoPresenter >> newInfoPage [ provider: [ self commitInfo ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> refresh [ selectedModel ifNil: [ ^ self ]. @@ -130,38 +132,38 @@ IceTipCommitInfoPresenter >> refresh [ notebookPanel resetAllPageContents ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestor [ ancestorTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestorLabel [ ancestorTabContainer updateLabelOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHead [ headTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHeadLabel [ headTabContainer updateLabelOn: selectedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> selectedModel: aModel [ selectedModel := aModel. self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> setModelBeforeInitialization: anObject [ model := anObject diff --git a/Iceberg-TipUI/IceTipCommitModel.class.st b/Iceberg-TipUI/IceTipCommitModel.class.st index 661a5e0c07..dc14b81d9e 100644 --- a/Iceberg-TipUI/IceTipCommitModel.class.st +++ b/Iceberg-TipUI/IceTipCommitModel.class.st @@ -2,42 +2,44 @@ I'm a model for IceCommit entries. " Class { - #name : #IceTipCommitModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitModel', + #superclass : 'IceTipCommitishModel', #traits : 'TIceCopyCommitId', #classTraits : 'TIceCopyCommitId classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipCommitModel >> adopt [ self entity adopt ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortId [ ^ self entity ancestors first shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortIdOrOrigin [ ^ self entity ancestors ifNotEmpty: [ self ancestorShortId ] ifEmpty: [ 'Origin' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestors [ ^ self entity ancestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> author [ ^ self entity author ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> calculateDiff: aBlock [ | diff | @@ -50,18 +52,18 @@ IceTipCommitModel >> calculateDiff: aBlock [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> comment [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -73,18 +75,18 @@ IceTipCommitModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> datetime [ ^ self entity datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> description [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromFirstAncestor [ | diff ancestorCommit | @@ -97,7 +99,7 @@ IceTipCommitModel >> diffFromFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromHead [ | head diff | @@ -108,7 +110,7 @@ IceTipCommitModel >> diffFromHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToFirstAncestor [ | diff ancestorCommit | @@ -121,7 +123,7 @@ IceTipCommitModel >> diffToFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToHead [ | head diff | @@ -132,7 +134,7 @@ IceTipCommitModel >> diffToHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToWorkingCopy [ | diff | diff := self calculateDiff: [ self entity diffToWorkingCopy ]. @@ -141,18 +143,18 @@ IceTipCommitModel >> diffToWorkingCopy [ on: diff ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> hasMultipleAncestors [ ^ self entity hasMultipleAncestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> id [ ^ self entity id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> info [ ^ {('Commit:' -> ('[' , self shortId , '] ' , self id)). ('Parents:' -> (self entity ancestors collect: #shortId) asCommaString). @@ -162,12 +164,12 @@ IceTipCommitModel >> info [ ('Comment:' -> self entity comment)} ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> isMerged [ ^ self entity isMerged ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ ^ (IceTipCommitRangeModel repositoryModel: self repositoryModel @@ -176,44 +178,44 @@ IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitModel >> mergeHistoryFromSecondAncestor [ ^ self mergeHistoryFromAncestor: self entity ancestors second ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> name [ ^ self entity description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> shortId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagDecorator [ ^ IceTipTagDecorator uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagNames [ ^ self entity tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagsDescription [ ^ ', ' join: self tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> timeStamp [ ^ self entity timeStamp ] diff --git a/Iceberg-TipUI/IceTipCommitRangeModel.class.st b/Iceberg-TipUI/IceTipCommitRangeModel.class.st index 7672e2d0dd..b0c9f2c5dd 100644 --- a/Iceberg-TipUI/IceTipCommitRangeModel.class.st +++ b/Iceberg-TipUI/IceTipCommitRangeModel.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipCommitRangeModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitRangeModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'toCommit' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> commitModels [ ^ (self fromCommit newCommitWalk uptoCommit: self toCommit) commits collect: [ :each | @@ -18,24 +20,24 @@ IceTipCommitRangeModel >> commitModels [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> fromCommit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> name [ ^ 'Commits from {1} to {2}' format: { self fromCommit shortId. self toCommit shortId } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit [ ^ toCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit: anObject [ toCommit := anObject ] diff --git a/Iceberg-TipUI/IceTipCommitishModel.class.st b/Iceberg-TipUI/IceTipCommitishModel.class.st index d861e067e4..608716641e 100644 --- a/Iceberg-TipUI/IceTipCommitishModel.class.st +++ b/Iceberg-TipUI/IceTipCommitishModel.class.st @@ -3,35 +3,37 @@ I'm a base model for all commitish models to be used. I can provide #commitModels which changes depending on concrete model. " Class { - #name : #IceTipCommitishModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitishModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitId [ ^ self entity commit id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitModels [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitishModel >> isCommitish [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> shortCommitId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> tagModels [ ^ self repositoryModel tagModels diff --git a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st index 34a2e6480d..3806ee454a 100644 --- a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st +++ b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st @@ -2,36 +2,38 @@ Command that copies the selected entity short commit ID to the clipboard " Class { - #name : #IceTipCopyCommitishCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCopyCommitishCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultDescription [ ^ 'Copy the selected short commit ID (7 characters long) to the clipboard' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultName [ ^ 'Copy commitish ID' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCopyCommitishCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item commitId isNotNil ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCopyCommitishCommand >> execute [ self item copyCommitIDToClipboard ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCopyCommitishCommand >> iconName [ ^ #book diff --git a/Iceberg-TipUI/IceTipCreateTagCommand.class.st b/Iceberg-TipUI/IceTipCreateTagCommand.class.st index 025f5e7a76..9d82bf01e3 100644 --- a/Iceberg-TipUI/IceTipCreateTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCreateTagCommand.class.st @@ -2,30 +2,32 @@ I an a commander command that will be activated on any commitish or repository and ask the selected item to create a tag on itself. " Class { - #name : #IceTipCreateTagCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCreateTagCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultDescription [ ^ 'Creates a tag for the selected commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultName [ ^ 'Create tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagCommand >> canBeExecuted [ ^ self repositoryModel isNotNil ] -{ #category : #executing } +{ #category : 'executing' } IceTipCreateTagCommand >> execute [ (IceTipCreateTagPanel @@ -36,7 +38,7 @@ IceTipCreateTagCommand >> execute [ open ] -{ #category : #activation } +{ #category : 'activation' } IceTipCreateTagCommand >> iconName [ ^ #glamorousBookmark diff --git a/Iceberg-TipUI/IceTipCreateTagPanel.class.st b/Iceberg-TipUI/IceTipCreateTagPanel.class.st index 665f1d5753..4784ee9aa5 100644 --- a/Iceberg-TipUI/IceTipCreateTagPanel.class.st +++ b/Iceberg-TipUI/IceTipCreateTagPanel.class.st @@ -5,8 +5,8 @@ I have a form with a label and an input, and the commitish to tag. I'm done to be embedded in a dialog, so I implement doAccept to execute my action. " Class { - #name : #IceTipCreateTagPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCreateTagPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'callback', 'tagNameInputText', @@ -19,10 +19,12 @@ Class { 'minorButton', 'patchButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> accept [ self validate. @@ -30,25 +32,25 @@ IceTipCreateTagPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitish: anIceTipCachedModel [ commitishToTag := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitishToTag [ ^ commitishToTag ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> currentCommitishLabel [ ^ currentCommitishLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCreateTagPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -72,7 +74,7 @@ IceTipCreateTagPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCreateTagPanel >> doAccept [ self validate. @@ -85,19 +87,19 @@ IceTipCreateTagPanel >> doAccept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> existingTagsList [ ^ existingTagsList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeCurrentBranchLabel [ currentCommitishLabel := self newLabel @@ -106,7 +108,7 @@ IceTipCreateTagPanel >> initializeCurrentBranchLabel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeExistingTagsList [ existingTagsList := self newList. @@ -117,7 +119,7 @@ IceTipCreateTagPanel >> initializeExistingTagsList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeNextTagPanel [ | parts prefix nextMajor nextMinor nextPatch toString | @@ -142,7 +144,7 @@ IceTipCreateTagPanel >> initializeNextTagPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -159,18 +161,18 @@ IceTipCreateTagPanel >> initializePresenters [ self initializeExistingTagsList ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagParts [ ^ self latestTagPartsIn: (commitishToTag tagModels collect: #name) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ | prefix parts | @@ -191,17 +193,17 @@ IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ ^ parts ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> majorButton [ ^ majorButton ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> minorButton [ ^ minorButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> openDialog [ ^ self asDialogWindow @@ -209,43 +211,43 @@ IceTipCreateTagPanel >> openDialog [ open ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> patchButton [ ^ patchButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> setModelBeforeInitialization: aCommitish [ self commitish: aCommitish ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagName [ ^ self tagNameInputText text asString trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameInputText [ ^ tagNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameLabel [ ^ tagNameLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> titleForWindow [ ^ 'New tag of ' , commitishToTag name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> validate [ self @@ -256,7 +258,7 @@ IceTipCreateTagPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCreateTagPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCredentialsSettings.class.st b/Iceberg-TipUI/IceTipCredentialsSettings.class.st index 7e39ca364c..ee86be1c80 100644 --- a/Iceberg-TipUI/IceTipCredentialsSettings.class.st +++ b/Iceberg-TipUI/IceTipCredentialsSettings.class.st @@ -1,26 +1,28 @@ Class { - #name : #IceTipCredentialsSettings, - #superclass : #Object, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipCredentialsSettings', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonAction [ IceTipCredentialsStoreBrowser new open. ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonLabel [ ^ 'Edit' ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonState [ ^ true ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> settingsOn: aBuilder [ diff --git a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st index 8bfeb9a0f4..7c0ffb3388 100644 --- a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st +++ b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st @@ -2,15 +2,17 @@ I am the browser used to show a credentials store. " Class { - #name : #IceTipCredentialsStoreBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCredentialsStoreBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'credentialsList' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddPlainTextCredentialCommand. @@ -20,7 +22,7 @@ IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter f aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipEditCredentialCommand. @@ -29,19 +31,19 @@ IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> credentialsList [ ^ credentialsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCredentialsStoreBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -49,14 +51,14 @@ IceTipCredentialsStoreBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initialize [ model ifNil: [ model := IceCredentialStore current ]. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializeCredentialsList [ credentialsList @@ -78,32 +80,32 @@ IceTipCredentialsStoreBrowser >> initializeCredentialsList [ evaluated: #description) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializePresenters [ credentialsList := self newTable. self initializeCredentialsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCredentialsStoreBrowser >> mainList [ ^ credentialsList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> refresh [ credentialsList items: self model allCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> store [ ^ self model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> titleForWindow [ ^ model isCurrent @@ -111,7 +113,7 @@ IceTipCredentialsStoreBrowser >> titleForWindow [ ifFalse: [ 'Credentials of ' , model printString ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st index f96e633058..7b82ab06f0 100644 --- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st @@ -2,8 +2,8 @@ I am a dialog to be used before commit so we can check if the code to commit has critiques on it " Class { - #name : #IceTipCritiquesBeforeCommitBrowser, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipCritiquesBeforeCommitBrowser', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'commitModel', 'onAcceptAction', @@ -15,41 +15,43 @@ Class { 'browseButton', 'autofixButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> accept [ self closeWindow. onAcceptAction value ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel [ ^ commitModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel: anObject [ commitModel := anObject ] -{ #category : #layout } +{ #category : 'layout' } IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -67,7 +69,7 @@ IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ yourself ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ self withWindowDo: [ :window | @@ -77,7 +79,7 @@ IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ window buttons third label: 'Close' ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doAutofix [ critiquesList selectedItem ifNotNil: [ :aCritique | @@ -98,13 +100,13 @@ IceTipCritiquesBeforeCommitBrowser >> doAutofix [ centered ]) actOnCritic: aCritique ofEntity: aCritique entity ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doBrowse [ critiquesList selectedItem ifNotNil: [ :aCritique | aCritique entity browse ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ critiquesList := self newTable. @@ -128,7 +130,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ whenSelectionChangedDo: (MessageSend receiver: self selector: #updateSelectedCritique) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ detailPanel := self newText @@ -139,7 +141,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -161,7 +163,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ browseButton := self newButton. @@ -179,7 +181,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ self initializeDetailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeReasonPanel [ reasonPanel := self newText @@ -193,18 +195,18 @@ Select each critique to see a detailed message of each critique.'. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> onAccept: aFullBlockClosure [ onAcceptAction := aFullBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ "If the setting is disabled we just commit" @@ -220,13 +222,13 @@ IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipCritiquesBeforeCommitBrowser >> setModelBeforeInitialization: someNodes [ model := someNodes ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ ^ 'Critiques for Commit on {1} branch {2}' format: { @@ -234,7 +236,7 @@ IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ commitModel branchName } ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ super updatePresenter. @@ -250,7 +252,7 @@ IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> updateSelectedCritique [ critiquesList selectedItem diff --git a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st index e6e7553bd8..d811fc6fa2 100644 --- a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st @@ -2,36 +2,38 @@ Command that deletes the selected branch " Class { - #name : #IceTipDeleteBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultDescription [ ^ 'Delete this branch for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultName [ ^ 'Delete branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteBranchCommand >> actsOnBranch: aBranchModel [ ^ aBranchModel isLocal ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteBranchCommand >> execute [ self item newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteBranchCommand >> iconName [ ^ #delete diff --git a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st index 2ceedd53fe..72ade8f5c3 100644 --- a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected remote " Class { - #name : #IceTipDeleteRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultDescription [ ^ 'Delete this remote for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultName [ ^ 'Delete remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> execute [ self remoteModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteRemoteCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st index dbbcff7b76..33a461bf49 100644 --- a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected tag " Class { - #name : #IceTipDeleteTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultDescription [ ^ 'Delete this tag for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultName [ ^ 'Delete tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> execute [ self tagModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteTagCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> tagModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st index cb9e666a4f..7fb84e4e1e 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceTipDescriptionDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> head [ ^ IceTipDescriptionDecoratorHead uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> modified [ ^ IceTipDescriptionDecoratorModified uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> notLoaded [ ^ IceTipDescriptionDecoratorNotLoaded uniqueInstance diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st index 719dc586a1..2197e5dc20 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorHead, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorHead', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceTipDescriptionDecoratorHead >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st index 47b9c2c22d..cb74929623 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorModified, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorModified', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorModified >> color [ ^ Smalltalk ui theme successTextColor diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st index 8092e02645..47ff354917 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorNotLoaded, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorNotLoaded', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorNotLoaded >> color [ ^ Smalltalk ui theme disabledTextColor diff --git a/Iceberg-TipUI/IceTipDialogPresenter.class.st b/Iceberg-TipUI/IceTipDialogPresenter.class.st index 28f57f6119..701c18a670 100644 --- a/Iceberg-TipUI/IceTipDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipDialogPresenter.class.st @@ -3,24 +3,26 @@ I'm a general dialog. I implement a default accept method that needs to be overriden my children and some utility methods to easier build a dialog. " Class { - #name : #IceTipDialogPresenter, - #superclass : #IceTipPresenter, - #category : #'Iceberg-TipUI-View' + #name : 'IceTipDialogPresenter', + #superclass : 'IceTipPresenter', + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> accept [ "override this if you want a dialog" ] -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> cancel [ "override this if you want a dialog" self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. diff --git a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st index 8538e7c551..533808c3ad 100644 --- a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st +++ b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st @@ -4,25 +4,27 @@ I announce when an entry (a method, a class or a package) has been reverted. I'm used to refresh diff panels without recalculate everything again. " Class { - #name : #IceTipDiffEntryRemoved, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffEntryRemoved', + #superclass : 'IceTipAnnouncement', #instVars : [ 'entry' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffEntryRemoved class >> entry: anObject [ ^ self new entry: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry [ ^ entry ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry: anObject [ entry := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffModel.class.st b/Iceberg-TipUI/IceTipDiffModel.class.st index 6d62e59e96..e58cbf43a8 100644 --- a/Iceberg-TipUI/IceTipDiffModel.class.st +++ b/Iceberg-TipUI/IceTipDiffModel.class.st @@ -2,34 +2,36 @@ I'm a base model to present diffs. " Class { - #name : #IceTipDiffModel, - #superclass : #IceTipEntityModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipDiffModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> new [ ^ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> on: aDiff [ ^ self basicNew initializeEntity: aDiff; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> copyWithOnly: aCollection [ ^ self diff copyWithOnly: aCollection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> diff [ ^ self subclassResponsibility ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffModel >> reset [ UIManager default informUser: 'Refreshing changes' @@ -39,17 +41,17 @@ IceTipDiffModel >> reset [ self diff ] ] -{ #category : #private } +{ #category : 'private' } IceTipDiffModel >> resetDiff [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> tree [ ^ self diff treeToShow ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> treeRoots [ ^ self tree children ] diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st index 1a9898f73b..6a999df1f2 100644 --- a/Iceberg-TipUI/IceTipDiffPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffPanel.class.st @@ -7,23 +7,25 @@ also #elements answer should be a collection of elements that also understand el (IceTipDiffPanel onDiff: (IceRepository registry first workingCopyDiff)) openWithSpec " Class { - #name : #IceTipDiffPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipDiffPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'diffPanel', 'iceNodesTree' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffPanel class >> onDiff: aDiff [ ^ self on: (IceTipCommitDiffModel on: aDiff) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> basicRefresh [ self resetDiffContents. @@ -32,7 +34,7 @@ IceTipDiffPanel >> basicRefresh [ expandAll ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeDescriptionColumn [ ^ SpStringTableColumn new @@ -40,7 +42,7 @@ IceTipDiffPanel >> changeDescriptionColumn [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -52,7 +54,7 @@ IceTipDiffPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> collapsePath: aPath [ iceNodesTree @@ -60,7 +62,7 @@ IceTipDiffPanel >> collapsePath: aPath [ selectPath: aPath ] -{ #category : #layout } +{ #category : 'layout' } IceTipDiffPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -70,7 +72,7 @@ IceTipDiffPanel >> defaultLayout [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ diffPanel @@ -82,25 +84,25 @@ IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ rightText: rightString ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doCollapseSelection [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doExpandSelection [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> expandPath: aPath [ iceNodesTree @@ -108,38 +110,38 @@ IceTipDiffPanel >> expandPath: aPath [ selectPath: aPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowLeft [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowRight [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> iceNodesTree [ ^ iceNodesTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeDiffPanel [ diffPanel showOptions: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializePresenters [ iceNodesTree := self newTreeTable. @@ -149,7 +151,7 @@ IceTipDiffPanel >> initializePresenters [ self initializeDiffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeTree [ iceNodesTree @@ -163,19 +165,19 @@ IceTipDiffPanel >> initializeTree [ toAction: [ self handleArrowRight ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> leftLabel: aString [ diffPanel leftLabel: aString. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> refresh [ self model reset. @@ -183,25 +185,25 @@ IceTipDiffPanel >> refresh [ ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> resetDiffContents [ self diffContentsLeft: '' right: '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> rightLabel: aString [ diffPanel rightLabel: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> selectedItem [ ^ iceNodesTree selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> selectionChanged [ | itemValue | @@ -212,13 +214,13 @@ IceTipDiffPanel >> selectionChanged [ right: itemValue leftContents ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> subscribeToAnnouncements [ self announcer @@ -228,13 +230,13 @@ IceTipDiffPanel >> subscribeToAnnouncements [ ] -{ #category : #specs } +{ #category : 'specs' } IceTipDiffPanel >> titleForWindow [ ^ 'Diff' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> updatePresenter [ self basicRefresh diff --git a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st index c59d12d568..c783d8158d 100644 --- a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st +++ b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st @@ -1,31 +1,33 @@ Class { - #name : #IceTipDiffPreviewModel, - #superclass : #IceTipModel, + #name : 'IceTipDiffPreviewModel', + #superclass : 'IceTipModel', #instVars : [ 'commitish', 'diffModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> calculateDiff [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish [ ^ commitish entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish: aCommitish [ commitish := aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> diff [ ^ diffModel ifNil: [ | diff | @@ -37,19 +39,19 @@ IceTipDiffPreviewModel >> diff [ on: diff ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repository [ ^ commitish repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repositoryName [ ^ self repository name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> targetName [ ^ commitish name diff --git a/Iceberg-TipUI/IceTipDiffRefreshed.class.st b/Iceberg-TipUI/IceTipDiffRefreshed.class.st index 4be166e6fd..0f5ae0833b 100644 --- a/Iceberg-TipUI/IceTipDiffRefreshed.class.st +++ b/Iceberg-TipUI/IceTipDiffRefreshed.class.st @@ -2,25 +2,27 @@ I announce when a diff has been refreshed. " Class { - #name : #IceTipDiffRefreshed, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffRefreshed', + #superclass : 'IceTipAnnouncement', #instVars : [ 'repository' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffRefreshed class >> for: aRepository [ ^ self new repository: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st index 2d1fad7eff..ccdc9c09d8 100644 --- a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st @@ -10,15 +10,17 @@ also #elements answer should be a collection of elements that also understand el " Class { - #name : #IceTipDiffSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipDiffSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> activateItem: iceNode [ checkedIceNodes add: iceNode. @@ -31,7 +33,7 @@ IceTipDiffSelectingPanel >> activateItem: iceNode [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -49,7 +51,7 @@ IceTipDiffSelectingPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> deactivateItem: iceNode [ checkedIceNodes remove: iceNode. @@ -61,7 +63,7 @@ IceTipDiffSelectingPanel >> deactivateItem: iceNode [ self refreshCheckbox. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initialize [ super initialize. @@ -72,7 +74,7 @@ IceTipDiffSelectingPanel >> initialize [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initializeTree [ super initializeTree. @@ -81,7 +83,7 @@ IceTipDiffSelectingPanel >> initializeTree [ toAction: [ self toggleActivationItem: iceNodesTree selectedItem ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refresh [ super refresh. @@ -89,20 +91,20 @@ IceTipDiffSelectingPanel >> refresh [ root withAllChildrenDo: [ :each | checkedIceNodes add: each ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refreshCheckbox [ "Refresh after a checkbox state has changed. When a node with children changes this state, all children might change too. That's the reason of this special refresh. When a leave node changed such state, this refresh is redundant." iceNodesTree refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> toggleActivationItem: iceNode [ (checkedIceNodes includes: iceNode) diff --git a/Iceberg-TipUI/IceTipDirectMergeType.class.st b/Iceberg-TipUI/IceTipDirectMergeType.class.st index 496b7b0bef..435ef190da 100644 --- a/Iceberg-TipUI/IceTipDirectMergeType.class.st +++ b/Iceberg-TipUI/IceTipDirectMergeType.class.st @@ -7,12 +7,14 @@ I will perform a simple merge: This is the default merge mechanism (what users do most of the time) " Class { - #name : #IceTipDirectMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDirectMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipDirectMergeType >> newMergeAction: aModel [ ^ aModel newDirectMergeAction diff --git a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st index 1ce6ddf7df..dd3ef54559 100644 --- a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st +++ b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose directories. " Class { - #name : #IceTipDirectoryPresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipDirectoryPresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipDirectoryPresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st index 6c0db8b7a6..e3adc08fca 100644 --- a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDiscardAllChangesPreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDiscardAllChangesPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepository [ ^ self on: (IceTipDiscardAllModel new @@ -13,7 +15,7 @@ IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepositor yourself) ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ self model newDiscardAction @@ -21,13 +23,13 @@ IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ executeWithContext: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initialExtentForWindow [ ^ (900 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -37,7 +39,7 @@ IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ rightLabel: 'Commit to load: ', self loadCommitShortId ] -{ #category : #private } +{ #category : 'private' } IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ | shortId | @@ -47,7 +49,7 @@ IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ ifFalse: [ shortId ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ ^ self newButton @@ -58,7 +60,7 @@ IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> titleForWindow [ ^ 'Preview Changes to Discard' diff --git a/Iceberg-TipUI/IceTipDiscardAllModel.class.st b/Iceberg-TipUI/IceTipDiscardAllModel.class.st index ebba7aa80c..67acf77adc 100644 --- a/Iceberg-TipUI/IceTipDiscardAllModel.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllModel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipDiscardAllModel, - #superclass : #IceTipModel, + #name : 'IceTipDiscardAllModel', + #superclass : 'IceTipModel', #instVars : [ 'workingCopy', 'diffModel', 'repository' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> calculateDiff [ ^ workingCopy referenceCommit diffTo: workingCopy ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> diff [ ^ diffModel ifNil: [ @@ -28,13 +30,13 @@ IceTipDiscardAllModel >> diff [ on: diff ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> discardAll [ workingCopy discardChanges ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> newDiscardAction [ @@ -46,24 +48,24 @@ IceTipDiscardAllModel >> newDiscardAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository: anIceTipCachedModel [ repository := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy [ ^ workingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy: anObject [ workingCopy := anObject diff --git a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st index 187f996cb8..a6ba03553b 100644 --- a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st +++ b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st @@ -2,24 +2,26 @@ Command that discard all changes in the repository " Class { - #name : #IceTipDiscardChangesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDiscardChangesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultDescription [ ^ 'Discard all changes in this working copy.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultName [ ^ 'Discard all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> canBeExecuted [ ^ self isRepositoryMissing not and: [ @@ -28,7 +30,7 @@ IceTipDiscardChangesCommand >> canBeExecuted [ aCommit isCollection not and: [ aCommit isUnknownCommit not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipDiscardChangesCommand >> execute [ (IceTipDiscardAllChangesPreviewBrowser onRepository: self repositoryModel) @@ -37,13 +39,13 @@ IceTipDiscardChangesCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardChangesCommand >> iconName [ ^ #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st index faab93d8da..bce29f97be 100644 --- a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st @@ -4,24 +4,26 @@ I colaborate with the credential to know the specific class of the dialog model. Check #editModelClass in IceSshCredentials and IcePlaintextCredentials " Class { - #name : #IceTipEditCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultDescription [ ^ 'Edits the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultName [ ^ 'Edit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditCredentialCommand >> execute [ ((self item editModelClass newApplication: context application) @@ -33,13 +35,13 @@ IceTipEditCredentialCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> iconName [ ^ #edit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> shortcutKey [ ^ $e meta diff --git a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st index e05dfb7673..962f411b2d 100644 --- a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit plaintext credentials. " Class { - #name : #IceTipEditPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 160) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -39,14 +41,14 @@ IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ password: self password ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditPlaintextCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. passwordInput text: credentials password ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Edit credential for ' , credentials host diff --git a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st index 3694af7c87..0f08da0b7f 100644 --- a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipEditProjectDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipEditProjectDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -18,10 +18,12 @@ Class { 'removeButton', 'addButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> accept [ IceTipStandardAction new @@ -43,13 +45,13 @@ IceTipEditProjectDialogPresenter >> accept [ acceptCallback value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> acceptCallback [ ^ acceptCallback ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> addDirectory [ | newDirectoryName newDirectory previousSelection | @@ -70,7 +72,7 @@ IceTipEditProjectDialogPresenter >> addDirectory [ self expandAndSelect: previousSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> connectPresenters [ super connectPresenters. @@ -87,13 +89,13 @@ IceTipEditProjectDialogPresenter >> connectPresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> defaultFormat [ ^ defaultFormat ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditProjectDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -128,7 +130,7 @@ IceTipEditProjectDialogPresenter >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ @@ -155,25 +157,25 @@ IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatLabel [ ^ formatLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatList [ ^ formatList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> formats [ ^ formats ] -{ #category : #'format-management' } +{ #category : 'format-management' } IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ "We take as guinea pig a sub-directory to guess what format it is on. @@ -192,13 +194,13 @@ IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ ifNone: [ ^ defaultFormat ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> hasToShowWarning [ ^ model repository workingCopy packages isNotEmpty ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ^ self hasToShowWarning @@ -213,7 +215,7 @@ IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialize [ selectedDirectoryPath := RelativePath new. @@ -223,7 +225,7 @@ IceTipEditProjectDialogPresenter >> initialize [ super initialize. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ sourceDirectoryTree @@ -241,7 +243,7 @@ IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ self sourceDirectorySelectionChanged: announcement selectedPaths ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeMessagePanel [ | icon | @@ -254,7 +256,7 @@ IceTipEditProjectDialogPresenter >> initializeMessagePanel [ messageText text: self warningMessage ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -292,43 +294,43 @@ IceTipEditProjectDialogPresenter >> initializePresenters [ self initializeDirectoryTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageIcon [ ^ messageIcon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageText [ ^ messageText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> removeDirectory [ | toRemove newSelection | @@ -346,31 +348,31 @@ IceTipEditProjectDialogPresenter >> removeDirectory [ self expandAndSelect: newSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> selectedDirectoryPath [ ^ selectedDirectoryPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> selectedFileFormat [ ^ formatList selectedItem ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryLabel [ ^ sourceDirectoryLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPaths [ | selection | @@ -386,25 +388,25 @@ IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPat selectedDirectoryPath := selection relativeTo: self model fileSystem. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryTree [ ^ sourceDirectoryTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> titleForWindow [ ^ 'Edit Project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> username [ ^ self nameInput text trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> warningMessage [ ^ 'Be careful. You should choose the actual format of the current repository. diff --git a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st index c0b67c816d..10013324e4 100644 --- a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to edit a repository meta-data " Class { - #name : #IceTipEditRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipEditRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultDescription [ ^ 'Edit repository data' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultName [ ^ 'Edit...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipEditRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditRepositoryCommand >> execute [ self flag: #TODO. "Demeter's law" @@ -37,7 +39,7 @@ IceTipEditRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditRepositoryCommand >> iconName [ ^ #edit diff --git a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st index b7d805fe72..6ba89b4467 100644 --- a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit SSH credentials. " Class { - #name : #IceTipEditSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -27,13 +29,13 @@ IceTipEditSSHCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> initialExtentForWindow [ ^ (500@230) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -43,7 +45,7 @@ IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ keyPassphrase: self passphrase ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -52,7 +54,7 @@ IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ publicKeyInput location: credentials publicKey ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> titleForWindow [ ^ 'Edit SSH keys for ' , self credentials hostDescription diff --git a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st index 3d3b8c23a9..d42a7e3b60 100644 --- a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I am a dialog to edit token credentials. " Class { - #name : #IceTipEditTokenCredentialsPresenter, - #superclass : #IceTipAddTokenCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditTokenCredentialsPresenter', + #superclass : 'IceTipAddTokenCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -23,7 +25,7 @@ IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -32,7 +34,7 @@ IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditTokenCredentialsPresenter >> titleForWindow [ ^ 'Edit token credentials' diff --git a/Iceberg-TipUI/IceTipEntityModel.class.st b/Iceberg-TipUI/IceTipEntityModel.class.st index 49b9933bf4..7c9c4c177d 100644 --- a/Iceberg-TipUI/IceTipEntityModel.class.st +++ b/Iceberg-TipUI/IceTipEntityModel.class.st @@ -2,28 +2,30 @@ I'm a generic model for Iceberg entities (tipically, repositories, commits, packages, etc., etc., etc.) " Class { - #name : #IceTipEntityModel, - #superclass : #IceTipModel, + #name : 'IceTipEntityModel', + #superclass : 'IceTipModel', #instVars : [ 'entity', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> new [ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> on: anObject [ ^ self basicNew initializeEntity: anObject; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ ^ self basicNew initializeEntity: anObject; @@ -31,54 +33,54 @@ IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> description [ "A decorated description of this entity. It can return a text (in case decorations apply) or a simple string." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> descriptionDecorator [ ^ IceTipTextDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> displayString [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> entity [ ^ entity ] -{ #category : #fetching } +{ #category : 'fetching' } IceTipEntityModel >> fetch [ self entity fetch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEntityModel >> initializeEntity: anObject [ entity := anObject. self initialize ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isCommitish [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isModelOf: anObject [ ^ self entity = anObject ] -{ #category : #tagging } +{ #category : 'tagging' } IceTipEntityModel >> newCreateTagAction: aString [ @@ -90,17 +92,17 @@ IceTipEntityModel >> newCreateTagAction: aString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> shortDescription [ ^ self description asString diff --git a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st index dc2d41d517..6e52aea96d 100644 --- a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st @@ -7,24 +7,26 @@ My model is an exception that I'll freeze for further debugging. (IceTipErrorDialog on: anError) openDialogWithSpec " Class { - #name : #IceTipErrorDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipErrorDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'exception', 'errorLabel', 'iconPanel' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> accept [ self closeWindow. exception debug. ] -{ #category : #layout } +{ #category : 'layout' } IceTipErrorDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -35,31 +37,31 @@ IceTipErrorDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> errorLabel [ ^ errorLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception [ ^ exception ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception: anException [ exception := anException freeze ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -69,7 +71,7 @@ IceTipErrorDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ aWindow @@ -80,7 +82,7 @@ IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ do: [ :presenter | presenter close ]. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializePresenters [ iconPanel := self newImage. @@ -91,13 +93,13 @@ IceTipErrorDialogPresenter >> initializePresenters [ errorLabel editable: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> setModelBeforeInitialization: aDomainObject [ self exception: aDomainObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> titleForWindow [ ^ 'Error' diff --git a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st index eae8c778d0..e7254a06fa 100644 --- a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st @@ -3,29 +3,31 @@ I'm a panel (that will be part of a dialog) to perform actions on existing panel Actions themselves needs to be defined by my children. " Class { - #name : #IceTipExistingBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipExistingBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'branchesList', 'title', 'icon' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> branchModels [ ^ self model branchModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> branchesList [ ^ branchesList ] -{ #category : #layout } +{ #category : 'layout' } IceTipExistingBranchPanel >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -33,25 +35,25 @@ IceTipExistingBranchPanel >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon [ ^ icon ifNil: [ self iconNamed: #branch ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon: anIcon [ icon := anIcon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializeBranchesList [ branchesList @@ -68,32 +70,32 @@ IceTipExistingBranchPanel >> initializeBranchesList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializePresenters [ branchesList := self newTable. self initializeBranchesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> selectedBranch [ ^ self branchesList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> titleForWindow [ ^ title ifNil: [ self model name ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> titleForWindow: aString [ title := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> validate [ self selectedBranch ifNil: [ diff --git a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st index 738ba20fd4..d026f08d94 100644 --- a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st @@ -2,31 +2,33 @@ I'm a command to perform a fetch operation on all registered projects. " Class { - #name : #IceTipFetchAllProjectCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchAllProjectCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from all repositories in your list.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultName [ ^ 'Fetch all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchAllProjectCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> execute [ | repositories | @@ -47,13 +49,13 @@ IceTipFetchAllProjectCommand >> execute [ Iceberg announcer announce: IceRepositoryModified new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchAllProjectCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> isConfirmed [ ^ self application newConfirm diff --git a/Iceberg-TipUI/IceTipFetchCommand.class.st b/Iceberg-TipUI/IceTipFetchCommand.class.st index faf109579a..d878f30cc3 100644 --- a/Iceberg-TipUI/IceTipFetchCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchCommand.class.st @@ -2,24 +2,26 @@ I'm a command to perform a fetch operation on selected project. " Class { - #name : #IceTipFetchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from this repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ @@ -27,19 +29,19 @@ IceTipFetchCommand >> canBeExecuted [ self repositoryModel hasRemotes ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchCommand >> execute [ self repositoryModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> iconName [ ^ #smallUpdate ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> shortcutKey [ ^ $f meta diff --git a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st index 119d3c33b9..630fd29e06 100644 --- a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st @@ -1,29 +1,31 @@ Class { - #name : #IceTipFetchInPullCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchInPullCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultDescription [ ^ 'Fetch from the selected remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchInPullCommand >> execute [ context model remoteModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchInPullCommand >> iconName [ ^ #smallUpdate diff --git a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st index 7c1b56024b..0c722b8509 100644 --- a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that fetches from remote repositories " Class { - #name : #IceTipFetchRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultDescription [ ^ 'Fetch commits from this remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultName [ ^ 'Fetch remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> execute [ self remoteModel fetch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchRemoteCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipFilePresenter.class.st b/Iceberg-TipUI/IceTipFilePresenter.class.st index 721985a143..a0e7c32f33 100644 --- a/Iceberg-TipUI/IceTipFilePresenter.class.st +++ b/Iceberg-TipUI/IceTipFilePresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose files. " Class { - #name : #IceTipFilePresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipFilePresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipFilePresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st index bf9876ab0d..413d50a79f 100644 --- a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st @@ -3,24 +3,26 @@ I will allow the ""forget"" of a repository (remote it from list of registered r I also add the possibility of remove the repository from file system. " Class { - #name : #IceTipForgetRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipForgetRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultDescription [ ^ 'Removes this repository from the list of managed repositories (it will not remove any local repository)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultName [ ^ 'Forget repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipForgetRepositoryCommand >> execute [ (IceTipRemoveRepositoryDialogPresenter @@ -31,13 +33,13 @@ IceTipForgetRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st index 49ac8a3bc4..977e81d533 100644 --- a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st @@ -6,8 +6,8 @@ for each provider. " Class { - #name : #IceTipGitProviderRepositoryPanel, - #superclass : #IceTipGitRepositoryPanel, + #name : 'IceTipGitProviderRepositoryPanel', + #superclass : 'IceTipGitRepositoryPanel', #instVars : [ 'userNameLabel', 'userNameInputText', @@ -16,22 +16,24 @@ Class { 'protocolDropList', 'protocolLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipGitProviderRepositoryPanel class >> isAbstract [ ^ super isAbstract or: [ self = IceTipGitProviderRepositoryPanel ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitProviderRepositoryPanel >> configureBuilder: aBuilder [ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitProviderRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -45,7 +47,7 @@ IceTipGitProviderRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitProviderRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -79,7 +81,7 @@ IceTipGitProviderRepositoryPanel >> initializePresenters [ ] -{ #category : #private } +{ #category : 'private' } IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ^ (self userName isEmpty and: [ self projectName isEmpty ]) @@ -88,43 +90,43 @@ IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> projectName [ ^ self projectNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolDropList [ ^ protocolDropList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolLabel [ ^ protocolLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> providerName [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> remoteUrl [ | builder | @@ -135,31 +137,31 @@ IceTipGitProviderRepositoryPanel >> remoteUrl [ ^ builder buildUrl ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> selectedProtocol [ ^ self protocolDropList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> userName [ ^ self userNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameInputText [ ^ userNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameLabel [ ^ userNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st index 4408387fe1..fdd7ef3847 100644 --- a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st @@ -3,18 +3,20 @@ I'm a presenter to define remote repositories. Repositories needs to have a valid url (one that can be parsed by IceRemote) and a valid location (where to place the clone) " Class { - #name : #IceTipGitRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipGitRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel class >> order [ ^ 1000 "to the end" ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -26,7 +28,7 @@ IceTipGitRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipGitRepositoryPanel >> extractProjectName: aString [ ^ [ (IceGitRemote url: aString) projectName ] @@ -34,13 +36,13 @@ IceTipGitRepositoryPanel >> extractProjectName: aString [ do: [ 'invalid-url' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> iconForWindow [ ^ self iconNamed: #git ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -53,7 +55,7 @@ IceTipGitRepositoryPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> newRepository [ UIManager default @@ -66,19 +68,19 @@ IceTipGitRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> remoteUrl [ ^ self remoteInputText text asString trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> titleForWindow [ ^ 'Clone remote repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> validate [ | remoteString | diff --git a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st index 7103019d4a..17a42bdec6 100644 --- a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog for asking ""user.name"" and ""user.email"" . " Class { - #name : #IceTipGitUsernameAndEmailDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipGitUsernameAndEmailDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -13,10 +13,12 @@ Class { 'model', 'acceptCallback' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipGitUsernameAndEmailDialogPresenter >> accept [ self username isEmptyOrNil ifTrue: [ ^ self window alert: 'user.name is required.' ]. @@ -32,7 +34,7 @@ IceTipGitUsernameAndEmailDialogPresenter >> accept [ acceptCallback value ]. ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -50,36 +52,36 @@ IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> email [ ^ self emailInput text trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailInput [ ^ emailInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailLabel [ ^ emailLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> globalCheckbox [ ^ globalCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initialExtentForWindow [ ^ (400@200) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -102,43 +104,43 @@ IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipGitUsernameAndEmailDialogPresenter >> isGlobal [ ^ self globalCheckbox state ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> titleForWindow [ ^ 'Please provide Git missing properties' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> username [ ^ self nameInput text trimBoth diff --git a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st index e78130b7b5..c23045931f 100644 --- a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltComponentHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltComponentHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,13 +29,13 @@ IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeCommitList [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -62,7 +64,7 @@ IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ commitList := self newComponentList. @@ -73,13 +75,13 @@ IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ self initializeHiedraColumn ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -87,20 +89,20 @@ IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ | commitModels | @@ -111,7 +113,7 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ commitInfoTabs selectedModel: (commitModels ifNotEmpty: #first ifEmpty: [ nil ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -133,19 +135,19 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ifNotNil: #item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st index 28565664db..73df2f5bef 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,7 +29,7 @@ IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeCommitList [ commitList @@ -63,7 +65,7 @@ IceTipHiedraAltHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -92,7 +94,7 @@ IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -104,13 +106,13 @@ IceTipHiedraAltHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -118,20 +120,20 @@ IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -153,13 +155,13 @@ IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st index b4d9f6b312..e2b6ea1bc2 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st @@ -1,12 +1,14 @@ Class { - #name : #IceTipHiedraAltHistoryRowPresenter, - #superclass : #SpPresenter, + #name : 'IceTipHiedraAltHistoryRowPresenter', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ | tagNames tagLayout | @@ -30,13 +32,13 @@ IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ aLayout add: tagLayout expand: false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> form [ ^ self model first ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ self layout: (SpBoxLayout newLeftToRight @@ -51,7 +53,7 @@ IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ yourself). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> item [ ^ self model second diff --git a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st index f481a468c0..dc81c98649 100644 --- a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st @@ -2,15 +2,17 @@ I add a Hiedra column to the browser defined by my superclass. This column visualizes the relationship between commits in the history list. " Class { - #name : #IceTipHiedraHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeCommitList [ "Add the Hiedra column at the beginning. The Datasource has the logic to render it." @@ -23,7 +25,7 @@ IceTipHiedraHistoryBrowser >> initializeCommitList [ super initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -50,21 +52,21 @@ IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ cellWidth: 5.25 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializePresenters [ super initializePresenters. self initializeHiedraColumn ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refreshHiedraColumn [ | ancestorIds | diff --git a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st index 16ad2d0857..63008dd9c3 100644 --- a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st @@ -2,47 +2,49 @@ I'm a base browser for pull/push action browser. " Class { - #name : #IceTipHistoryActionBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryActionBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitsPanel', 'actionButtonBar', 'button' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> accept [ button performAction ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel [ ^ commitsPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel: aSpPresenter [ commitsPanel := aSpPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initializePresenters [ commitsPanel := self instantiate: IceTipHistoryBrowser on: self model. @@ -50,7 +52,7 @@ IceTipHistoryActionBrowser >> initializePresenters [ actionButtonBar add: (button := self newActionButton) ] -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ aRemoteModel ifNil: [ ^ self ]. @@ -61,26 +63,26 @@ IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ self updateTitle ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipHistoryActionBrowser >> newActionButton [ "Answer a new instance of SpButton to be placed at bottom, as the main action of the window." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refresh [ self refreshCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refreshCommits [ commitsPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ (self model repositoryModel isModelOf: ann repository) @@ -89,7 +91,7 @@ IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> subscribeToAnnouncements [ self announcer diff --git a/Iceberg-TipUI/IceTipHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHistoryBrowser.class.st index 3c5dfdee58..71a6d22f46 100644 --- a/Iceberg-TipUI/IceTipHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryBrowser.class.st @@ -5,22 +5,24 @@ I'm usually used as part of an IceTipRepositoryBrowser. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'commitInfoTabs' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipAdoptCommitCommand. @@ -35,7 +37,7 @@ IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCo ] -{ #category : #specs } +{ #category : 'specs' } IceTipHistoryBrowser class >> panelSpec [ ^ SpPanedLayout newTopToBottom @@ -44,25 +46,25 @@ IceTipHistoryBrowser class >> panelSpec [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> beForMerge [ self commitInfoTabs beForMerge ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitInfoTabs [ ^ commitInfoTabs ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,13 +73,13 @@ IceTipHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initialExtentForWindow [ ^ (700 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializeCommitList [ commitList @@ -102,7 +104,7 @@ IceTipHistoryBrowser >> initializeCommitList [ whenSelectionChangedDo: [ :aSelection | self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -111,27 +113,27 @@ IceTipHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refresh [ self refreshCommitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refreshCommitList [ | commitModels | @@ -141,19 +143,19 @@ IceTipHistoryBrowser >> refreshCommitList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipHistoryBrowser >> selectionChanged: anElement [ commitInfoTabs selectedModel: anElement ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> titleForWindow [ ^ self model @@ -162,13 +164,13 @@ IceTipHistoryBrowser >> titleForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> updatePresenter [ self refresh ] -{ #category : #events } +{ #category : 'events' } IceTipHistoryBrowser >> whenSelectionChangedDo: aBlock [ commitList whenSelectionChangedDo: aBlock diff --git a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st index 16b04a9a5b..06ef203e2b 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st @@ -3,17 +3,19 @@ I keep a diff from HEAD to WorkingCopy. " Class { - #name : #IceTipHistoryDiffFromHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffFromHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> diffFor: aCommitModel [ ^ aCommitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> labelFor: aCommitModel [ ^ 'HEAD to {1}' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st index d0b9344fa1..12aab5b16c 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st @@ -2,17 +2,19 @@ I keep a diff from a commit to his mail parent. " Class { - #name : #IceTipHistoryDiffToAncestor, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToAncestor', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> diffFor: aCommitModel [ ^ aCommitModel diffToFirstAncestor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> labelFor: aCommitModel [ ^ '{1} to {2}' format: { aCommitModel shortId. diff --git a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st index d1dcb6fca4..2bff338b13 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st @@ -3,17 +3,19 @@ I keep a diff from WorkingCopy to HEAD. " Class { - #name : #IceTipHistoryDiffToHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> diffFor: aCommitModel [ ^ aCommitModel diffToHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> labelFor: aCommitModel [ ^ '{1} to HEAD' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st index 0cfc0e00fc..2c33f2fa79 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st @@ -4,64 +4,66 @@ Since orders may change for different operations, I need a different approach fo " Class { - #name : #IceTipHistoryDiffUpdater, - #superclass : #Object, + #name : 'IceTipHistoryDiffUpdater', + #superclass : 'Object', #instVars : [ 'tab' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #testing } +{ #category : 'testing' } IceTipHistoryDiffUpdater class >> isAbstract [ ^ self == IceTipHistoryDiffUpdater ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipHistoryDiffUpdater class >> tab: aTab [ ^ self new tab: aTab; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> diffFor: aCommitModel [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> labelFor: aCommitModel [ ^ self subclassResponsibility ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipHistoryDiffUpdater >> newDiffPanelFor: aDiffModel [ ^ IceTipDiffPanel on: aDiffModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab [ ^ tab ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab: anObject [ tab := anObject ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateContentsOn: aCommitModel [ aCommitModel ifNil: [ ^ self ]. self tab contents: (self newDiffPanelFor: (self diffFor: aCommitModel)) build ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateLabelOn: aCommitModel [ self tab label: (self labelFor: aCommitModel) ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateOn: aCommitModel [ self updateLabelOn: aCommitModel. self updateContentsOn: aCommitModel diff --git a/Iceberg-TipUI/IceTipInspectCommand.class.st b/Iceberg-TipUI/IceTipInspectCommand.class.st index d50a4ee13d..f5ef0d83c4 100644 --- a/Iceberg-TipUI/IceTipInspectCommand.class.st +++ b/Iceberg-TipUI/IceTipInspectCommand.class.st @@ -2,42 +2,44 @@ I am a command implementing the inspect option. I have several context activations to be able to inspect different objects in Iceberg's UI " Class { - #name : #IceTipInspectCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInspectCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultDescription [ ^ 'Inspect the selected element' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultName [ ^ 'Inspect...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipInspectCommand >> canBeExecuted [ ^ self context hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipInspectCommand >> execute [ self item inspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> iconName [ ^ #glamorousInspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> item [ | maybeCachedObject | diff --git a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st index a11c718b99..fbbaad2497 100644 --- a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st @@ -3,36 +3,38 @@ Command used in the version browser, inside the code browser. This command takes the selected version and installs it (also called revert). " Class { - #name : #IceTipInstallVersionCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInstallVersionCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultDescription [ ^ 'Revert to the selected version' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultName [ ^ 'Install this version' ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> execute [ self version install ] -{ #category : #activation } +{ #category : 'activation' } IceTipInstallVersionCommand >> iconName [ ^ #smallRedo ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> version [ ^ self context selectedItem diff --git a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st index e74a3465c0..e76f8c4c84 100644 --- a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st +++ b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st @@ -2,23 +2,25 @@ I am a credential provider that requires the missing plaintext credential to the user. " Class { - #name : #IceTipInteractiveCredentialsProvider, - #superclass : #IceCredentialsProvider, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipInteractiveCredentialsProvider', + #superclass : 'IceCredentialsProvider', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceTipInteractiveCredentialsProvider class >> initialize [ self providerType: nil ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider class >> isDefault [ ^ true ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ | returnedCred | @@ -30,7 +32,7 @@ IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsToReturn [ | returnedCred | @@ -43,7 +45,7 @@ IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsT credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainSshCredentials: credentialsToReturn [ | returnedCred | diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index 533f52c029..a420c950b2 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -3,22 +3,24 @@ I'm a visitor to provide users with an interactive way to react to iceberg error " Class { - #name : #IceTipInteractiveErrorVisitor, - #superclass : #IceErrorVisitor, + #name : 'IceTipInteractiveErrorVisitor', + #superclass : 'IceErrorVisitor', #instVars : [ 'context', 'repository' ], - #category : #'Iceberg-TipUI-Exceptions' + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext [ ^ self newContext: aContext repository: nil ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ ^ self new @@ -27,40 +29,40 @@ IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> on: aModel [ ^ self new repository: aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context: anObject [ context := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository: anObject [ repository := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ self defaultApplication label: anError messageText; @@ -68,7 +70,7 @@ IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ self defaultApplication @@ -77,7 +79,7 @@ IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ self defaultApplication @@ -88,7 +90,7 @@ IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ self defaultApplication @@ -98,7 +100,7 @@ IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ | proceed | @@ -112,7 +114,7 @@ IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitGenericError: anError [ (IceTipErrorDialogPresenter @@ -123,7 +125,7 @@ IceTipInteractiveErrorVisitor >> visitGenericError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMergeAborted: anError [ self defaultApplication @@ -135,7 +137,7 @@ WARNING: If you have external files, you may need to verify the conflicts there. openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ ((IceTipGitUsernameAndEmailDialogPresenter @@ -147,7 +149,7 @@ IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ | proceed | @@ -162,7 +164,7 @@ IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoRemote: anError [ self defaultApplication @@ -172,7 +174,7 @@ Add one before continue.'; openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ self defaultApplication newInform @@ -180,7 +182,7 @@ IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ self defaultApplication newInform @@ -189,7 +191,7 @@ IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteDesynchronizedError: anError [ | continue command | @@ -222,7 +224,7 @@ You need to pull remote changes before continue and push your changes.' anError retry ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitShouldCommitBeforePullError: anError [ | continue | @@ -239,7 +241,7 @@ We recommend that you commit first and then pull incoming changes again.'; anError resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitWorkingCopyDesynchronizedError: anError [ | solveStrategy command | diff --git a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st index 577cf69282..c2d502942e 100644 --- a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that loads the current non-loaded selected package " Class { - #name : #IceTipLoadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipLoadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultDescription [ ^ 'Load selected package in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultName [ ^ 'Load' ] -{ #category : #testing } +{ #category : 'testing' } IceTipLoadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded not ] -{ #category : #executing } +{ #category : 'executing' } IceTipLoadPackageCommand >> execute [ self packageModel newLoadAction executeWithContext: self context. @@ -33,7 +35,7 @@ IceTipLoadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLoadPackageCommand >> iconName [ ^ #add diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 9e3bcd9b5d..73ba56fba6 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -3,18 +3,20 @@ I will define a repository that already exists. " Class { - #name : #IceTipLocalRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipLocalRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel class >> order [ ^ 20 ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocalRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipLocalRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallOpen ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> initialExtentForWindow [ ^ (500@( @@ -41,25 +43,25 @@ IceTipLocalRepositoryPanel >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #testing } +{ #category : 'testing' } IceTipLocalRepositoryPanel >> isLocalRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location [ ^ self projectLocation location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location: aReferenceOrString [ ^ self projectLocation location: aReferenceOrString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> newRepository [ UIManager default @@ -71,13 +73,13 @@ IceTipLocalRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> titleForWindow [ ^ 'Import from existing clone' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipLocationPresenter.class.st b/Iceberg-TipUI/IceTipLocationPresenter.class.st index b62a028a13..7278835716 100644 --- a/Iceberg-TipUI/IceTipLocationPresenter.class.st +++ b/Iceberg-TipUI/IceTipLocationPresenter.class.st @@ -3,8 +3,8 @@ I'm an abstract model to provide locations (directories or files). I need to be included in other components (search references to my children for examples) " Class { - #name : #IceTipLocationPresenter, - #superclass : #SpPresenter, + #name : 'IceTipLocationPresenter', + #superclass : 'SpPresenter', #instVars : [ 'locationInput', 'chooseButton', @@ -12,16 +12,18 @@ Class { 'chooseBlock', 'keptLocation' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipLocationPresenter class >> isAbstract [ ^ self == IceTipLocationPresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> appendPath: aString [ keptLocation ifNil: [ keptLocation := self location ]. @@ -31,13 +33,13 @@ IceTipLocationPresenter >> appendPath: aString [ ifEmpty: [ keptLocation ]). ] -{ #category : #private } +{ #category : 'private' } IceTipLocationPresenter >> basicLocation: aReference [ locationInput text: aReference pathString ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> choose [ self chooseReference ifNotNil: [ :reference | @@ -45,43 +47,43 @@ IceTipLocationPresenter >> choose [ self onChoose ifNotNil: #value ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> chooseButton [ ^ chooseButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> chooseReference [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle [ ^ chooseTitle ifNil: [ self defaultChooseDialogTitle ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle: aString [ chooseTitle := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultChooseDialogTitle [ ^ 'Choose directory' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultLabel [ ^ 'Directory' ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocationPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -93,13 +95,13 @@ IceTipLocationPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> icon [ ^ self iconNamed: #open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocationPresenter >> initializePresenters [ locationInput := self newTextInput @@ -113,7 +115,7 @@ IceTipLocationPresenter >> initializePresenters [ chooseButton action: [ self choose ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location [ "This method return the location to use in the repository If the location is relative to IceLibgitRepository >> #localRepositoriesLocation @@ -135,7 +137,7 @@ IceTipLocationPresenter >> location [ ^ IceLibgitRepository localRepositoriesLocation resolvePath: relativePath ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location: aReferenceOrString [ | ref | @@ -152,26 +154,26 @@ IceTipLocationPresenter >> location: aReferenceOrString [ self basicLocation: ref ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> locationInput [ ^ locationInput ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose [ ^ chooseBlock ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose: aBlockClosure [ "I allow to set a hook to execute when the user select a location." chooseBlock := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipLocationPresenter >> whenTextChanged: aBlockClosure [ self locationInput whenTextChangedDo: aBlockClosure diff --git a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st index 10c1f65a81..e0f99435cf 100644 --- a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st @@ -2,24 +2,26 @@ I'm a command to open the package manager browser for a project. " Class { - #name : #IceTipManagePackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManagePackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultDescription [ ^ 'Open packages manager browser for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultName [ ^ 'Packages' ] -{ #category : #executing } +{ #category : 'executing' } IceTipManagePackagesCommand >> execute [ (IceTipWorkingCopyBrowser @@ -28,13 +30,13 @@ IceTipManagePackagesCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> iconName [ ^ #package ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> shortcutKey [ ^ $p meta diff --git a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st index 25acd74669..4d0185f541 100644 --- a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st @@ -3,36 +3,38 @@ I'm a command to show the repository manager for a repository model. " Class { - #name : #IceTipManageRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManageRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultDescription [ ^ 'Open repository manager browser for this repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultName [ ^ 'Open Repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultToolbarItemName [ ^ 'Repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipManageRepositoryCommand >> execute [ (IceTipRepositoryBrowser @@ -41,19 +43,19 @@ IceTipManageRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> iconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> shortcutKey [ ^ $r meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st index fbd509f795..9a1252f105 100644 --- a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st @@ -4,34 +4,36 @@ I'm a dialog to perform a merge of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipMergeBranchDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipMergeBranchDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeBranchDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> allTypes [ ^ types ifNil: [ types := self createMergeBranchTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> beSwitchAndMerge [ self allTypes do: #beSwitchAndMerge ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ | allTypes | @@ -54,44 +56,44 @@ IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchDialogPresenter >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model: anObject [ model := anObject. self allTypes do: [ :each | each model: anObject ] ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipMergeBranchDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> titleForWindow [ ^ 'Select branch to merge into ' , (self model branchName contractTo: 45) ] -{ #category : #activation } +{ #category : 'activation' } IceTipMergeBranchDialogPresenter >> updateWindowTitle [ self window title: self titleForWindow diff --git a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st index 24bd011621..608f005030 100644 --- a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st @@ -2,21 +2,23 @@ I'm a panel to peform the merge of an existing branch. " Class { - #name : #IceTipMergeBranchPanel, - #superclass : #IceTipExistingBranchPanel, + #name : 'IceTipMergeBranchPanel', + #superclass : 'IceTipExistingBranchPanel', #instVars : [ 'mergeType' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> beSwitchAndMerge [ self mergeType: IceTipMergeType switchAndMerge ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchPanel >> doAccept [ IceTipStandardAction new @@ -27,19 +29,19 @@ IceTipMergeBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType [ ^ mergeType ifNil: [ IceTipMergeType default ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType: anObject [ mergeType := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> withoutHead [ self branchesList items: (self branchModels reject: #isHead). diff --git a/Iceberg-TipUI/IceTipMergeCommand.class.st b/Iceberg-TipUI/IceTipMergeCommand.class.st index 11c5c49cdd..b5345488ef 100644 --- a/Iceberg-TipUI/IceTipMergeCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to select a branch to merge in the current merge " Class { - #name : #IceTipMergeCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultDescription [ ^ 'Merge a given branch into your current branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultName [ ^ 'Merge to current' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeCommand >> execute [ (IceTipMergeBranchDialogPresenter @@ -36,7 +38,7 @@ IceTipMergeCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeCommand >> iconName [ ^ #merge diff --git a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st index 1d70eeb9d7..bfe81e157f 100644 --- a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st @@ -2,36 +2,38 @@ Command that opens a window showing the history of the selected merged branch. " Class { - #name : #IceTipMergeHistoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeHistoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultDescription [ ^ 'Show the merged history of the selected merge commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultName [ ^ 'Browse merge history' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeHistoryCommand >> canBeExecuted [ ^ self commitModel hasMultipleAncestors ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> commitModel [ ^ self context selectedCommit ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> execute [ (IceTipHistoryBrowser on: diff --git a/Iceberg-TipUI/IceTipMergeModel.class.st b/Iceberg-TipUI/IceTipMergeModel.class.st index 249baca4a0..3a2be87af4 100644 --- a/Iceberg-TipUI/IceTipMergeModel.class.st +++ b/Iceberg-TipUI/IceTipMergeModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipMergeModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipMergeModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'mergeType', 'mergeAction' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> calculateDiff [ ^ self mergeAction ] -{ #category : #private } +{ #category : 'private' } IceTipMergeModel >> mergeAction [ ^ mergeAction ifNil: [ @@ -24,13 +26,13 @@ IceTipMergeModel >> mergeAction [ yourself ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> mergeType: aMergeType [ mergeType := aMergeType ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newExecuteMergeAction [ @@ -42,13 +44,13 @@ IceTipMergeModel >> newExecuteMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newMergeAction [ ^ mergeType newMergeAction: commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> repositoryModel [ ^ commitish repositoryModel ] diff --git a/Iceberg-TipUI/IceTipMergeMorph.class.st b/Iceberg-TipUI/IceTipMergeMorph.class.st index f45def3de7..4dc7b9b9f2 100644 --- a/Iceberg-TipUI/IceTipMergeMorph.class.st +++ b/Iceberg-TipUI/IceTipMergeMorph.class.st @@ -2,19 +2,21 @@ I redefine PSMCMergeMorph to be able to use an IceMergePatchMorph as patch morph " Class { - #name : #IceTipMergeMorph, - #superclass : #PSMCMergeMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergeMorph', + #superclass : 'PSMCMergeMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeMorph >> conflictCount [ "Answer the number of conflicts that are unresolved." ^(self model ifNil: [^0]) unresolvedConflictCount ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeMorph >> model: aMerger [ "Set the model and update the window." @@ -26,7 +28,7 @@ IceTipMergeMorph >> model: aMerger [ self patchMorph model: aMerger ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeMorph >> newPatchMorph [ "Answer a new patch morph." diff --git a/Iceberg-TipUI/IceTipMergePatchMorph.class.st b/Iceberg-TipUI/IceTipMergePatchMorph.class.st index 534efa39a0..6a05a76fb0 100644 --- a/Iceberg-TipUI/IceTipMergePatchMorph.class.st +++ b/Iceberg-TipUI/IceTipMergePatchMorph.class.st @@ -2,19 +2,21 @@ I redefine part of monticello's PSMCMergePatchMorph to not require to rebuild a tree but use Iceberg's one directly. I also adapt the patch morph to handle files and several packages at the same time. " Class { - #name : #IceTipMergePatchMorph, - #superclass : #PSMCMergePatchMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergePatchMorph', + #superclass : 'PSMCMergePatchMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> changes [ "Answer the changes tree roots." ^ model ifNotNil: [ model mergeTree children collect: [ :each | IceMergeListWrapper with: each model: model ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ "Answer whether there are any conflicts not marked as a conflict." @@ -22,7 +24,7 @@ IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ conflict isConflict and: [ conflict isResolved ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ "Answer whether there are any conflicts not marked as incoming." @@ -31,7 +33,7 @@ IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ conflict isResolved not or: [conflict isLeftChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ "Answer whether there are any conflicts not marked as keep." @@ -40,7 +42,7 @@ IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ conflict isResolved not or: [conflict isRightChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasConflicts [ "Answer whether there are any conflicts." @@ -48,7 +50,7 @@ IceTipMergePatchMorph >> hasConflicts [ conflict isConflict ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> keepAllCurrentVersion [ "Mark all conflicts as local." @@ -58,7 +60,7 @@ IceTipMergePatchMorph >> keepAllCurrentVersion [ self updateSource ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> markAllAsConflict [ "Mark all conflicts as unresolved." @@ -68,7 +70,7 @@ IceTipMergePatchMorph >> markAllAsConflict [ self updateSource ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> markAsConflict [ "Mark the operation as unresolved conflict." @@ -77,7 +79,7 @@ IceTipMergePatchMorph >> markAsConflict [ self updateSource. ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> nextConflict [ "Answer the next (unresolved) conflict or, nil if none." @@ -92,7 +94,7 @@ IceTipMergePatchMorph >> nextConflict [ ^ IceMergeListWrapper with: node model: model. ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> notAllConflictsResolved [ "Answer whether any conflicts are unresolved." @@ -100,7 +102,7 @@ IceTipMergePatchMorph >> notAllConflictsResolved [ item isConflict and: [item isResolved not]] ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> selectNextConflict [ "Select the next conflict after the current selection, if any." @@ -109,14 +111,14 @@ IceTipMergePatchMorph >> selectNextConflict [ self changed: {#openPath}, next item path segments ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> selectedChange [ "Answer the selected change." ^(self selectedChangeWrapper ifNil: [^nil]) item value ] -{ #category : #private } +{ #category : 'private' } IceTipMergePatchMorph >> selectionHasActualClass [ "Answer whether the currently selected change has an actual class in the image." @@ -126,14 +128,14 @@ IceTipMergePatchMorph >> selectionHasActualClass [ ifNotNil: [:w | w item value contextClass notNil] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> selectionIsRemoteChosen [ self selectedChange ifNil: [ ^ false]. ^ self selectedChange isConflict and: [ self selectedChange isRightChosen ] ] -{ #category : #updating } +{ #category : 'updating' } IceTipMergePatchMorph >> updateSource [ "Update the source difference morph." @@ -159,7 +161,7 @@ IceTipMergePatchMorph >> updateSource [ ifFalse: [self diffMorph indicateSrc] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> useAllIncomingVersion [ "Mark all conflicts as remote." diff --git a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st index 5d9d18d743..83535956d8 100644 --- a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st @@ -4,12 +4,14 @@ I preview the changes that will be introduced in the image when a merge occurs. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipMergePreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipMergePreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergePreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipMergeModel new commitish: aBranch; @@ -17,14 +19,14 @@ IceTipMergePreviewBrowser class >> onBranch: aBranch [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePreviewBrowser >> doMerge [ self model newExecuteMergeAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipMergePreviewBrowser >> initializePresenters [ diffPanel rightLabel: 'Merge with ', model targetName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergePreviewBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipMergePreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> titleForWindow [ ^ 'Preview merge of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st index 3f8a4eec31..fdfc258341 100644 --- a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipMergeSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipMergeSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'codePanel', 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> basicRefresh [ super basicRefresh. self refreshCodePanel. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -46,13 +48,13 @@ IceTipMergeSelectingPanel >> changeListColumn [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> codePanel [ ^ codePanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipMergeSelectingPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -66,7 +68,7 @@ IceTipMergeSelectingPanel >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initialize [ super initialize. @@ -77,7 +79,7 @@ IceTipMergeSelectingPanel >> initialize [ child value isConflict ifTrue: [ child value selectLeft ] ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initializePresenters [ codePanel := self newCode. @@ -87,7 +89,7 @@ IceTipMergeSelectingPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> refresh [ super refresh. @@ -96,7 +98,7 @@ IceTipMergeSelectingPanel >> refresh [ self refreshCodePanel ] -{ #category : #private } +{ #category : 'private' } IceTipMergeSelectingPanel >> refreshCodePanel [ | visitor mergeNode | @@ -107,13 +109,13 @@ IceTipMergeSelectingPanel >> refreshCodePanel [ ifNotNil: [ mergeNode accept: visitor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipMergeSelectingPanel >> selectionChanged [ super selectionChanged. diff --git a/Iceberg-TipUI/IceTipMergeType.class.st b/Iceberg-TipUI/IceTipMergeType.class.st index 3fa3830c87..6d96c48bec 100644 --- a/Iceberg-TipUI/IceTipMergeType.class.st +++ b/Iceberg-TipUI/IceTipMergeType.class.st @@ -5,47 +5,49 @@ My children define strategies of how to merge two commitish. " Class { - #name : #IceTipMergeType, - #superclass : #Object, + #name : 'IceTipMergeType', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> default [ ^ self direct ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> direct [ ^ IceTipDirectMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> switchAndMerge [ ^ IceTipSwitchAndMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> uniqueInstance [ self = IceTipMergeType ifTrue: [ self error: 'I''m an abstract type. Use one of my children' ]. ^ uniqueInstance ifNil: [ uniqueInstance := self basicNew initialize ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> mergeOn: aModel then: aBlock [ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> newMergeAction: aModel [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st index dd81696941..0639cde03a 100644 --- a/Iceberg-TipUI/IceTipModel.class.st +++ b/Iceberg-TipUI/IceTipModel.class.st @@ -4,35 +4,37 @@ Each tip component refers to one (and just one) model, which will provide model Models can be cached using #beCached. " Class { - #name : #IceTipModel, - #superclass : #Object, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipModel', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #converting } +{ #category : 'converting' } IceTipModel >> beCached [ ^ IceTipCachedModel for: self ] -{ #category : #private } +{ #category : 'private' } IceTipModel >> colorForError [ ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipModel >> matches: aString [ "Override this if you want to make this model discoverable" ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> repositoryModel [ "this model does not provides a repository model" ^ nil ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> reset [ "to provide polymorphism with cached version" ] diff --git a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st index 8d00759a46..e5d2698279 100644 --- a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st @@ -5,24 +5,26 @@ Usually, I'm part of an IceTipRegisterProjectPresenter. I will define location, name and source subdirectory and I will use that to create a #newRepository. " Class { - #name : #IceTipNewRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, + #name : 'IceTipNewRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', #instVars : [ 'projectNameLabel', 'projectNameInputText', 'subdirectoryLabel', 'subdirectoryInputText' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel class >> order [ ^ 10 ] -{ #category : #layout } +{ #category : 'layout' } IceTipNewRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -35,13 +37,13 @@ IceTipNewRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -58,7 +60,7 @@ IceTipNewRepositoryPanel >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializeSourceDirectory [ subdirectoryLabel := self newLabel @@ -72,13 +74,13 @@ IceTipNewRepositoryPanel >> initializeSourceDirectory [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipNewRepositoryPanel >> isNewRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> newRepository [ | repositoryName location subdirectory | @@ -96,37 +98,37 @@ IceTipNewRepositoryPanel >> newRepository [ createNewRepositoryNamed: repositoryName ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryInputText [ ^ subdirectoryInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryLabel [ ^ subdirectoryLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> titleForWindow [ ^ 'New repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st index 046c3d4e94..51f0260a57 100644 --- a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st +++ b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st @@ -2,24 +2,26 @@ I am a command that, once executed, will open the native file browser on the directory containing the local repository of the git project. " Class { - #name : #IceTipOpenNativelyCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipOpenNativelyCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultDescription [ ^ 'Open the native file browser on the local repository of this project.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultName [ ^ 'Open in native file browser' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenNativelyCommand >> canBeExecuted [ | location | @@ -28,13 +30,13 @@ IceTipOpenNativelyCommand >> canBeExecuted [ ^ location isNotNil and: [ location exists ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenNativelyCommand >> execute [ self item location openInOSFileBrowser ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenNativelyCommand >> iconName [ ^ #smallWindow diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st index 2f6133367c..c63a4618b6 100644 --- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st @@ -7,17 +7,19 @@ I'm kind of a ""tabbed"" dialog, but my options are ""mac style"": lateral and n This is useful to keep a variable number of options. " Class { - #name : #IceTipOptionDialogPresenter, - #superclass : #IceTipPresenter, + #name : 'IceTipOptionDialogPresenter', + #superclass : 'IceTipPresenter', #instVars : [ 'typeList', 'type', 'contentLayout' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> accept [ [ @@ -28,19 +30,19 @@ IceTipOptionDialogPresenter >> accept [ e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> allTypes [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> contextSelection [ ^ type ] -{ #category : #layout } +{ #category : 'layout' } IceTipOptionDialogPresenter >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -50,19 +52,19 @@ IceTipOptionDialogPresenter >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> doAccept [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter @@ -72,14 +74,14 @@ IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter whenOpenedDo: [ self typeList selectIndex: 1 ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializePresenters [ contentLayout := SpBoxLayout newTopToBottom. self initializeTypeList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeTypeList [ (typeList := self newList) @@ -90,7 +92,7 @@ IceTipOptionDialogPresenter >> initializeTypeList [ self selectionChanged: selection selectedItem ] ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> replacePanelWith: aType [ contentLayout @@ -98,13 +100,13 @@ IceTipOptionDialogPresenter >> replacePanelWith: aType [ add: aType ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> selectedType [ ^ type ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> selectionChanged: aType [ type := aType. @@ -113,13 +115,13 @@ IceTipOptionDialogPresenter >> selectionChanged: aType [ self replacePanelWith: type ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipOptionDialogPresenter >> typeList [ ^ typeList ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> updateWindowTitle [ self window title: type titleForWindow diff --git a/Iceberg-TipUI/IceTipPackageCommand.class.st b/Iceberg-TipUI/IceTipPackageCommand.class.st index 2f48f71553..72c5cc9e02 100644 --- a/Iceberg-TipUI/IceTipPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipPackageCommand.class.st @@ -2,45 +2,47 @@ Abstract class representing commands to be applied on top of packages. " Class { - #name : #IceTipPackageCommand, - #superclass : #IceTipCommand, + #name : 'IceTipPackageCommand', + #superclass : 'IceTipCommand', #instVars : [ 'packageModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand class >> isAbstract [ ^ self == IceTipPackageCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> hasPackageModel [ ^ self packageModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> isPackageLoaded [ ^ self hasPackageModel and: [ self packageModel isLoaded ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> package [ ^ self packageModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel [ ^ packageModel ifNil: [self context packageModel] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel: anIceTipPackageModel [ packageModel := anIceTipPackageModel diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index e37bfc6d98..080c19e5b6 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -2,19 +2,21 @@ I'm a model for IcePackage entries. " Class { - #name : #IceTipPackageModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPackageModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browsePackage [ self entity browse ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browseRepositoryVersion [ | snapshot | @@ -24,7 +26,7 @@ IceTipPackageModel >> browseRepositoryVersion [ showLabelled: 'Snapshot for ', self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> description [ | text | @@ -34,7 +36,7 @@ IceTipPackageModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> descriptionDecorator [ self entity isModified @@ -45,22 +47,22 @@ IceTipPackageModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isLoaded [ ^ self entity isLoaded ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isModified [ ^ self entity isModified ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> newLoadAction [ @@ -75,12 +77,12 @@ IceTipPackageModel >> newLoadAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> packageName [ ^ self entity packageName ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> reload [ @@ -94,7 +96,7 @@ IceTipPackageModel >> reload [ while: [ self entity reload ] ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> remove [ @@ -108,7 +110,7 @@ IceTipPackageModel >> remove [ while: [ self entity remove ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> status [ "entity could be a repository or a package" [ @@ -120,7 +122,7 @@ IceTipPackageModel >> status [ ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> statusDecorator [ self entity isLoaded @@ -128,7 +130,7 @@ IceTipPackageModel >> statusDecorator [ ^ super statusDecorator ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> unload [ diff --git a/Iceberg-TipUI/IceTipPresenter.class.st b/Iceberg-TipUI/IceTipPresenter.class.st index bd03d7bd41..e6fa418d83 100644 --- a/Iceberg-TipUI/IceTipPresenter.class.st +++ b/Iceberg-TipUI/IceTipPresenter.class.st @@ -2,54 +2,56 @@ I'm a SpPresenter that is prepared to be wrapped in a window (or a dialog). The way it is prepared is through a system of hooks (template method pattern), but also providing some convenience API. " Class { - #name : #IceTipPresenter, - #superclass : #SpPresenter, + #name : 'IceTipPresenter', + #superclass : 'SpPresenter', #instVars : [ 'decorations' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #decorating } +{ #category : 'decorating' } IceTipPresenter class >> buildDecorations [ ^ (Pragma allNamed: #extensionDecorators in: self class) flatCollect: [ :pragma | self perform: pragma methodSelector ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter class >> currentApplication [ ^ StPresenter currentApplication ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPresenter class >> new [ ^ self newApplication: self currentApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter >> closeWindow [ "Close the window of this presenter" self window close ] -{ #category : #private } +{ #category : 'private' } IceTipPresenter >> decorations [ ^ decorations ifNil: [ decorations := self class buildDecorations ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> iconForWindow [ "Answer a Form to be used during initialization when opening in a SpWindowPresenter." ^ self iconNamed: #smallWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initialExtentForWindow [ "Answer either nil or a Point representing the initial extent of this presenter. It is used during initialization if this presenter is opened inside a SpWindowPresenter. @@ -58,7 +60,7 @@ IceTipPresenter >> initialExtentForWindow [ ^ nil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -70,25 +72,25 @@ IceTipPresenter >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setInitialExtentTo: aSpWindowPresenter [ aSpWindowPresenter initialExtent: self initialExtentForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setTitleTo: aSpWindowPresenter [ aSpWindowPresenter title: self titleForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setWindowIconTo: aSpWindowPresenter [ aSpWindowPresenter windowIcon: self iconForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> titleForWindow [ "Answer the title to use during initialization when this presenter is being opened in a SpWindowPresenter." @@ -97,7 +99,7 @@ IceTipPresenter >> titleForWindow [ ] -{ #category : #extensions } +{ #category : 'extensions' } IceTipPresenter >> updateTitle [ self withWindowDo: [ :aWindow | aWindow title: self titleForWindow ] diff --git a/Iceberg-TipUI/IceTipPreviewBrowser.class.st b/Iceberg-TipUI/IceTipPreviewBrowser.class.st index 7623877b11..50cb8b30d1 100644 --- a/Iceberg-TipUI/IceTipPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipPreviewBrowser.class.st @@ -3,35 +3,37 @@ I'm a browser to show a preview of an operation that can be made right after. Tipically, I'm using through my chldren, to do a checkout or merge. " Class { - #name : #IceTipPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'actionPanel', 'button' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> actionPanel [ ^ actionPanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,19 +44,19 @@ IceTipPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffPanel on: self model diff. @@ -62,14 +64,14 @@ IceTipPreviewBrowser >> initializePresenters [ actionPanel add: (button := self newActionButton) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPreviewBrowser >> newActionButton [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipPullBrowser.class.st b/Iceberg-TipUI/IceTipPullBrowser.class.st index 8337cf3717..2f61669678 100644 --- a/Iceberg-TipUI/IceTipPullBrowser.class.st +++ b/Iceberg-TipUI/IceTipPullBrowser.class.st @@ -3,18 +3,20 @@ I perform a pull of incoming commits. " Class { - #name : #IceTipPullBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPullBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPullBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipFetchInPullCommand forSpec ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPullBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPullModel @@ -24,20 +26,20 @@ IceTipPullBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullBrowser >> doPull [ self model newPullAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> labelForRemotePanel [ ^ 'Pull from remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPullBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipPullBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> titleForWindow [ ^ 'Pull {1}/{2} from {3}' format: { diff --git a/Iceberg-TipUI/IceTipPullCommand.class.st b/Iceberg-TipUI/IceTipPullCommand.class.st index 52249626c8..f51c0503b4 100644 --- a/Iceberg-TipUI/IceTipPullCommand.class.st +++ b/Iceberg-TipUI/IceTipPullCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a pull of incomming commits. I open a pull view window. " Class { - #name : #IceTipPullCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPullCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultDescription [ ^ 'Pulls into image all commits from your version to the origin remote HEAD' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultName [ ^ 'Pull' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> badge [ | result | @@ -33,7 +35,7 @@ IceTipPullCommand >> badge [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPullCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullCommand >> iconName [ ^ #down diff --git a/Iceberg-TipUI/IceTipPullModel.class.st b/Iceberg-TipUI/IceTipPullModel.class.st index 1dc3fc02fc..a539dc84d4 100644 --- a/Iceberg-TipUI/IceTipPullModel.class.st +++ b/Iceberg-TipUI/IceTipPullModel.class.st @@ -2,12 +2,14 @@ I'm a model to present pull commits and operations. " Class { - #name : #IceTipPullModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPullModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullModel >> commitModels [ ^ (self entity branch incomingCommitsFrom: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPullModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullModel >> newPullAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipPushAction.class.st b/Iceberg-TipUI/IceTipPushAction.class.st index 25ab9149af..63e2530b17 100644 --- a/Iceberg-TipUI/IceTipPushAction.class.st +++ b/Iceberg-TipUI/IceTipPushAction.class.st @@ -2,12 +2,14 @@ I perform a push. " Class { - #name : #IceTipPushAction, - #superclass : #IceTipAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushAction', + #superclass : 'IceTipAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipPushAction >> basicExecute [ UIManager default diff --git a/Iceberg-TipUI/IceTipPushBrowser.class.st b/Iceberg-TipUI/IceTipPushBrowser.class.st index 9947a1bdbc..a9fd2695c0 100644 --- a/Iceberg-TipUI/IceTipPushBrowser.class.st +++ b/Iceberg-TipUI/IceTipPushBrowser.class.st @@ -3,18 +3,20 @@ I perform a push of outgoing commits. " Class { - #name : #IceTipPushBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPushBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPushBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "No commands to add." ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPushBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPushModel @@ -24,21 +26,21 @@ IceTipPushBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushBrowser >> doPush [ self model newPushAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> labelForRemotePanel [ ^ 'Push to remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPushBrowser >> newActionButton [ ^ self newButton @@ -50,7 +52,7 @@ IceTipPushBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> titleForWindow [ ^ 'Push {1}/{2} to {3}' format: { diff --git a/Iceberg-TipUI/IceTipPushCommand.class.st b/Iceberg-TipUI/IceTipPushCommand.class.st index 282cc6f6e2..4c8aebefd0 100644 --- a/Iceberg-TipUI/IceTipPushCommand.class.st +++ b/Iceberg-TipUI/IceTipPushCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a push of outgoing commits. I open a push view window. " Class { - #name : #IceTipPushCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultDescription [ ^ 'Pushes pending commits to the origin repository (in current branch)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultName [ ^ 'Push' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> badge [ | result | @@ -34,7 +36,7 @@ IceTipPushCommand >> badge [ ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPushCommand >> execute [ (IceTipPushBrowser onRepositoryModel: self repositoryModel) open ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushCommand >> iconName [ ^ #up diff --git a/Iceberg-TipUI/IceTipPushModel.class.st b/Iceberg-TipUI/IceTipPushModel.class.st index 888cfbeccf..c41a476ead 100644 --- a/Iceberg-TipUI/IceTipPushModel.class.st +++ b/Iceberg-TipUI/IceTipPushModel.class.st @@ -2,12 +2,14 @@ I'm a model to present push commits and operations. " Class { - #name : #IceTipPushModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPushModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushModel >> commitModels [ ^ (self entity outgoingCommitsTo: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPushModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushModel >> newPushAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st index c0ff3c884f..a5791aa76d 100644 --- a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st +++ b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st @@ -15,8 +15,8 @@ IceTipReadOnlyForm new " Class { - #name : #IceTipReadOnlyFormBuilder, - #superclass : #Object, + #name : 'IceTipReadOnlyFormBuilder', + #superclass : 'Object', #instVars : [ 'labelColor', 'labelWidth', @@ -25,10 +25,12 @@ Class { 'spApplication', 'presenter' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpApplication [ "If you want to keep order, just send an OrderedDictionary" @@ -39,13 +41,13 @@ IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpAppl build ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> application: aSpApplication [ spApplication := aSpApplication ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> build [ presenter := spApplication newPresenter: SpPresenter. @@ -53,7 +55,7 @@ IceTipReadOnlyFormBuilder >> build [ ^ presenter ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> buildLayout [ | lastLabel fieldPresenter | lastLabel := items associations last key. @@ -84,26 +86,26 @@ IceTipReadOnlyFormBuilder >> buildLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultLabelWidth [ ^ 100 * self currentWorld displayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultRowHeight [ ^ 30 * self currentWorld displayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipReadOnlyFormBuilder >> initialize [ items := OrderedDictionary new. super initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> items: aDictionary [ items removeAll. @@ -111,37 +113,37 @@ IceTipReadOnlyFormBuilder >> items: aDictionary [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor [ ^ labelColor ifNil: [ labelColor := Smalltalk ui theme textColor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor: aColor [ ^ labelColor := aColor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth [ ^ labelWidth ifNil: [ self defaultLabelWidth ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth: aNumber [ ^ labelWidth := aNumber ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight [ ^ rowHeight ifNil: [ rowHeight := self defaultRowHeight ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight: aNumber [ rowHeight := aNumber diff --git a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st index 5ac1bb6832..d96de2a584 100644 --- a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st @@ -2,24 +2,26 @@ Command that launches a refresh of the commit tree during commit " Class { - #name : #IceTipRefreshCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRefreshCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultDescription [ ^ 'Refresh this change tree' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultName [ ^ 'Refresh' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRefreshCommitCommand >> execute [ self repositoryModel reset. @@ -28,13 +30,13 @@ IceTipRefreshCommitCommand >> execute [ self toolAnnouncer announce: (IceTipDiffRefreshed for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> iconName [ ^ #glamorousRefresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st index b93531803d..2388a31c59 100644 --- a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st @@ -7,23 +7,25 @@ self new openDialogWithSpec " Class { - #name : #IceTipRegisterRepositoryDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipRegisterRepositoryDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'types', 'repository', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> allTypes [ ^ types ifNil: [ types := IceTipRepositoryTypePanel allTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ self withoutNewRepository. @@ -31,7 +33,7 @@ IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ repository := aRepository ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doAccept [ | newRepository | @@ -42,7 +44,7 @@ IceTipRegisterRepositoryDialogPresenter >> doAccept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ repository @@ -50,32 +52,32 @@ IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ subdirectory: aRepository subdirectory ] -{ #category : #testing } +{ #category : 'testing' } IceTipRegisterRepositoryDialogPresenter >> isEditing [ ^ repository isNotNil ] -{ #category : #events } +{ #category : 'events' } IceTipRegisterRepositoryDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRegisterRepositoryDialogPresenter >> titleForWindow [ ^ 'Register project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutLocalRepository [ types := self allTypes reject: #isLocalRepository. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutNewRepository [ types := self allTypes reject: #isNewRepository. diff --git a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st index 197067b52f..e09b6bdb88 100644 --- a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that reloads the code of an already loaded package, discarding all changes done in the meantime that were not committed. " Class { - #name : #IceTipReloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipReloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultDescription [ ^ 'Reload selected package, discarding all changes.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultName [ ^ 'Reload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipReloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipReloadPackageCommand >> execute [ self packageModel reload. @@ -33,7 +35,7 @@ IceTipReloadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReloadPackageCommand >> iconName [ ^ #refresh diff --git a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st index 34937c7b68..ae2706a1ef 100644 --- a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st @@ -1,25 +1,27 @@ Class { - #name : #IceTipRemoteActionBrowser, - #superclass : #IceTipHistoryActionBrowser, + #name : 'IceTipRemoteActionBrowser', + #superclass : 'IceTipHistoryActionBrowser', #instVars : [ 'remotePanel', 'remoteLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRemoteActionBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "No commands to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRemoteActionBrowser class >> onRepositoryModel: aRepository [ ^ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoteActionBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -36,7 +38,7 @@ IceTipRemoteActionBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializePresenters [ super initializePresenters. @@ -51,7 +53,7 @@ IceTipRemoteActionBrowser >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. @@ -59,25 +61,25 @@ IceTipRemoteActionBrowser >> initializeWindow: aWindow [ aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> labelForRemotePanel [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> mainList [ ^ commitsPanel commitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel [ ^ remotePanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel: aSpPresenter [ remotePanel := aSpPresenter diff --git a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st index 88a28a1881..db2bb3ddd6 100644 --- a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st @@ -2,24 +2,26 @@ I'm a the abstract superclass of commands that act on remotes. " Class { - #name : #IceTipRemoteActionCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoteActionCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand class >> isAbstract [ ^ self == IceTipRemoteActionCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand >> canBeExecuted [ ^ self isRepositoryOperational and: [ self repositoryModel hasRemotes ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipRemoteActionCommand >> validateRemotesPresent [ self repositoryModel hasRemotes diff --git a/Iceberg-TipUI/IceTipRemoteActionModel.class.st b/Iceberg-TipUI/IceTipRemoteActionModel.class.st index 20b9262471..bac204af2f 100644 --- a/Iceberg-TipUI/IceTipRemoteActionModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionModel.class.st @@ -1,24 +1,26 @@ Class { - #name : #IceTipRemoteActionModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipRemoteActionModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> branchName [ ^ entity branchName ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionModel >> isRepositoryDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remote [ ^ remote ifNil: [ | head | head := self repositoryModel entity head. @@ -27,27 +29,27 @@ IceTipRemoteActionModel >> remote [ ifFalse: [ self remoteModels first entity ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModel [ ^ repositoryModel remoteModels detect: [ :e | e entity = self remote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModels [ ^ self repositoryModel remoteModels ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteName [ ^ self remote name, '/', self entity branch name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> useRemote: aRemoteModel [ remote := aRemoteModel entity. ] diff --git a/Iceberg-TipUI/IceTipRemoteModel.class.st b/Iceberg-TipUI/IceTipRemoteModel.class.st index 88688143f4..520a10d1cd 100644 --- a/Iceberg-TipUI/IceTipRemoteModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteModel.class.st @@ -2,14 +2,16 @@ I'm a model for IceRemote entries. " Class { - #name : #IceTipRemoteModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRemoteModel', + #superclass : 'IceTipEntityModel', #traits : 'TWithBranchModel', #classTraits : 'TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #comparing } +{ #category : 'comparing' } IceTipRemoteModel >> = anotherModel [ self species = anotherModel species ifFalse: [ ^ false ]. @@ -17,23 +19,23 @@ IceTipRemoteModel >> = anotherModel [ ^ entity = anotherModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> branches [ ^ self entity branches ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> description [ ^ '{1} <{2}>' format: { self name. self entity url } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newDeleteAction [ @@ -45,7 +47,7 @@ IceTipRemoteModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newFetchAction [ diff --git a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st index 8007441af0..67ab450880 100644 --- a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st +++ b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st @@ -2,36 +2,38 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRemotesTreeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemotesTreeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand class >> isAbstract [ ^ self == IceTipRemotesTreeCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item canActivateCommand: self ] diff --git a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st index e2b78de9dc..fbf5514850 100644 --- a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st @@ -2,43 +2,45 @@ I remove a credential from the credential store. " Class { - #name : #IceTipRemoveCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipRemoveCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultDescription [ ^ 'Removes the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultName [ ^ 'Remove' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoveCredentialCommand >> canBeExecuted [ ^ self item isDefault not ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveCredentialCommand >> execute [ self store removeCredential: self item. self tool refresh. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st index be305dcb9b..371f2f2475 100644 --- a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st @@ -2,30 +2,32 @@ Command that removes a package from the repository, without removing it from the system. " Class { - #name : #IceTipRemoveFromRepositoryPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoveFromRepositoryPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultDescription [ ^ 'Removes the current repository from the repository, without removing it from the system' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultName [ ^ 'Remove from repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveFromRepositoryPackageCommand >> execute [ self packageModel remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveFromRepositoryPackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st index c1872aeb06..23317b3c2b 100644 --- a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRemovePackageDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemovePackageDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', @@ -8,10 +8,12 @@ Class { 'removeFromRepositoryCheckbox', 'unloadFromImageCheckbox' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemovePackageDialogPresenter >> accept [ self removeFromRepositoryCheckbox state @@ -20,19 +22,19 @@ IceTipRemovePackageDialogPresenter >> accept [ ifTrue: [ self model unload ]. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove package {1}?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemovePackageDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -48,13 +50,13 @@ IceTipRemovePackageDialogPresenter >> defaultLayout [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ ^ (500 @@ -62,7 +64,7 @@ IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ scaledByDisplayScaleFactor "Yes, a magic number" ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -81,37 +83,37 @@ IceTipRemovePackageDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> removeFromRepositoryCheckbox [ ^ removeFromRepositoryCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> titleForWindow [ ^ 'Remove Package' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> unloadFromImageCheckbox [ ^ unloadFromImageCheckbox diff --git a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st index 448a16e9ed..71fe70061b 100644 --- a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRemoveRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemoveRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', 'confirmLabel', 'removeFileSystemCheckbox' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemoveRepositoryDialogPresenter >> accept [ (self removeFileSystemCheckbox state @@ -19,18 +21,18 @@ IceTipRemoveRepositoryDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove your repository {1} from your image?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -44,13 +46,13 @@ IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -60,7 +62,7 @@ IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -74,36 +76,36 @@ IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> removeFileSystemCheckbox [ ^ removeFileSystemCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> removeMessage [ ^ 'Also remove repository from file system' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> titleForWindow [ ^ 'Remove repository' diff --git a/Iceberg-TipUI/IceTipRepairAction.class.st b/Iceberg-TipUI/IceTipRepairAction.class.st index 32ed347aa6..787abea3ae 100644 --- a/Iceberg-TipUI/IceTipRepairAction.class.st +++ b/Iceberg-TipUI/IceTipRepairAction.class.st @@ -3,15 +3,17 @@ I'm a repair option. Repositories can be broken in several ways. My children will describe them and take the actions needed to perform the re-alignment of an image with its repository. " Class { - #name : #IceTipRepairAction, - #superclass : #IceTipAction, + #name : 'IceTipRepairAction', + #superclass : 'IceTipAction', #instVars : [ 'repositoryModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> allAvailableFor: aRepository [ ^ ((self allSubclasses select: [ :each | each isAvailableFor: aRepository ]) @@ -19,38 +21,38 @@ IceTipRepairAction class >> allAvailableFor: aRepository [ collect: #new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> help [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAbstract [ ^ self == IceTipRepairAction ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAvailableFor: aRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> order [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> title [ ^ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self context: aContext. @@ -58,7 +60,7 @@ IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> fetchAllRemotes [ | remotes | remotes := self repository remotes. @@ -72,32 +74,32 @@ IceTipRepairAction >> fetchAllRemotes [ self repository fetchFrom: each ] ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> help [ ^ self class help ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> icon [ ^ self class icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repositoryModel [ ^ repositoryModel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> title [ ^ self class title ] diff --git a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st index cd6c84405b..ff31e7a499 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> help [ ^ 'Discard all changes in your image and checkout an existing branch. This action will checkout the branch in the repository and synchronize your image with your repository. @@ -23,12 +25,12 @@ This action opens a preview window before doing any change. This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> icon [ ^ self iconNamed: #branch ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -38,17 +40,17 @@ IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ and: [ aRepository project isUnborn or: [ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> title [ ^ 'Checkout an existing branch discarding image changes' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st index 086cfc6cb7..acfd0b145a 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st @@ -7,12 +7,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutNewBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutNewBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> help [ ^ 'It creates a new branch from the commit your image is pointing to. This will not lose any change in the image. @@ -22,12 +24,12 @@ This situation happens because the code loaded in your image does not correspond This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> title [ ^ 'Create a new branch pointing to your image commit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutNewBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st index 2bbf694e4d..229ce41e08 100644 --- a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairCloneRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCloneRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> help [ ^ 'Clone again the repository into a new location. @@ -23,29 +25,29 @@ So, this action will very probably let you in a detached status. You will need to re-synchronize your repository with another repair action.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> icon [ ^ self iconNamed: #smallAdd ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCloneRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> title [ ^ 'Clone again this repository in a new location' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCloneRepository >> basicExecute [ ((IceTipRegisterRepositoryDialogPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipRepairCommand.class.st b/Iceberg-TipUI/IceTipRepairCommand.class.st index ad3f612190..1ea3fd269e 100644 --- a/Iceberg-TipUI/IceTipRepairCommand.class.st +++ b/Iceberg-TipUI/IceTipRepairCommand.class.st @@ -2,36 +2,38 @@ Command that opens the repair window on a repository " Class { - #name : #IceTipRepairCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultDescription [ ^ 'Helps you to repair your repository when it is detached.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultName [ ^ 'Repair repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultToolbarItemName [ ^ 'Repair' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCommand >> execute [ ((IceTipRepairRepositoryDialogPresenter @@ -42,7 +44,7 @@ IceTipRepairCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st index db3a15c9fa..9329155783 100644 --- a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st +++ b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairCreateSubdirectory, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCreateSubdirectory', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> help [ ^ 'Create a new subdirectory for the code. @@ -20,28 +22,28 @@ It is possible that the directory has been deleted or never committed after crea This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCreateSubdirectory class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> title [ ^ 'Create code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCreateSubdirectory >> basicExecute [ self repositoryModel createSourceDirectory. diff --git a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st index fe32425ac2..afc8e2f488 100644 --- a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st +++ b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairDiscardAndLoad, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairDiscardAndLoad', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> help [ ^ 'Discard all changes in your image and checkout the current commit (HEAD) in the repository. @@ -24,12 +26,12 @@ This situation happens because loaded code in your image is from a different com Opens a preview window with the incoming changes before doing any change.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> icon [ ^ self iconNamed: #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ and: [ aRepository head isDetached not ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> order [ ^ 40 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> title [ ^ 'Discard image changes and load repository version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairDiscardAndLoad >> basicExecute [ (IceTipCheckoutPreviewBrowser onBranch: self repositoryModel branchModel) @@ -58,7 +60,7 @@ IceTipRepairDiscardAndLoad >> basicExecute [ open ] -{ #category : #private } +{ #category : 'private' } IceTipRepairDiscardAndLoad >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairEditRepository.class.st b/Iceberg-TipUI/IceTipRepairEditRepository.class.st index 8850faf7bf..44a93839e4 100644 --- a/Iceberg-TipUI/IceTipRepairEditRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairEditRepository.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairEditRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairEditRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> help [ ^ 'You can edit the repository to inform another subdirectory name. Once the new subdirectory is updated, the packages in the repository are available. @@ -20,28 +22,28 @@ This happens because the source code directory has been moved or renamed. ' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> icon [ ^ self iconNamed: #edit ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairEditRepository class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> title [ ^ 'Edit the repository to select the correct code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairEditRepository >> basicExecute [ (IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st index c12b889730..74e0a17e52 100644 --- a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st @@ -6,12 +6,14 @@ matches if: " Class { - #name : #IceTipRepairFetchRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairFetchRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> help [ ^ 'You can fetch commits from a remote to find your image commit in your repository. This will not lose any change in the image or the repository. @@ -23,12 +25,12 @@ After doing the fetch, it is required to create a new branch to commit into the A second repair action will help you.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> icon [ ^ self iconNamed: #smallUpdate ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy referenceCommit isUnknownCommit" @@ -37,24 +39,24 @@ IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy referenceCommit isUnknownCommit ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> order [ ^ 15 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> title [ ^ 'Fetch remote commits including the commits of the image version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" self fetchAllRemotes ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st index 232abefec4..985b9b5f55 100644 --- a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairLocateRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairLocateRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> help [ ^ 'Locate this repository in your file system. @@ -23,29 +25,29 @@ You will need to re-synchronize your repository with another repair action. This happens if the repository has been removed from the disk or the image was pointing to a repository in another machine (For example, when sharing images with other machines / people).' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> icon [ ^ self iconNamed: #glamorousFolder ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairLocateRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> title [ ^ 'Locate this repository in your file system' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> basicExecute [ | dialog | @@ -61,12 +63,12 @@ IceTipRepairLocateRepository >> basicExecute [ open. ] -{ #category : #private } +{ #category : 'private' } IceTipRepairLocateRepository >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] diff --git a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st index 13cae27f81..6cbe2c40af 100644 --- a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairMergeWithBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairMergeWithBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> help [ ^ 'This action checkouts an existing branch and loads the code in your image without discarding any change. This will not lose any change in the image but may lead to conflicts. If there are conflicts it opens a merge view. @@ -21,12 +23,12 @@ This situation happens because loaded code in your image is from a different com This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-committed changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> icon [ ^ self iconNamed: #merge ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -39,17 +41,17 @@ IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ aRepository head isDetached not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> title [ ^ 'Checkout an existing branch and merge the changes into the image (without discarding image changes)' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairMergeWithBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairProject.class.st b/Iceberg-TipUI/IceTipRepairProject.class.st index ce164f63e0..92caae1ec9 100644 --- a/Iceberg-TipUI/IceTipRepairProject.class.st +++ b/Iceberg-TipUI/IceTipRepairProject.class.st @@ -2,12 +2,14 @@ I'm an action to repair a project, which is useful when it answers true to #isUnborn. " Class { - #name : #IceTipRepairProject, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairProject', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> help [ ^ 'Edit the repository to add project meta-data. This action will create a .project file in the root of your repository adding meta information such as source code directory, project name, format and so on. @@ -15,12 +17,12 @@ This action will create a .project file in the root of your repository adding me This situation happens because your project does not have project meta-data and Iceberg does not know how to correctly interpret its data.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> icon [ ^ self iconNamed: #config ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairProject class >> isAvailableFor: aRepository [ "matches if: - workingCopy is atached @@ -32,17 +34,17 @@ IceTipRepairProject class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy project isUnborn ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> title [ ^ 'Create project meta-data' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairProject >> basicExecute [ ((IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st index bd5358853b..39dab6c93d 100644 --- a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st @@ -5,12 +5,14 @@ matches if: - workingCopy is detached AND there is no commit in the current available commits " Class { - #name : #IceTipRepairPullRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairPullRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> help [ ^ 'You can pull commits from a remote to put your image and your repository in sync. This will not lose any change in the image. @@ -20,12 +22,12 @@ This situation happens because the code loaded in your image is not in the branc This operation will modify the state of your working copy in disk. All non-committed changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> icon [ ^ self iconNamed: #down ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached AND there is no commit in the current available commits" @@ -37,17 +39,17 @@ IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ (aRepository includesCommit: aRepository workingCopy referenceCommit) not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> title [ ^ 'Pull remote commits to put your repository in sync' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairPullRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st index 9284c8ae2d..c67813e158 100644 --- a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRepairRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRepairRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'optionsList', 'detailPanel', @@ -8,16 +8,18 @@ Class { 'selectedOption', 'reasonPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepairRepositoryDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepairRepositoryDialogPresenter >> accept [ self closeWindow. @@ -26,13 +28,13 @@ IceTipRepairRepositoryDialogPresenter >> accept [ model: self model ] -{ #category : #'api - focus' } +{ #category : 'api - focus' } IceTipRepairRepositoryDialogPresenter >> defaultKeyboardFocus [ ^ optionsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepairRepositoryDialogPresenter >> defaultLayout [ self flag: #TODO. "Replace the fixed height with a correct style" @@ -44,19 +46,19 @@ IceTipRepairRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> detailPanel [ ^ detailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -70,7 +72,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ optionsList @@ -89,7 +91,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ whenActivatedDo: [ :selection | selection ifNotNil: [ self accept ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializePresenters [ reasonPanel := self newText @@ -108,31 +110,31 @@ IceTipRepairRepositoryDialogPresenter >> initializePresenters [ self initializeOptionsList ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> initializeReasonPanel [ reasonPanel text: self model longStatus ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> optionsList [ ^ optionsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> reasonPanel [ ^ reasonPanel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ selectedOption ifNotNil: [ @@ -141,14 +143,14 @@ IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> refreshDialogButtons [ self window ifNotNil: [ :aWindow | aWindow buttons first enabled: (selectedOption isNotNil) ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ selectedOption := selectedItem. @@ -157,13 +159,13 @@ IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> titleForWindow [ ^ 'Repair repository' diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 0bf3a8bff7..f10f85f4ff 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -5,17 +5,19 @@ I define basic actions and an entry point to manage each repository individually IceTipRepositoriesBrowser new open. " Class { - #name : #IceTipRepositoriesBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoriesBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'currentGroupPanel', 'repositoryNotebook', 'notifyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipFetchAllProjectCommand. @@ -26,7 +28,7 @@ IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -47,7 +49,7 @@ IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ super buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup. @@ -60,13 +62,13 @@ IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presente ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser class >> iconForWorldMenu [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #'world menu' } +{ #category : 'world menu' } IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ "Add a custom menu item to the world menu" @@ -80,13 +82,13 @@ IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ action: [ self new open ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> new [ ^ self newOnRepositoryProvider: IceRepository ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ | application | @@ -104,7 +106,7 @@ IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ notifyPanel layout add: (notifyPanel newLabel @@ -112,7 +114,7 @@ IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> connectPresenters [ repositoryNotebook whenSelectedPageChangedDo: [ :newPage | @@ -120,19 +122,19 @@ IceTipRepositoriesBrowser >> connectPresenters [ aPresenter updatePresenter ] ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> currentGroupPanel [ ^ currentGroupPanel ifNil: [ currentGroupPanel := self layout children first ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> defaultKeyboardFocus [ ^ repositoryNotebook ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoriesBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -141,7 +143,7 @@ IceTipRepositoriesBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> hasSelectedItem [ ^ repositoryNotebook selectedPage @@ -150,19 +152,19 @@ IceTipRepositoriesBrowser >> hasSelectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> iconForWindow [ ^ self class iconForWorldMenu ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initialExtentForWindow [ ^ (600 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initializePresenters [ notifyPanel := self newPresenter. @@ -172,14 +174,14 @@ IceTipRepositoriesBrowser >> initializePresenters [ repositoryNotebook := self newNotebook ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> mainList [ "should not arrive here" ^ nil ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -187,20 +189,20 @@ IceTipRepositoriesBrowser >> openManagePackagesWindow [ execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanel [ "this method is using exclusively for testing." ^ repositoryNotebook pages first activePresenter ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelIsShowingRepository: anIceLibgitRepository [ ^ self projectsPanel isShowingRepository: anIceLibgitRepository ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ "this method is using exclusively for testing. it will answer the repository list form the projects page" @@ -208,21 +210,21 @@ IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ ^ self projectsPanel repositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryModels [ "this method is used exclusively for testing" ^ self projectsPanelRepositoryList items ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> refresh [ repositoryNotebook selectedPage ifNil: [ ^ self ]. repositoryNotebook selectedPage activePresenter updatePresenter ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> refreshCommands [ | rootGroup | @@ -233,13 +235,13 @@ IceTipRepositoriesBrowser >> refreshCommands [ refreshToolbarWith: rootGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> selectedItem [ ^ repositoryNotebook selectedPage @@ -247,7 +249,7 @@ IceTipRepositoriesBrowser >> selectedItem [ ifNil: [ nil ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -255,7 +257,7 @@ IceTipRepositoriesBrowser >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -264,13 +266,13 @@ IceTipRepositoriesBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> titleForWindow [ ^ 'Repositories' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> updatePresenter [ LGitLibrary uniqueInstance isAvailable @@ -287,7 +289,7 @@ IceTipRepositoriesBrowser >> updatePresenter [ self refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoriesModel.class.st b/Iceberg-TipUI/IceTipRepositoriesModel.class.st index 363bd7ed9a..8d3cf107d6 100644 --- a/Iceberg-TipUI/IceTipRepositoriesModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesModel.class.st @@ -2,21 +2,23 @@ I'm a model to provide access to all repositories registered. " Class { - #name : #IceTipRepositoriesModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoriesModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositories [ ^ repositoryProvider repositories collect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryGroups [ | sortGroup groups | @@ -46,7 +48,7 @@ IceTipRepositoriesModel >> repositoryGroups [ group: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st index 3932c52a2d..d4c3e05009 100644 --- a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st @@ -3,16 +3,18 @@ I'm a browser to show the internals of a repository. I will show remotes, branches, tags and all possible operations in low level repository (pull, push, branch. But all edit remotes, etc.) " Class { - #name : #IceTipRepositoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'sidebarTree', 'historyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddRemoteCommand. @@ -24,7 +26,7 @@ IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aC aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ | aGroup | @@ -50,30 +52,30 @@ IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> new [ self error: 'Use #onRepository:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepositoryNamed: aString [ ^ self onRepository: (IceRepository registry detect: [ :each | each name = aString ]) ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipRepositoryBrowser >> commitishSelected: ann [ historyPanel model: ann ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryBrowser >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -83,19 +85,19 @@ IceTipRepositoryBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> historyPanel [ ^ historyPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initialExtentForWindow [ ^ (1000 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializePresenters [ sidebarTree := self newTreeTable. @@ -109,7 +111,7 @@ IceTipRepositoryBrowser >> initializePresenters [ self initializeSidebarTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializeSidebarTree [ sidebarTree @@ -129,14 +131,14 @@ IceTipRepositoryBrowser >> initializeSidebarTree [ ifTrue: [ self commitishSelected: selection selectedItem ] ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ sidebarTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryBrowser >> refresh [ self refreshCommands. @@ -145,7 +147,7 @@ IceTipRepositoryBrowser >> refresh [ self selectCurrentBranch ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) ifFalse: [ ^ self ]. @@ -153,7 +155,7 @@ IceTipRepositoryBrowser >> refreshWhenRepository: ann [ self updatePresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> selectCurrentBranch [ | branch | @@ -166,13 +168,13 @@ IceTipRepositoryBrowser >> selectCurrentBranch [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> sidebarTree [ ^ sidebarTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -181,13 +183,13 @@ IceTipRepositoryBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> titleForWindow [ ^ 'Repository of ' , self model name ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipRepositoryCommand.class.st b/Iceberg-TipUI/IceTipRepositoryCommand.class.st index 31cfa04b4c..42a298249b 100644 --- a/Iceberg-TipUI/IceTipRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipRepositoryCommand.class.st @@ -2,42 +2,44 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRepositoryCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepositoryCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand class >> isAbstract [ ^ self == IceTipRepositoryCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryCommand >> announcer [ ^ self context toolAnnouncer ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> canBeExecuted [ ^ self repositoryModel isNotNil diff --git a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st index d8aec6c69b..a31676a85a 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st @@ -4,23 +4,25 @@ Repository groups are taken from tags added to the repository metadata (usually NOTICE: first tag will be taken as the group. " Class { - #name : #IceTipRepositoryGroupModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoryGroupModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider', 'repositories', 'group' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel class >> defaultLabel [ ^ 'Projects' ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryGroupModel >> containsRepository: aRepository [ (self group isEmpty and: [ aRepository project tags isEmpty ]) @@ -29,19 +31,19 @@ IceTipRepositoryGroupModel >> containsRepository: aRepository [ ^ aRepository project tags includes: self group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group [ ^ group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group: aGroup [ group := aGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> label [ ^ self group @@ -49,7 +51,7 @@ IceTipRepositoryGroupModel >> label [ ifEmpty: [ self class defaultLabel ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositories [ ^ repositories := repositoryProvider repositories @@ -57,7 +59,7 @@ IceTipRepositoryGroupModel >> repositories [ thenCollect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st index 783b0f3295..fd61359ed0 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRepositoryGroupPanel, - #superclass : #SpPresenter, + #name : 'IceTipRepositoryGroupPanel', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', #instVars : [ 'repositoryList', 'repositoryFilter' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ self flag: #HACK. "I extracted this panel from IceTipRepositoriesBrowser, @@ -21,7 +23,7 @@ IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: a forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ | rootCommandGroup | @@ -36,13 +38,13 @@ IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ ^ rootCommandGroup ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> allListItems [ ^ self model repositories ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryGroupPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,26 +53,26 @@ IceTipRepositoryGroupPanel >> defaultLayout [ yourself ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> defaultOutputPort [ ^ self outputSelectionPort ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryGroupPanel >> hasSelectedItem [ ^ repositoryList selectedItem notNil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializePresenters [ repositoryList := self newTable. @@ -78,7 +80,7 @@ IceTipRepositoryGroupPanel >> initializePresenters [ self initializeRepositoryFilter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ repositoryFilter := self newTextInput. @@ -88,7 +90,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryList [ repositoryList @@ -122,7 +124,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryList [ whenActivatedDo: [ self openManagePackagesWindow ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ "this method is using just for test" @@ -130,7 +132,7 @@ IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ aRepositoryModel entity = anIceLibgitRepository ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ^ self rootCommandsGroup @@ -138,7 +140,7 @@ IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ifNone: [ nil ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryGroupPanel >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -146,7 +148,7 @@ IceTipRepositoryGroupPanel >> openManagePackagesWindow [ execute ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> outputSelectionPort [ ^ (SpSelectionPort newPresenter: self) @@ -154,7 +156,7 @@ IceTipRepositoryGroupPanel >> outputSelectionPort [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> refreshRepositoryList [ repositoryList updateItemsKeepingSelection: (repositoryFilter text @@ -163,25 +165,25 @@ IceTipRepositoryGroupPanel >> refreshRepositoryList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryList [ ^ repositoryList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> selectedItem [ ^ repositoryList selectedItem ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -189,13 +191,13 @@ IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> updatePresenter [ self refreshRepositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st index 9f59fb91b9..50453d5757 100644 --- a/Iceberg-TipUI/IceTipRepositoryModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryModel.class.st @@ -2,26 +2,28 @@ I'm a model for IceRepository entries. " Class { - #name : #IceTipRepositoryModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRepositoryModel', + #superclass : 'IceTipEntityModel', #traits : 'TIceCopyCommitId + TWithBranchModel', #classTraits : 'TIceCopyCommitId classTrait + TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel class >> unknownBranchLabel [ ^ 'Unknown' ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> = other [ ^ self species = other species and: [ self entity = other entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> allBranchModels [ ^ self entity allBranches collect: [ :each | @@ -31,14 +33,14 @@ IceTipRepositoryModel >> allBranchModels [ beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> availableRepairOptions [ ^ IceTipRepairAction allAvailableFor: self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModel [ ^ (IceTipBranchModel @@ -47,7 +49,7 @@ IceTipRepositoryModel >> branchModel [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModelFor: aBranch [ ^ (IceTipBranchModel repositoryModel: self @@ -55,7 +57,7 @@ IceTipRepositoryModel >> branchModelFor: aBranch [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchName [ (self isLibGitAvailable not or: [ self entity isMissing ]) @@ -64,36 +66,36 @@ IceTipRepositoryModel >> branchName [ ^ self entity head description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchNamed: aString [ ^ self entity branchNamed: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branches [ ^ self entity localBranches ] -{ #category : #checking } +{ #category : 'checking' } IceTipRepositoryModel >> checkMissing [ self isMissing ifTrue: [ IceError signal: ('You have no repository attached to project "{1}"' format: { self name }) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commit [ ^ self entity workingCopy referenceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitId [ ^ [ self entity headCommit id ] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitModelFor: aCommit [ ^ (IceTipCommitModel repositoryModel: self @@ -101,13 +103,13 @@ IceTipRepositoryModel >> commitModelFor: aCommit [ beCached ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> createSourceDirectory [ entity createSourceDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> description [ | text | @@ -117,7 +119,7 @@ IceTipRepositoryModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> descriptionDecorator [ (self isLibGitAvailable and: [ self entity isModified ]) @@ -125,24 +127,24 @@ IceTipRepositoryModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasRemotes [ ^ self entity remotes notEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasUnbornProject [ ^ self entity workingCopy project isUnborn ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> hash [ ^ self species hash bitXor: self entity hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> headModel [ | head | @@ -152,12 +154,12 @@ IceTipRepositoryModel >> headModel [ ifFalse: [ self commitModelFor: head ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> incomingCommits [ ^ self entity incomingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> info [ ^ { 'Branch' -> self entity branch name. @@ -166,46 +168,46 @@ IceTipRepositoryModel >> info [ } ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isCodeMissing [ ^ entity isCodeMissing ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLibGitAvailable [ ^ LGitLibrary uniqueInstance isAvailable ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLoaded [ ^ self entity loadedPackages notEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isMissing [ ^ self entity isMissing ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> localRepositoryMissing [ ^ 'Local repository missing' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> location [ ^ entity location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> longStatus [ (entity isMissing and: [ entity location isNil ]) @@ -229,17 +231,17 @@ IceTipRepositoryModel >> longStatus [ ^ 'Your repository seems ok. Please report a ticket in Iceberg''s issue tracker. If you can, please send us a backup of your image in this state for debugging.' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> matches: aString [ ^ self entity name matchesRegexIgnoringCase: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddPackagesAction: aCollection [ @@ -253,7 +255,7 @@ IceTipRepositoryModel >> newAddPackagesAction: aCollection [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ @@ -268,7 +270,7 @@ IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ @@ -279,7 +281,7 @@ IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ action: [ self entity createBranch: aString inCommit: aCommit ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCommitAction [ ^ IceTipCommitAction new @@ -287,7 +289,7 @@ IceTipRepositoryModel >> newCommitAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDeleteAction [ @@ -298,7 +300,7 @@ IceTipRepositoryModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDiscardChangesAction [ @@ -312,7 +314,7 @@ IceTipRepositoryModel >> newDiscardChangesAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newFetchAction [ @@ -324,7 +326,7 @@ IceTipRepositoryModel >> newFetchAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newForgetAction [ @@ -335,12 +337,12 @@ IceTipRepositoryModel >> newForgetAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfIncomingCommits [ ^ self incomingCommits size ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfOutgoingCommits [ ^ [ | size | self entity branch hasUpstream ifFalse: [ ^ '*' ]. @@ -351,40 +353,40 @@ IceTipRepositoryModel >> numberOfOutgoingCommits [ on: IceNotInBranch do: [ :e | '0' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> outgoingCommits [ ^ self entity outgoingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> packages [ ^ self entity workingCopy packages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> pushRemoteName [ ^ self entity branch upstream name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remoteModels [ ^ self entity remotes collect: [ :each | (IceTipRemoteModel repositoryModel: self on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remotes [ ^ entity remotes ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModel [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModelsByGroup [ | branches tags | branches := self allBranchModels. @@ -422,12 +424,12 @@ IceTipRepositoryModel >> repositoryModelsByGroup [ } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> shortCommitId [ ^ [self entity headCommit shortId] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> status [ [ | status incoming outgoing | @@ -465,7 +467,7 @@ IceTipRepositoryModel >> status [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusDecorator [ [ @@ -488,7 +490,7 @@ IceTipRepositoryModel >> statusDecorator [ ^ IceTipStatusDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusString [ [ | status incoming outgoing | @@ -525,13 +527,13 @@ IceTipRepositoryModel >> statusString [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> subdirectory [ ^ self entity subdirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> tagModels [ ^ self entity tags @@ -542,7 +544,7 @@ IceTipRepositoryModel >> tagModels [ beCached ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> updateLocation: aReference [ "change location" @@ -552,18 +554,18 @@ IceTipRepositoryModel >> updateLocation: aReference [ Iceberg announcer announce: (IceRepositoryModified for: self entity) ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> verifyDirectoryStructureIfMissing: aBlock [ self entity isMissing ifTrue: [ ^ aBlock value: self localRepositoryMissing ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopy [ ^ IceTipWorkingCopyModel on: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopyDiff [ diff --git a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st index 5d7d48dc7e..a5bff37e31 100644 --- a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st @@ -3,8 +3,8 @@ I'm a generic repository type panel. I'm used as part of the creation dialog and to edit repository properties. " Class { - #name : #IceTipRepositoryTypePanel, - #superclass : #IceTipPresenter, + #name : 'IceTipRepositoryTypePanel', + #superclass : 'IceTipPresenter', #instVars : [ 'projectLocationLabel', 'projectLocation', @@ -12,10 +12,12 @@ Class { 'remoteInputText', 'repository' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> allTypes [ ^ ((self allSubclasses reject: #isAbstract) @@ -23,37 +25,37 @@ IceTipRepositoryTypePanel class >> allTypes [ collect: #new ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel class >> isAbstract [ ^ self = IceTipRepositoryTypePanel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> order [ ^ 0 ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryTypePanel >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation pathString ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializePresenters [ self initializeProjectLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeProjectLocation [ projectLocationLabel := self newLabel label: 'Local directory'. @@ -63,7 +65,7 @@ IceTipRepositoryTypePanel >> initializeProjectLocation [ location: self defaultLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeRemoteURL [ remoteLabel := self newLabel label: 'Remote URL'; yourself. @@ -73,50 +75,50 @@ IceTipRepositoryTypePanel >> initializeRemoteURL [ yourself. ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isLocalRepository [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isNewRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> newRepository [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> projectLocation [ ^ projectLocation ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteInputText [ ^ remoteInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteLabel [ ^ remoteLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> repository: aRepository [ "Used if editing an existing repository" repository := aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> validate [ ^ self subclassResponsibility diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index a92054e657..fe4979489e 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -2,37 +2,39 @@ I'm a command to reset the selected branch to the selected commit. It does not modify the working copy. " Class { - #name : #IceTipResetBranchToThisCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipResetBranchToThisCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipResetBranchToThisCommitCommand class >> defaultDescription [ ^ 'Resets the selected branch to the selected commit. It does not modify the working copy (!!).' ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [ ^ 'Reset ', self selectedBranch name, ' to commit ', self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> execute [ self selectedBranch resetToCommit: self selectedCommitish. Iceberg announcer announce: (IceRepositoryModified for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> iconName [ ^ #bottom ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipResetBranchToThisCommitCommand >> name [ ^ self context @@ -40,13 +42,13 @@ IceTipResetBranchToThisCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedBranch [ ^ self context model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st index 2a35d1e302..32620f7057 100644 --- a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st +++ b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st @@ -3,24 +3,26 @@ I'm a command to install a chunk of code from a commit (shown in a diff) into th ""chunk"" can be a package, class or single method. " Class { - #name : #IceTipRevertChangeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRevertChangeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultDescription [ ^ 'Revert selected change in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultName [ ^ 'Revert change' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> execute [ UIManager default @@ -33,13 +35,13 @@ IceTipRevertChangeCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRevertChangeCommand >> iconName [ ^ #smallUndo ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> tool [ "We consider the diffPanel of the context as our tool. This is important because we have to announce in the same Announcer instance that is subscribed for our news." diff --git a/Iceberg-TipUI/IceTipSaveImageAction.class.st b/Iceberg-TipUI/IceTipSaveImageAction.class.st index a60893f771..0dc8f6057b 100644 --- a/Iceberg-TipUI/IceTipSaveImageAction.class.st +++ b/Iceberg-TipUI/IceTipSaveImageAction.class.st @@ -4,12 +4,14 @@ I implement the action of saving the image. I'm used by the presenter that prepares the commit. " Class { - #name : #IceTipSaveImageAction, - #superclass : #Object, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSaveImageAction', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execution } +{ #category : 'execution' } IceTipSaveImageAction >> execute [ Smalltalk saveSession. diff --git a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st index 69334d31e0..4b30645958 100644 --- a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st @@ -3,24 +3,26 @@ Implements the select all option behavior in the ""Select New Packages to Load"" " Class { - #name : #IceTipSelectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultName [ ^ 'Select all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSelectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display and they are not all selected " @@ -30,7 +32,7 @@ IceTipSelectAllPackagesCommand >> canBeExecuted [ ^ pkgList items notEmpty and: [ pkgList items size ~= pkgList selectedItems size ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipSelectAllPackagesCommand >> execute [ " Private - Select all the receiver's packages " @@ -38,7 +40,7 @@ IceTipSelectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectAllPackagesCommand >> iconName [ ^ #checkboxSelected diff --git a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st index c8218a5b92..25f6293bb2 100644 --- a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st @@ -2,12 +2,14 @@ Provides common behavior to accesing the packages list presenters in its context. " Class { - #name : #IceTipSelectPackagesCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectPackagesCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipSelectPackagesCommand >> packagesList [ " Answer a including the receiver's packages " diff --git a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st index 51ece93142..9ed3ec2535 100644 --- a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st +++ b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipSelectRemotePresenter, - #superclass : #SpPresenter, + #name : 'IceTipSelectRemotePresenter', + #superclass : 'SpPresenter', #instVars : [ 'remoteList', 'addButton', 'model' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> addButton [ ^ addButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipSelectRemotePresenter >> addRemote [ ((IceTipAddRemoteDialogPresenter @@ -30,7 +32,7 @@ IceTipSelectRemotePresenter >> addRemote [ open ] -{ #category : #layout } +{ #category : 'layout' } IceTipSelectRemotePresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -40,13 +42,13 @@ IceTipSelectRemotePresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> icon [ ^ self iconNamed: #add ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> initializePresenters [ remoteList := self newDropList @@ -60,44 +62,44 @@ IceTipSelectRemotePresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> label: aString [ self remoteLabel label: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> refresh [ remoteList items: self model remoteModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> remoteList [ ^ remoteList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> selectRemoteNamed: aString [ remoteList selectItem: (self model remoteModels detect: [ :each | each name = aString ]) ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipSelectRemotePresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> updatePresenter [ self refresh. diff --git a/Iceberg-TipUI/IceTipSettingsCommand.class.st b/Iceberg-TipUI/IceTipSettingsCommand.class.st index 7fd84a78c0..487cfeffdc 100644 --- a/Iceberg-TipUI/IceTipSettingsCommand.class.st +++ b/Iceberg-TipUI/IceTipSettingsCommand.class.st @@ -2,31 +2,33 @@ Command that opens the settings on a repository " Class { - #name : #IceTipSettingsCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSettingsCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultDescription [ ^ 'Open settings browser to configure Iceberg' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultName [ ^ 'Settings' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSettingsCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipSettingsCommand >> execute [ | browser window path | @@ -41,19 +43,19 @@ IceTipSettingsCommand >> execute [ browser expandNodePath: path first contents first contents first path. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> iconName [ ^ #configuration ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shortcutKey [ ^ $n meta ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipSpCommand.class.st b/Iceberg-TipUI/IceTipSpCommand.class.st index 41ad221c73..02907cc53e 100644 --- a/Iceberg-TipUI/IceTipSpCommand.class.st +++ b/Iceberg-TipUI/IceTipSpCommand.class.st @@ -4,27 +4,29 @@ I am a CmUICommand that is specialized for Iceberg UI. In particular, I'm used to wrap instances of IceTipCommand in a IceTipBrowser. " Class { - #name : #IceTipSpCommand, - #superclass : #CmUICommand, + #name : 'IceTipSpCommand', + #superclass : 'CmUICommand', #instVars : [ 'presenterBuildingStrategy' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> buildPresenter [ ^ self presenterBuildingStrategy resultOn: self ] -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> configureAsToolbarButton [ self presenterBuildingStrategy: IceTipToolbarButtonStrategy new ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ self displayStrategy @@ -33,30 +35,30 @@ IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ do: aBlock ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> ifVisible: aBlock [ self displayStrategy ifVisible: self do: aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSpCommand >> initialize [ super initialize. self configureAsToolbarButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy [ ^ presenterBuildingStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy: aStrategy [ presenterBuildingStrategy := aStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> toolbarItemName [ ^ self decoratedCommand toolbarItemName diff --git a/Iceberg-TipUI/IceTipStandardAction.class.st b/Iceberg-TipUI/IceTipStandardAction.class.st index 6d97da6496..205c3bf83c 100644 --- a/Iceberg-TipUI/IceTipStandardAction.class.st +++ b/Iceberg-TipUI/IceTipStandardAction.class.st @@ -4,27 +4,29 @@ I will perform an action by informing user what's happening. I will also check for errors happening while performing the task and try to recover from them. " Class { - #name : #IceTipStandardAction, - #superclass : #IceTipAction, + #name : 'IceTipStandardAction', + #superclass : 'IceTipAction', #instVars : [ 'message', 'successAnnounceBlock', 'actionBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action [ ^ actionBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action: aBlock [ actionBlock := aBlock ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> basicExecute [ | result | @@ -38,35 +40,35 @@ IceTipStandardAction >> basicExecute [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> do: aBlock [ self action: aBlock. self execute ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> execute: aBlock [ self action: aBlock. self execute ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message: anObject [ message := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessAnnounce: aValuable [ successAnnounceBlock := aValuable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessRepositoryModified [ ^ self onSuccessAnnounce: [ IceRepositoryModified for: self repository ] ] diff --git a/Iceberg-TipUI/IceTipStatusDecorator.class.st b/Iceberg-TipUI/IceTipStatusDecorator.class.st index ba1f418e96..47bd5ea718 100644 --- a/Iceberg-TipUI/IceTipStatusDecorator.class.st +++ b/Iceberg-TipUI/IceTipStatusDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> error [ ^ IceTipStatusDecoratorError uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> warning [ ^ IceTipStatusDecoratorWarning uniqueInstance diff --git a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st index c68d74a199..b17b0b0531 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecoratorError, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorError', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorError >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipStatusDecoratorError >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st index 4ab0410f00..27b044612c 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipStatusDecoratorWarning, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorWarning', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorWarning >> color [ ^ Smalltalk ui theme warningTextColor diff --git a/Iceberg-TipUI/IceTipStyleContributor.class.st b/Iceberg-TipUI/IceTipStyleContributor.class.st index 57fadcd53a..85cad5d70c 100644 --- a/Iceberg-TipUI/IceTipStyleContributor.class.st +++ b/Iceberg-TipUI/IceTipStyleContributor.class.st @@ -4,12 +4,14 @@ This class is call by Spec2 to extend the default stylesheet. Check its superclass to understand the way of working. " Class { - #name : #IceTipStyleContributor, - #superclass : #StPharoStyleContributor, - #category : #'Iceberg-TipUI-Styles' + #name : 'IceTipStyleContributor', + #superclass : 'StPharoStyleContributor', + #category : 'Iceberg-TipUI-Styles', + #package : 'Iceberg-TipUI', + #tag : 'Styles' } -{ #category : #styles } +{ #category : 'styles' } IceTipStyleContributor >> styleSheetContribution [ ^ SpStyle newApplication diff --git a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st index 20245a7b30..2cf032c786 100644 --- a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st +++ b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st @@ -8,12 +8,14 @@ I will switch first to the new branch, and then I will perform a merge with curr This strategy is used to re-attach image when it is detached from current development branch. " Class { - #name : #IceTipSwitchAndMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipSwitchAndMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipSwitchAndMergeType >> newMergeAction: aModel [ ^ aModel newSwitchAndMergeAction diff --git a/Iceberg-TipUI/IceTipTagDecorator.class.st b/Iceberg-TipUI/IceTipTagDecorator.class.st index 695df71986..52aafff355 100644 --- a/Iceberg-TipUI/IceTipTagDecorator.class.st +++ b/Iceberg-TipUI/IceTipTagDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipTagDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagDecorator >> color [ ^ Smalltalk ui theme disabledColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTagDecorator >> isItalic [ ^ true diff --git a/Iceberg-TipUI/IceTipTagModel.class.st b/Iceberg-TipUI/IceTipTagModel.class.st index cfd67df83a..cc72af64a0 100644 --- a/Iceberg-TipUI/IceTipTagModel.class.st +++ b/Iceberg-TipUI/IceTipTagModel.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTagModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> commitModels [ | commits | @@ -17,7 +19,7 @@ IceTipTagModel >> commitModels [ ^ commits ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> delete [ @@ -28,19 +30,19 @@ IceTipTagModel >> delete [ do: [ self repositoryModel entity removeTag: self entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> description [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" diff --git a/Iceberg-TipUI/IceTipTextDecorator.class.st b/Iceberg-TipUI/IceTipTextDecorator.class.st index 879c33d06a..0530538c8a 100644 --- a/Iceberg-TipUI/IceTipTextDecorator.class.st +++ b/Iceberg-TipUI/IceTipTextDecorator.class.st @@ -1,44 +1,46 @@ Class { - #name : #IceTipTextDecorator, - #superclass : #Object, + #name : 'IceTipTextDecorator', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator class >> none [ ^ IceTipTextDecoratorNone uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> uniqueInstance [ self = IceTipTextDecorator ifTrue: [ ^ self error: 'I''m abstract, use one of my children.' ]. ^ uniqueInstance ifNil: [ uniqueInstance := super new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme textColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isBold [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isItalic [ ^ false diff --git a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st index 5bfcdfb1db..79c406d278 100644 --- a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st +++ b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTextDecoratorNone, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTextDecoratorNone', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } diff --git a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st index 610e84556c..ceb50f8d8a 100644 --- a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st +++ b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st @@ -3,18 +3,20 @@ I'm a strategy to build Spec2 buttons foro a toolar wrapping a IceTipSpCommand. " Class { - #name : #IceTipToolbarButtonStrategy, - #superclass : #IceTipCommandToPresenterBuildingStrategy, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarButtonStrategy', + #superclass : 'IceTipCommandToPresenterBuildingStrategy', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipToolbarButtonStrategy >> buttonPresenterClass [ ^ SpToolbarButtonPresenter ] -{ #category : #public } +{ #category : 'public' } IceTipToolbarButtonStrategy >> resultOn: aCommand [ | aButtonPresenter | diff --git a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st index 67f6838fb7..91cc8f7fce 100644 --- a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st +++ b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st @@ -3,12 +3,14 @@ I'm a SpToolbarPresenterBuilder that delegates to the command the decision to ac " Class { - #name : #IceTipToolbarPresenterBuilder, - #superclass : #SpToolbarPresenterBuilder, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarPresenterBuilder', + #superclass : 'SpToolbarPresenterBuilder', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipToolbarPresenterBuilder >> visitCommand: anEntry [ anEntry ifVisible: [ super visitCommand: anEntry ] diff --git a/Iceberg-TipUI/IceTipTreeBranch.class.st b/Iceberg-TipUI/IceTipTreeBranch.class.st index 2c2c76c0ba..048ef0aeb2 100644 --- a/Iceberg-TipUI/IceTipTreeBranch.class.st +++ b/Iceberg-TipUI/IceTipTreeBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeBranch, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeBranch', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeBranch >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnBranch: self ] diff --git a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st index abe4c6c3f2..6d6c8e77c2 100644 --- a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st @@ -3,31 +3,33 @@ A generic command to collapse a tree. It sends `doCollapseSelection` message to its context. " Class { - #name : #IceTipTreeCollapseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeCollapseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultDescription [ ^ 'Collapse selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultName [ ^ 'Collapse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeCollapseCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeCollapseCommand >> execute [ self context doCollapseSelection diff --git a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st index b3e6aab770..c7ff5ac195 100644 --- a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st @@ -2,37 +2,39 @@ A generic command to expand tree items within a tree. " Class { - #name : #IceTipTreeExpandCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeExpandCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultDescription [ ^ 'Expand selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultName [ ^ 'Expand' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeExpandCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeExpandCommand >> execute [ self context doExpandSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeExpandCommand >> iconName [ ^ nil diff --git a/Iceberg-TipUI/IceTipTreeGroup.class.st b/Iceberg-TipUI/IceTipTreeGroup.class.st index bf0b91e110..3de0ec917c 100644 --- a/Iceberg-TipUI/IceTipTreeGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeGroup.class.st @@ -4,16 +4,18 @@ I keep groups with elements. I can provide also a contexts for menu operations and other kind of options to be associated with group. " Class { - #name : #IceTipTreeGroup, - #superclass : #IceTipTreeNode, + #name : 'IceTipTreeGroup', + #superclass : 'IceTipTreeNode', #instVars : [ 'name', 'children' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName children: aCollection [ ^ self new name: aName; @@ -21,7 +23,7 @@ IceTipTreeGroup class >> name: aName children: aCollection [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ ^ self new name: aName; @@ -30,7 +32,7 @@ IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> addChild: anObject [ children ifNil: [ children := OrderedCollection new ]. children add: anObject. @@ -38,23 +40,23 @@ IceTipTreeGroup >> addChild: anObject [ ^ anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children [ ^ children ifNil: [ #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children: aCollection [ children := aCollection. children do: [ :each | each parent: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> ensurePath: aPath [ | first next | @@ -67,34 +69,34 @@ IceTipTreeGroup >> ensurePath: aPath [ ifEmpty: [ next ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isGroup [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isSameAs: aNode [ ^ aNode species = self species and: [ self name = aNode name and: [ aNode name notNil ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name: anObject [ name := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock [ ^ self traversingDo: aBlock parents: #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray. self children do: [ :each | diff --git a/Iceberg-TipUI/IceTipTreeItem.class.st b/Iceberg-TipUI/IceTipTreeItem.class.st index bea3c80b69..62ce9f9737 100644 --- a/Iceberg-TipUI/IceTipTreeItem.class.st +++ b/Iceberg-TipUI/IceTipTreeItem.class.st @@ -2,36 +2,38 @@ I'm a leaf element of a tree. " Class { - #name : #IceTipTreeItem, - #superclass : #IceTipTreeNode, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeItem', + #superclass : 'IceTipTreeNode', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> description [ ^ self model description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> descriptionDecorator [ ^ self model descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeItem >> isSameAs: aNode [ ^ aNode species = self species and: [ self model = aNode model ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> shortDescription [ ^ self model shortDescription ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray diff --git a/Iceberg-TipUI/IceTipTreeNode.class.st b/Iceberg-TipUI/IceTipTreeNode.class.st index 43b31c752c..932a612b46 100644 --- a/Iceberg-TipUI/IceTipTreeNode.class.st +++ b/Iceberg-TipUI/IceTipTreeNode.class.st @@ -5,38 +5,40 @@ I understand - icon " Class { - #name : #IceTipTreeNode, - #superclass : #Object, + #name : 'IceTipTreeNode', + #superclass : 'Object', #instVars : [ 'model', 'parent', 'icon' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeNode class >> on: aModel [ ^ self new model: aModel ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> canActivateCommand: aCommandClass [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> children [ ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> description [ ^ self subclassResponsibility ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipTreeNode >> doesNotUnderstand: aMessage [ "redirect to model to provide polymorphism." self flag: #pharoTodo. "I'm not sure this is good practice... we'll see how it works" @@ -44,59 +46,59 @@ IceTipTreeNode >> doesNotUnderstand: aMessage [ ^ aMessage sendTo: self model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon [ ^ icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon: anIcon [ icon := anIcon ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isGroup [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isLeaf [ ^ self isGroup not ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isSameAs: aNode [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent [ ^ parent ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent: anObject [ parent := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> path [ ^ self parent ifNotNil: [ :p | p path, { self } ] ifNil: [ { self } ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> traversingDo: aBlock parents: anArray [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipTreeRemote.class.st b/Iceberg-TipUI/IceTipTreeRemote.class.st index ca4a7d6761..df832c0592 100644 --- a/Iceberg-TipUI/IceTipTreeRemote.class.st +++ b/Iceberg-TipUI/IceTipTreeRemote.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeRemote, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRemote', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeRemote >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnRemote: self ] diff --git a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st index 641cdf415b..34b4cacef9 100644 --- a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTreeRepositoryGroup, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRepositoryGroup', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } diff --git a/Iceberg-TipUI/IceTipTreeTag.class.st b/Iceberg-TipUI/IceTipTreeTag.class.st index 1f930e5759..5369001c4b 100644 --- a/Iceberg-TipUI/IceTipTreeTag.class.st +++ b/Iceberg-TipUI/IceTipTreeTag.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeTag, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeTag', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeTag >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnTag: self ] diff --git a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st index 799a7e886a..95664d05d8 100644 --- a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st @@ -7,30 +7,32 @@ It gives the user with two checkboxes to choose: Right now this is only shown for loaded packages. " Class { - #name : #IceTipUnloadAndRemovePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadAndRemovePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultDescription [ ^ 'Opens a dialog to choose between unloading from system and/or removing a package from the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultName [ ^ 'Unload and/or remove from repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadAndRemovePackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadAndRemovePackageCommand >> execute [ (IceTipRemovePackageDialogPresenter @@ -41,7 +43,7 @@ IceTipUnloadAndRemovePackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadAndRemovePackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st index 6ca10d560f..ba89f54d03 100644 --- a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st @@ -2,36 +2,38 @@ Command to unload a package from the system, keeping it in the repository " Class { - #name : #IceTipUnloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultDescription [ ^ 'Unload selected package from the system, but keep it in the repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultName [ ^ 'Unload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadPackageCommand >> execute [ self packageModel unload ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadPackageCommand >> iconName [ ^ #smallCancel diff --git a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st index 9527d0f50e..f2b6ae1931 100644 --- a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st @@ -3,24 +3,26 @@ Implements the unselect all option behavior in the ""Select New Packages to Load " Class { - #name : #IceTipUnselectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnselectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnselectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipUnselectAllPackagesCommand class >> defaultName [ ^ 'Unselect all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnselectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display " @@ -30,7 +32,7 @@ IceTipUnselectAllPackagesCommand >> canBeExecuted [ ^ pkgList items notEmpty ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnselectAllPackagesCommand >> execute [ " Private - Unselect all the receiver's packages " @@ -38,7 +40,7 @@ IceTipUnselectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnselectAllPackagesCommand >> iconName [ ^ #checkboxUnselected diff --git a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st index c21462781d..57a7aa7cd3 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st @@ -8,8 +8,8 @@ For versions, I show the same commands of a regular history browser, but add som " Class { - #name : #IceTipVersionHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipVersionHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'selectedModel', @@ -17,16 +17,18 @@ Class { 'diffPage', 'commitPanel' ], - #category : #'Iceberg-TipUI-View-Versions' + #category : 'Iceberg-TipUI-View-Versions', + #package : 'Iceberg-TipUI', + #tag : 'View-Versions' } -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipInstallVersionCommand } @@ -35,7 +37,7 @@ IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter f ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ ^ self on: (IceTipVersionHistoryModel @@ -44,13 +46,13 @@ IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipVersionHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -59,13 +61,13 @@ IceTipVersionHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initialExtentForWindow [ ^ (700@700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitList [ commitList @@ -94,7 +96,7 @@ IceTipVersionHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -106,7 +108,7 @@ IceTipVersionHistoryBrowser >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -116,21 +118,21 @@ IceTipVersionHistoryBrowser >> initializePresenters [ self initializeCommitPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipVersionHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPage [ ^ SpNotebookPage @@ -139,7 +141,7 @@ IceTipVersionHistoryBrowser >> newDiffPage [ provider: [ self newDiffPresenter ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ ^ (self instantiate: SpDiffPresenter) @@ -148,7 +150,7 @@ IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ showOptions: false ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newDiffPresenter [ selectedModel ifNil: [ ^ self ]. @@ -159,7 +161,7 @@ IceTipVersionHistoryBrowser >> newDiffPresenter [ right: selectedModel source ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newInfoPage [ ^ SpNotebookPage @@ -169,14 +171,14 @@ IceTipVersionHistoryBrowser >> newInfoPage [ ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newVersionInfoPresenter [ selectedModel ifNil: [ ^ self ]. ^ IceTipReadOnlyFormBuilder newBuiltFor: selectedModel info application: self application ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> refresh [ commitList items: self model commitModels. @@ -186,7 +188,7 @@ IceTipVersionHistoryBrowser >> refresh [ self refreshCommitTabPanel ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ selectedModel ifNil: [ ^ self ]. @@ -198,14 +200,14 @@ IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ commitPanel resetAllPageContents ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipVersionHistoryBrowser >> selectionChanged: aSelectedItem [ selectedModel := aSelectedItem. self refreshCommitTabPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> titleForWindow [ ^ self model @@ -213,7 +215,7 @@ IceTipVersionHistoryBrowser >> titleForWindow [ ifNil: [ 'Versions' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st index 59bfc94f75..b5fd22c176 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st @@ -2,22 +2,24 @@ I'm a model to provide the history of a method. " Class { - #name : #IceTipVersionHistoryModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipVersionHistoryModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'commitModels' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModelAfter: aModel [ ^ self commitModels after: aModel ifAbsent: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModels [ ^ commitModels ifNil: [ commitModels := self retrieveHistory collect: [ :each | @@ -27,18 +29,18 @@ IceTipVersionHistoryModel >> commitModels [ beCached ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> name [ ^ '{1}>>{2}' format: { self entity origin name. self entity selector } ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryModel >> retrieveHistory [ self repositoryModel checkMissing. diff --git a/Iceberg-TipUI/IceTipVersionModel.class.st b/Iceberg-TipUI/IceTipVersionModel.class.st index a416351dc2..4382df60ce 100644 --- a/Iceberg-TipUI/IceTipVersionModel.class.st +++ b/Iceberg-TipUI/IceTipVersionModel.class.st @@ -5,12 +5,14 @@ I'm a model for IceLogVersion entries. - I can install a certain method version. " Class { - #name : #IceTipVersionModel, - #superclass : #IceTipCommitModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipVersionModel', + #superclass : 'IceTipCommitModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #private } +{ #category : 'private' } IceTipVersionModel >> basicInstall [ | definition | @@ -20,12 +22,12 @@ IceTipVersionModel >> basicInstall [ classified: definition category ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> commit [ ^ self entity commit ] -{ #category : #actions } +{ #category : 'actions' } IceTipVersionModel >> install [ @@ -36,7 +38,7 @@ IceTipVersionModel >> install [ execute: [ self basicInstall ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> source [ ^ self entity source ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st index ebf9dd35c6..e9379df0ba 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st @@ -5,17 +5,19 @@ I show the packages managed by this repository and a series of actions to proper (IceTipPackagesBrowser forRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipWorkingCopyBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipWorkingCopyBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'statusBar', 'packagesTable', 'filterInput' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipRepairCommand. @@ -33,7 +35,7 @@ IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: a ] -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipBrowsePackageCommand. @@ -47,19 +49,19 @@ IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> allListItems [ ^ self model packageModels ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ | commandClass | @@ -72,7 +74,7 @@ IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> connectPresenters [ super connectPresenters. @@ -82,7 +84,7 @@ IceTipWorkingCopyBrowser >> connectPresenters [ ] -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -91,20 +93,20 @@ IceTipWorkingCopyBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> filterInput [ ^ filterInput ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> iconFor: aPackage [ self decorations do: [ :each | @@ -114,13 +116,13 @@ IceTipWorkingCopyBrowser >> iconFor: aPackage [ ^ self iconNamed: #package ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePackagesTable [ packagesTable @@ -147,7 +149,7 @@ IceTipWorkingCopyBrowser >> initializePackagesTable [ whenActivatedDo: [ :selection | self browsePackage: selection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePresenters [ filterInput := self newTextInput. @@ -156,7 +158,7 @@ IceTipWorkingCopyBrowser >> initializePresenters [ statusBar := self instantiate: IceTipWorkingCopyStatusBarPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -165,25 +167,25 @@ IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> mainList [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> packageModel [ ^ packagesTable selectedItem ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> packagesTable [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> refresh [ self refreshCommands. @@ -191,7 +193,7 @@ IceTipWorkingCopyBrowser >> refresh [ self refreshPackagesTable ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshPackagesTable [ packagesTable items: (filterInput text @@ -200,13 +202,13 @@ IceTipWorkingCopyBrowser >> refreshPackagesTable [ ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshStatusBar [ statusBar model: self model ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ (ann repository isNil or: [ @@ -217,25 +219,25 @@ IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipWorkingCopyBrowser >> setModelBeforeInitialization: aRepositoryModel [ self model: ( IceTipWorkingCopyModel on: aRepositoryModel ) ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyBrowser >> showsPackageNamed: aString [ ^ packagesTable items anySatisfy: [ :packageModel | packageModel name = aString ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> statusBar [ ^ statusBar ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -244,13 +246,13 @@ IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> titleForWindow [ ^ 'Working copy of ', self model repositoryName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st index e116fd4bcb..507b1e2c59 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st @@ -2,30 +2,32 @@ I'm a diff model that represents a diff between the HEAD commit and the image working copy. " Class { - #name : #IceTipWorkingCopyDiffModel, - #superclass : #IceTipDiffModel, + #name : 'IceTipWorkingCopyDiffModel', + #superclass : 'IceTipDiffModel', #instVars : [ 'diff' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyDiffModel >> diff [ ^ diff ifNil: [ diff := self newDiff ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyDiffModel >> isEmpty [ ^ self diff isEmpty ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipWorkingCopyDiffModel >> newDiff [ ^ self entity workingCopyDiff ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyDiffModel >> resetDiff [ diff := nil ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st index 21b5734be7..201e8943a9 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st @@ -2,51 +2,53 @@ I'm a model to for IceWorkingCopy entries. " Class { - #name : #IceTipWorkingCopyModel, - #superclass : #IceTipModel, + #name : 'IceTipWorkingCopyModel', + #superclass : 'IceTipModel', #instVars : [ 'sortingStrategy', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> new [ self error: 'use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> on: aRepositoryModel [ ^ self basicNew initializeRepositoryModel: aRepositoryModel; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> branchName [ ^ self repositoryModel branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> commitId [ ^ repositoryModel commitId ] -{ #category : #operations } +{ #category : 'operations' } IceTipWorkingCopyModel >> copyCommitIDToClipboard [ repositoryModel copyCommitIDToClipboard ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyModel >> initializeRepositoryModel: aRepositoryModel [ repositoryModel := aRepositoryModel. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> packageModels [ ^ self sortingStrategy sort: (self repositoryModel entity workingCopy packages collect: [ :each | @@ -56,37 +58,37 @@ IceTipWorkingCopyModel >> packageModels [ beCached ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> reset [ self repositoryModel reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> shortCommitId [ ^ repositoryModel shortCommitId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> sortingStrategy [ ^ sortingStrategy ifNil: [ sortingStrategy := IceSortingStrategy new first: #modified ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> status [ ^ self repositoryModel status ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> statusDecorator [ ^ self repositoryModel statusDecorator diff --git a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st index 03e34062ab..8cbcf3dfce 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st @@ -2,17 +2,19 @@ I'm the status bar for a IceTipWorkingCopyBrowser. " Class { - #name : #IceTipWorkingCopyStatusBarPresenter, - #superclass : #SpPresenter, + #name : 'IceTipWorkingCopyStatusBarPresenter', + #superclass : 'SpPresenter', #instVars : [ 'branchLabel', 'commitLink', 'statusLabel' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -25,20 +27,20 @@ IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyStatusBarPresenter >> canTakeKeyboardFocus [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyStatusBarPresenter >> initializePresenters [ branchLabel := self newLabel. statusLabel := self newLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> model: aModel [ "Fill labels from a IceTipWorkingCopyModel." @@ -52,7 +54,7 @@ IceTipWorkingCopyStatusBarPresenter >> model: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ branchLabel label: ('{1} at ' format: { aModel branchName }). @@ -64,7 +66,7 @@ IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithoutCommitId: aModel [ branchLabel label: aModel branchName. diff --git a/Iceberg-TipUI/IceTokenCredentials.extension.st b/Iceberg-TipUI/IceTokenCredentials.extension.st index 5b476eeb69..7164335fb8 100644 --- a/Iceberg-TipUI/IceTokenCredentials.extension.st +++ b/Iceberg-TipUI/IceTokenCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceTokenCredentials } +Extension { #name : 'IceTokenCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> editModelClass [ ^ IceTipEditTokenCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTraitDefinition.extension.st b/Iceberg-TipUI/IceTraitDefinition.extension.st index d072826557..03b023e483 100644 --- a/Iceberg-TipUI/IceTraitDefinition.extension.st +++ b/Iceberg-TipUI/IceTraitDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTraitDefinition } +Extension { #name : 'IceTraitDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTraitDefinition >> icon [ ^ self iconNamed: #trait ] diff --git a/Iceberg-TipUI/IceWarning.class.st b/Iceberg-TipUI/IceWarning.class.st index 2015f64db3..9b64da1319 100644 --- a/Iceberg-TipUI/IceWarning.class.st +++ b/Iceberg-TipUI/IceWarning.class.st @@ -2,12 +2,14 @@ I'm a general warning in the context of iceberg UI. " Class { - #name : #IceWarning, - #superclass : #Warning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceWarning', + #superclass : 'Warning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceWarning >> acceptError: aVisitor [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceWorkingCopy.extension.st b/Iceberg-TipUI/IceWorkingCopy.extension.st index 77e8f52665..c95aa1cc69 100644 --- a/Iceberg-TipUI/IceWorkingCopy.extension.st +++ b/Iceberg-TipUI/IceWorkingCopy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceWorkingCopy } +Extension { #name : 'IceWorkingCopy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceWorkingCopy >> description [ ^ self workingCopyState description diff --git a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st index 6806b57051..13901f838c 100644 --- a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st +++ b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitCredentialsPlaintext } +Extension { #name : 'LGitCredentialsPlaintext' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } LGitCredentialsPlaintext >> askForModelClassOn: aString [ ^ IceTipAskForPlaintextCredentialsPresenter diff --git a/Iceberg-TipUI/MCAddition.extension.st b/Iceberg-TipUI/MCAddition.extension.st index 86d577821e..eb93d60d68 100644 --- a/Iceberg-TipUI/MCAddition.extension.st +++ b/Iceberg-TipUI/MCAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCAddition } +Extension { #name : 'MCAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCAddition >> icon [ ^ self iconNamed: #changeAdd ] diff --git a/Iceberg-TipUI/MCModification.extension.st b/Iceberg-TipUI/MCModification.extension.st index e38d6d6886..2e6b693643 100644 --- a/Iceberg-TipUI/MCModification.extension.st +++ b/Iceberg-TipUI/MCModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCModification } +Extension { #name : 'MCModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCModification >> icon [ ^ self iconNamed: #changeUpdate ] diff --git a/Iceberg-TipUI/MCPatchOperation.extension.st b/Iceberg-TipUI/MCPatchOperation.extension.st index 8c55a52b83..e1f00ea122 100644 --- a/Iceberg-TipUI/MCPatchOperation.extension.st +++ b/Iceberg-TipUI/MCPatchOperation.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCPatchOperation } +Extension { #name : 'MCPatchOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCPatchOperation >> canBeBrowsed [ ^ true ] diff --git a/Iceberg-TipUI/MCRemoval.extension.st b/Iceberg-TipUI/MCRemoval.extension.st index 0eb55e9bd1..64ad429fed 100644 --- a/Iceberg-TipUI/MCRemoval.extension.st +++ b/Iceberg-TipUI/MCRemoval.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #MCRemoval } +Extension { #name : 'MCRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> canBeBrowsed [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> icon [ ^ self iconNamed: #changeRemove ] diff --git a/Iceberg-TipUI/ManifestIcebergTipUI.class.st b/Iceberg-TipUI/ManifestIcebergTipUI.class.st index a47a98479d..22b6f421f0 100644 --- a/Iceberg-TipUI/ManifestIcebergTipUI.class.st +++ b/Iceberg-TipUI/ManifestIcebergTipUI.class.st @@ -2,22 +2,24 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergTipUI, - #superclass : #PackageManifest, - #category : #'Iceberg-TipUI-Manifest' + #name : 'ManifestIcebergTipUI', + #superclass : 'PackageManifest', + #category : 'Iceberg-TipUI-Manifest', + #package : 'Iceberg-TipUI', + #tag : 'Manifest' } -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleAnySatisfyRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #guessFormatFromDirectory: #false)) #'2021-01-05T16:19:22.932793-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleNotEliminationRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipBrowser #hasSelectedItem #false)) #'2020-12-17T18:54:45.342746-03:00') #(#(#RGMethodDefinition #(#IceTipRepositoryBrowser #initializeSidebarTree #false)) #'2021-01-05T16:19:22.920159-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleReGuardClauseRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #initializeMessagePanel #false)) #'2021-01-05T16:19:22.928248-03:00') ) ] diff --git a/Iceberg-TipUI/PharoDarkTheme.extension.st b/Iceberg-TipUI/PharoDarkTheme.extension.st index 197cd482cc..25b3e1736e 100644 --- a/Iceberg-TipUI/PharoDarkTheme.extension.st +++ b/Iceberg-TipUI/PharoDarkTheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #PharoDarkTheme } +Extension { #name : 'PharoDarkTheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeColor [ ^ Color red alpha: 0.5 ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeTextColor [ ^ self textColor ] diff --git a/Iceberg-TipUI/PharoShortcuts.extension.st b/Iceberg-TipUI/PharoShortcuts.extension.st index df7e450e6d..fa394b6cfb 100644 --- a/Iceberg-TipUI/PharoShortcuts.extension.st +++ b/Iceberg-TipUI/PharoShortcuts.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #PharoShortcuts } +Extension { #name : 'PharoShortcuts' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoShortcuts >> openIcebergShortcut [ ^ $o meta, $i meta ] diff --git a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st index d61a72635f..2f13adf7b3 100644 --- a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st +++ b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #SpToolbarButtonPresenter } +Extension { #name : 'SpToolbarButtonPresenter' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } SpToolbarButtonPresenter >> hasBadge [ ^ badge isNotNil ] diff --git a/Iceberg-TipUI/TIceCopyCommitId.trait.st b/Iceberg-TipUI/TIceCopyCommitId.trait.st index 66a989ae08..ad1849ee58 100644 --- a/Iceberg-TipUI/TIceCopyCommitId.trait.st +++ b/Iceberg-TipUI/TIceCopyCommitId.trait.st @@ -5,17 +5,19 @@ Description I am a simple Trait allowing to copy a commit ID to the clipboard without duplicating the code in Iceberg. " Trait { - #name : #TIceCopyCommitId, - #category : #'Iceberg-TipUI-Model' + #name : 'TIceCopyCommitId', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyCommitIDToClipboard [ self copyToClipboardId: self commitId ] -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyToClipboardId: id [ Clipboard clipboardText: id informing: ('Commitish ID copied to clipboard ({1})' format: {id}) ] diff --git a/Iceberg-TipUI/TWithBranchModel.trait.st b/Iceberg-TipUI/TWithBranchModel.trait.st index 9b2a646f4a..836a8e7053 100644 --- a/Iceberg-TipUI/TWithBranchModel.trait.st +++ b/Iceberg-TipUI/TWithBranchModel.trait.st @@ -1,19 +1,21 @@ Trait { - #name : #TWithBranchModel, - #category : #'Iceberg-TipUI-Model' + #name : 'TWithBranchModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branchModels [ ^ self branches collect: [ :each | (IceTipBranchModel repositoryModel: self repositoryModel on: each) beCached ] ] -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branches [ ^ self explicitRequirement ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> defaultBranchSelection [ ^ self branchModels detect: #isHead @@ -21,12 +23,12 @@ TWithBranchModel >> defaultBranchSelection [ ifTrue: [ self branchModels ifNotEmpty: #anyOne ] ] ] -{ #category : #testing } +{ #category : 'testing' } TWithBranchModel >> hasBranches [ ^ self branches isNotEmpty ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> repositoryModel [ ^ self explicitRequirement ] diff --git a/Iceberg-TipUI/Text.extension.st b/Iceberg-TipUI/Text.extension.st index 74d7bfde6c..0ae90973d7 100644 --- a/Iceberg-TipUI/Text.extension.st +++ b/Iceberg-TipUI/Text.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Text } +Extension { #name : 'Text' } -{ #category : #'*Iceberg-TipUI-Spec' } +{ #category : '*Iceberg-TipUI-Spec' } Text >> threeWayCompareTo: anotherText [ ^ self asString threeWayCompareTo: anotherText asString diff --git a/Iceberg-TipUI/ToolShortcutsCategory.extension.st b/Iceberg-TipUI/ToolShortcutsCategory.extension.st index 39e8ed6bf0..22fbb318cc 100644 --- a/Iceberg-TipUI/ToolShortcutsCategory.extension.st +++ b/Iceberg-TipUI/ToolShortcutsCategory.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #ToolShortcutsCategory } +Extension { #name : 'ToolShortcutsCategory' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } ToolShortcutsCategory >> openIceberg [ diff --git a/Iceberg-TipUI/UITheme.extension.st b/Iceberg-TipUI/UITheme.extension.st index 45eef9230e..b1aee015ae 100644 --- a/Iceberg-TipUI/UITheme.extension.st +++ b/Iceberg-TipUI/UITheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #UITheme } +Extension { #name : 'UITheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeColor [ ^ Color red ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeTextColor [ ^ Color white ] diff --git a/Iceberg-TipUI/package.st b/Iceberg-TipUI/package.st index 34a4b630d6..c1b5ad7667 100644 --- a/Iceberg-TipUI/package.st +++ b/Iceberg-TipUI/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-TipUI' } +Package { #name : 'Iceberg-TipUI' } diff --git a/Iceberg/IceSystemEventListener.class.st b/Iceberg/IceSystemEventListener.class.st index 1eae7b3a34..dd973f6697 100644 --- a/Iceberg/IceSystemEventListener.class.st +++ b/Iceberg/IceSystemEventListener.class.st @@ -48,26 +48,25 @@ IceSystemEventListener class >> handleVersionLoaded: ann [ | package | "this is ugly, but since I do not have a package I need to look for it" - package := RPackageOrganizer default packageMatchingExtensionName: ann label. - - "The package can be nil". - package ifNil: [ ^self ]. - - "now we can verify its status" - RPackageSet withoutCacheDo: [ - IceRepository registry - do: [ :repository | - (repository includesPackageNamed: package name) - ifTrue: [ | icePackage isDirty | - icePackage := repository packageNamed: package name. - self flag: #pharoTodo. "Ugly hack. Should enhance for next version" - isDirty := repository workingCopy referenceCommit isUnknownCommit - ifTrue: [ true ] - ifFalse: [ | diff | - diff := repository workingCopy referenceCommit diffToWorkingCopyForPackage: icePackage. - diff includesPackageNamed: package name ]. - icePackage beDirty: isDirty. - Iceberg announcer announce: (IceRepositoryModified for: repository) ] ]] + package := self packageOrganizer packageMatchingExtensionName: ann label. + + "The package can be nil" + package ifNil: [ ^ self ]. + + + IceRepository registry do: [ :repository | + (repository includesPackageNamed: package name) ifTrue: [ + | icePackage isDirty | + icePackage := repository packageNamed: package name. + self flag: #pharoTodo. "Ugly hack. Should enhance for next version" + isDirty := repository workingCopy referenceCommit isUnknownCommit + ifTrue: [ true ] + ifFalse: [ + | diff | + diff := repository workingCopy referenceCommit diffToWorkingCopyForPackage: icePackage. + diff includesPackageNamed: package name ]. + icePackage beDirty: isDirty. + Iceberg announcer announce: (IceRepositoryModified for: repository) ] ] ] { #category : 'class initialization' } diff --git a/Iceberg/Iceberg.class.st b/Iceberg/Iceberg.class.st index 3227b7b320..ad71edb1aa 100644 --- a/Iceberg/Iceberg.class.st +++ b/Iceberg/Iceberg.class.st @@ -171,10 +171,10 @@ Iceberg class >> remoteTypeSelector: anObject [ ] { #category : 'accessing' } -Iceberg class >> repositoryForPackage: anRPackage [ +Iceberg class >> repositoryForPackage: aPackage [ | existingRepositories possibleRepositoryTypes | - existingRepositories := anRPackage mcWorkingCopy repositoryGroup repositories. + existingRepositories := aPackage mcWorkingCopy repositoryGroup repositories. possibleRepositoryTypes := IceRepository allSubclasses , { IceMetacelloRepositoryAdapter . MCGitHubRepository }. possibleRepositoryTypes do: [ :class | @@ -182,7 +182,7 @@ Iceberg class >> repositoryForPackage: anRPackage [ detect: [ :repo | repo isKindOf: class ] ifFound: [ :repo | ^ repo getOrCreateIcebergRepository ] ]. - self error: ('Could not find a git repository for {1}' format: { anRPackage name }) + self error: ('Could not find a git repository for {1}' format: { aPackage name }) ] { #category : 'settings' } diff --git a/Iceberg/MCClassDefinition.extension.st b/Iceberg/MCClassDefinition.extension.st index 8b636ac077..4247440153 100644 --- a/Iceberg/MCClassDefinition.extension.st +++ b/Iceberg/MCClassDefinition.extension.st @@ -1,12 +1,5 @@ Extension { #name : 'MCClassDefinition' } -{ #category : '*Iceberg-Adapters' } -MCClassDefinition >> classCategory [ - "Avoid direct use of #category, because MCClassDefinitions and - MCMethodDefinition use the same message for different things. " - ^ self category -] - { #category : '*Iceberg' } MCClassDefinition >> fullDefinitionString [ ^ String streamContents: [:stream | diff --git a/Iceberg/MCClassTraitDefinition.extension.st b/Iceberg/MCClassTraitDefinition.extension.st index 7ad0bde0a7..7e9b26e462 100644 --- a/Iceberg/MCClassTraitDefinition.extension.st +++ b/Iceberg/MCClassTraitDefinition.extension.st @@ -1,10 +1,5 @@ Extension { #name : 'MCClassTraitDefinition' } -{ #category : '*Iceberg-Adapters' } -MCClassTraitDefinition >> classCategory [ - ^ self category -] - { #category : '*Iceberg-Core' } MCClassTraitDefinition >> traitComposition [ ^ self classTraitComposition diff --git a/Iceberg/MCMethodDefinition.extension.st b/Iceberg/MCMethodDefinition.extension.st index 11c41461d0..e09b49c08e 100644 --- a/Iceberg/MCMethodDefinition.extension.st +++ b/Iceberg/MCMethodDefinition.extension.st @@ -5,12 +5,6 @@ MCMethodDefinition >> buildOn: anIcePackageDiff [ self shouldBeImplemented. ] -{ #category : '*Iceberg-Adapters' } -MCMethodDefinition >> classCategory [ - ^ self actualClass ifNotNil: #category ifNil: [ RPackage defaultPackageName ] - -] - { #category : '*Iceberg-Changes' } MCMethodDefinition >> method [ ^ self actualClass >> self selector diff --git a/Iceberg/RPackageSet.extension.st b/Iceberg/RPackageSet.extension.st deleted file mode 100644 index 56f893dab4..0000000000 --- a/Iceberg/RPackageSet.extension.st +++ /dev/null @@ -1,10 +0,0 @@ -Extension { #name : 'RPackageSet' } - -{ #category : '*Iceberg' } -RPackageSet class >> withoutCacheDo: aBlock [ - | oldActive | - - oldActive := self isCacheActive. - self cacheActive: false. - aBlock ensure: [ self cacheActive: oldActive ]. -] From eea611e85c7aa37ce44792bc0be4a3c93bddf5bd Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Mon, 20 Nov 2023 14:29:56 +0100 Subject: [PATCH 44/83] Updating libgit2 to v3.0.9 --- BaselineOfIceberg/BaselineOfIceberg.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st index 96dcdeed61..377ceb92ea 100644 --- a/BaselineOfIceberg/BaselineOfIceberg.class.st +++ b/BaselineOfIceberg/BaselineOfIceberg.class.st @@ -77,7 +77,7 @@ BaselineOfIceberg >> libgit: spec [ baseline: 'LibGit' with: [ spec - repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.8'; + repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.9'; loads: 'default' ]. spec project: 'LibGit-Tests' From fc7d386e9b99439cb1c2197e69b0e2cfd0a7bb79 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 10:38:08 +0100 Subject: [PATCH 45/83] - Improve formatting - Start to migrate to Ring from Pharo - Remove deprecated calls - Improve a tear down that is brittle --- Iceberg-Memory/IceRingWorkingCopy.class.st | 5 ++-- Iceberg-Tests/IceAbstractTestCase.class.st | 2 +- .../IceParameterizedTestCase.class.st | 6 ++-- ...eSinglePackageLocalRepositoryTest.class.st | 28 ++++++++----------- Iceberg/IceWorkingCopy.class.st | 13 ++++----- 5 files changed, 23 insertions(+), 31 deletions(-) diff --git a/Iceberg-Memory/IceRingWorkingCopy.class.st b/Iceberg-Memory/IceRingWorkingCopy.class.st index c0571d4cd6..73194d061d 100644 --- a/Iceberg-Memory/IceRingWorkingCopy.class.st +++ b/Iceberg-Memory/IceRingWorkingCopy.class.st @@ -10,9 +10,10 @@ Class { { #category : 'helpers' } IceRingWorkingCopy >> addClassVariable: aVariableName to: aClassName [ + | class | class := ringEnvironment ensureClassNamed: aClassName. - class addClassVariable: (RG2ClassVariableDefinition named: aVariableName asSymbol parent: class ). + class addClassVariable: (RGClassVariable named: aVariableName asSymbol parent: class) ] { #category : 'private-impacting-changes' } @@ -139,7 +140,7 @@ IceRingWorkingCopy >> environment [ IceRingWorkingCopy >> initialize [ super initialize. - ringEnvironment := RG2Environment new. + ringEnvironment := RGEnvironment new. ] { #category : 'packages' } diff --git a/Iceberg-Tests/IceAbstractTestCase.class.st b/Iceberg-Tests/IceAbstractTestCase.class.st index 24009302d0..90abd2de5e 100644 --- a/Iceberg-Tests/IceAbstractTestCase.class.st +++ b/Iceberg-Tests/IceAbstractTestCase.class.st @@ -103,7 +103,7 @@ IceAbstractTestCase >> setUp [ { #category : 'running' } IceAbstractTestCase >> tearDown [ - fixture tearDown. + fixture ifNotNil: [ fixture tearDown ]. super tearDown. ] diff --git a/Iceberg-Tests/IceParameterizedTestCase.class.st b/Iceberg-Tests/IceParameterizedTestCase.class.st index 1bda0f3054..ad43de34cb 100644 --- a/Iceberg-Tests/IceParameterizedTestCase.class.st +++ b/Iceberg-Tests/IceParameterizedTestCase.class.st @@ -139,12 +139,10 @@ IceParameterizedTestCase >> printOn: aStream [ IceParameterizedTestCase >> setUp [ super setUp. - oldShareRepositoriesBetweenImages := IceLibgitRepository - shareRepositoriesBetweenImages. + oldShareRepositoriesBetweenImages := IceLibgitRepository shareRepositoriesBetweenImages. IceLibgitRepository shareRepositoriesBetweenImages: false. provider := IceCredentialsProvider providerType. - IceCredentialsProvider providerType: - IceNonInteractiveCredentialsProvider. + IceCredentialsProvider providerType: IceNonInteractiveCredentialsProvider. self parameters do: [ :each | each activate ] ] diff --git a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st index 15e4c35637..3aa26a061a 100644 --- a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st @@ -421,20 +421,18 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInI | message | message := 'Added IceGeneratedClassForTesting'. - + "This is a Ring working copy" - self repository workingCopy - createClass: 'IceGeneratedClassForTesting' - inPackage: self packageName1 asSymbol. - + self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol. + self repository commitWithMessage: message. - + self repository unload. - self deny: (RPackageOrganizer default includesPackageNamed: self packageName1). - + self deny: (RPackageOrganizer default hasPackage: self packageName1). + self repository head checkoutAllPackages. self assertClassExists: #IceGeneratedClassForTesting. - self assertPackageExists: self packageName1. + self assertPackageExists: self packageName1 ] { #category : 'tests-checkout' } @@ -451,18 +449,16 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ message := 'Added IceGeneratedClassForTesting'. "This is a Ring working copy" - self repository workingCopy - createClass: 'IceGeneratedClassForTesting' - inPackage: self packageName1 asSymbol. + self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol. self repository commitWithMessage: message. - + self repository unload. - self deny: (RPackageOrganizer default includesPackageNamed: self packageName1). - + self deny: (RPackageOrganizer default hasPackage: self packageName1). + self repository branch commit checkoutAllPackages. self assertClassExists: #IceGeneratedClassForTesting. - self assertPackageExists: self packageName1. + self assertPackageExists: self packageName1 ] { #category : 'tests-checkout' } diff --git a/Iceberg/IceWorkingCopy.class.st b/Iceberg/IceWorkingCopy.class.st index 8d7a44daba..0d6ffe7727 100644 --- a/Iceberg/IceWorkingCopy.class.st +++ b/Iceberg/IceWorkingCopy.class.st @@ -206,16 +206,13 @@ IceWorkingCopy >> changesTo: aCommitish [ | removedPackages changes | changes := Set new. - + changes addAll: (aCommitish changesFromCommit: self referenceCommit). removedPackages := aCommitish packages \ self packages. - changes addAll: (((self modifiedPackages, removedPackages) collect: [ :each | - IceImageChange package: each ])). - - self project isDirty - ifTrue: [ changes add: IceProjectChange new ]. - self repositoryProperties isDirty - ifTrue: [ changes add: IceCypressPropertiesChange new ]. + changes addAll: (self modifiedPackages , removedPackages collect: [ :each | IceImageChange package: each ]). + + self project isDirty ifTrue: [ changes add: IceProjectChange new ]. + self repositoryProperties isDirty ifTrue: [ changes add: IceCypressPropertiesChange new ]. ^ changes ] From 4d2257f40cdf0224946c9d3d913de71a1b7382ea Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 11:50:36 +0100 Subject: [PATCH 46/83] Fix more tests --- Iceberg-Memory/IceMemoryRepository.class.st | 5 +- Iceberg-Memory/IceRingWorkingCopy.class.st | 2 +- .../IceRingWorkingCopyChangerVisitor.class.st | 4 +- Iceberg-Memory/ManifestIcebergMemory.class.st | 17 ++++ .../IceClassesCherryPickingTest.class.st | 8 +- .../IceMethodCherryPickingTest.class.st | 98 +++++-------------- ...eSinglePackageLocalRepositoryTest.class.st | 48 ++++----- .../IceTraitsCherryPickingTest.class.st | 12 +-- .../RG2MetaclassTraitDefinition.extension.st | 10 -- .../RG2PackageDefinition.extension.st | 20 ---- Iceberg-Tests/RG2TraitDefinition.extension.st | 15 --- Iceberg-Tests/RG2UnresolvedValue.extension.st | 7 -- 12 files changed, 78 insertions(+), 168 deletions(-) create mode 100644 Iceberg-Memory/ManifestIcebergMemory.class.st delete mode 100644 Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st delete mode 100644 Iceberg-Tests/RG2PackageDefinition.extension.st delete mode 100644 Iceberg-Tests/RG2TraitDefinition.extension.st delete mode 100644 Iceberg-Tests/RG2UnresolvedValue.extension.st diff --git a/Iceberg-Memory/IceMemoryRepository.class.st b/Iceberg-Memory/IceMemoryRepository.class.st index e07eae0d14..5c2833c36e 100644 --- a/Iceberg-Memory/IceMemoryRepository.class.st +++ b/Iceberg-Memory/IceMemoryRepository.class.st @@ -63,10 +63,7 @@ IceMemoryRepository class >> exampleWithChanges [ anotherPackageName := 'AnotherNonExistentPackage' asSymbol. repository := self exampleWithNoChanges. repository workingCopy addPackageNamed: anotherPackageName. - Object subclass: 'IceGeneratedClassForUI' - instanceVariableNames: '' - classVariableNames: '' - package: anotherPackageName. + (Object << 'IceGeneratedClassForUI' package: anotherPackageName) install. self assert: repository isModified. ^ repository ] diff --git a/Iceberg-Memory/IceRingWorkingCopy.class.st b/Iceberg-Memory/IceRingWorkingCopy.class.st index 73194d061d..621662bf80 100644 --- a/Iceberg-Memory/IceRingWorkingCopy.class.st +++ b/Iceberg-Memory/IceRingWorkingCopy.class.st @@ -170,7 +170,7 @@ IceRingWorkingCopy >> loadPackagesNamed: packageNames fromCommit: aCommit [ fromCommit: aCommit package: package) mcSnapshot. - snapshot ring2ImportInto: ringEnvironment asPackageNamed: packageName. + snapshot importInto: ringEnvironment asPackageNamed: packageName. package beClean. ]. self referenceCommit: aCommit diff --git a/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st b/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st index 188ba5bc1a..0bd002e277 100644 --- a/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st +++ b/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st @@ -180,8 +180,8 @@ IceRingWorkingCopyChangerVisitor >> visitTraitDefinition: anIceTraitDefinition [ inPackage: package name with: [ :trait | | composition transformations | - composition := RG2TraitCompositionDefinition parent: trait. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: trait. + transformations := RGTraitCompositionVisitor new parse: anIceTraitDefinition asMCDefinition traitComposition for: composition. trait traitComposition: composition. diff --git a/Iceberg-Memory/ManifestIcebergMemory.class.st b/Iceberg-Memory/ManifestIcebergMemory.class.st new file mode 100644 index 0000000000..307731660f --- /dev/null +++ b/Iceberg-Memory/ManifestIcebergMemory.class.st @@ -0,0 +1,17 @@ +" +Please describe the package using the class comment of the included manifest class. The manifest class also includes other additional metadata for the package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser +" +Class { + #name : 'ManifestIcebergMemory', + #superclass : 'PackageManifest', + #category : 'Iceberg-Memory-Manifest', + #package : 'Iceberg-Memory', + #tag : 'Manifest' +} + +{ #category : 'meta-data - dependency analyser' } +ManifestIcebergMemory class >> manuallyResolvedDependencies [ + + + ^ #(#'Collections-Streams' #'Monticello-Model' #'FileSystem-Core' #'Collections-Abstract' #'Ring-Monticello') +] diff --git a/Iceberg-Tests/IceClassesCherryPickingTest.class.st b/Iceberg-Tests/IceClassesCherryPickingTest.class.st index 3226450f27..3d880b95fe 100644 --- a/Iceberg-Tests/IceClassesCherryPickingTest.class.st +++ b/Iceberg-Tests/IceClassesCherryPickingTest.class.st @@ -25,8 +25,8 @@ IceClassesCherryPickingTest >> testAddClassDependingInATrait [ inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'TestTrait' for: composition. class traitComposition: composition. @@ -71,8 +71,8 @@ IceClassesCherryPickingTest >> testAddClassDependingInATraitWithComposition [ inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'TestTrait - {#hello. #world}' for: composition. diff --git a/Iceberg-Tests/IceMethodCherryPickingTest.class.st b/Iceberg-Tests/IceMethodCherryPickingTest.class.st index 6f5558717d..c69707c3b0 100644 --- a/Iceberg-Tests/IceMethodCherryPickingTest.class.st +++ b/Iceberg-Tests/IceMethodCherryPickingTest.class.st @@ -427,6 +427,7 @@ IceMethodCherryPickingTest >> testAddMethodWithClassAndSuperclassAsDependency [ { #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependency [ + | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -434,29 +435,19 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependency [ self repository workingCopy createClass: 'TestClass2' inPackage: self packageName1 asSymbol - with: [ :class | - class - addClassVariable: - (RG2ClassVariableDefinition - named: 'TestClassVariable' asSymbol - parent: class) ]. - self repository - commitWithMessage: 'Adding a test class with class variable'. + with: [ :class | class addClassVariable: (RGClassVariable named: 'TestClassVariable' asSymbol parent: class) ]. + self repository commitWithMessage: 'Adding a test class with class variable'. self repository workingCopy addPackageNamed: self packageName1. self repository workingCopy createClass: 'TestClass3' inPackage: self packageName1 asSymbol - with: - [ :class | class superclass: (class environment ask behaviorNamed: #TestClass2) ]. + with: [ :class | class superclass: (class environment ask behaviorNamed: #TestClass2) ]. self repository commitWithMessage: 'Adding another test class'. self repository workingCopy addPackageNamed: self packageName1. - self repository workingCopy - createMethod: 'm1 ^TestClassVariable' - inClass: 'TestClass3' asSymbol. - self repository - commitWithMessage: 'Adding method using test class variable'. + self repository workingCopy createMethod: 'm1 ^TestClassVariable' inClass: 'TestClass3' asSymbol. + self repository commitWithMessage: 'Adding method using test class variable'. commitToCherryPick := fixture repository head. @@ -465,38 +456,20 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependency [ diff := mergeTree collect: [ :each | each chosenOperation ]. self assert: diff children size equals: 1. - self - assert: (diff / self packageName1) children size - equals: 4. + self assert: (diff / self packageName1) children size equals: 4. - self - assert: - (diff / self packageName1 / 'TestClass2') value - isAddition. - self - assert: - (diff / self packageName1 / 'TestClass2') - children size - equals: 0. + self assert: (diff / self packageName1 / 'TestClass2') value isAddition. + self assert: (diff / self packageName1 / 'TestClass2') children size equals: 0. - self - assert: - (diff / self packageName1 / 'TestClass3') value - isAddition. - self - assert: - (diff / self packageName1 / 'TestClass3') - children size - equals: 1. + self assert: (diff / self packageName1 / 'TestClass3') value isAddition. + self assert: (diff / self packageName1 / 'TestClass3') children size equals: 1. - self - assert: - (diff / self packageName1 / 'TestClass3' / 'm1') - value isAddition + self assert: (diff / self packageName1 / 'TestClass3' / 'm1') value isAddition ] { #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependencyWithSuperclassAlreadyCommited [ + | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -504,29 +477,19 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependencyWithSupe self repository workingCopy createClass: 'TestClass' inPackage: self packageName1 asSymbol - with: [ :class | - class - addClassVariable: - (RG2ClassVariableDefinition - named: 'TestClassVariable' asSymbol - parent: class) ]. - self repository - commitWithMessage: 'Adding a test class with class variable'. + with: [ :class | class addClassVariable: (RGClassVariable named: 'TestClassVariable' asSymbol parent: class) ]. + self repository commitWithMessage: 'Adding a test class with class variable'. self repository workingCopy addPackageNamed: self packageName1. self repository workingCopy createClass: 'TestClass2' inPackage: self packageName1 asSymbol - with: - [ :class | class superclass: (class environment ask behaviorNamed: #TestClass) ]. + with: [ :class | class superclass: (class environment ask behaviorNamed: #TestClass) ]. self repository commitWithMessage: 'Adding another test class'. self repository workingCopy addPackageNamed: self packageName1. - self repository workingCopy - createMethod: 'm1 ^TestClassVariable' - inClass: 'TestClass2' asSymbol. - self repository - commitWithMessage: 'Adding method using test class variable'. + self repository workingCopy createMethod: 'm1 ^TestClassVariable' inClass: 'TestClass2' asSymbol. + self repository commitWithMessage: 'Adding method using test class variable'. commitToCherryPick := fixture repository head. @@ -535,28 +498,13 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependencyWithSupe diff := mergeTree collect: [ :each | each chosenOperation ]. self assert: diff children size equals: 1. - self - assert: (diff / self packageName1) children size - equals: 3. + self assert: (diff / self packageName1) children size equals: 3. - self - assert: - (diff / self packageName1 / 'TestClass') value - isModification. + self assert: (diff / self packageName1 / 'TestClass') value isModification. - self - assert: - (diff / self packageName1 / 'TestClass2') value - isAddition. - self - assert: - (diff / self packageName1 / 'TestClass2') - children size - equals: 1. - self - assert: - (diff / self packageName1 / 'TestClass2' / 'm1') - value isAddition + self assert: (diff / self packageName1 / 'TestClass2') value isAddition. + self assert: (diff / self packageName1 / 'TestClass2') children size equals: 1. + self assert: (diff / self packageName1 / 'TestClass2' / 'm1') value isAddition ] { #category : 'tests' } diff --git a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st index 3aa26a061a..c0825ed05c 100644 --- a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st @@ -165,14 +165,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait - {#m1}' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -203,14 +203,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -221,14 +221,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait - {#m1}' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -260,8 +260,8 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExpor self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ] @@ -295,8 +295,8 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExpor self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ] @@ -337,14 +337,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeTraitWithClassSideTraitsComposi self repository workingCopy createTrait: 'T2' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -355,14 +355,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeTraitWithClassSideTraitsComposi self repository workingCopy createTrait: 'T2' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait - {#m1}' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | diff --git a/Iceberg-Tests/IceTraitsCherryPickingTest.class.st b/Iceberg-Tests/IceTraitsCherryPickingTest.class.st index aae53d3007..d9871e5d3b 100644 --- a/Iceberg-Tests/IceTraitsCherryPickingTest.class.st +++ b/Iceberg-Tests/IceTraitsCherryPickingTest.class.st @@ -23,8 +23,8 @@ IceTraitsCherryPickingTest >> testAddTraitDependingInATrait [ inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'TestTrait' for: composition. class traitComposition: composition. @@ -72,8 +72,8 @@ IceTraitsCherryPickingTest >> testRemoveTraitUsedByAClass [ inPackage: self packageName1 asSymbol with: [ :class | | transformations composition | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'TestTraitInitial' for: composition. class traitComposition: composition. @@ -112,8 +112,8 @@ IceTraitsCherryPickingTest >> testRemoveTraitUsedByATrait [ inPackage: self packageName1 asSymbol with: [ :class | | transformations composition | - composition := (RG2TraitCompositionDefinition parent: class). - transformations := RG2TraitCompositionVisitor new + composition := (RGTraitComposition parent: class). + transformations := RGTraitCompositionVisitor new parse: 'TestTraitInitial' for: composition. diff --git a/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st b/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st deleted file mode 100644 index 3254182648..0000000000 --- a/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st +++ /dev/null @@ -1,10 +0,0 @@ -Extension { #name : 'RG2MetaclassTraitDefinition' } - -{ #category : '*Iceberg-Tests' } -RG2MetaclassTraitDefinition >> asMCDefinition [ - - ^ MCClassTraitDefinition - baseTraitName: baseTrait name - classTraitComposition: self traitCompositionString - category: self category -] diff --git a/Iceberg-Tests/RG2PackageDefinition.extension.st b/Iceberg-Tests/RG2PackageDefinition.extension.st deleted file mode 100644 index 7abc8170d7..0000000000 --- a/Iceberg-Tests/RG2PackageDefinition.extension.st +++ /dev/null @@ -1,20 +0,0 @@ -Extension { #name : 'RG2PackageDefinition' } - -{ #category : '*Iceberg-Tests' } -RG2PackageDefinition >> asMCSnapshot [ - - | definitions | - definitions := ((((self definedBehaviors reject: #isMeta) sorted: [ :a :b | a name < b name ]) collect: #asMCDefinition) - , (self extensionMethods collect: #asMCDefinition)) asOrderedCollection. - definitions addAll: (self definedBehaviors - select: [ :each | each isTrait and: [ each classSide hasTraitComposition ] ] - thenCollect: [ :aTrait | aTrait classSide asMCDefinition ]). - - definitions addAll: (self definedBehaviors , (self definedBehaviors collect: #classSide) flatCollect: [ :behavior | - behavior localMethods - select: [ :each | each parent instanceSide package = each package ] - thenCollect: [ :method | method asMCDefinition ] ]). - definitions add: (MCOrganizationDefinition packageName: name). - - ^ MCSnapshot fromDefinitions: definitions -] diff --git a/Iceberg-Tests/RG2TraitDefinition.extension.st b/Iceberg-Tests/RG2TraitDefinition.extension.st deleted file mode 100644 index 0e3c62a7e5..0000000000 --- a/Iceberg-Tests/RG2TraitDefinition.extension.st +++ /dev/null @@ -1,15 +0,0 @@ -Extension { #name : 'RG2TraitDefinition' } - -{ #category : '*Iceberg-Tests' } -RG2TraitDefinition >> asMCDefinition [ - - ^ MCTraitDefinition - name: self name - traitComposition: self traitCompositionString - category: self category - instVarNames: '' - classInstVarNames: '' - classTraitComposition: self classSide traitCompositionString - comment: self comment content - commentStamp: '' -] diff --git a/Iceberg-Tests/RG2UnresolvedValue.extension.st b/Iceberg-Tests/RG2UnresolvedValue.extension.st deleted file mode 100644 index 5cf171826e..0000000000 --- a/Iceberg-Tests/RG2UnresolvedValue.extension.st +++ /dev/null @@ -1,7 +0,0 @@ -Extension { #name : 'RG2UnresolvedValue' } - -{ #category : '*Iceberg-Tests' } -RG2UnresolvedValue >> remove: aRG2MethodDefinition [ - - "I am undefined, removing something is futil" -] From 7a0688aaa67cd54e8899beb7456093fce8474afa Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 12:14:04 +0100 Subject: [PATCH 47/83] Remove Ring2 from baseline --- BaselineOfIceberg/BaselineOfIceberg.class.st | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st index 96dcdeed61..9c25c6ea8b 100644 --- a/BaselineOfIceberg/BaselineOfIceberg.class.st +++ b/BaselineOfIceberg/BaselineOfIceberg.class.st @@ -17,7 +17,6 @@ BaselineOfIceberg >> baseline: spec [ self tonel: spec. self libgit: spec. - self ring2: spec. spec "iceberg" @@ -31,7 +30,7 @@ BaselineOfIceberg >> baseline: spec [ package: 'Iceberg-TipUI' with: [ spec requires: #('Iceberg') ]; package: 'Iceberg-Memory' with: [ spec requires: #('Iceberg') ]; "tests" - package: 'Iceberg-Tests' with: [ spec requires: #('Iceberg' 'Iceberg-Memory' 'Ring2') ]; + package: 'Iceberg-Tests' with: [ spec requires: #('Iceberg' 'Iceberg-Memory') ]; package: 'Iceberg-Tests-MetacelloIntegration' with: [ spec requires: #('Iceberg-Tests') ]; package: 'Iceberg-UI-Tests' with: [ spec requires: #('Iceberg-TipUI' 'Iceberg-Tests')]; package: 'Iceberg-Plugin-Migration-Tests' with: [ spec requires: #('Iceberg-Plugin-Migration' 'Iceberg-Tests') ]; @@ -125,13 +124,6 @@ BaselineOfIceberg >> resetKMRepository [ ifPresent: [ :class | class reset ] ] -{ #category : 'baseline' } -BaselineOfIceberg >> ring2: spec [ - spec - baseline: 'Ring2' - with: [ spec repository: 'github://guillep/Ring2:v2.0.0/src' ] -] - { #category : 'baseline' } BaselineOfIceberg >> tonel: spec [ spec From 32611aa6bb361a322a61fcb5dc4e03123ac63711 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 13:34:38 +0100 Subject: [PATCH 48/83] Do not reload Spec and Tonel --- scripts/preLoading.st | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/scripts/preLoading.st b/scripts/preLoading.st index 719a94d1bb..2714f931b9 100644 --- a/scripts/preLoading.st +++ b/scripts/preLoading.st @@ -12,12 +12,8 @@ Smalltalk globals at: #IceSystemEventListener ifPresent: #unregisterSystemAnnoun "Remove iceberg from system (so I can reload it)" MetacelloPharoPlatform select. #( - 'BaselineOfTonel' 'BaselineOfLibGit' 'BaselineOfIceberg' - 'MonticelloTonel-Core' - 'MonticelloTonel-FileSystem' - 'MonticelloTonel-Tests' 'Iceberg-UI' 'Iceberg-TipUI' 'Iceberg-Plugin-Pharo' @@ -46,20 +42,4 @@ do: [ :each | nil ]) ifNotNil: [ :package | ('Removing ', each) traceCr. - package removeFromSystem ] ]. - -"Loading Tonel before trying to load Iceberg. -This is required to load iceberg packages and dependencies in Tonel format" -Metacello new - baseline: 'Tonel'; - repository: 'github://pharo-vcs/tonel:v1.0.17'; - load. - -"Development branch requires latest Spec2" -Metacello new - githubUser: 'pharo-spec' project: 'Spec' commitish: 'Pharo10' path: 'src'; - baseline: 'Spec2'; - onConflict: [ :e | e useIncoming ]; - onUpgrade: [ :e | e useIncoming ]; - ignoreImage; - load + package removeFromSystem ] ] From b70e016034a13357d94839e3eaa076c0eb1de83f Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 16:03:03 +0100 Subject: [PATCH 49/83] Remove useless scripts and move scripts to the same folder --- {scripts => .github/scripts}/postLoading.st | 0 .github/scripts/preLoading.st | 48 +++++++++++++++++-- .github/scripts/preTesting.st | 3 -- {scripts => .github/scripts}/sync-wiki.sh | 0 .../scripts}/testUpdateIceberg.sh | 0 .github/workflows/sync-wiki.yml | 2 +- .github/workflows/test.yml | 9 +--- .project | 3 +- .smalltalk.release.ston | 18 ------- .smalltalk.ston | 4 +- .smalltalk.windows.ston | 4 +- docs/Contributing-to-Iceberg.md | 8 ++-- scripts/preLoading.st | 45 ----------------- 13 files changed, 57 insertions(+), 87 deletions(-) rename {scripts => .github/scripts}/postLoading.st (100%) delete mode 100644 .github/scripts/preTesting.st rename {scripts => .github/scripts}/sync-wiki.sh (100%) rename {scripts => .github/scripts}/testUpdateIceberg.sh (100%) delete mode 100644 .smalltalk.release.ston delete mode 100644 scripts/preLoading.st diff --git a/scripts/postLoading.st b/.github/scripts/postLoading.st similarity index 100% rename from scripts/postLoading.st rename to .github/scripts/postLoading.st diff --git a/.github/scripts/preLoading.st b/.github/scripts/preLoading.st index 3eb1cbe92e..2714f931b9 100644 --- a/.github/scripts/preLoading.st +++ b/.github/scripts/preLoading.st @@ -1,3 +1,45 @@ -#( 'BaselineOfLibGit' 'BaselineOfIceberg' ) do: [ :each | - (RPackageOrganizer default packageNamed: each ifAbsent: [ nil ]) - ifNotNil: [ :aPackage | aPackage removeFromSystem ] ] +"Shutdown Libgit" +LGitLibrary shutDown: true. + +"Unregister all iceberg repository adapters since we are going to unload all code related to it. +Otherwise obsolete instances will stay". +IceMetacelloRepositoryAdapter allInstances do: #unregister. +Smalltalk globals at: #IceSystemEventListener ifPresent: #unregisterSystemAnnouncements. + +"Workaround to avoid keeping an entry in World Menu to the obsolete class." +(IceTipRepositoriesBrowser class>>#menuCommandOn:) removeFromSystem. + +"Remove iceberg from system (so I can reload it)" +MetacelloPharoPlatform select. +#( + 'BaselineOfLibGit' + 'BaselineOfIceberg' + 'Iceberg-UI' + 'Iceberg-TipUI' + 'Iceberg-Plugin-Pharo' + 'Iceberg-Plugin-Metacello' + 'Iceberg-Plugin-GitHub' + 'Iceberg-Plugin-Migration' + 'Iceberg-Plugin' + 'Iceberg-Metacello-Integration' + 'Iceberg-Libgit-Tonel' + 'Iceberg-Libgit-Filetree' + 'Iceberg-Libgit' + 'Iceberg-Tests' + 'Iceberg-Memory' + 'Iceberg-UI-Tests' + 'Iceberg-Core' + 'Iceberg-Changes' + 'Iceberg-Adapters' + 'Iceberg' + 'Iceberg-GitCommand' + 'Iceberg-SmartUI' + 'Iceberg-Pharo6' + 'LibGit-Core') +do: [ :each | + (each asPackageIfAbsent: [ + (each , ' not found') traceCr. + nil ]) + ifNotNil: [ :package | + ('Removing ', each) traceCr. + package removeFromSystem ] ] diff --git a/.github/scripts/preTesting.st b/.github/scripts/preTesting.st deleted file mode 100644 index 7136993914..0000000000 --- a/.github/scripts/preTesting.st +++ /dev/null @@ -1,3 +0,0 @@ -"Adding this to pass a release test that does not has sense to run here" -(FileLocator imageDirectory / 'pharo.version') writeStreamDo: [ :stream | - stream << (SystemVersion current major asString, SystemVersion current minor asString) ] diff --git a/scripts/sync-wiki.sh b/.github/scripts/sync-wiki.sh similarity index 100% rename from scripts/sync-wiki.sh rename to .github/scripts/sync-wiki.sh diff --git a/scripts/testUpdateIceberg.sh b/.github/scripts/testUpdateIceberg.sh similarity index 100% rename from scripts/testUpdateIceberg.sh rename to .github/scripts/testUpdateIceberg.sh diff --git a/.github/workflows/sync-wiki.yml b/.github/workflows/sync-wiki.yml index 32e23003e6..7ba5ec0ae3 100644 --- a/.github/workflows/sync-wiki.yml +++ b/.github/workflows/sync-wiki.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest name: Sync GitHub Wiki from Sources steps: - - run: ./scripts/sync-wiki.sh + - run: ./.github/scripts/sync-wiki.sh env: GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} shell: bash diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1592af0894..89c428c23a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,16 +32,11 @@ jobs: runs-on: ${{ matrix.os }} name: ${{ matrix.smalltalk }} on ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup smalltalkCI uses: hpi-swa/setup-smalltalkCI@v1 with: - smalltalk-image: ${{ matrix.smalltalk }} -# - name: Load Image and Run Release Tests -# run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.release.ston -# timeout-minutes: 10 -# - name: Clean Up -# run: rm -Rf ${{ env.SMALLTALK_CI_BUILD }} + smalltalk-version: ${{ matrix.smalltalk }} - name: Load Image and Run Tests run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }} shell: bash diff --git a/.project b/.project index 078c63e532..ac2d93a83c 100644 --- a/.project +++ b/.project @@ -1,4 +1,3 @@ { - 'srcDirectory' : '', - 'tags' : [ #system ] + 'srcDirectory' : '' } diff --git a/.smalltalk.release.ston b/.smalltalk.release.ston deleted file mode 100644 index 9ec58385eb..0000000000 --- a/.smalltalk.release.ston +++ /dev/null @@ -1,18 +0,0 @@ -SmalltalkCISpec { - #loading : [ - SCIMetacelloLoadSpec { - #baseline : 'Iceberg', - #onConflict : #useIncoming, - #onUpgrade : #useIncoming, - #ignoreImage : true, - #onWarningLog : true, - #load : [ 'development' ] - } - ], - #preTesting : [ '.github/scripts/preTesting.st' ], - #testing : { - #packages : [ - 'System-Settings-Tests.*', - 'ReleaseTests.*' ] - } -} diff --git a/.smalltalk.ston b/.smalltalk.ston index 1e26ca81b4..b147c319bf 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -1,7 +1,7 @@ SmalltalkCISpec { #name: 'Iceberg', - #preLoading: 'scripts/preLoading.st', - #postLoading: 'scripts/postLoading.st', + #preLoading: '.github/scripts/preLoading.st', + #postLoading: '.github/scripts/postLoading.st', #loading : [ SCIMetacelloLoadSpec { #baseline : 'Iceberg', diff --git a/.smalltalk.windows.ston b/.smalltalk.windows.ston index c2c7ac2dcd..b966023674 100644 --- a/.smalltalk.windows.ston +++ b/.smalltalk.windows.ston @@ -1,7 +1,7 @@ SmalltalkCISpec { #name: 'Iceberg', - #preLoading: 'scripts/preLoading.st', - #postLoading: 'scripts/postLoading.st', + #preLoading: '.github/scripts/preLoading.st', + #postLoading: '.github/scripts/postLoading.st', #loading : [ SCIMetacelloLoadSpec { #baseline : 'Iceberg', diff --git a/docs/Contributing-to-Iceberg.md b/docs/Contributing-to-Iceberg.md index d581603e7c..3cd634e009 100644 --- a/docs/Contributing-to-Iceberg.md +++ b/docs/Contributing-to-Iceberg.md @@ -16,11 +16,11 @@ To do that, it's needed to create a pull request to one of the following branche Loading Iceberg in Pharo is more difficult than updating other projects -that just use a "Metacello script"- since normally Metacello will rely on Iceberg to update Iceberg. -That's the reason to have [a bash update script](../scripts/testUpdateIceberg.sh) that performs some pre- and post-load actions. +That's the reason to have [a bash update script](../.github/scripts/testUpdateIceberg.sh) that performs some pre- and post-load actions. Steps to use it: 1. Open a terminal 2. Clone this repository and checkout the desired branch -3. Execute `./scripts/testUpdateIceberg.sh --dev` +3. Execute `./.github/scripts/testUpdateIceberg.sh --dev` 4. Execute `./pharo-ui Pharo.image` Also, the script loads the `development` Metacello group, which contains some tests that are not present in the Pharo image normally. @@ -30,14 +30,14 @@ About Windows platform, we know it worked in the MINGW64 Bash Console that came ## Contributions to Wiki -We count with [a bash script](../scripts/sync-wiki.sh) that deploys the markdown files in `doc/` directory to the Wiki section. +We count with [a bash script](../.github/scripts/sync-wiki.sh) that deploys the markdown files in `doc/` directory to the Wiki section. The entry point for the wiki is the [Home page](Home.md). A while ago, Travis CI executed such bash script each time the `master` branch changed. This is not working for the moment, but contributors can execute the following command in a terminal: ```bash -export GH_TOKEN=<> && ./scripts/sync-wiki.sh +export GH_TOKEN=<> && ./.github/scripts/sync-wiki.sh ``` where `<>` is a [GitHub Personal Token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) with repo:write permissions on this repository. diff --git a/scripts/preLoading.st b/scripts/preLoading.st deleted file mode 100644 index 2714f931b9..0000000000 --- a/scripts/preLoading.st +++ /dev/null @@ -1,45 +0,0 @@ -"Shutdown Libgit" -LGitLibrary shutDown: true. - -"Unregister all iceberg repository adapters since we are going to unload all code related to it. -Otherwise obsolete instances will stay". -IceMetacelloRepositoryAdapter allInstances do: #unregister. -Smalltalk globals at: #IceSystemEventListener ifPresent: #unregisterSystemAnnouncements. - -"Workaround to avoid keeping an entry in World Menu to the obsolete class." -(IceTipRepositoriesBrowser class>>#menuCommandOn:) removeFromSystem. - -"Remove iceberg from system (so I can reload it)" -MetacelloPharoPlatform select. -#( - 'BaselineOfLibGit' - 'BaselineOfIceberg' - 'Iceberg-UI' - 'Iceberg-TipUI' - 'Iceberg-Plugin-Pharo' - 'Iceberg-Plugin-Metacello' - 'Iceberg-Plugin-GitHub' - 'Iceberg-Plugin-Migration' - 'Iceberg-Plugin' - 'Iceberg-Metacello-Integration' - 'Iceberg-Libgit-Tonel' - 'Iceberg-Libgit-Filetree' - 'Iceberg-Libgit' - 'Iceberg-Tests' - 'Iceberg-Memory' - 'Iceberg-UI-Tests' - 'Iceberg-Core' - 'Iceberg-Changes' - 'Iceberg-Adapters' - 'Iceberg' - 'Iceberg-GitCommand' - 'Iceberg-SmartUI' - 'Iceberg-Pharo6' - 'LibGit-Core') -do: [ :each | - (each asPackageIfAbsent: [ - (each , ' not found') traceCr. - nil ]) - ifNotNil: [ :package | - ('Removing ', each) traceCr. - package removeFromSystem ] ] From 7a04662c4badc4b4a81ce89d0fb1a5a56ac76715 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 16:28:51 +0100 Subject: [PATCH 50/83] Hope to fix windows CI? --- Iceberg-Memory/IceMemoryCommit.class.st | 7 +++++-- Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Iceberg-Memory/IceMemoryCommit.class.st b/Iceberg-Memory/IceMemoryCommit.class.st index 6566600ed9..712cf67a70 100644 --- a/Iceberg-Memory/IceMemoryCommit.class.st +++ b/Iceberg-Memory/IceMemoryCommit.class.st @@ -15,8 +15,11 @@ Class { { #category : 'comparing' } IceMemoryCommit >> = aCommit [ - ^ (self mcCommit dependencies asArray sort: [ :a :b | a timeStamp > b timeStamp ]) - = (aCommit mcCommit dependencies asArray sort: [ :a :b | a timeStamp > b timeStamp ]) + self == aCommit ifTrue: [ ^ true ]. + + self species = aCommit species ifFalse: [ ^ false ]. + + ^ self mcCommit dependencies asSet = aCommit mcCommit dependencies asSet ] { #category : 'accessing' } diff --git a/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st b/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st index 9bd2157083..191a0481f3 100644 --- a/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st +++ b/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st @@ -31,11 +31,11 @@ IceRepositoryWithSingleRemoteTest >> testFetchUpdatesTrackedRemoteBranch [ | newCommit remoteTrackedBranches | self remoteRepository workingCopy addPackageNamed: 'AnotherPackage'. newCommit := self remoteRepository commitWithMessage: 'Another commit message'. - + self repository fetch. remoteTrackedBranches := self repository remoteTrackedBranches. self assert: remoteTrackedBranches size equals: 1. - self assert: self repository remoteTrackedBranches anyOne commit equals: newCommit + self assert: remoteTrackedBranches anyOne commit equals: newCommit ] { #category : 'tests-checkout' } From fc689b931479120954cabdffc165aba8e0395c4c Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 16:30:03 +0100 Subject: [PATCH 51/83] Take Martin's comment into account --- .github/workflows/sync-wiki.yml | 2 +- .smalltalk.ston | 4 ++-- .smalltalk.windows.ston | 4 ++-- docs/Contributing-to-Iceberg.md | 8 ++++---- {.github/scripts => scripts}/postLoading.st | 0 {.github/scripts => scripts}/preLoading.st | 0 {.github/scripts => scripts}/sync-wiki.sh | 0 {.github/scripts => scripts}/testUpdateIceberg.sh | 0 8 files changed, 9 insertions(+), 9 deletions(-) rename {.github/scripts => scripts}/postLoading.st (100%) rename {.github/scripts => scripts}/preLoading.st (100%) rename {.github/scripts => scripts}/sync-wiki.sh (100%) rename {.github/scripts => scripts}/testUpdateIceberg.sh (100%) diff --git a/.github/workflows/sync-wiki.yml b/.github/workflows/sync-wiki.yml index 7ba5ec0ae3..32e23003e6 100644 --- a/.github/workflows/sync-wiki.yml +++ b/.github/workflows/sync-wiki.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest name: Sync GitHub Wiki from Sources steps: - - run: ./.github/scripts/sync-wiki.sh + - run: ./scripts/sync-wiki.sh env: GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} shell: bash diff --git a/.smalltalk.ston b/.smalltalk.ston index b147c319bf..1e26ca81b4 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -1,7 +1,7 @@ SmalltalkCISpec { #name: 'Iceberg', - #preLoading: '.github/scripts/preLoading.st', - #postLoading: '.github/scripts/postLoading.st', + #preLoading: 'scripts/preLoading.st', + #postLoading: 'scripts/postLoading.st', #loading : [ SCIMetacelloLoadSpec { #baseline : 'Iceberg', diff --git a/.smalltalk.windows.ston b/.smalltalk.windows.ston index b966023674..c2c7ac2dcd 100644 --- a/.smalltalk.windows.ston +++ b/.smalltalk.windows.ston @@ -1,7 +1,7 @@ SmalltalkCISpec { #name: 'Iceberg', - #preLoading: '.github/scripts/preLoading.st', - #postLoading: '.github/scripts/postLoading.st', + #preLoading: 'scripts/preLoading.st', + #postLoading: 'scripts/postLoading.st', #loading : [ SCIMetacelloLoadSpec { #baseline : 'Iceberg', diff --git a/docs/Contributing-to-Iceberg.md b/docs/Contributing-to-Iceberg.md index 3cd634e009..d581603e7c 100644 --- a/docs/Contributing-to-Iceberg.md +++ b/docs/Contributing-to-Iceberg.md @@ -16,11 +16,11 @@ To do that, it's needed to create a pull request to one of the following branche Loading Iceberg in Pharo is more difficult than updating other projects -that just use a "Metacello script"- since normally Metacello will rely on Iceberg to update Iceberg. -That's the reason to have [a bash update script](../.github/scripts/testUpdateIceberg.sh) that performs some pre- and post-load actions. +That's the reason to have [a bash update script](../scripts/testUpdateIceberg.sh) that performs some pre- and post-load actions. Steps to use it: 1. Open a terminal 2. Clone this repository and checkout the desired branch -3. Execute `./.github/scripts/testUpdateIceberg.sh --dev` +3. Execute `./scripts/testUpdateIceberg.sh --dev` 4. Execute `./pharo-ui Pharo.image` Also, the script loads the `development` Metacello group, which contains some tests that are not present in the Pharo image normally. @@ -30,14 +30,14 @@ About Windows platform, we know it worked in the MINGW64 Bash Console that came ## Contributions to Wiki -We count with [a bash script](../.github/scripts/sync-wiki.sh) that deploys the markdown files in `doc/` directory to the Wiki section. +We count with [a bash script](../scripts/sync-wiki.sh) that deploys the markdown files in `doc/` directory to the Wiki section. The entry point for the wiki is the [Home page](Home.md). A while ago, Travis CI executed such bash script each time the `master` branch changed. This is not working for the moment, but contributors can execute the following command in a terminal: ```bash -export GH_TOKEN=<> && ./.github/scripts/sync-wiki.sh +export GH_TOKEN=<> && ./scripts/sync-wiki.sh ``` where `<>` is a [GitHub Personal Token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) with repo:write permissions on this repository. diff --git a/.github/scripts/postLoading.st b/scripts/postLoading.st similarity index 100% rename from .github/scripts/postLoading.st rename to scripts/postLoading.st diff --git a/.github/scripts/preLoading.st b/scripts/preLoading.st similarity index 100% rename from .github/scripts/preLoading.st rename to scripts/preLoading.st diff --git a/.github/scripts/sync-wiki.sh b/scripts/sync-wiki.sh similarity index 100% rename from .github/scripts/sync-wiki.sh rename to scripts/sync-wiki.sh diff --git a/.github/scripts/testUpdateIceberg.sh b/scripts/testUpdateIceberg.sh similarity index 100% rename from .github/scripts/testUpdateIceberg.sh rename to scripts/testUpdateIceberg.sh From 9d8870a616551b8962f5e300017114ddf274826f Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 16:53:02 +0100 Subject: [PATCH 52/83] Migrate to Tonel V3 --- .../IceLibgitRuleBreakerRepository.class.st | 21 +-- .../IceShouldHandleLibgitErrors.class.st | 17 +-- .../IceShouldHandleLibgitErrorsTest.class.st | 25 ++-- Iceberg-ArchitecturalRules/package.st | 2 +- .../IceLibgitFiletreeFileUtils.class.st | 26 ++-- .../IceLibgitFiletreeLog.class.st | 28 ++-- .../IceLibgitFiletreeLogReader.class.st | 20 +-- .../IceLibgitFiletreeReader.class.st | 32 ++--- .../IceLibgitFiletreeSnapshotWriter.class.st | 14 +- .../IceLibgitFiletreeWriter.class.st | 34 ++--- .../IceMetadatalessFileTreeWriter.class.st | 14 +- .../IceMetadatalessStCypressWriter.class.st | 18 +-- .../ManifestIcebergLibgitFiletree.class.st | 10 +- Iceberg-Libgit-Filetree/package.st | 2 +- .../IceLibgitTonelFileUtils.class.st | 26 ++-- .../IceLibgitTonelLog.class.st | 28 ++-- .../IceLibgitTonelLogReader.class.st | 20 +-- .../IceLibgitTonelReader.class.st | 30 +++-- .../IceLibgitTonelWriter.class.st | 40 +++--- .../ManifestIcebergLibgitTonel.class.st | 10 +- Iceberg-Libgit-Tonel/package.st | 2 +- .../IceBitbucketRepositoryType.class.st | 10 +- .../IceGitLocalRepositoryType.class.st | 16 ++- .../IceGitRepositoryType.class.st | 12 +- .../IceGithubRepositoryType.class.st | 12 +- .../IceGitlabRepositoryType.class.st | 10 +- .../IceMetacelloLoadChoice.class.st | 26 ++-- .../IceMetacelloLoadSession.class.st | 14 +- .../IceMetacelloLoadSessionContext.class.st | 8 +- .../IceMetacelloPharoPlatform.class.st | 18 +-- .../IceMetacelloRepositoryType.class.st | 32 ++--- .../IceProviderRepositoryType.class.st | 20 +-- .../IceRepository.extension.st | 4 +- .../MCGitRemoteRepository.class.st | 38 +++--- ...nifestIcebergMetacelloIntegration.class.st | 10 +- .../MetacelloPlatform.extension.st | 4 +- .../MetacelloScriptApiExecutor.extension.st | 4 +- Iceberg-Metacello-Integration/package.st | 2 +- .../IcePlaygroundPublishGistCommand.class.st | 20 +-- .../IcePublishGistPresenter.class.st | 32 ++--- Iceberg-Playground-Plugin-Gist/package.st | 2 +- Iceberg-Plugin-GitHub/IceGitHubAPI.class.st | 80 +++++------ .../IceGitHubAPIPaginatedResult.class.st | 26 ++-- .../IceGitHubAcceptPullRequestModel.class.st | 42 +++--- .../IceGitHubAction.class.st | 28 ++-- .../IceGitHubBadCredentialsError.class.st | 12 +- .../IceGitHubCommand.class.st | 14 +- .../IceGitHubCreatePullRequestModel.class.st | 104 ++++++++------- Iceberg-Plugin-GitHub/IceGitHubError.class.st | 38 +++--- .../IceGitHubGenericError.class.st | 10 +- .../IceGitHubJSONDataSource.class.st | 16 ++- ...ceGitHubNewBranchFromIssueCommand.class.st | 20 +-- .../IceGitHubNewBranchFromIssuePanel.class.st | 48 +++---- .../IceGitHubNewPullRequestAction.class.st | 16 ++- .../IceGitHubNewPullRequestCommand.class.st | 12 +- .../IceGitHubNilPullRequest.class.st | 18 +-- .../IceGitHubOpenOnGithubAction.class.st | 20 +-- .../IceGitHubOpenOnGithubCommand.class.st | 12 +- .../IceGitHubPlugin.class.st | 12 +- .../IceGitHubPullRequest.class.st | 76 ++++++----- .../IceGitHubPullRequestDataSource.class.st | 26 ++-- .../IceGitHubPullRequestDefinition.class.st | 38 +++--- .../IceGitHubPullRequestDetailModel.class.st | 66 ++++----- .../IceGitHubRejectPullRequestModel.class.st | 36 ++--- .../IceGitHubRemoteCommand.class.st | 18 +-- .../IceGitHubRemoveBranchesAction.class.st | 26 ++-- .../IceGitHubRemoveBranchesCommand.class.st | 12 +- .../IceGitHubRemoveBranchesModel.class.st | 38 +++--- .../IceGitHubSelectItem.class.st | 22 +-- .../IceGitHubTipPullRequestBrowser.class.st | 64 ++++----- .../IceGitHubTreeCommand.class.st | 20 +-- ...ceGitHubTreeNewPullRequestCommand.class.st | 12 +- .../IceGitHubTreeOpenOnGithubCommand.class.st | 12 +- ...ceGitHubTreeRemoveBranchesCommand.class.st | 12 +- ...eGitHubTreeViewPullRequestCommand.class.st | 12 +- .../IceGitHubViewPullRequestAction.class.st | 10 +- ...tHubViewPullRequestOnGithubAction.class.st | 20 +-- .../IceGitHubViewPullRequestsCommand.class.st | 12 +- .../IceHttpsProtocol.extension.st | 4 +- .../IcePlaintextCredentials.extension.st | 4 +- .../IcePlaintextOtpCredentials.extension.st | 4 +- .../IceSSHProtocol.extension.st | 4 +- ...ceTipGitHubPullRequestListBrowser.class.st | 50 +++---- .../IceTipGitHubRepositoryPanel.class.st | 22 +-- .../IceTipOpenCheckUrlCommand.class.st | 16 ++- ...ceTipOpenGitHubPullRequestCommand.class.st | 18 +-- ...GitHubPullRequestInBrowserCommand.class.st | 16 ++- .../IceTipRefreshPullRequestsCommand.class.st | 18 +-- .../IceTipRepositoriesBrowser.extension.st | 8 +- .../IceTokenCredentials.extension.st | 8 +- .../IceUrlProtocol.extension.st | 4 +- .../ManifestIcebergPluginGitHub.class.st | 10 +- .../MorphicUIManager.extension.st | 4 +- Iceberg-Plugin-GitHub/UIManager.extension.st | 4 +- Iceberg-Plugin-GitHub/package.st | 2 +- .../IceTipMetacelloBaselineDecorator.class.st | 13 +- ...ipMetacelloInstallBaselineCommand.class.st | 27 ++-- ...elloInstallBaselineDefaultCommand.class.st | 11 +- ...acelloInstallBaselineGroupCommand.class.st | 11 +- ...TipMetacelloInstallCommandBuilder.class.st | 11 +- .../IceTipMetacelloPlugin.class.st | 9 +- .../IceTipMetacelloToggleLockCommand.class.st | 23 ++-- .../IceTipRepositoriesBrowser.extension.st | 4 +- .../IceTipWorkingCopyBrowser.extension.st | 6 +- .../ManifestIcebergPluginMetacello.class.st | 8 +- Iceberg-Plugin-Metacello/package.st | 2 +- .../IceConvertFormatAction.class.st | 42 +++--- .../IceFiletreeToTonelCommand.class.st | 14 +- ...TipFiletreeToTonelDialogPresenter.class.st | 38 +++--- .../ManifestIcebergPluginMigration.class.st | 8 +- Iceberg-Plugin-Migration/package.st | 2 +- Iceberg-Plugin-Pharo/IcePharoPlugin.class.st | 34 ++--- .../ManifestIcebergPluginPharo.class.st | 8 +- Iceberg-Plugin-Pharo/package.st | 2 +- Iceberg-Plugin/IcePlugin.class.st | 20 +-- Iceberg-Plugin/IcePluginManager.class.st | 26 ++-- Iceberg-Plugin/IceRepository.extension.st | 4 +- .../IceTipBitbucketRepositoryPanel.class.st | 18 +-- Iceberg-Plugin/IceTipDecorator.class.st | 9 +- .../IceTipGitLabRepositoryPanel.class.st | 18 +-- Iceberg-Plugin/ManifestIcebergPlugin.class.st | 10 +- Iceberg-Plugin/package.st | 2 +- ...tractIceMetacelloIntegrationTests.class.st | 21 +-- .../IceMetacelloIntegrationTests.class.st | 55 ++++---- ...tegrationUpdateALoadedVersionTest.class.st | 19 +-- ...acelloIntegrationWithMissingClone.class.st | 15 ++- ...ojectNoSourceNoPropertiesFiletree.class.st | 17 +-- ...ProjectNoSourcePropertiesFiletree.class.st | 17 +-- ...oNoProjectNoSourcePropertiesTonel.class.st | 17 +-- ...ProjectSourceNoPropertiesFiletree.class.st | 19 +-- ...NoProjectSourcePropertiesFiletree.class.st | 19 +-- ...lloNoProjectSourcePropertiesTonel.class.st | 19 +-- ...ProjectNoSourcePropertiesFiletree.class.st | 17 +-- ...lloProjectNoSourcePropertiesTonel.class.st | 17 +-- ...loProjectSourcePropertiesFiletree.class.st | 17 +-- ...celloProjectSourcePropertiesTonel.class.st | 17 +-- Iceberg-Tests-MetacelloIntegration/package.st | 2 +- Iceberg-TipUI/Clipboard.extension.st | 4 +- Iceberg-TipUI/CmCommandGroup.extension.st | 4 +- .../CmCommandGroupDecorator.extension.st | 4 +- .../CmUICommandDisplayStrategy.extension.st | 4 +- .../CmUIDisableWhenCantBeRun.extension.st | 4 +- .../CmUIHideWhenCantBeRun.extension.st | 4 +- Iceberg-TipUI/FTBasicItem.extension.st | 4 +- Iceberg-TipUI/FTRootItem.extension.st | 4 +- Iceberg-TipUI/FTTableMorph.extension.st | 6 +- Iceberg-TipUI/FTTreeItem.extension.st | 4 +- .../IceAbstractCredentials.extension.st | 6 +- Iceberg-TipUI/IceAddition.extension.st | 4 +- .../IceCheckoutAllPackages.extension.st | 4 +- ...CheckoutAlreadyLoadedPackages.extension.st | 4 +- .../IceCheckoutDoNotLoadPackages.extension.st | 4 +- .../IceCheckoutStrategy.extension.st | 6 +- Iceberg-TipUI/IceClassDefinition.extension.st | 4 +- .../IceConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceCreateBranchCommand.class.st | 10 +- Iceberg-TipUI/IceDefinition.extension.st | 4 +- .../IceDirectoryDefinition.extension.st | 4 +- Iceberg-TipUI/IceErrorVisitor.extension.st | 6 +- Iceberg-TipUI/IceExperimentalFeature.class.st | 10 +- .../IceExtensionDefinition.extension.st | 4 +- Iceberg-TipUI/IceFileDefinition.extension.st | 4 +- .../IceFileSystemDefinition.extension.st | 6 +- Iceberg-TipUI/IceMergeListWrapper.class.st | 28 ++-- .../IceMergeWorkingCopyCommand.class.st | 10 +- .../IceMethodContainerDefinition.extension.st | 10 +- .../IceMethodDefinition.extension.st | 10 +- Iceberg-TipUI/IceModification.extension.st | 4 +- Iceberg-TipUI/IceNoCommitMessage.class.st | 14 +- Iceberg-TipUI/IceNoModification.extension.st | 4 +- Iceberg-TipUI/IceNode.extension.st | 4 +- .../IceNodeCodeDisplayVisitor.class.st | 24 ++-- .../IceNonConflictingOperation.extension.st | 6 +- Iceberg-TipUI/IceOperation.extension.st | 12 +- Iceberg-TipUI/IceOperationMerge.extension.st | 6 +- Iceberg-TipUI/IcePackage.extension.st | 4 +- .../IcePackageDefinition.extension.st | 10 +- .../IcePlaintextCredentials.extension.st | 8 +- .../IcePlaintextOtpCredentials.extension.st | 4 +- Iceberg-TipUI/IcePullRemoteCommand.class.st | 14 +- Iceberg-TipUI/IceRemoval.extension.st | 4 +- Iceberg-TipUI/IceRepository.extension.st | 4 +- Iceberg-TipUI/IceRepositoryCommand.class.st | 24 ++-- .../IceSavedPackageVersion.extension.st | 4 +- Iceberg-TipUI/IceSortingStrategy.class.st | 28 ++-- Iceberg-TipUI/IceSshCredentials.extension.st | 6 +- .../IceTipAbstractCredentialCommand.class.st | 14 +- ...TipAbstractCredentialStoreCommand.class.st | 16 ++- ...ceTipAbstractCredentialsPresenter.class.st | 56 ++++---- ...ractPlaintextCredentialsPresenter.class.st | 24 ++-- ...ipAbstractSSHCredentialsPresenter.class.st | 20 +-- Iceberg-TipUI/IceTipAction.class.st | 30 +++-- ...eTipAddNewPackagesDialogPresenter.class.st | 40 +++--- .../IceTipAddPackageCommand.class.st | 20 +-- .../IceTipAddPackagesDialogPresenter.class.st | 44 +++--- ...eTipAddPlainTextCredentialCommand.class.st | 14 +- ...pAddPlaintextCredentialsPresenter.class.st | 22 +-- Iceberg-TipUI/IceTipAddRemoteCommand.class.st | 20 +-- .../IceTipAddRemoteDialogPresenter.class.st | 40 +++--- .../IceTipAddRepositoryCommand.class.st | 22 +-- .../IceTipAddSSHCredentialsPresenter.class.st | 22 +-- .../IceTipAddSshCredentialCommand.class.st | 14 +- .../IceTipAddTokenCredentialCommand.class.st | 14 +- ...ceTipAddTokenCredentialsPresenter.class.st | 28 ++-- .../IceTipAdoptCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipAnnouncement.class.st | 8 +- ...kForPlaintextCredentialsPresenter.class.st | 20 +-- ...rPlaintextOtpCredentialsPresenter.class.st | 18 +-- ...bForPlaintextCredentialsPresenter.class.st | 10 +- .../IceTipAskSSHCredentialsPresenter.class.st | 14 +- Iceberg-TipUI/IceTipBranchModel.class.st | 48 +++---- Iceberg-TipUI/IceTipBranchPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipBrowseCommand.class.st | 20 +-- .../IceTipBrowsePackageCommand.class.st | 18 +-- ...seRepositoryPackageVersionCommand.class.st | 14 +- Iceberg-TipUI/IceTipBrowser.class.st | 62 ++++----- Iceberg-TipUI/IceTipCache.class.st | 28 ++-- Iceberg-TipUI/IceTipCachedModel.class.st | 26 ++-- ...eTipCalculateDirtyPackagesCommand.class.st | 16 ++- .../IceTipCheckoutBranchCommand.class.st | 20 +-- .../IceTipCheckoutBranchDialog.class.st | 30 +++-- .../IceTipCheckoutBranchPanel.class.st | 10 +- .../IceTipCheckoutCommitCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCheckoutModel.class.st | 26 ++-- .../IceTipCheckoutNewBranchCommand.class.st | 18 +-- .../IceTipCheckoutNewBranchPanel.class.st | 40 +++--- .../IceTipCheckoutPreviewBrowser.class.st | 32 ++--- ...eTipCheckoutSelectedBranchCommand.class.st | 18 +-- .../IceTipCheckoutSelectedTagCommand.class.st | 18 +-- .../IceTipCherryPickCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCherrypickModel.class.st | 22 +-- .../IceTipCherrypickPreviewBrowser.class.st | 34 ++--- .../IceTipCleanCommandGroupVisitor.class.st | 12 +- Iceberg-TipUI/IceTipCommand.class.st | 50 +++---- ...ommandToPresenterBuildingStrategy.class.st | 12 +- Iceberg-TipUI/IceTipCommentPanel.class.st | 54 ++++---- Iceberg-TipUI/IceTipCommitAction.class.st | 28 ++-- Iceberg-TipUI/IceTipCommitBrowser.class.st | 58 ++++---- Iceberg-TipUI/IceTipCommitCommand.class.st | 20 +-- Iceberg-TipUI/IceTipCommitDiffModel.class.st | 10 +- .../IceTipCommitInfoPresenter.class.st | 46 ++++--- Iceberg-TipUI/IceTipCommitModel.class.st | 64 ++++----- Iceberg-TipUI/IceTipCommitRangeModel.class.st | 18 +-- Iceberg-TipUI/IceTipCommitishModel.class.st | 18 +-- .../IceTipCopyCommitishCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagCommand.class.st | 18 +-- Iceberg-TipUI/IceTipCreateTagPanel.class.st | 60 +++++---- .../IceTipCredentialsSettings.class.st | 16 ++- .../IceTipCredentialsStoreBrowser.class.st | 34 ++--- ...ceTipCritiquesBeforeCommitBrowser.class.st | 50 +++---- .../IceTipDeleteBranchCommand.class.st | 18 +-- .../IceTipDeleteRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipDeleteTagCommand.class.st | 20 +-- .../IceTipDescriptionDecorator.class.st | 14 +- .../IceTipDescriptionDecoratorHead.class.st | 10 +- ...ceTipDescriptionDecoratorModified.class.st | 10 +- ...eTipDescriptionDecoratorNotLoaded.class.st | 10 +- Iceberg-TipUI/IceTipDialogPresenter.class.st | 14 +- Iceberg-TipUI/IceTipDiffEntryRemoved.class.st | 14 +- Iceberg-TipUI/IceTipDiffModel.class.st | 24 ++-- Iceberg-TipUI/IceTipDiffPanel.class.st | 66 ++++----- Iceberg-TipUI/IceTipDiffPreviewModel.class.st | 22 +-- Iceberg-TipUI/IceTipDiffRefreshed.class.st | 14 +- .../IceTipDiffSelectingPanel.class.st | 26 ++-- Iceberg-TipUI/IceTipDirectMergeType.class.st | 10 +- .../IceTipDirectoryPresenter.class.st | 10 +- ...ipDiscardAllChangesPreviewBrowser.class.st | 22 +-- Iceberg-TipUI/IceTipDiscardAllModel.class.st | 24 ++-- .../IceTipDiscardChangesCommand.class.st | 20 +-- .../IceTipEditCredentialCommand.class.st | 18 +-- ...EditPlaintextCredentialsPresenter.class.st | 20 +-- .../IceTipEditProjectDialogPresenter.class.st | 74 +++++----- .../IceTipEditRepositoryCommand.class.st | 18 +-- ...IceTipEditSSHCredentialsPresenter.class.st | 20 +-- ...eTipEditTokenCredentialsPresenter.class.st | 16 ++- Iceberg-TipUI/IceTipEntityModel.class.st | 38 +++--- .../IceTipErrorDialogPresenter.class.st | 30 +++-- .../IceTipExistingBranchPanel.class.st | 32 ++--- .../IceTipFetchAllProjectCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFetchCommand.class.st | 20 +-- .../IceTipFetchInPullCommand.class.st | 16 ++- .../IceTipFetchRemoteCommand.class.st | 20 +-- Iceberg-TipUI/IceTipFilePresenter.class.st | 10 +- .../IceTipForgetRepositoryCommand.class.st | 18 +-- .../IceTipGitProviderRepositoryPanel.class.st | 42 +++--- .../IceTipGitRepositoryPanel.class.st | 26 ++-- ...itUsernameAndEmailDialogPresenter.class.st | 38 +++--- ...pHiedraAltComponentHistoryBrowser.class.st | 36 ++--- .../IceTipHiedraAltHistoryBrowser.class.st | 32 ++--- ...ceTipHiedraAltHistoryRowPresenter.class.st | 16 ++- .../IceTipHiedraHistoryBrowser.class.st | 18 +-- .../IceTipHistoryActionBrowser.class.st | 32 ++--- Iceberg-TipUI/IceTipHistoryBrowser.class.st | 46 ++++--- .../IceTipHistoryDiffFromHead.class.st | 12 +- .../IceTipHistoryDiffToAncestor.class.st | 12 +- .../IceTipHistoryDiffToHead.class.st | 12 +- .../IceTipHistoryDiffUpdater.class.st | 28 ++-- Iceberg-TipUI/IceTipInspectCommand.class.st | 20 +-- .../IceTipInstallVersionCommand.class.st | 18 +-- ...TipInteractiveCredentialsProvider.class.st | 18 +-- .../IceTipInteractiveErrorVisitor.class.st | 54 ++++---- .../IceTipLoadPackageCommand.class.st | 18 +-- .../IceTipLocalRepositoryPanel.class.st | 28 ++-- .../IceTipLocationPresenter.class.st | 46 ++++--- .../IceTipManagePackagesCommand.class.st | 18 +-- .../IceTipManageRepositoryCommand.class.st | 24 ++-- .../IceTipMergeBranchDialogPresenter.class.st | 30 +++-- Iceberg-TipUI/IceTipMergeBranchPanel.class.st | 18 +-- Iceberg-TipUI/IceTipMergeCommand.class.st | 18 +-- .../IceTipMergeHistoryCommand.class.st | 18 +-- Iceberg-TipUI/IceTipMergeModel.class.st | 20 +-- Iceberg-TipUI/IceTipMergeMorph.class.st | 14 +- Iceberg-TipUI/IceTipMergePatchMorph.class.st | 40 +++--- .../IceTipMergePreviewBrowser.class.st | 20 +-- .../IceTipMergeSelectingPanel.class.st | 28 ++-- Iceberg-TipUI/IceTipMergeType.class.st | 22 +-- Iceberg-TipUI/IceTipModel.class.st | 18 +-- .../IceTipNewRepositoryPanel.class.st | 34 ++--- .../IceTipOpenNativelyCommand.class.st | 18 +-- .../IceTipOptionDialogPresenter.class.st | 36 ++--- Iceberg-TipUI/IceTipPackageCommand.class.st | 20 +-- Iceberg-TipUI/IceTipPackageModel.class.st | 36 ++--- Iceberg-TipUI/IceTipPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipPreviewBrowser.class.st | 26 ++-- Iceberg-TipUI/IceTipPullBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPullCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPullModel.class.st | 12 +- Iceberg-TipUI/IceTipPushAction.class.st | 10 +- Iceberg-TipUI/IceTipPushBrowser.class.st | 20 +-- Iceberg-TipUI/IceTipPushCommand.class.st | 18 +-- Iceberg-TipUI/IceTipPushModel.class.st | 12 +- .../IceTipReadOnlyFormBuilder.class.st | 36 ++--- .../IceTipRefreshCommitCommand.class.st | 18 +-- ...RegisterRepositoryDialogPresenter.class.st | 26 ++-- .../IceTipReloadPackageCommand.class.st | 18 +-- .../IceTipRemoteActionBrowser.class.st | 26 ++-- .../IceTipRemoteActionCommand.class.st | 14 +- .../IceTipRemoteActionModel.class.st | 24 ++-- Iceberg-TipUI/IceTipRemoteModel.class.st | 20 +-- .../IceTipRemotesTreeCommand.class.st | 18 +-- .../IceTipRemoveCredentialCommand.class.st | 20 +-- ...emoveFromRepositoryPackageCommand.class.st | 16 ++- ...ceTipRemovePackageDialogPresenter.class.st | 34 ++--- ...ipRemoveRepositoryDialogPresenter.class.st | 34 ++--- Iceberg-TipUI/IceTipRepairAction.class.st | 38 +++--- .../IceTipRepairCheckoutBranch.class.st | 20 +-- .../IceTipRepairCheckoutNewBranch.class.st | 20 +-- .../IceTipRepairCloneRepository.class.st | 20 +-- Iceberg-TipUI/IceTipRepairCommand.class.st | 20 +-- .../IceTipRepairCreateSubdirectory.class.st | 20 +-- .../IceTipRepairDiscardAndLoad.class.st | 22 +-- .../IceTipRepairEditRepository.class.st | 20 +-- .../IceTipRepairFetchRemoteBranch.class.st | 22 +-- .../IceTipRepairLocateRepository.class.st | 24 ++-- .../IceTipRepairMergeWithBranch.class.st | 20 +-- Iceberg-TipUI/IceTipRepairProject.class.st | 20 +-- .../IceTipRepairPullRemoteBranch.class.st | 20 +-- ...ipRepairRepositoryDialogPresenter.class.st | 44 +++--- .../IceTipRepositoriesBrowser.class.st | 70 +++++----- .../IceTipRepositoriesModel.class.st | 14 +- .../IceTipRepositoryBrowser.class.st | 46 ++++--- .../IceTipRepositoryCommand.class.st | 20 +-- .../IceTipRepositoryGroupModel.class.st | 22 +-- .../IceTipRepositoryGroupPanel.class.st | 50 +++---- Iceberg-TipUI/IceTipRepositoryModel.class.st | 126 +++++++++--------- .../IceTipRepositoryTypePanel.class.st | 40 +++--- ...TipResetBranchToThisCommitCommand.class.st | 22 +-- .../IceTipRevertChangeCommand.class.st | 18 +-- Iceberg-TipUI/IceTipSaveImageAction.class.st | 10 +- .../IceTipSelectAllPackagesCommand.class.st | 18 +-- .../IceTipSelectPackagesCommand.class.st | 10 +- .../IceTipSelectRemotePresenter.class.st | 32 ++--- Iceberg-TipUI/IceTipSettingsCommand.class.st | 22 +-- Iceberg-TipUI/IceTipSpCommand.class.st | 24 ++-- Iceberg-TipUI/IceTipStandardAction.class.st | 26 ++-- Iceberg-TipUI/IceTipStatusDecorator.class.st | 12 +- .../IceTipStatusDecoratorError.class.st | 12 +- .../IceTipStatusDecoratorWarning.class.st | 10 +- Iceberg-TipUI/IceTipStyleContributor.class.st | 10 +- .../IceTipSwitchAndMergeType.class.st | 10 +- Iceberg-TipUI/IceTipTagDecorator.class.st | 12 +- Iceberg-TipUI/IceTipTagModel.class.st | 18 +-- Iceberg-TipUI/IceTipTextDecorator.class.st | 20 +-- .../IceTipTextDecoratorNone.class.st | 8 +- .../IceTipToolbarButtonStrategy.class.st | 12 +- .../IceTipToolbarPresenterBuilder.class.st | 10 +- Iceberg-TipUI/IceTipTreeBranch.class.st | 10 +- .../IceTipTreeCollapseCommand.class.st | 16 ++- .../IceTipTreeExpandCommand.class.st | 18 +-- Iceberg-TipUI/IceTipTreeGroup.class.st | 34 ++--- Iceberg-TipUI/IceTipTreeItem.class.st | 18 +-- Iceberg-TipUI/IceTipTreeNode.class.st | 40 +++--- Iceberg-TipUI/IceTipTreeRemote.class.st | 10 +- .../IceTipTreeRepositoryGroup.class.st | 8 +- Iceberg-TipUI/IceTipTreeTag.class.st | 10 +- ...eTipUnloadAndRemovePackageCommand.class.st | 18 +-- .../IceTipUnloadPackageCommand.class.st | 18 +-- .../IceTipUnselectAllPackagesCommand.class.st | 18 +-- .../IceTipVersionHistoryBrowser.class.st | 50 +++---- .../IceTipVersionHistoryModel.class.st | 18 +-- Iceberg-TipUI/IceTipVersionModel.class.st | 16 ++- .../IceTipWorkingCopyBrowser.class.st | 62 ++++----- .../IceTipWorkingCopyDiffModel.class.st | 16 ++- Iceberg-TipUI/IceTipWorkingCopyModel.class.st | 36 ++--- ...eTipWorkingCopyStatusBarPresenter.class.st | 20 +-- .../IceTokenCredentials.extension.st | 6 +- Iceberg-TipUI/IceTraitDefinition.extension.st | 4 +- Iceberg-TipUI/IceWarning.class.st | 10 +- Iceberg-TipUI/IceWorkingCopy.extension.st | 4 +- .../LGitCredentialsPlaintext.extension.st | 4 +- Iceberg-TipUI/MCAddition.extension.st | 4 +- Iceberg-TipUI/MCModification.extension.st | 4 +- Iceberg-TipUI/MCPatchOperation.extension.st | 4 +- Iceberg-TipUI/MCRemoval.extension.st | 6 +- Iceberg-TipUI/ManifestIcebergTipUI.class.st | 14 +- Iceberg-TipUI/PharoDarkTheme.extension.st | 6 +- Iceberg-TipUI/PharoShortcuts.extension.st | 4 +- .../SpToolbarButtonPresenter.extension.st | 4 +- Iceberg-TipUI/TIceCopyCommitId.trait.st | 10 +- Iceberg-TipUI/TWithBranchModel.trait.st | 16 ++- Iceberg-TipUI/Text.extension.st | 4 +- .../ToolShortcutsCategory.extension.st | 4 +- Iceberg-TipUI/UITheme.extension.st | 6 +- Iceberg-TipUI/package.st | 2 +- 424 files changed, 4575 insertions(+), 3914 deletions(-) diff --git a/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st b/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st index 7404476c71..e2d671e1a8 100644 --- a/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st +++ b/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st @@ -1,47 +1,48 @@ Class { - #name : #IceLibgitRuleBreakerRepository, - #superclass : #IceLibgitRepository, - #category : 'Iceberg-ArchitecturalRules' + #name : 'IceLibgitRuleBreakerRepository', + #superclass : 'IceLibgitRepository', + #category : 'Iceberg-ArchitecturalRules', + #package : 'Iceberg-ArchitecturalRules' } -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testDefinedRepositoryAccessor [ ^ handle ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodAccessHandleDirectly [ ^ handle allBranches ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodAccessHandleDirectlyWithErrorHandler [ self handleLibgitError: [handle allBranches] ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodAccessHandleThroughAccessor [ ^ self testDefinedRepositoryAccessor allBranches ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodAccessHandleThroughAccessorWithErrorHandler [ self handleLibgitError: [ self testDefinedRepositoryAccessor allBranches] ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodNotBreakingRule [ ^ 1+1 ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testNonDefinedRepositoryAccessor [ ^ handle diff --git a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st index 431bcaa6b9..e244c3af05 100644 --- a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st +++ b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st @@ -6,18 +6,19 @@ Otherwise, libgit errors may be thrown to the user and produce ugly effects. E.g - Libgit errors are criptyc and can only be understood by reading the message text... " Class { - #name : #IceShouldHandleLibgitErrors, - #superclass : #ReAbstractRule, - #category : #'Iceberg-ArchitecturalRules' + #name : 'IceShouldHandleLibgitErrors', + #superclass : 'ReAbstractRule', + #category : 'Iceberg-ArchitecturalRules', + #package : 'Iceberg-ArchitecturalRules' } -{ #category : #'testing-interest' } +{ #category : 'testing-interest' } IceShouldHandleLibgitErrors class >> checksNode [ ^ true ] -{ #category : #running } +{ #category : 'running' } IceShouldHandleLibgitErrors >> check: aNode forCritiquesDo: aBlock [ "Detect strange case where method node is nil" @@ -44,13 +45,13 @@ IceShouldHandleLibgitErrors >> check: aNode forCritiquesDo: aBlock [ ifFalse: [ aBlock cull: (self critiqueFor: aNode) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceShouldHandleLibgitErrors >> group [ ^ 'Architectural' ] -{ #category : #accessing } +{ #category : 'accessing' } IceShouldHandleLibgitErrors >> libgitRepositoryHandleAccessorsForClass: aClass [ ^ aClass allMethods @@ -58,7 +59,7 @@ IceShouldHandleLibgitErrors >> libgitRepositoryHandleAccessorsForClass: aClass [ [ :m | m pragmas anySatisfy: [ :p | p selector = IceLibgitRepository libgitRepositoryHandleAccessorPragmaSelector ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceShouldHandleLibgitErrors >> name [ ^ 'Should manage errors when doing a libgit call' diff --git a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st index 0b87f127b7..5f08bb76d9 100644 --- a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st +++ b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st @@ -1,15 +1,16 @@ Class { - #name : #IceShouldHandleLibgitErrorsTest, - #superclass : #TestCase, - #category : 'Iceberg-ArchitecturalRules' + #name : 'IceShouldHandleLibgitErrorsTest', + #superclass : 'TestCase', + #category : 'Iceberg-ArchitecturalRules', + #package : 'Iceberg-ArchitecturalRules' } -{ #category : #rules } +{ #category : 'rules' } IceShouldHandleLibgitErrorsTest class >> libgitRepositoryHandleAccessors [ self shouldBeImplemented. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> check: aRule on: aMethod [ | lintRule | @@ -18,7 +19,7 @@ IceShouldHandleLibgitErrorsTest >> check: aRule on: aMethod [ ^ lintRule result smallLintCritics ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testDefinedRepositoryAccessorDoesNotBreakRule [ | critiques | @@ -27,7 +28,7 @@ IceShouldHandleLibgitErrorsTest >> testDefinedRepositoryAccessorDoesNotBreakRule self assert: critiques isEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithErrorChecking [ | critiques | @@ -36,7 +37,7 @@ IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithErrorChecking [ self assert: critiques isEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithoutErrorChecking [ | critiques | @@ -45,7 +46,7 @@ IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithoutErrorChecking [ self assert: critiques notEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithErrorChecking [ | critiques | @@ -54,7 +55,7 @@ IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithErr self assert: critiques isEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithoutErrorChecking [ | critiques | @@ -63,7 +64,7 @@ IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithout self assert: critiques notEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testMethodNotBreakingRuleYieldsNoCritiques [ | critiques | @@ -72,7 +73,7 @@ IceShouldHandleLibgitErrorsTest >> testMethodNotBreakingRuleYieldsNoCritiques [ self assert: critiques isEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testNonDefinedRepositoryAccessorBreaksRule [ | critiques | diff --git a/Iceberg-ArchitecturalRules/package.st b/Iceberg-ArchitecturalRules/package.st index 3c48720b44..cd17b06d4f 100644 --- a/Iceberg-ArchitecturalRules/package.st +++ b/Iceberg-ArchitecturalRules/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-ArchitecturalRules' } +Package { #name : 'Iceberg-ArchitecturalRules' } diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st index b1bccf1d42..cde75852b4 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st @@ -2,27 +2,29 @@ Emulates other 'file utils' classes by reading from a git repository (its blob, not a working copy'). Allows for reading any tree (from any commit) in the repository. " Class { - #name : #IceLibgitFiletreeFileUtils, - #superclass : #Object, - #category : #'Iceberg-Libgit-Filetree-Utilities' + #name : 'IceLibgitFiletreeFileUtils', + #superclass : 'Object', + #category : 'Iceberg-Libgit-Filetree-Utilities', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Utilities' } -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> deleteAll: aTreeBuilder [ ^ aTreeBuilder deleteAll ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> directoryExists: aLGitTreeEntry [ ^ aLGitTreeEntry type = LGitObjectTypeEnum git_obj_tree ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> directoryFromEntry: treeEntry [ ^ treeEntry object ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> directoryFromPath: aString relativeTo: aCommitOrTree [ ^ aCommitOrTree entryByPath: aString @@ -31,27 +33,27 @@ IceLibgitFiletreeFileUtils class >> directoryFromPath: aString relativeTo: aComm ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> directoryName: anEntry [ ^ anEntry filename ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> fileName: anEntry [ ^ anEntry filename ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeFileUtils class >> pathNameDelimiter [ ^ $/ ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> readStreamFor: fileName in: tree do: aBlock [ (tree entryByPath: fileName) readStreamDo: aBlock ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> writeStreamFor: fileName in: directory do: aBlock [ directory addEntryNamed: fileName withContents: (String streamContents: aBlock). ] diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeLog.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeLog.class.st index b44ae81ca7..6760559e4e 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeLog.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeLog.class.st @@ -2,52 +2,54 @@ I'm a tool to ask the full history of a method (based on filetree file format). " Class { - #name : #IceLibgitFiletreeLog, - #superclass : #IceLog, - #category : #'Iceberg-Libgit-Filetree-Log' + #name : 'IceLibgitFiletreeLog', + #superclass : 'IceLog', + #category : 'Iceberg-Libgit-Filetree-Log', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Log' } -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeLog class >> isAvailableFor: aRepository [ ^ aRepository writerClass id = #filetree ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> basepathOf: aPath [ ^ aPath ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressClassOrTraitName: aMethod [ ^ aMethod origin instanceSide name, (self cypressMethodClassExtension: aMethod) ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressMethodClassExtension: aMethod [ aMethod isExtension ifTrue: [ ^ '.extension' ]. aMethod origin isTrait ifTrue: [ ^ '.trait' ]. ^ '.class' ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressMethodName: aMethod [ ^ (MCFileTreeStCypressWriter fileNameForSelector: aMethod selector asString), '.st' ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressMethodSideName: aMethod [ ^ aMethod origin isClassSide ifTrue: [ 'class' ] ifFalse: [ 'instance' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressPackageName: aPackage [ ^ aPackage name, '.package' ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> definitionFor: aMethod path: aPath commit: aCommit [ ^ ((IceLibgitFiletreeLogReader fileName: aPath on: aCommit) package: aMethod package mcPackage; @@ -66,7 +68,7 @@ IceLibgitFiletreeLog >> definitionFor: aMethod path: aPath commit: aCommit [ source: '' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> fileNameForMethod: aMethod [ | path | @@ -83,7 +85,7 @@ IceLibgitFiletreeLog >> fileNameForMethod: aMethod [ path asStringOn: stream delimiter: '/' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> toFileName: aMethod [ ^ self fileNameForMethod: aMethod ] diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeLogReader.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeLogReader.class.st index 882934e06c..152658d89e 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeLogReader.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeLogReader.class.st @@ -3,32 +3,34 @@ I read exclusively the definition of the method defined in fileName. I'm using to speed the creation of a version list on IceLibgitFiletreeLog. " Class { - #name : #IceLibgitFiletreeLogReader, - #superclass : #IceLibgitFiletreeReader, + #name : 'IceLibgitFiletreeLogReader', + #superclass : 'IceLibgitFiletreeReader', #instVars : [ 'fileName' ], - #category : #'Iceberg-Libgit-Filetree-Reader' + #category : 'Iceberg-Libgit-Filetree-Reader', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Reader' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitFiletreeLogReader class >> fileName: aString on: aCommit [ ^ (self on: aCommit) fileName: aString; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeLogReader >> fileName [ ^ fileName ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeLogReader >> fileName: aString [ fileName := aString ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeLogReader >> loadDefinitions [ | entry segments className classIsMeta entryPath packageIndex | @@ -63,12 +65,12 @@ IceLibgitFiletreeLogReader >> loadDefinitions [ source: source) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeLogReader >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeLogReader >> package: aPackage [ package := aPackage ] diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeReader.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeReader.class.st index 6107c0e193..d3bef7fe34 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeReader.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeReader.class.st @@ -4,17 +4,19 @@ Reads an MCVersion from a git repository (its blob, not a working copy!) using l Currently we only support metadata-less repositories. " Class { - #name : #IceLibgitFiletreeReader, - #superclass : #MCFileTreeStCypressReader, + #name : 'IceLibgitFiletreeReader', + #superclass : 'MCFileTreeStCypressReader', #traits : 'TIceRepositoryReader', #classTraits : 'TIceRepositoryReader classTrait', #instVars : [ 'iceVersion' ], - #category : #'Iceberg-Libgit-Filetree-Reader' + #category : 'Iceberg-Libgit-Filetree-Reader', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Reader' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader class >> compatibleAuthorNameOf: aString [ "Timestamp of method has a very precise format that needs to be fulfiled: @@ -26,60 +28,60 @@ IceLibgitFiletreeReader class >> compatibleAuthorNameOf: aString [ ^ aString reject: [ :each | each = Character space ] ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeReader class >> id [ ^ #filetree ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeReader class >> isLegacyDefault [ ^ true ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitFiletreeReader class >> on: aCommitOrTree iceVersion: iceVersion [ ^ (self on: aCommitOrTree) iceVersion: iceVersion; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> commit [ ^ stream ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> fileUtils [ ^ IceLibgitFiletreeFileUtils ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeReader >> hasMonticelloMetadata [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> iceVersion [ ^ iceVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> iceVersion: anObject [ iceVersion := anObject. self packageDirectory: (iceVersion commit project sourceDirectoryPath / (IceLibgitFiletreeWriter directoryNameFor: (IcePackage named: iceVersion package name repository: iceVersion commit repository))) pathString ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> loadVersionInfo [ ^ info := self iceVersion info ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> packageNameFromPackageDirectory [ ^ iceVersion packageName ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> versionName [ ^ ('{1}-{2}.{3}' format: { self packageNameFromPackageDirectory. diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeSnapshotWriter.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeSnapshotWriter.class.st index fcb81b269f..4649254d50 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeSnapshotWriter.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeSnapshotWriter.class.st @@ -3,22 +3,24 @@ I'm a filetree snapshot writer to ensure the output will be libgit2 compatible. I'm not surre I cannot unify myself class with my parent. " Class { - #name : #IceLibgitFiletreeSnapshotWriter, - #superclass : #IceMetadatalessStCypressWriter, - #category : #'Iceberg-Libgit-Filetree-Writer' + #name : 'IceLibgitFiletreeSnapshotWriter', + #superclass : 'IceMetadatalessStCypressWriter', + #category : 'Iceberg-Libgit-Filetree-Writer', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Writer' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeSnapshotWriter >> fileUtils [ ^ IceLibgitFiletreeFileUtils ] -{ #category : #'initialize-release' } +{ #category : 'initialize-release' } IceLibgitFiletreeSnapshotWriter >> propertyFileExtension [ ^ MCFileTreeRepository defaultPropertyFileExtension ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitFiletreeSnapshotWriter >> writeInDirectoryName: directoryNameOrPath fileName: fileName extension: ext visit: visitBlock [ | directory | directory := self directoryForDirectoryNamed: directoryNameOrPath. diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeWriter.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeWriter.class.st index c7a5894abf..6717cb5531 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeWriter.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeWriter.class.st @@ -3,58 +3,60 @@ I'm a filetree writer to ensure the output will be libgit2 compatible. I'm not surre I cannot unify myself class with my parent. " Class { - #name : #IceLibgitFiletreeWriter, - #superclass : #IceMetadatalessFileTreeWriter, + #name : 'IceLibgitFiletreeWriter', + #superclass : 'IceMetadatalessFileTreeWriter', #traits : 'TIceRepositoryWriter', #classTraits : 'TIceRepositoryWriter classTrait', - #category : #'Iceberg-Libgit-Filetree-Writer' + #category : 'Iceberg-Libgit-Filetree-Writer', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Writer' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> description [ ^ 'Filetree' ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> directoryNameFor: aPackage [ ^ aPackage name, '.package' ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> forInternalStore [ ^ IceMetadatalessFileTreeWriter ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitFiletreeWriter class >> forInternalStoreFileOut: aMCVersion on: aRepository [ self forInternalStore fileOut: aMCVersion on: (IceBackendWriterAdapter for: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> id [ ^ #filetree ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeWriter class >> isLegacyDefault [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeWriter class >> isValidPackage: aFileReference [ ^ (aFileReference basename endsWith: '.package') and: [ aFileReference isDirectory and: [(aFileReference / 'monticello.meta') exists]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> packageNameFromDirectory: aFileReference [ ^ aFileReference basenameWithoutExtension ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitFiletreeWriter >> addString: string at: fileNameOrPath encodedTo: ignored [ "fileNameOrPath may have one or two elements" "encodeTo: arg, because FileTree uses UTF8 by default" @@ -69,22 +71,22 @@ IceLibgitFiletreeWriter >> addString: string at: fileNameOrPath encodedTo: ignor ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter >> fileUtils [ ^ IceLibgitFiletreeFileUtils ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter >> snapshotWriterClass [ ^ IceLibgitFiletreeSnapshotWriter ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitFiletreeWriter >> subPackageFileDirectoryFor: directoryNameOrPath [ ^ self packageFileDirectory entryByPath: directoryNameOrPath ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitFiletreeWriter >> writeVersion: aVersion [ directory := aVersion package name, '.package'. packageFileDirectory := stream / directory. diff --git a/Iceberg-Libgit-Filetree/IceMetadatalessFileTreeWriter.class.st b/Iceberg-Libgit-Filetree/IceMetadatalessFileTreeWriter.class.st index 66be3e0615..91fde45f86 100644 --- a/Iceberg-Libgit-Filetree/IceMetadatalessFileTreeWriter.class.st +++ b/Iceberg-Libgit-Filetree/IceMetadatalessFileTreeWriter.class.st @@ -2,22 +2,24 @@ I can write metadataless filetree versions from an ice formed version. " Class { - #name : #IceMetadatalessFileTreeWriter, - #superclass : #MCFileTreeWriter, - #category : #'Iceberg-Libgit-Filetree-Writer' + #name : 'IceMetadatalessFileTreeWriter', + #superclass : 'MCFileTreeWriter', + #category : 'Iceberg-Libgit-Filetree-Writer', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Writer' } -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessFileTreeWriter class >> fileOut: aVersion on: aStream [ (self on: aStream) writeVersion: aVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetadatalessFileTreeWriter >> snapshotWriterClass [ ^ IceMetadatalessStCypressWriter ] -{ #category : #visiting } +{ #category : 'visiting' } IceMetadatalessFileTreeWriter >> writeVersion: aVersion [ "We have to do that to avoid writing the version info." diff --git a/Iceberg-Libgit-Filetree/IceMetadatalessStCypressWriter.class.st b/Iceberg-Libgit-Filetree/IceMetadatalessStCypressWriter.class.st index d4246f8760..d3a53a0070 100644 --- a/Iceberg-Libgit-Filetree/IceMetadatalessStCypressWriter.class.st +++ b/Iceberg-Libgit-Filetree/IceMetadatalessStCypressWriter.class.st @@ -2,17 +2,19 @@ I can write filetree metadataless versions of a snapshot. " Class { - #name : #IceMetadatalessStCypressWriter, - #superclass : #MCFileTreeStCypressWriter, - #category : #'Iceberg-Libgit-Filetree-Writer' + #name : 'IceMetadatalessStCypressWriter', + #superclass : 'MCFileTreeStCypressWriter', + #category : 'Iceberg-Libgit-Filetree-Writer', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Writer' } -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter class >> on: aStream [ ^ self new stream: aStream ] -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter >> writeClassDefinition: definition to: classPath [ self writeInDirectoryName: classPath @@ -26,7 +28,7 @@ IceMetadatalessStCypressWriter >> writeClassDefinition: definition to: classPath visit: [ self writeClassDefinition: definition ] ] -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter >> writeDefinitions: aCollection [ | classDirExtension extensionClasses extensionMethodDefinitions extensionMethodMap methodHolders | self writeBasicDefinitions: aCollection. @@ -95,14 +97,14 @@ IceMetadatalessStCypressWriter >> writeDefinitions: aCollection [ filename: filename ] ] ] -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter >> writeMethodProperties: classMethodDefinitions [ "We don't want to write that." self shouldNotImplement ] -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter >> writeTraitDefinition: definition to: classPath [ self writeInDirectoryName: classPath diff --git a/Iceberg-Libgit-Filetree/ManifestIcebergLibgitFiletree.class.st b/Iceberg-Libgit-Filetree/ManifestIcebergLibgitFiletree.class.st index be450bd147..6507369c69 100644 --- a/Iceberg-Libgit-Filetree/ManifestIcebergLibgitFiletree.class.st +++ b/Iceberg-Libgit-Filetree/ManifestIcebergLibgitFiletree.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergLibgitFiletree, - #superclass : #PackageManifest, - #category : 'Iceberg-Libgit-Filetree-Manifest' + #name : 'ManifestIcebergLibgitFiletree', + #superclass : 'PackageManifest', + #category : 'Iceberg-Libgit-Filetree-Manifest', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergLibgitFiletree class >> description [ ^ 'I contain the libgit binding for the FileTree export format. diff --git a/Iceberg-Libgit-Filetree/package.st b/Iceberg-Libgit-Filetree/package.st index 80fec0171f..3e3214ee4e 100644 --- a/Iceberg-Libgit-Filetree/package.st +++ b/Iceberg-Libgit-Filetree/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Libgit-Filetree' } +Package { #name : 'Iceberg-Libgit-Filetree' } diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelFileUtils.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelFileUtils.class.st index e8474cd955..78b7ad3de4 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelFileUtils.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelFileUtils.class.st @@ -2,27 +2,29 @@ Emulates other 'file utils' classes by reading from a git repository (its blob, not a working copy'). Allows for reading any tree (from any commit) in the repository. " Class { - #name : #IceLibgitTonelFileUtils, - #superclass : #Object, - #category : #'Iceberg-Libgit-Tonel-Utilities' + #name : 'IceLibgitTonelFileUtils', + #superclass : 'Object', + #category : 'Iceberg-Libgit-Tonel-Utilities', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Utilities' } -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> deleteAll: aTreeBuilder [ ^ aTreeBuilder deleteAll ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> directoryExists: aLGitTreeEntry [ ^ aLGitTreeEntry type = LGitObjectTypeEnum git_obj_tree ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> directoryFromEntry: treeEntry [ ^ treeEntry object ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> directoryFromPath: aString relativeTo: aCommitOrTree [ ^ aCommitOrTree entryByPath: aString @@ -31,27 +33,27 @@ IceLibgitTonelFileUtils class >> directoryFromPath: aString relativeTo: aCommitO ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> directoryName: anEntry [ ^ anEntry filename ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> fileName: anEntry [ ^ anEntry filename ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelFileUtils class >> pathNameDelimiter [ ^ $/ ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> readStreamFor: fileName in: tree do: aBlock [ (tree entryByPath: fileName) readStreamDo: aBlock ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> writeStreamFor: fileName in: directory do: aBlock [ directory addEntryNamed: fileName withContents: (String streamContents: aBlock). ] diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelLog.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelLog.class.st index 8da2e3555f..cdf301f65d 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelLog.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelLog.class.st @@ -2,22 +2,24 @@ I'm a tool to ask the full history of a method (based on tonel file format). " Class { - #name : #IceLibgitTonelLog, - #superclass : #IceLog, - #category : #'Iceberg-Libgit-Tonel-Log' + #name : 'IceLibgitTonelLog', + #superclass : 'IceLog', + #category : 'Iceberg-Libgit-Tonel-Log', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Log' } -{ #category : #testing } +{ #category : 'testing' } IceLibgitTonelLog class >> isAvailableFor: aRepository [ ^ aRepository writerClass id = #tonel ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> basepathOf: aPath [ ^ aPath copyAfterLast: $/ ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> definitionFor: aMethod path: aPath commit: aCommit [ ^ ((IceLibgitTonelLogReader fileName: aPath on: aCommit) package: aMethod package mcPackage; @@ -36,7 +38,7 @@ IceLibgitTonelLog >> definitionFor: aMethod path: aPath commit: aCommit [ source: '' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> fileNameForMethod: aMethod [ | path | @@ -50,23 +52,23 @@ IceLibgitTonelLog >> fileNameForMethod: aMethod [ path asStringOn: stream delimiter: '/' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> toFileName: aMethod [ ^ self fileNameForMethod: aMethod ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelClassExtension: aClass [ aClass isTrait ifTrue: [ ^ '.trait' ]. ^ '.class' ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelClassOrTraitName: aClass [ ^ aClass name, (self tonelClassExtension: aClass), '.st' ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelMethodClassExtension: aMethod [ aMethod isExtension ifTrue: [ ^ '.extension' ]. aMethod origin isTrait ifTrue: [ ^ '.trait' ]. @@ -74,14 +76,14 @@ IceLibgitTonelLog >> tonelMethodClassExtension: aMethod [ ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelMethodClassOrTraitName: aMethod [ ^ aMethod origin instanceSide name, (self tonelMethodClassExtension: aMethod), '.st' ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelPackageName: aPackage [ ^ aPackage name ] diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelLogReader.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelLogReader.class.st index 7dd1de4e33..8b86a364f7 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelLogReader.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelLogReader.class.st @@ -3,43 +3,45 @@ I read exclusively the definition of the method defined in fileName. I'm using to speed the creation of a version list on IceLibgitTonelLog. " Class { - #name : #IceLibgitTonelLogReader, - #superclass : #IceLibgitTonelReader, + #name : 'IceLibgitTonelLogReader', + #superclass : 'IceLibgitTonelReader', #instVars : [ 'fileName' ], - #category : #'Iceberg-Libgit-Tonel-Reader' + #category : 'Iceberg-Libgit-Tonel-Reader', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Reader' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitTonelLogReader class >> fileName: aString on: aCommit [ ^ (self on: aCommit) fileName: aString; yourself ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLogReader >> canBeLoaded: aFileReference [ ^ (super canBeLoaded: aFileReference) and: [ aFileReference filename = self fileName ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelLogReader >> fileName [ ^ fileName ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelLogReader >> fileName: aString [ fileName := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelLogReader >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelLogReader >> package: aPackage [ package := aPackage ] diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelReader.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelReader.class.st index 67c9946df4..b0cab04951 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelReader.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelReader.class.st @@ -3,44 +3,46 @@ I'm a reader for the tonel file format. " Class { - #name : #IceLibgitTonelReader, - #superclass : #TonelReader, + #name : 'IceLibgitTonelReader', + #superclass : 'TonelReader', #traits : 'TIceRepositoryReader', #classTraits : 'TIceRepositoryReader classTrait', #instVars : [ 'iceVersion' ], - #category : #'Iceberg-Libgit-Tonel-Reader' + #category : 'Iceberg-Libgit-Tonel-Reader', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Reader' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader class >> id [ ^ #tonel ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitTonelReader class >> on: aCommitOrTree iceVersion: iceVersion [ ^ (self on: aCommitOrTree) iceVersion: iceVersion; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> commit [ ^ stream ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> fileUtils [ ^ IceLibgitTonelFileUtils ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> iceVersion [ ^ iceVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> iceVersion: anObject [ | repository packageDirectoryName | iceVersion := anObject. @@ -51,27 +53,27 @@ IceLibgitTonelReader >> iceVersion: anObject [ self packageDirectory: (repository subdirectoryPath / packageDirectoryName) pathString ] -{ #category : #loading } +{ #category : 'loading' } IceLibgitTonelReader >> loadVersionInfo [ ^ info := self iceVersion info ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> package [ ^ MCPackage named: self iceVersion packageName ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelReader >> packageNameFromPackageDirectory [ ^ iceVersion packageName ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> repository [ ^ self iceVersion repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> versionName [ ^ ('{1}-{2}.{3}' format: { self packageNameFromPackageDirectory. diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st index a9919d85ae..dff3220f26 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st @@ -2,55 +2,57 @@ I write versions and snapshots in tonel format. " Class { - #name : #IceLibgitTonelWriter, - #superclass : #MCWriter, + #name : 'IceLibgitTonelWriter', + #superclass : 'MCWriter', #traits : 'TIceRepositoryWriter', #classTraits : 'TIceRepositoryWriter classTrait', #instVars : [ 'repositoryDirectory' ], - #category : #'Iceberg-Libgit-Tonel-Writer' + #category : 'Iceberg-Libgit-Tonel-Writer', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Writer' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> description [ ^ 'Tonel' ] -{ #category : #'accessing - ancient preference selectors' } +{ #category : 'accessing - ancient preference selectors' } IceLibgitTonelWriter class >> directoryNameFor: aPackage [ ^ aPackage name ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitTonelWriter class >> fileOut: aVersion on: dir [ (self on: dir) writeVersion: aVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> forInternalStore [ ^ TonelWriter ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitTonelWriter class >> forInternalStoreFileOut: aMCVersion on: aRepository [ self forInternalStore fileOut: aMCVersion on: aRepository subdirectoryReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> id [ ^ #tonel ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitTonelWriter class >> isDefault [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitTonelWriter class >> isValidPackage: aFileReference [ ^ aFileReference basename first isLetter @@ -58,12 +60,12 @@ IceLibgitTonelWriter class >> isValidPackage: aFileReference [ and: [ (aFileReference / 'package.st') exists ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> logClass [ ^ IceLibgitTonelLog ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitTonelWriter class >> on: dir [ ^ self new repositoryDirectory: dir @@ -71,33 +73,33 @@ IceLibgitTonelWriter class >> on: dir [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> packageNameFromDirectory: aFileReference [ ^ aFileReference basename ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> readerClass [ ^ IceLibgitTonelReader ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter >> repositoryDirectory [ ^ repositoryDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter >> repositoryDirectory: anObject [ repositoryDirectory := anObject ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitTonelWriter >> writeSnapshot: aSnapshot [ (TonelWriter on: self repositoryDirectory) writeSnapshot: aSnapshot ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitTonelWriter >> writeVersion: aVersion [ (self repositoryDirectory / aVersion package name) ensureDeleteAll. self writeSnapshot: aVersion snapshot diff --git a/Iceberg-Libgit-Tonel/ManifestIcebergLibgitTonel.class.st b/Iceberg-Libgit-Tonel/ManifestIcebergLibgitTonel.class.st index 1dab4db244..8fdbaec2de 100644 --- a/Iceberg-Libgit-Tonel/ManifestIcebergLibgitTonel.class.st +++ b/Iceberg-Libgit-Tonel/ManifestIcebergLibgitTonel.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergLibgitTonel, - #superclass : #PackageManifest, - #category : 'Iceberg-Libgit-Tonel-Manifest' + #name : 'ManifestIcebergLibgitTonel', + #superclass : 'PackageManifest', + #category : 'Iceberg-Libgit-Tonel-Manifest', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergLibgitTonel class >> description [ ^ 'I contain the libgit binding for the Tonel export format. diff --git a/Iceberg-Libgit-Tonel/package.st b/Iceberg-Libgit-Tonel/package.st index 2864f7ce28..83eb22365a 100644 --- a/Iceberg-Libgit-Tonel/package.st +++ b/Iceberg-Libgit-Tonel/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Libgit-Tonel' } +Package { #name : 'Iceberg-Libgit-Tonel' } diff --git a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st index 9f4ffef342..fb260621cb 100644 --- a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Bitbucket repositories " Class { - #name : #IceBitbucketRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceBitbucketRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceBitbucketRepositoryType class >> type [ ^ 'bitbucket' ] diff --git a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st index 1c2f49f152..bf150ca7e2 100644 --- a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st @@ -20,22 +20,24 @@ Metacello new " Class { - #name : #IceGitLocalRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitLocalRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType class >> type [ ^ 'gitlocal' ] -{ #category : #testing } +{ #category : 'testing' } IceGitLocalRepositoryType >> isGitRoot: aReference [ ^ IceRepositoryCreator isGitRoot: aReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType >> mcRepository [ | repository tuple extractedLocation | @@ -57,7 +59,7 @@ IceGitLocalRepositoryType >> mcRepository [ ^ repository metacelloAdapter: repository head description. ] -{ #category : #private } +{ #category : 'private' } IceGitLocalRepositoryType >> splitRootAndSubdirectoryFromLocation [ | root subDir | (self location beginsWith: (self class type, '://')) diff --git a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st index d8f91b3b32..2b2b031127 100644 --- a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st @@ -7,18 +7,20 @@ git:https://github.com/user/project.git git:git@github.com:user/project.git " Class { - #name : #IceGitRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType class >> type [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType >> mcRepositoryClass [ ^ MCGitRemoteRepository diff --git a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st index 3d42910506..00b3bf513c 100644 --- a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st @@ -2,17 +2,19 @@ I resolve Github repositories " Class { - #name : #IceGithubRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGithubRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType class >> type [ ^ 'github' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType >> mcRepository [ | baseRepo | diff --git a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st index 597dcee6da..620b0f0811 100644 --- a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Gilab repositories " Class { - #name : #IceGitlabRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitlabRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitlabRepositoryType class >> type [ ^ 'gitlab' ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st index 3ab968801a..2f7b4b760e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st @@ -3,60 +3,62 @@ I'm a recorded choice when installing a metacello baseline/configuration. A choice is created whenever there is a conflict between two project versions (loaded and incomming). Due the nature of Matacello, this choice can be asked several times... A choice keeps track of what user selected to avoid asking him every time. " Class { - #name : #IceMetacelloLoadChoice, - #superclass : #Object, + #name : 'IceMetacelloLoadChoice', + #superclass : 'Object', #instVars : [ 'projectName', 'optionA', 'optionB', 'choosen' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen [ ^ choosen ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen: anObject [ choosen := anObject ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloLoadChoice >> isChoiceBetween: firstOption and: secondOption [ ^ (self optionA = firstOption) and: [ self optionB = secondOption ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA [ ^ optionA ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA: anObject [ optionA := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB [ ^ optionB ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB: anObject [ optionB := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st index 71cd94a286..1e0f8d7831 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st @@ -5,28 +5,30 @@ I will be active during the context of a ""metacello load"" command, and it will Tipically, I will be used to keep some state needed during the full execution, like a choice of what whas selected when conflicting or upgraded versions acts. " Class { - #name : #IceMetacelloLoadSession, - #superclass : #Object, + #name : 'IceMetacelloLoadSession', + #superclass : 'Object', #instVars : [ 'choices' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloLoadSession >> initialize [ super initialize. choices := Set new ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoice: anIceMetacelloLoadChoice [ ^ choices add: anIceMetacelloLoadChoice ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoiceProject: projectName optionA: optionA optionB: optionB ifAbsentAnswer: aBlock [ ^ choices diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st index 20c708ea70..ff4a76cf1a 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st @@ -2,7 +2,9 @@ I'm a dynamic variable to keep a load session. " Class { - #name : #IceMetacelloLoadSessionContext, - #superclass : #DynamicVariable, - #category : #'Iceberg-Metacello-Integration-Session' + #name : 'IceMetacelloLoadSessionContext', + #superclass : 'DynamicVariable', + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index 84a2c88bbf..25e20e3cda 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -2,23 +2,25 @@ I'm a class to add support for iceberg to metacello. " Class { - #name : #IceMetacelloPharoPlatform, - #superclass : #MetacelloPharoPlatform, - #category : #'Iceberg-Metacello-Integration-Platform' + #name : 'IceMetacelloPharoPlatform', + #superclass : 'MetacelloPharoPlatform', + #category : 'Iceberg-Metacello-Integration-Platform', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Platform' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceMetacelloPharoPlatform class >> initialize [ self select ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloPharoPlatform >> canHandleType: type [ ^ Iceberg enableMetacelloIntegration and: [ IceMetacelloRepositoryType canHandleType: type ] ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ (self canHandleType: aRepositorySpec type) ifTrue: [ ^ Iceberg mcRepositoryFor: aRepositorySpec description ]. @@ -26,7 +28,7 @@ IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ ^ super createRepository: aRepositorySpec ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ (description beginsWith: 'ftp://') ifTrue: [ ^'ftp' ]. @@ -36,7 +38,7 @@ IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ ^ super extractTypeFromDescription: description ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceMetacelloPharoPlatform >> withMetacelloLoadSessionDo: aBlock [ | context | diff --git a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st index ad7653c809..57f5b0a2c1 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st @@ -3,21 +3,23 @@ I'm a base class to provide different type of MCRepositories from iceberg, so me My children define specific types, visit them to have more details of what you can do. " Class { - #name : #IceMetacelloRepositoryType, - #superclass : #Object, + #name : 'IceMetacelloRepositoryType', + #superclass : 'Object', #instVars : [ 'location' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> allTypes [ ^ self allSubclasses reject: [ :each | each isAbstract ] ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> canHandleType: aType [ ^ self allTypes @@ -25,35 +27,35 @@ IceMetacelloRepositoryType class >> canHandleType: aType [ ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> extractTypeOf: aString [ ^ aString copyUpTo: $: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMetacelloRepositoryType class >> for: aLocationString [ ^ (self allTypes detect: [ :each | each isSuitableForLocation: aLocationString ]) location: aLocationString ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isAbstract [ ^ self = IceMetacelloRepositoryType ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForLocation: aLocationString [ ^ self isSuitableForType: (self extractTypeOf: aLocationString) ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForType: aType [ ^ self type = aType ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> location: aLocationString [ self = IceMetacelloRepositoryType ifTrue: [ self error: 'I''m an abstract class, use one of my children instead.' ]. @@ -63,23 +65,23 @@ IceMetacelloRepositoryType class >> location: aLocationString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> type [ ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloRepositoryType >> initializeLocation: aString [ location := aString. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> mcRepository [ self subclassResponsibility ] diff --git a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st index ae7b35ddbb..4036cf4c81 100644 --- a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st @@ -20,18 +20,20 @@ Metacello new load: 'mongo tests'. " Class { - #name : #IceProviderRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceProviderRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #testing } +{ #category : 'testing' } IceProviderRepositoryType class >> isAbstract [ ^ super isAbstract or: [ self = IceProviderRepositoryType ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> guessRegisteredRepository [ "I get the project name and try to find it into the already registered projects. If I find it, I will use this instead cloning a new one." @@ -41,7 +43,7 @@ IceProviderRepositoryType >> guessRegisteredRepository [ ifNone: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepository [ | baseRepo | @@ -55,7 +57,7 @@ IceProviderRepositoryType >> mcRepository [ ^ baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepositoryClass [ ^ (MCGitBasedNetworkRepository allSubclasses @@ -63,13 +65,13 @@ IceProviderRepositoryType >> mcRepositoryClass [ detect: [ :each | each basicDescription = self class type ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectName [ ^ (self location substrings: '/') third copyUpTo: $: ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectVersion [ ^ (location substrings: '/') third copyAfter: $: diff --git a/Iceberg-Metacello-Integration/IceRepository.extension.st b/Iceberg-Metacello-Integration/IceRepository.extension.st index fcb43e92a5..e9f60ebc90 100644 --- a/Iceberg-Metacello-Integration/IceRepository.extension.st +++ b/Iceberg-Metacello-Integration/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } IceRepository >> metacelloAdapter: version [ ^ IceMetacelloRepositoryAdapter for: self withVersion: version ] diff --git a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st index a698e9d6d7..6874e90140 100644 --- a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st +++ b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st @@ -9,30 +9,32 @@ git@github.com:user/project.git WARNING: This repository is meant to be used with iceberg and it will not work with plain Monticello/Metacello (because there is no way to know how to download a zip) " Class { - #name : #MCGitRemoteRepository, - #superclass : #MCGitBasedNetworkRepository, + #name : 'MCGitRemoteRepository', + #superclass : 'MCGitBasedNetworkRepository', #instVars : [ 'host', 'port', 'path', 'user' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> basicDescription [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> description [ ^ self basicDescription , ':' ] -{ #category : #private } +{ #category : 'private' } MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ ^ self new @@ -40,13 +42,13 @@ MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> host [ ^ host ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> httpsUrl [ ^ 'https://{1}{2}/{3}.git' format: { @@ -57,13 +59,13 @@ MCGitRemoteRepository >> httpsUrl [ self path } ] -{ #category : #initialization } +{ #category : 'initialization' } MCGitRemoteRepository >> initialize [ super initialize. ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseHTTPLocation: aString [ | url | @@ -73,7 +75,7 @@ MCGitRemoteRepository >> parseHTTPLocation: aString [ path := self pathFrom: url path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseLocation: aString [ (#('http:' 'https:') @@ -82,7 +84,7 @@ MCGitRemoteRepository >> parseLocation: aString [ ifFalse: [ self parseSSHLocation: aString ] ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseSSHLocation: aString [ | segments | @@ -92,13 +94,13 @@ MCGitRemoteRepository >> parseSSHLocation: aString [ path := self pathFrom: segments third ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> path [ ^ path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> pathFrom: aString [ ^ (aString endsWith: '.git') @@ -106,19 +108,19 @@ MCGitRemoteRepository >> pathFrom: aString [ ifFalse: [ aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> port [ ^ port ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> projectPath [ ^ self path ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> scpUrl [ ^ '{1}@{2}/{3}.git' format: { @@ -127,7 +129,7 @@ MCGitRemoteRepository >> scpUrl [ self path } ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> user [ ^ user diff --git a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st index db10aae91b..d60493f9b4 100644 --- a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st +++ b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergMetacelloIntegration, - #superclass : #PackageManifest, - #category : 'Iceberg-Metacello-Integration-Manifest' + #name : 'ManifestIcebergMetacelloIntegration', + #superclass : 'PackageManifest', + #category : 'Iceberg-Metacello-Integration-Manifest', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergMetacelloIntegration class >> description [ ^ 'I contains the code related to the Metacello integration of Iceberg. diff --git a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st index 6c833fb9fe..28bb44563a 100644 --- a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloPlatform } +Extension { #name : 'MetacelloPlatform' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloPlatform >> withMetacelloLoadSessionDo: aBlock [ aBlock value diff --git a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st index 00384fd4ac..74c3d4eb18 100644 --- a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloScriptApiExecutor } +Extension { #name : 'MetacelloScriptApiExecutor' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloScriptApiExecutor >> execute: statements [ MetacelloPlatform current withMetacelloLoadSessionDo: [ diff --git a/Iceberg-Metacello-Integration/package.st b/Iceberg-Metacello-Integration/package.st index c5a00f7fb1..228e3a9d15 100644 --- a/Iceberg-Metacello-Integration/package.st +++ b/Iceberg-Metacello-Integration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Metacello-Integration' } +Package { #name : 'Iceberg-Metacello-Integration' } diff --git a/Iceberg-Playground-Plugin-Gist/IcePlaygroundPublishGistCommand.class.st b/Iceberg-Playground-Plugin-Gist/IcePlaygroundPublishGistCommand.class.st index 6c2f25c54d..b9b5549e64 100644 --- a/Iceberg-Playground-Plugin-Gist/IcePlaygroundPublishGistCommand.class.st +++ b/Iceberg-Playground-Plugin-Gist/IcePlaygroundPublishGistCommand.class.st @@ -2,36 +2,38 @@ Publish content of playground a github gist (in your user space) " Class { - #name : #IcePlaygroundPublishGistCommand, - #superclass : #StPlaygroundToolbarExtensionCommand, - #category : #'Iceberg-Playground-Plugin-Gist-Command' + #name : 'IcePlaygroundPublishGistCommand', + #superclass : 'StPlaygroundToolbarExtensionCommand', + #category : 'Iceberg-Playground-Plugin-Gist-Command', + #package : 'Iceberg-Playground-Plugin-Gist', + #tag : 'Command' } -{ #category : #default } +{ #category : 'default' } IcePlaygroundPublishGistCommand class >> defaultDescription [ ^ 'Publish contents as gist.' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaygroundPublishGistCommand class >> defaultIconName [ ^ #github ] -{ #category : #default } +{ #category : 'default' } IcePlaygroundPublishGistCommand class >> defaultName [ ^ 'Publish Gist' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaygroundPublishGistCommand class >> order [ ^ 6 ] -{ #category : #execution } +{ #category : 'execution' } IcePlaygroundPublishGistCommand >> execute [ | contents | @@ -47,7 +49,7 @@ IcePlaygroundPublishGistCommand >> execute [ openModal ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaygroundPublishGistCommand >> page [ ^ context page diff --git a/Iceberg-Playground-Plugin-Gist/IcePublishGistPresenter.class.st b/Iceberg-Playground-Plugin-Gist/IcePublishGistPresenter.class.st index e1065e8501..8008734986 100644 --- a/Iceberg-Playground-Plugin-Gist/IcePublishGistPresenter.class.st +++ b/Iceberg-Playground-Plugin-Gist/IcePublishGistPresenter.class.st @@ -4,8 +4,8 @@ A presenter to request aditional data and publish the content of a playground as The method `StPlaygroundPublishGistPresenter>>#publishThen:` will use the `IceGitHubAPI` to publish the data. " Class { - #name : #IcePublishGistPresenter, - #superclass : #SpPresenter, + #name : 'IcePublishGistPresenter', + #superclass : 'SpPresenter', #instVars : [ 'descriptionTextInput', 'contentCode', @@ -15,34 +15,36 @@ Class { #classVars : [ 'GistPublic' ], - #category : #'Iceberg-Playground-Plugin-Gist-View' + #category : 'Iceberg-Playground-Plugin-Gist-View', + #package : 'Iceberg-Playground-Plugin-Gist', + #tag : 'View' } -{ #category : #accessing } +{ #category : 'accessing' } IcePublishGistPresenter class >> initialExtent [ ^ 600@400 ] -{ #category : #accessing } +{ #category : 'accessing' } IcePublishGistPresenter class >> windowTitle [ ^ 'Publish Gist' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePublishGistPresenter >> content: aString [ contentCode text: aString ] -{ #category : #initialization } +{ #category : 'initialization' } IcePublishGistPresenter >> defaultPublic [ ^ GistPublic ifNil: [ GistPublic := true ] ] -{ #category : #private } +{ #category : 'private' } IcePublishGistPresenter >> fileNameFrom: aString [ | normalized | @@ -54,7 +56,7 @@ IcePublishGistPresenter >> fileNameFrom: aString [ ^ normalized, '.st' ] -{ #category : #initialization } +{ #category : 'initialization' } IcePublishGistPresenter >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -65,7 +67,7 @@ IcePublishGistPresenter >> initializeDialogWindow: aDialogWindowPresenter [ self publishThen: [ presenter close ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IcePublishGistPresenter >> initializePresenters [ self layout: (SpBoxLayout newTopToBottom @@ -86,7 +88,7 @@ IcePublishGistPresenter >> initializePresenters [ beForScripting ] -{ #category : #initialization } +{ #category : 'initialization' } IcePublishGistPresenter >> initializeWindow: aWindowPresenter [ aWindowPresenter @@ -94,7 +96,7 @@ IcePublishGistPresenter >> initializeWindow: aWindowPresenter [ initialExtent: self class initialExtent. ] -{ #category : #actions } +{ #category : 'actions' } IcePublishGistPresenter >> publishThen: aBlock [ | description public jsonResult | @@ -116,7 +118,7 @@ IcePublishGistPresenter >> publishThen: aBlock [ aBlock value. ] -{ #category : #private } +{ #category : 'private' } IcePublishGistPresenter >> showError: aString [ self application newInform @@ -125,7 +127,7 @@ IcePublishGistPresenter >> showError: aString [ openModalWithSpecParent: self window ] -{ #category : #private } +{ #category : 'private' } IcePublishGistPresenter >> validate [ descriptionTextInput text trimmed ifEmpty: [ @@ -136,7 +138,7 @@ IcePublishGistPresenter >> validate [ ] -{ #category : #events } +{ #category : 'events' } IcePublishGistPresenter >> whenPublishedDo: aBlock [ publishedAction := aBlock diff --git a/Iceberg-Playground-Plugin-Gist/package.st b/Iceberg-Playground-Plugin-Gist/package.st index 240986a6e3..1a63bd2699 100644 --- a/Iceberg-Playground-Plugin-Gist/package.st +++ b/Iceberg-Playground-Plugin-Gist/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Playground-Plugin-Gist' } +Package { #name : 'Iceberg-Playground-Plugin-Gist' } diff --git a/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st b/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st index b1757b8910..e43b1d23a5 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st @@ -3,17 +3,19 @@ I represent an access point to the GitHub API. I provide different high level abstractions to interact with GitHub, following the speciphications you can find here: https://developer.github.com/v3/ " Class { - #name : #IceGitHubAPI, - #superclass : #Object, + #name : 'IceGitHubAPI', + #superclass : 'Object', #instVars : [ 'credentials', 'isAnonymous', 'acceptMediaType' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #credentials } +{ #category : 'credentials' } IceGitHubAPI class >> ensureCredentials [ | provider | @@ -21,7 +23,7 @@ IceGitHubAPI class >> ensureCredentials [ ^ provider providePlaintextCredentials. ] -{ #category : #utilities } +{ #category : 'utilities' } IceGitHubAPI class >> issuesClosedOn: repoName milestone: milestone [ "Answers a string with a list and description of items closed on a milestone. Used to paste it as explanations on releases, etc. @@ -57,7 +59,7 @@ IceGitHubAPI class >> issuesClosedOn: repoName milestone: milestone [ separatedBy: [ stream << String lf ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI class >> obtainCredentials [ | provider | @@ -70,14 +72,14 @@ IceGitHubAPI class >> obtainCredentials [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> acceptMediaType [ ^ acceptMediaType ifNil: [ acceptMediaType := 'application/vnd.github.v3+json' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> acceptMediaType: aString [ "Set the media type to use in the request. See: https://developer.github.com/v3/media/" @@ -85,7 +87,7 @@ IceGitHubAPI >> acceptMediaType: aString [ acceptMediaType := aString ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> acceptPullRequest: owner project: projectName number: aNumber data: aDictionary [ ^ self put: 'repos/', owner, '/', projectName, '/pulls/', aNumber asString, '/merge' @@ -95,7 +97,7 @@ IceGitHubAPI >> acceptPullRequest: owner project: projectName number: aNumber da contentType: ZnMimeType applicationJson ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> addComment: owner project: projectName number: aNumber data: aDictionary [ ^ self post: 'repos/', owner, '/', projectName, '/issues/', aNumber asString, '/comments' @@ -105,7 +107,7 @@ IceGitHubAPI >> addComment: owner project: projectName number: aNumber data: aDi contentType: ZnMimeType applicationJson ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> addPullRequest: owner project: projectName data: aDictionary [ ^ self post: 'repos/', owner, '/', projectName, '/pulls' @@ -115,28 +117,28 @@ IceGitHubAPI >> addPullRequest: owner project: projectName data: aDictionary [ contentType: ZnMimeType applicationJson ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> beAnonymous [ isAnonymous := true ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> contentsWithValidationDo: aBlock [ ^ (self responseWithValidationDo: aBlock) contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> credentials [ ^ credentials ifNil: [ credentials := self class obtainCredentials ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> credentials: anObject [ credentials := anObject ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> delete: aString [ ^ self contentsWithValidationDo: [ (self newRequestTo: aString) @@ -144,12 +146,12 @@ IceGitHubAPI >> delete: aString [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> deleteBranch: owner project: projectName name: branchName [ ^ self delete: 'repos/', owner, '/', projectName, '/git/refs/heads/', branchName ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> get: aString [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -157,7 +159,7 @@ IceGitHubAPI >> get: aString [ response ] ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> get: aString parameters: aDictionary [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString, (String streamContents: [ :stream | @@ -169,41 +171,41 @@ IceGitHubAPI >> get: aString parameters: aDictionary [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getBranch: owner project: projectName name: branchName [ ^ self get: 'repos/', owner,'/', projectName, '/branches/', branchName ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getBranches: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName, '/branches' ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getCommit: aCommitish owner: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName, '/commits/', aCommitish ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getIssue: owner project: projectName number: issueNumber [ ^ self get: 'repos/', owner,'/', projectName, '/issues/', (issueNumber asString) ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> getPaginated: aString [ ^ IceGitHubAPIPaginatedResult api: self request: aString ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getPullRequests: owner project: projectName [ ^ self getPaginated: 'repos/', owner, '/', projectName, '/pulls' ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> getRaw: aString [ ^ self responseWithValidationDo: [ (self newRequestTo: aString) @@ -211,18 +213,18 @@ IceGitHubAPI >> getRaw: aString [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getRepository: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getTagsOwner: owner project: project [ ^ self get: 'repos', '/', owner, '/', project, '/tags' ] -{ #category : #responses } +{ #category : 'responses' } IceGitHubAPI >> handleUnauthorized: aZnResponse [ "If we are in unauthorized we require the correct credentials." @@ -243,20 +245,20 @@ IceGitHubAPI >> handleUnauthorized: aZnResponse [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAPI >> initialize [ super initialize. isAnonymous := false ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> jsonContentsWithValidationDo: aBlock [ ^ STON fromString: (self contentsWithValidationDo: aBlock) ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceGitHubAPI >> newRequestTo: aString [ ^ ZnClient new @@ -270,7 +272,7 @@ IceGitHubAPI >> newRequestTo: aString [ yourself ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> patch: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -279,7 +281,7 @@ IceGitHubAPI >> patch: aString with: aBlock [ response ] ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> post: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -288,7 +290,7 @@ IceGitHubAPI >> post: aString with: aBlock [ response ] ] -{ #category : #'requesting - gists' } +{ #category : 'requesting - gists' } IceGitHubAPI >> postGist: descriptionString public: aBoolean files: anArrayOfAssociations [ ^ self @@ -306,7 +308,7 @@ IceGitHubAPI >> postGist: descriptionString public: aBoolean files: anArrayOfAss contentType: ZnMimeType applicationJson ] ] -{ #category : #'requesting - gists' } +{ #category : 'requesting - gists' } IceGitHubAPI >> postGist: descriptionString public: aBoolean name: fileName contents: contentsString [ ^ self @@ -315,7 +317,7 @@ IceGitHubAPI >> postGist: descriptionString public: aBoolean name: fileName cont files: { fileName -> contentsString } ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> put: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -324,7 +326,7 @@ IceGitHubAPI >> put: aString with: aBlock [ response ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> responseWithValidationDo: aBlock [ | response | @@ -337,7 +339,7 @@ IceGitHubAPI >> responseWithValidationDo: aBlock [ ^ response ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> updatePullRequest: owner project: projectName number: aNumber data: aDictionary [ ^ self patch: 'repos/', owner, '/', projectName, '/pulls/', aNumber asString diff --git a/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st b/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st index d556e04f6d..d6cb2cb7aa 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st @@ -2,18 +2,20 @@ I'm a paginated answer from github (he sends results in pages and includes information in headers) " Class { - #name : #IceGitHubAPIPaginatedResult, - #superclass : #Object, + #name : 'IceGitHubAPIPaginatedResult', + #superclass : 'Object', #instVars : [ 'api', 'request', 'result', 'nextPage' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubAPIPaginatedResult class >> api: anAPI request: aString [ ^ self new api: anAPI; @@ -22,7 +24,7 @@ IceGitHubAPIPaginatedResult class >> api: anAPI request: aString [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> all [ | stream | stream := Array new writeStream. @@ -31,22 +33,22 @@ IceGitHubAPIPaginatedResult >> all [ ^ stream contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> api [ ^ api ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> api: anObject [ api := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> hasNext [ ^ result isNil or: [ self parseMorePages: (result headers at: 'Link' ifAbsent: [ nil ]) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> next [ nextPage ifNil: [ nextPage := 1 ]. @@ -59,7 +61,7 @@ IceGitHubAPIPaginatedResult >> next [ ] ensure: [ nextPage := nextPage + 1 ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPIPaginatedResult >> parseMorePages: aString [ "github does not send 'Links' header if there are no pages, and it does not sends 'next' link if we are at the last page" @@ -67,12 +69,12 @@ IceGitHubAPIPaginatedResult >> parseMorePages: aString [ ^ (aString substrings: ',') anySatisfy: [ :each | each includesSubstring: 'rel="next"' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> request [ ^ request ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> request: anObject [ request := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st index cd59c9f869..5a19df5eec 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st @@ -2,8 +2,8 @@ I'm a dialog for collecting data to accept a pull request. " Class { - #name : #IceGitHubAcceptPullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubAcceptPullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'messageLabel', 'messageText', @@ -11,10 +11,12 @@ Class { 'typeList', 'acceptBlock' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubAcceptPullRequestModel >> accept [ acceptBlock ifNotNil: [ @@ -22,13 +24,13 @@ IceGitHubAcceptPullRequestModel >> accept [ self closeWindow ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> availableTypes [ ^ #( 'merge' 'squash' 'rebase' ) ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> connectPresenters [ self typeList @@ -36,7 +38,7 @@ IceGitHubAcceptPullRequestModel >> connectPresenters [ selectItem: self defaultType ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubAcceptPullRequestModel >> defaultLayout [ ^ SpGridLayout new @@ -48,19 +50,19 @@ IceGitHubAcceptPullRequestModel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> defaultType [ ^ 'merge' ] -{ #category : #api } +{ #category : 'api' } IceGitHubAcceptPullRequestModel >> initialExtentForWindow [ ^ (600 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -71,7 +73,7 @@ IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresente presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> initializePresenters [ messageLabel := self newLabel. @@ -85,13 +87,13 @@ IceGitHubAcceptPullRequestModel >> initializePresenters [ typeLabel label: 'Merge type' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> message [ ^ self messageText text asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> messageGhostText [ ^ 'Commit title @@ -99,42 +101,42 @@ IceGitHubAcceptPullRequestModel >> messageGhostText [ Add an optional extented description' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> messageLabel [ ^ messageLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> messageText [ ^ messageText ] -{ #category : #events } +{ #category : 'events' } IceGitHubAcceptPullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubAcceptPullRequestModel >> titleForWindow [ ^ 'Accept pull request' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> type [ ^ self typeList selectedItem ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> typeLabel [ ^ typeLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> typeList [ ^ typeList diff --git a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st index 3aaad09ba9..b25a0b4725 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st @@ -2,34 +2,36 @@ I represent a common behavior for the actions of the GithubPlugin " Class { - #name : #IceGitHubAction, - #superclass : #IceTipAction, + #name : 'IceGitHubAction', + #superclass : 'IceTipAction', #instVars : [ 'credentials', 'remote', 'retries' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubAction class >> isAbstract [ ^ self == IceGitHubAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> credentials [ ^ credentials ifNil: [ credentials := self obtainCredentials ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubAction >> execute [ self withErrorHandlingDo: [ [[ self basicExecute ] on: IceAuthenticationError do: [ :e | @@ -40,34 +42,34 @@ IceGitHubAction >> execute [ self finishSuccess ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> github [ ^ IceGitHubAPI new credentials: self credentials; yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAction >> initialize [ retries := 3 ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> obtainCredentials [ ^ IceGitHubAPI obtainCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> remote: anObject [ remote := anObject ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> reportError: error [ | message | diff --git a/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st b/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st index ab3dbcd6c4..bd1f0039e2 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st @@ -2,17 +2,19 @@ I'm an error that happens when credentials are bad. " Class { - #name : #IceGitHubBadCredentialsError, - #superclass : #IceGitHubError, - #category : 'Iceberg-Plugin-GitHub-Model' + #name : 'IceGitHubBadCredentialsError', + #superclass : 'IceGitHubError', + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubBadCredentialsError class >> isAppropriateFor: aResponse [ ^ aResponse status = 401 ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubBadCredentialsError >> messageBody [ ^ 'Credentials provided are wrong' ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st index 73aa81a6df..347e57926c 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st @@ -3,24 +3,26 @@ I'm a generic command to perform plugin actions for GitHub. My children define the real behavior, and they need to implement #execute. " Class { - #name : #IceGitHubCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubCommand class >> isAbstract [ ^ self == IceGitHubCommand ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self remote url includesSubstring: 'github.com' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCommand >> remote [ ^ self subclassResponsibility diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st index 5407bc4e0e..56a27acda2 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st @@ -2,8 +2,8 @@ I'm a dialog to ask for data relevant to create a pull request. " Class { - #name : #IceGitHubCreatePullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubCreatePullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'repository', 'titleLabel', @@ -26,15 +26,17 @@ Class { 'titleTextInput', 'bodyText' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubCreatePullRequestModel class >> new [ self error: 'Use #repository:credentials:headRemote:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubCreatePullRequestModel class >> newApplication: anApplication repository: aRepository credentials: aCredentials @@ -48,13 +50,13 @@ IceGitHubCreatePullRequestModel class >> newApplication: anApplication yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel class >> titleSize [ ^ 80 ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubCreatePullRequestModel >> accept [ | title | @@ -72,14 +74,14 @@ IceGitHubCreatePullRequestModel >> accept [ self closeWindow ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> availableBranchNames [ ^ availableBranchNames ifNil: [ availableBranchNames := self obtainAvailableBranchNames ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> availableRemotes [ "Retrieves available remotes to perform the PR" @@ -87,40 +89,40 @@ IceGitHubCreatePullRequestModel >> availableRemotes [ availableRemotes := self obtainAvailableRemotes ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseBranchList [ ^ baseBranchList ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> baseBranchNames [ ^ self baseBranches collect: [ :each | each at: #name ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> baseBranches [ ^ baseBranches ifNil: [ baseBranches := self requestBaseBranches ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> baseDefaultBranchName [ ^ self gitBase at: #default_branch ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseForkList [ ^ baseForkList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseLabel [ ^ baseLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> baseRemote [ "This is the 'base' remote (the place where the repository is forked). This is used to suggest fork PR destination (base)" @@ -128,23 +130,23 @@ IceGitHubCreatePullRequestModel >> baseRemote [ ^ baseRemote ifNil: [ baseRemote := self obtainBaseRemote ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> bodyLabel [ ^ bodyLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> bodyPanel [ ^ bodyText ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> branch [ ^ self repository branch ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> createPullRequest [ ^ IceGitHubPullRequestDefinition new @@ -158,19 +160,19 @@ IceGitHubCreatePullRequestModel >> createPullRequest [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> credentials: aCredentials [ credentials := aCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> defaultBaseBranchName [ self hasParent ifFalse: [ ^ self baseDefaultBranchName ]. @@ -179,13 +181,13 @@ IceGitHubCreatePullRequestModel >> defaultBaseBranchName [ ifNone: [ self baseDefaultBranchName ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> defaultHeadBranchName [ ^ self branch shortname ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubCreatePullRequestModel >> defaultLayout [ ^ SpGridLayout new @@ -200,7 +202,7 @@ IceGitHubCreatePullRequestModel >> defaultLayout [ yourself ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> gitBase [ | json | @@ -208,47 +210,47 @@ IceGitHubCreatePullRequestModel >> gitBase [ ^ json at: #parent ifAbsent: [ json ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> gitRepositoryInfo [ ^ gitRepositoryInfo ifNil: [ gitRepositoryInfo := self requestGitRepositoryInfo ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> hasParent [ ^ self gitRepositoryInfo includesKey: #parent ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headBranchList [ ^ headBranchList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headForkList [ ^ headForkList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headLabel [ ^ headLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> headRemote [ ^ headRemote ifNil: [ self repository head upstream remote ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ aWindow @@ -259,7 +261,7 @@ IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializePresenters [ titleLabel := self newLabel label: 'Title'. @@ -280,7 +282,7 @@ IceGitHubCreatePullRequestModel >> initializePresenters [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializeRepository: aRepository credentials: aCredentials headRemote: aRemote [ repository := aRepository. @@ -289,13 +291,13 @@ IceGitHubCreatePullRequestModel >> initializeRepository: aRepository credentials self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> lastCommitMessage [ ^ lastCommitMessage ifNil: [ lastCommitMessage := self obtainLastCommitMessage ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainAvailableBranchNames [ ^ ((self repository allBranches collect: #shortname as: Set) @@ -305,7 +307,7 @@ IceGitHubCreatePullRequestModel >> obtainAvailableBranchNames [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainAvailableRemotes [ | remotes | @@ -316,7 +318,7 @@ IceGitHubCreatePullRequestModel >> obtainAvailableRemotes [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainBaseRemote [ | base sshUrl httpUrl | @@ -331,19 +333,19 @@ IceGitHubCreatePullRequestModel >> obtainBaseRemote [ yourself ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainLastCommitMessage [ ^ self branch commit comment ] -{ #category : #events } +{ #category : 'events' } IceGitHubCreatePullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> proposedComment [ | lines firstLine remainingLines | @@ -362,7 +364,7 @@ IceGitHubCreatePullRequestModel >> proposedComment [ separatedBy: [ stream cr ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> proposedTitle [ self lastCommitMessage linesDo: [ :eachLine | @@ -373,13 +375,13 @@ IceGitHubCreatePullRequestModel >> proposedTitle [ ^ '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> repository [ ^ repository ] -{ #category : #'private - request' } +{ #category : 'private - request' } IceGitHubCreatePullRequestModel >> requestBaseBranches [ ^ IceGitHubAPI new @@ -388,7 +390,7 @@ IceGitHubCreatePullRequestModel >> requestBaseBranches [ project: self baseRemote projectBasename ] -{ #category : #'private - request' } +{ #category : 'private - request' } IceGitHubCreatePullRequestModel >> requestGitRepositoryInfo [ | remote | @@ -398,25 +400,25 @@ IceGitHubCreatePullRequestModel >> requestGitRepositoryInfo [ getRepository: remote owner project: remote projectBasename ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubCreatePullRequestModel >> titleForWindow [ ^ 'New pull request' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> titleLabel [ ^ titleLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> titlePanel [ ^ titleTextInput ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> updatePresenter [ baseForkList diff --git a/Iceberg-Plugin-GitHub/IceGitHubError.class.st b/Iceberg-Plugin-GitHub/IceGitHubError.class.st index 4050f7bf0e..832ecbb444 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubError.class.st @@ -2,56 +2,58 @@ I'm an error that happens when something fails when performing a GitHub action. " Class { - #name : #IceGitHubError, - #superclass : #Error, + #name : 'IceGitHubError', + #superclass : 'Error', #instVars : [ 'response', 'jsonContents' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #private } +{ #category : 'private' } IceGitHubError class >> errorClassFor: aResponse [ ^ self allSubclasses detect: [ :each | each isAppropriateFor: aResponse ] ifNone: [ self ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubError class >> for: aResponse [ ^ (self errorClassFor: aResponse) new response: aResponse; yourself ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubError class >> isAppropriateFor: aResponse [ ^ false ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubError class >> signalFor: aResponse [ ^ (self for: aResponse) signal ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> code [ ^ self response status ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> contents [ ^ self response contents ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> customError: aDictionary [ ^ aDictionary at: #message ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> errorToString: aDictionary [ (aDictionary at: #code) = 'custom' ifTrue: [ ^ self customError: aDictionary ]. (aDictionary at: #code) = 'invalid' ifTrue: [ ^ self invalidError: aDictionary ]. @@ -59,20 +61,20 @@ IceGitHubError >> errorToString: aDictionary [ ^ self unknownError: aDictionary ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> invalidError: aDictionary [ ^ 'Invalid field: ', (aDictionary at: #field) ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> jsonContents [ ^ jsonContents ifNil: [ jsonContents := STON fromString: self contents ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> messageBody [ | errors | errors := self jsonContents at: #errors ifAbsent: [ ^ '' ]. @@ -82,22 +84,22 @@ IceGitHubError >> messageBody [ separatedBy: [ stream cr ] ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> messageText [ ^ self jsonContents at: #message ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> response [ ^ response ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> response: anObject [ response := anObject ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> unknownError: aDictionary [ ^ String streamContents: [ :stream | (aDictionary associations sorted: [ :a :b | a key < b key ]) diff --git a/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st b/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st index 88aa35a4c1..cc8e5ec297 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st @@ -2,12 +2,14 @@ I'm an error that happens when something went wrong on GitHub API operations. " Class { - #name : #IceGitHubGenericError, - #superclass : #IceGitHubError, - #category : 'Iceberg-Plugin-GitHub-Model' + #name : 'IceGitHubGenericError', + #superclass : 'IceGitHubError', + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubGenericError class >> isAppropriateFor: aResponse [ ^ aResponse status = 422 ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st b/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st index 679432db0c..379544f3ba 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st @@ -3,19 +3,21 @@ I'm a generic datasource to show in a table results of a JSON. I'm intended to be used to show information from GitHub API, but I'm generic enough to be used which any kind of JSON structure. " Class { - #name : #IceGitHubJSONDataSource, - #superclass : #FTSimpleDataSource, - #category : 'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubJSONDataSource', + #superclass : 'FTSimpleDataSource', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> actionColumn: column [ elements := elements sorted: [ :a :b | (a at: column id) < (b at: column id) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> cellColumn: column row: rowIndex [ ^ FTCellMorph new addMorphBack: ((self elementAt: rowIndex) at: column id) asStringMorph; @@ -23,12 +25,12 @@ IceGitHubJSONDataSource >> cellColumn: column row: rowIndex [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubJSONDataSource >> columnTitleFor: column [ ^ column id capitalized ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> headerColumn: column [ column id ifNil: [ ^ nil ]. diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st index 246c06412c..9af63050a6 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st @@ -1,28 +1,30 @@ Class { - #name : #IceGitHubNewBranchFromIssueCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewBranchFromIssueCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand class >> defaultName [ ^ 'Create new branch for issue...' ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand class >> defaultToolbarItemName [ ^ 'New issue' ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> canBeExecuted [ ^ self repositoryModel isNotNil ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewBranchFromIssueCommand >> execute [ (IceTipCheckoutBranchDialog on: self repositoryModel) @@ -30,13 +32,13 @@ IceGitHubNewBranchFromIssueCommand >> execute [ openDialog ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> iconName [ ^ #github ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st index 5e1ddfeea4..d7bcca423e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st @@ -5,8 +5,8 @@ A GitHub issue will be created in the form: 123-a-github-issue " Class { - #name : #IceGitHubNewBranchFromIssuePanel, - #superclass : #IceTipCheckoutNewBranchPanel, + #name : 'IceGitHubNewBranchFromIssuePanel', + #superclass : 'IceTipCheckoutNewBranchPanel', #instVars : [ 'remotePanel', 'issueNumberText', @@ -18,10 +18,12 @@ Class { 'issueText', 'remoteLabel' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> branchName [ ^ '{1}-{2}' format: { @@ -29,13 +31,13 @@ IceGitHubNewBranchFromIssuePanel >> branchName [ issueText text trim }. ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubNewBranchFromIssuePanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -54,26 +56,26 @@ IceGitHubNewBranchFromIssuePanel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> icon [ ^ (self iconNamed: #github) scaledToSize: 16@16 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initialExtentForWindow [ ^ 800 @ 175 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initialize [ super initialize. fetched := false ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initializePresenters [ super initializePresenters. @@ -102,31 +104,31 @@ IceGitHubNewBranchFromIssuePanel >> initializePresenters [ issueNumberText whenTextChangedDo: [ :text | self validateIssue: text ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueLabel [ ^ issueLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueNumberText [ ^ issueNumberText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueText [ ^ issueText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> remotePanel [ ^ remotePanel ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> sanitizeTitle: aString [ | separators safeSeparator | @@ -140,7 +142,7 @@ IceGitHubNewBranchFromIssuePanel >> sanitizeTitle: aString [ c isAlphaNumeric ifTrue: [ str nextPut: c ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> selectRemoteModel [ ^ selectRemoteModel ifNil: [ @@ -149,32 +151,32 @@ IceGitHubNewBranchFromIssuePanel >> selectRemoteModel [ on: self model entity ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> titleForWindow [ ^ 'New branch from issue' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> unknownTitle [ ^ 'INVALID-ISSUE' ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> updateText: aString [ issueText text: aString. fetched := true ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> useRemote: aRemoteModel [ self selectRemoteModel useRemote: aRemoteModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> validate [ self @@ -185,7 +187,7 @@ IceGitHubNewBranchFromIssuePanel >> validate [ description: 'Please fetch a valid issue number' ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [ | number remote | @@ -213,7 +215,7 @@ IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [ self updateText: self unknownTitle ] ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> wait: time thenDo: aBlock [ "This method avoids to request too many times the github api. It does it in the simplest way possible: it starts a process that waits some diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st index 7748441a94..2cb8a64469 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st @@ -2,18 +2,20 @@ I'm an action to create a new pull request. " Class { - #name : #IceGitHubNewPullRequestAction, - #superclass : #IceGitHubAction, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewPullRequestAction', + #superclass : 'IceGitHubAction', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #private } +{ #category : 'private' } IceGitHubNewPullRequestAction >> askRemote: aRepository [ ^ aRepository remotes anyOne ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. @@ -37,7 +39,7 @@ IceGitHubNewPullRequestAction >> basicExecute [ open ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ [ | pullRequestDatas url | @@ -53,7 +55,7 @@ IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ do: [ :e | self reportError: e ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewPullRequestAction >> validateMakePullRequestOn: aRepository [ | status | diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st index 7e69b15818..d6edc030f8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to create a Pull Request " Class { - #name : #IceGitHubNewPullRequestCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewPullRequestCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubNewPullRequestCommand class >> defaultName [ ^ 'Create Pull Request...' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestCommand >> execute [ ^ IceGitHubNewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st b/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st index 3dbc4588c3..0909d8d9a3 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st @@ -5,32 +5,34 @@ Description I am a nil PR that can be used when the user has no PR to see. " Class { - #name : #IceGitHubNilPullRequest, - #superclass : #Object, - #category : 'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubNilPullRequest', + #superclass : 'Object', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> author [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> baseLabel [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> body [ ^ '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> headLabel [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> url [ ^ 'No PR selected' ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st index 46eff77942..567af5269e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st @@ -13,16 +13,18 @@ Internal Representation and Key Implementation Points. " Class { - #name : #IceGitHubOpenOnGithubAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubOpenOnGithubAction', + #superclass : 'IceGitHubAction', #instVars : [ 'organisation', 'projectName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubOpenOnGithubAction class >> organisation: aString projectName: anotherString [ ^ self new organisation: aString; @@ -30,7 +32,7 @@ IceGitHubOpenOnGithubAction class >> organisation: aString projectName: anotherS yourself ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubOpenOnGithubAction >> basicExecute [ [ @@ -59,22 +61,22 @@ IceGitHubOpenOnGithubAction >> basicExecute [ openModal ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> organisation [ ^ organisation ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> organisation: anObject [ organisation := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st index d57849f27a..aead585cd8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st @@ -5,18 +5,20 @@ Description I am a command opening the repository page of the remote on GitHub if possible. " Class { - #name : #IceGitHubOpenOnGithubCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubOpenOnGithubCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubOpenOnGithubCommand class >> defaultName [ ^ 'Open on github' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubOpenOnGithubCommand >> execute [ (IceGitHubOpenOnGithubAction diff --git a/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st b/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st index 478e659b62..d901aa0d09 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st @@ -6,18 +6,20 @@ It just add options to easily handle the creation of branchs with the ""conventi " Class { - #name : #IceGitHubPlugin, - #superclass : #IcePlugin, - #category : #'Iceberg-Plugin-GitHub-Core' + #name : 'IceGitHubPlugin', + #superclass : 'IcePlugin', + #category : 'Iceberg-Plugin-GitHub-Core', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubPlugin class >> isAvailableFor: aRepository [ ^ aRepository remotes anySatisfy: [ :each | each host = 'github.com' ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPlugin >> checkoutBranchPanelsOnModel: aRepositoryModel [ ^ { IceGitHubNewBranchFromIssuePanel on: aRepositoryModel } diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st index f817771784..606d1d5dc0 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st @@ -3,8 +3,8 @@ I'm a pull request from github API. I represent (more or less), what is described here: https://developer.github.com/v3/pulls/#list-pull-requests " Class { - #name : #IceGitHubPullRequest, - #superclass : #Object, + #name : 'IceGitHubPullRequest', + #superclass : 'Object', #instVars : [ 'repository', 'json', @@ -14,17 +14,19 @@ Class { 'status', 'remote' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubPullRequest class >> fromJSON: aDictionary [ ^ self basicNew initializeWithJSON: aDictionary; yourself ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> acceptMessage: messageString type: typeString [ IceGitHubAPI new acceptPullRequest: self owner @@ -41,7 +43,7 @@ IceGitHubPullRequest >> acceptMessage: messageString type: typeString [ #merge_method -> typeString } asDictionary ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> addComment: messageString [ IceGitHubAPI new addComment: self owner @@ -50,103 +52,103 @@ IceGitHubPullRequest >> addComment: messageString [ data: { #body -> messageString } asDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> author [ ^ (self jsonAt: 'user') at: 'login' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseCommit [ ^ repository commitAt: self baseSHA ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseLabel [ ^ (self jsonAt: #base) at: #label ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseSHA [ ^ (self jsonAt: #base) at: #sha ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> body [ ^ self jsonAt: #body ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> branch [ fetched ifFalse: [ self fetch ]. ^ branch ifNil: [ branch := self remote remoteBranchNamed: self headRef ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> branchName [ ^ self branch name ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> commits [ ^ self branch commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> detail [ ^ detail ifNil: [ detail := IceGitHubAPI new get: ((self jsonAt: #url) allButFirst: 23) ] ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> fetch [ ^ [ self remote fetch ] ensure: [ fetched := true ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headLabel [ ^ (self jsonAt: #head) at: #label ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headRef [ ^ (self jsonAt: #head) at: #ref ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headSHA [ ^ (self jsonAt: #head) at: #sha ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> htmlUrl [ ^ self jsonAt: #html_url ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequest >> initialize [ super initialize. fetched := false ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequest >> initializeWithJSON: aDictionary [ json := aDictionary. self initialize ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceGitHubPullRequest >> json [ ^ json ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceGitHubPullRequest >> jsonAt: aKey [ ^ self json at: aKey ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> mergeIntoWorkingCopy [ self repository ensureBranch: self branchName; @@ -154,12 +156,12 @@ IceGitHubPullRequest >> mergeIntoWorkingCopy [ self branch merge ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> number [ ^ self jsonAt: #number ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequest >> obtainRemote [ | remoteCandidate | @@ -175,17 +177,17 @@ IceGitHubPullRequest >> obtainRemote [ remoteCandidate ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> owner [ ^ (((self jsonAt: #base) at: #repo) at: #owner) at: #login ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> projectName [ ^ ((self jsonAt: #base) at: #repo) at: #name ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> rejectMessage: messageString [ messageString trimBoth ifNotEmpty: [ self addComment: messageString ]. @@ -196,40 +198,40 @@ IceGitHubPullRequest >> rejectMessage: messageString [ data: { #state -> #closed } asDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> remote [ ^ remote ifNil: [ remote := self obtainRemote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> repository: anObject [ repository := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> state [ ^ self jsonAt: #state ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> status [ ^ status ifNil: [ status := IceGitHubAPI new get: 'repos/', self owner, '/', self projectName, '/commits/', self headSHA, '/status' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> title [ ^ self jsonAt: #title ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> url [ ^ self jsonAt: #url ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st index 1bd7fed23a..d31145b524 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st @@ -4,19 +4,21 @@ I'm a datasource for pull request status, to be used when showing pull requests See IceGitHubPullRequestDetailModel " Class { - #name : #IceGitHubPullRequestDataSource, - #superclass : #IceGitHubJSONDataSource, - #category : #'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubPullRequestDataSource', + #superclass : 'IceGitHubJSONDataSource', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDataSource >> actionColumn: column [ column id = #target_url ifTrue: [ ^ self ]. ^ super actionColumn: column ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDataSource >> cellColumn: column row: rowIndex [ column id = #target_url ifTrue: [ ^ self targetUrlCellColumn: column rowIndex: rowIndex ]. column id = #state ifTrue: [ ^ self statusCellColumn: column rowIndex: rowIndex ]. @@ -24,13 +26,13 @@ IceGitHubPullRequestDataSource >> cellColumn: column row: rowIndex [ ^ super cellColumn: column row: rowIndex ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> columnTitleFor: column [ column id = #target_url ifTrue: [ ^ '' ]. ^ super columnTitleFor: column ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> contextCellColumn: column rowIndex: rowIndex [ | context | context := (self elementAt: rowIndex) at: column id. @@ -42,17 +44,17 @@ IceGitHubPullRequestDataSource >> contextCellColumn: column rowIndex: rowIndex [ ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequestDataSource >> copyToClipboard: url [ Clipboard clipboardText: url informing: ('Url {1} copied to clipboard' format: {url}) ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> iconForStatus: status [ ^ self iconNamed: (self iconNameForStatus: status) ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> iconNameForStatus: status [ status = 'success' ifTrue: [ ^ #testGreen ]. status = 'failure' ifTrue: [ ^ #testRed ]. @@ -61,7 +63,7 @@ IceGitHubPullRequestDataSource >> iconNameForStatus: status [ ^ #testNotRun ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> statusCellColumn: column rowIndex: rowIndex [ | status | status := (self elementAt: rowIndex) at: column id. @@ -73,7 +75,7 @@ IceGitHubPullRequestDataSource >> statusCellColumn: column rowIndex: rowIndex [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> targetUrlCellColumn: column rowIndex: rowIndex [ | url | url := (self elementAt: rowIndex) at: column id. diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st index b4d31af781..f4367e908b 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st @@ -3,8 +3,8 @@ I am a pull request. I can be sent using ==#sendWithCredentials:== protocol. " Class { - #name : #IceGitHubPullRequestDefinition, - #superclass : #Object, + #name : 'IceGitHubPullRequestDefinition', + #superclass : 'Object', #instVars : [ 'credentials', 'title', @@ -14,70 +14,72 @@ Class { 'headBranchName', 'body' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseBranchName [ ^ baseBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseBranchName: anObject [ baseBranchName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseRemote [ ^ baseRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseRemote: anObject [ baseRemote := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> body [ ^ body ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> body: anObject [ body := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> credentials: anObject [ credentials := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headBranchName [ ^ headBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headBranchName: anObject [ headBranchName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headRemote [ ^ headRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headRemote: anObject [ headRemote := anObject ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequestDefinition >> send [ | pullRequestData | @@ -95,12 +97,12 @@ IceGitHubPullRequestDefinition >> send [ data: pullRequestData ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> title [ ^ title ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> title: anObject [ title := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st index d7ba4b97bc..2c08055388 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st @@ -2,8 +2,8 @@ I'm a spec model to present a detailed view of a Pull Request. " Class { - #name : #IceGitHubPullRequestDetailModel, - #superclass : #SpPresenter, + #name : 'IceGitHubPullRequestDetailModel', + #superclass : 'SpPresenter', #instVars : [ 'urlLabel', 'urlText', @@ -24,10 +24,12 @@ Class { 'statusIcon', 'scheduler' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntance forRoot: rootCommandGroup [ rootCommandGroup register: @@ -35,27 +37,27 @@ IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntanc register: IceTipOpenCheckUrlCommand forSpec) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> authorLabel [ ^ authorLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> authorText [ ^ authorText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> bodyText [ ^ bodyText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> checksTable [ ^ checksTable ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubPullRequestDetailModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -88,23 +90,23 @@ IceGitHubPullRequestDetailModel >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> fromLabel [ ^ fromLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> fromText [ ^ fromText ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> iconForMergeable: mergeable [ mergeable = true ifTrue: [ ^ self iconNamed: #smallOk ]. ^ self iconNamed: #smallCancel ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> iconForStatus: status [ status = 'success' ifTrue: [ ^ self iconNamed: #testGreen ]. status = 'failure' ifTrue: [ ^ self iconNamed: #testRed ]. @@ -113,7 +115,7 @@ IceGitHubPullRequestDetailModel >> iconForStatus: status [ ^ self iconNamed: #testNotRun ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequestDetailModel >> initializePresenters [ urlLabel := self newLabel label: 'Url'. @@ -139,17 +141,17 @@ IceGitHubPullRequestDetailModel >> initializePresenters [ addStyle: 'iceTipReadonly' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> mergeableLabel [ ^ mergeableLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> mergeableMessage [ ^ mergeableMessage ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceGitHubPullRequestDetailModel >> newChecksTable [ ^ self newTable @@ -173,19 +175,19 @@ IceGitHubPullRequestDetailModel >> newChecksTable [ contextMenu: [ (self rootCommandsGroup / 'checks commands') beRoot asMenuPresenter ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDetailModel >> pullRequest [ ^ pullRequest ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDetailModel >> pullRequest: aPullRequest [ pullRequest := aPullRequest. self updatePresenter ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> retrieveDetail [ self mergeableMessage text: (self mergeableMessage text , ' Loading...' ). @@ -202,7 +204,7 @@ IceGitHubPullRequestDetailModel >> retrieveDetail [ mergeableIcon image: ( self iconForMergeable: mergeable) ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> retrieveStatuses [ " self statusPanel widget addMorphBack: 'Loading...' asMorph." self statusMessage text: (statusMessage text , ' Loading...'). @@ -222,13 +224,13 @@ IceGitHubPullRequestDetailModel >> retrieveStatuses [ checksTable defer: [ checksTable items:(statuses ) ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> schedule: aBlock [ self scheduler schedule: aBlock ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> scheduler [ ^ scheduler ifNil: [ @@ -238,22 +240,22 @@ IceGitHubPullRequestDetailModel >> scheduler [ yourself ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusIcon [ ^ statusIcon ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusLabel [ ^ statusLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusMessage [ ^ statusMessage ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> textForMergeable: mergeable [ mergeable = true ifTrue: [ ^ 'Yes' ]. @@ -263,17 +265,17 @@ IceGitHubPullRequestDetailModel >> textForMergeable: mergeable [ ifNil: [ 'Unknown' ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> toLabel [ ^ toLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> toText [ ^ toText ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequestDetailModel >> updatePresenter [ self pullRequest ifNil: [ ^ self ]. @@ -287,12 +289,12 @@ IceGitHubPullRequestDetailModel >> updatePresenter [ self retrieveDetail ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> urlLabel [ ^ urlLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> urlText [ ^ urlText ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st index c8657444fe..29d86d03e1 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st @@ -2,18 +2,20 @@ I'm a dialog to collect data about a pull request rejection. " Class { - #name : #IceGitHubRejectPullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubRejectPullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'messageLabel', 'messageText', 'acceptButton', 'acceptBlock' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubRejectPullRequestModel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ]. @@ -21,19 +23,19 @@ IceGitHubRejectPullRequestModel >> accept [ self closeWindow ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> acceptButton [ ^ acceptButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> availableTypes [ ^ #( 'merge' 'squash' 'rebase' ) ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubRejectPullRequestModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -44,19 +46,19 @@ IceGitHubRejectPullRequestModel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> defaultType [ ^ 'merge' ] -{ #category : #api } +{ #category : 'api' } IceGitHubRejectPullRequestModel >> initialExtentForWindow [ ^ (500 @ 250) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -68,7 +70,7 @@ IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresente presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRejectPullRequestModel >> initializePresenters [ super initializePresenters. @@ -84,13 +86,13 @@ IceGitHubRejectPullRequestModel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> message [ ^ self messageText text asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> messageGhostText [ ^ 'Commit title @@ -98,25 +100,25 @@ IceGitHubRejectPullRequestModel >> messageGhostText [ Add an optional extented description' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> messageLabel [ ^ messageLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> messageText [ ^ messageText ] -{ #category : #events } +{ #category : 'events' } IceGitHubRejectPullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubRejectPullRequestModel >> titleForWindow [ ^ 'Reject pull request' diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st index 9ac0aba650..c20a2f536e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st @@ -2,39 +2,41 @@ I represent the commands that execute on certain repository's remote. " Class { - #name : #IceGitHubRemoteCommand, - #superclass : #IceGitHubCommand, + #name : 'IceGitHubRemoteCommand', + #superclass : 'IceGitHubCommand', #instVars : [ 'remoteModel' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubRemoteCommand class >> isAbstract [ ^ self == IceGitHubRemoteCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remote [ ^ self remoteModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remoteModel [ ^ remoteModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remoteModel: aModel [ remoteModel := aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> repositoryModel [ ^ self remoteModel repositoryModel diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st index 9ba9896429..854ba15eab 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st @@ -2,16 +2,18 @@ I'm an action to remove branches from remotes. " Class { - #name : #IceGitHubRemoveBranchesAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubRemoveBranchesAction', + #superclass : 'IceGitHubAction', #instVars : [ 'branches', 'branchesByName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceGitHubRemoveBranchesAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. UIManager default @@ -27,7 +29,7 @@ IceGitHubRemoveBranchesAction >> basicExecute [ open ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> cacheAllBranches [ self remoteBranches do: [ :each | | branchName | branchName := each at: 'name'. @@ -36,23 +38,23 @@ IceGitHubRemoveBranchesAction >> cacheAllBranches [ ifAbsentPut: [ self remoteBranch: branchName ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesAction >> initialize [ super initialize. branchesByName := OrderedDictionary new ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> remoteBranch: aName [ ^ self requestRemoteBranch: aName ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> remoteBranches [ ^ branches ifNil: [ branches := self requestRemoteBranches ] ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesAction >> removeBranch: json [ | branchName | @@ -67,14 +69,14 @@ IceGitHubRemoveBranchesAction >> removeBranch: json [ openModal ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesAction >> removeBranches: aCollection [ [ aCollection do: [ :each | self removeBranch: each ] ] on: IceGitHubError do: [ :e | self reportError: e ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> requestRemoteBranch: aName [ ^ IceGitHubAPI new getBranch: self remote owner @@ -82,7 +84,7 @@ IceGitHubRemoveBranchesAction >> requestRemoteBranch: aName [ name: aName ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> requestRemoteBranches [ ^ IceGitHubAPI new getBranches: self remote owner diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st index 8cf7f2ef0c..f9bac67a31 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st @@ -2,18 +2,20 @@ I'm a command to remove branches from remotes. " Class { - #name : #IceGitHubRemoveBranchesCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubRemoveBranchesCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubRemoveBranchesCommand class >> defaultName [ ^ 'Remove Branches...' ] -{ #category : #execute } +{ #category : 'execute' } IceGitHubRemoveBranchesCommand >> execute [ ^ IceGitHubRemoveBranchesAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st index 6a03ad61ad..fc8e1b1965 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st @@ -2,8 +2,8 @@ I'm a dialog to select a list of anything (used by branches now). " Class { - #name : #IceGitHubRemoveBranchesModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubRemoveBranchesModel', + #superclass : 'IceTipPresenter', #instVars : [ 'selectedItems', 'listPanel', @@ -11,17 +11,19 @@ Class { 'displayBlock', 'remote' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesModel >> confirmSelection [ acceptBlock ifNotNil: [ acceptBlock value: selectedItems ]. self closeWindow ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubRemoveBranchesModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -30,26 +32,26 @@ IceGitHubRemoveBranchesModel >> defaultLayout [ yourself ] -{ #category : #api } +{ #category : 'api' } IceGitHubRemoveBranchesModel >> displayBlock: aBlock [ displayBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initialExtentForWindow [ ^ 550 @ 500 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initialize [ selectedItems := Set new. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -61,7 +63,7 @@ IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initializePresenters [ listPanel := self newTable. @@ -76,37 +78,37 @@ IceGitHubRemoveBranchesModel >> initializePresenters [ addColumn: (SpStringTableColumn evaluated: [ :branch | self timeSinceLastCommit: branch ]) ] -{ #category : #api } +{ #category : 'api' } IceGitHubRemoveBranchesModel >> items: aCollection [ self listPanel items: aCollection ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRemoveBranchesModel >> listPanel [ ^ listPanel ] -{ #category : #events } +{ #category : 'events' } IceGitHubRemoveBranchesModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> remote: anObject [ remote := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> timeSinceLastCommit: branch [ | lastCommitDate | @@ -115,14 +117,14 @@ IceGitHubRemoveBranchesModel >> timeSinceLastCommit: branch [ ^ '{1} days' format: {(Date today - lastCommitDate) days} ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> titleForWindow [ ^ 'Select branches to remove on remote {1}' format: { self remote name } ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesModel >> triggerAcceptAction [ acceptBlock ifNil: [ ^ self ]. diff --git a/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st b/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st index 98bc78b454..6c88298b43 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st @@ -2,52 +2,54 @@ I'm a helper to keep selected items in a list. " Class { - #name : #IceGitHubSelectItem, - #superclass : #Object, + #name : 'IceGitHubSelectItem', + #superclass : 'Object', #instVars : [ 'list', 'item' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubSelectItem class >> list: selectedItems item: anObject [ ^ self basicNew initializeList: selectedItems item: anObject; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubSelectItem class >> new [ self error: 'Use #list:item:' ] -{ #category : #private } +{ #category : 'private' } IceGitHubSelectItem >> addItem [ (list includes: item) ifTrue: [ ^ self ]. list add: item ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubSelectItem >> initializeList: aCollection item: anObject [ list := aCollection. item := anObject. self initialize ] -{ #category : #private } +{ #category : 'private' } IceGitHubSelectItem >> removeItem [ (list includes: item) ifFalse: [ ^ self ]. list remove: item ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubSelectItem >> value [ ^ list includes: item ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubSelectItem >> value: aBoolean [ aBoolean ifTrue: [ self addItem ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st index 6b69f7f713..dae041341e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st @@ -8,8 +8,8 @@ I display the list of commits of the PR for review, allow the user to merge the " Class { - #name : #IceGitHubTipPullRequestBrowser, - #superclass : #IceTipBrowser, + #name : 'IceGitHubTipPullRequestBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'repositoryModel', 'pullRequest', @@ -20,22 +20,24 @@ Class { 'acceptButton', 'rejectButton' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceGitHubTipPullRequestBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceGitHubTipPullRequestBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubTipPullRequestBrowser class >> newApplication: app model: aModel pullRequest: aPullRequest [ ^ self basicNew @@ -46,19 +48,19 @@ IceGitHubTipPullRequestBrowser class >> newApplication: app model: aModel pullRe yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser class >> taskbarIconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> acceptButton [ ^ acceptButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> acceptPullRequest [ IceGitHubAcceptPullRequestModel new @@ -69,19 +71,19 @@ IceGitHubTipPullRequestBrowser >> acceptPullRequest [ open ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> commitLabel [ ^ commitLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> commits [ ^ commits ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> connectPresenters [ super connectPresenters. @@ -93,7 +95,7 @@ IceGitHubTipPullRequestBrowser >> connectPresenters [ rejectButton action: [ self rejectPullRequest ] ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubTipPullRequestBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -112,19 +114,19 @@ IceGitHubTipPullRequestBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> diff [ ^ diff ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initialExtentForWindow [ ^ (1050 @ 800) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializeCommitsTable [ | textStylingBlock | @@ -165,14 +167,14 @@ IceGitHubTipPullRequestBrowser >> initializeCommitsTable [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializeDiff [ diff beForMerge. ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializePresenters [ super initializePresenters. @@ -201,20 +203,20 @@ IceGitHubTipPullRequestBrowser >> initializePresenters [ icon: (self iconNamed: #testRed) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commits ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> mergeButton [ ^ mergeButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> mergePullRequestIntoImage [ (self confirm: @@ -226,17 +228,17 @@ IceGitHubTipPullRequestBrowser >> mergePullRequestIntoImage [ self pullRequest mergeIntoWorkingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> pullRequest [ ^ pullRequest ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> pullRequest: anObject [ pullRequest := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> refresh [ | commitModels | @@ -250,13 +252,13 @@ IceGitHubTipPullRequestBrowser >> refresh [ commits items: commitModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> rejectButton [ ^ rejectButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> rejectPullRequest [ ((IceGitHubRejectPullRequestModel newApplication: self application) @@ -269,30 +271,30 @@ IceGitHubTipPullRequestBrowser >> rejectPullRequest [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> setModelBeforeInitialization: aModel [ self repositoryModel: aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> titleForWindow [ ^ 'Browsing pull request: #{1} {2}' format: { self pullRequest number. self pullRequest title } ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st index 678fa7d9e0..ea12946868 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st @@ -2,42 +2,44 @@ I represent all the Github commands that work on a Tree item " Class { - #name : #IceGitHubTreeCommand, - #superclass : #IceGitHubCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeCommand', + #superclass : 'IceGitHubCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand class >> isAbstract [ ^ self == IceGitHubTreeCommand ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnBranch: anIceTipTreeBranch [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnTag: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> canBeExecuted [ ^ self item notNil and: [(self item canActivateCommand: self) and: [super canBeExecuted]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTreeCommand >> remote [ ^ self item model entity diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st index 705319f26e..843332c918 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to create a Pull Request " Class { - #name : #IceGitHubTreeNewPullRequestCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeNewPullRequestCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeNewPullRequestCommand class >> defaultName [ ^ 'New Pull Request' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeNewPullRequestCommand >> execute [ ^ IceGitHubNewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st index ab78eb0052..5d9b54362a 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st @@ -5,18 +5,20 @@ Description I am a command opening the repository page of the remote on GitHub if possible. " Class { - #name : #IceGitHubTreeOpenOnGithubCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeOpenOnGithubCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeOpenOnGithubCommand class >> defaultName [ ^ 'Open on github' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeOpenOnGithubCommand >> execute [ (IceGitHubOpenOnGithubAction diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st index 8118e2f7c9..d657e71447 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st @@ -2,18 +2,20 @@ I'm a command to remove branches from remotes. " Class { - #name : #IceGitHubTreeRemoveBranchesCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeRemoveBranchesCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeRemoveBranchesCommand class >> defaultName [ ^ 'Remove Remote Branches' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeRemoveBranchesCommand >> execute [ ^ IceGitHubRemoveBranchesAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st index a8d2ed51fc..7917530343 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to show the pull request review browser. " Class { - #name : #IceGitHubTreeViewPullRequestCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeViewPullRequestCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeViewPullRequestCommand class >> defaultName [ ^ 'View Pull Requests' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeViewPullRequestCommand >> execute [ ^ IceGitHubViewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st index de680c2d32..2a0627cf35 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st @@ -2,12 +2,14 @@ I'm an action to view the open pull Requests. " Class { - #name : #IceGitHubViewPullRequestAction, - #superclass : #IceGitHubAction, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubViewPullRequestAction', + #superclass : 'IceGitHubAction', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceGitHubViewPullRequestAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st index b3e2fa4f79..1cd03b3202 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceGitHubViewPullRequestOnGithubAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubViewPullRequestOnGithubAction', + #superclass : 'IceGitHubAction', #instVars : [ 'organisation', 'projectName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubViewPullRequestOnGithubAction class >> organisation: aString projectName: anotherString [ ^ self new organisation: aString; @@ -16,7 +18,7 @@ IceGitHubViewPullRequestOnGithubAction class >> organisation: aString projectNam yourself ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubViewPullRequestOnGithubAction >> basicExecute [ [ @@ -45,22 +47,22 @@ IceGitHubViewPullRequestOnGithubAction >> basicExecute [ openModal ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> organisation [ ^ organisation ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> organisation: anObject [ organisation := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st index 4568ca6e71..49c03821a8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st @@ -2,18 +2,20 @@ I'm a command to show the pull request review browser. " Class { - #name : #IceGitHubViewPullRequestsCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubViewPullRequestsCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubViewPullRequestsCommand class >> defaultName [ ^ 'View Pull Requests...' ] -{ #category : #execute } +{ #category : 'execute' } IceGitHubViewPullRequestsCommand >> execute [ ^ IceGitHubViewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st b/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st index 4f213015f8..4a9a9a1e1b 100644 --- a/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceHttpsProtocol } +Extension { #name : 'IceHttpsProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceHttpsProtocol class >> githubRequestUrlKey [ ^ #'clone_url' diff --git a/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st b/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st index 7ab271db48..6b4cd0e304 100644 --- a/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextCredentials } +Extension { #name : 'IcePlaintextCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IcePlaintextCredentials >> applyToRequest: aRequest [ aRequest username: self username password: self password diff --git a/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st b/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st index 303dc4c0ea..97d3a6f9c7 100644 --- a/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextOtpCredentials } +Extension { #name : 'IcePlaintextOtpCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IcePlaintextOtpCredentials >> applyToRequest: aRequest [ super applyToRequest: aRequest. self token ifNotNil: [:aToken | diff --git a/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st b/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st index e1416b318b..2123bca7a7 100644 --- a/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceSSHProtocol } +Extension { #name : 'IceSSHProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceSSHProtocol class >> githubRequestUrlKey [ ^ #'ssh_url' diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st index 4516b774f3..9817279f26 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st @@ -14,23 +14,25 @@ Internal Representation and Key Implementation Points. " Class { - #name : #IceTipGitHubPullRequestListBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipGitHubPullRequestListBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'remote', 'pullRequests', 'details' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceTipGitHubPullRequestListBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipRefreshPullRequestsCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipGitHubPullRequestListBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -41,19 +43,19 @@ IceTipGitHubPullRequestListBrowser class >> buildSelectionCommandGroupWith: pres ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipGitHubPullRequestListBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser class >> taskbarIconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> connectPresenters [ super connectPresenters. @@ -65,7 +67,7 @@ IceTipGitHubPullRequestListBrowser >> connectPresenters [ ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitHubPullRequestListBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -75,13 +77,13 @@ IceTipGitHubPullRequestListBrowser >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> details [ ^ details ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> fetchPullRequests [ ^ (IceGitHubAPI new @@ -92,13 +94,13 @@ IceTipGitHubPullRequestListBrowser >> fetchPullRequests [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initialExtentForWindow [ ^ (700 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initializePresenters [ super initializePresenters. @@ -109,7 +111,7 @@ IceTipGitHubPullRequestListBrowser >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initializePullRequestsTable [ pullRequests @@ -140,19 +142,19 @@ IceTipGitHubPullRequestListBrowser >> initializePullRequestsTable [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitHubPullRequestListBrowser >> mainList [ ^ pullRequests ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> pullRequests [ ^ pullRequests ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitHubPullRequestListBrowser >> refreshPullRequests [ self pullRequests @@ -161,44 +163,44 @@ IceTipGitHubPullRequestListBrowser >> refreshPullRequests [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> remote: aRemote [ remote := aRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> repository [ ^ model ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> strongSelection: aSelection [ self viewPullRequest: aSelection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> titleForWindow [ ^ 'Pull requests on {1} ({2})' format: { self remote name. self remote url } ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> updateSelectedPullRequest: aSpSingleSelectionMode [ aSpSingleSelectionMode isEmpty ifFalse: [ self details pullRequest: aSpSingleSelectionMode selectedItem ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitHubPullRequestListBrowser >> viewPullRequest: aPullRequest [ UIManager default diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st index f0555f5701..8979de690d 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st @@ -3,24 +3,26 @@ I'm a presenter to define a new remote repository from a GitHub repository (owne " Class { - #name : #IceTipGitHubRepositoryPanel, - #superclass : #IceTipGitProviderRepositoryPanel, - #category : #'Iceberg-Plugin-GitHub-View' + #name : 'IceTipGitHubRepositoryPanel', + #superclass : 'IceTipGitProviderRepositoryPanel', + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel class >> order [ ^ 100 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> configureBuilder: aBuilder [ aBuilder beGithub ] -{ #category : #'querying - github' } +{ #category : 'querying - github' } IceTipGitHubRepositoryPanel >> getGitHubRepository [ ^ [ [ IceGitHubAPI new @@ -36,13 +38,13 @@ IceTipGitHubRepositoryPanel >> getGitHubRepository [ error pass ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubRepositoryPanel >> iconForWindow [ ^ (self iconNamed: #github) lighter: 0.50 "just to be sure is visible in all themes" ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> newRepository [ | newRepository | @@ -64,13 +66,13 @@ IceTipGitHubRepositoryPanel >> newRepository [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> providerName [ ^ 'GitHub' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubRepositoryPanel >> titleForWindow [ ^ 'Clone from github.com' diff --git a/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st index 4b77df36d1..b13fe12178 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st @@ -3,24 +3,26 @@ I'm a command to open in the native web browser the detail of a GitHub Pull Requ " Class { - #name : #IceTipOpenCheckUrlCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-View' + #name : 'IceTipOpenCheckUrlCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenCheckUrlCommand class >> defaultDescription [ ^ 'Open a internet browser to look for the url of the check' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenCheckUrlCommand class >> defaultName [ ^ 'Open url' ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenCheckUrlCommand >> execute [ "Execute the actions that should be done by the command. This method expect that the context has been put in #context inst.var. if any context is relevant." @@ -29,7 +31,7 @@ IceTipOpenCheckUrlCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenCheckUrlCommand >> targetUrl [ ^ self context checksTable selection selectedItem at: 'target_url' diff --git a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st index 487e8524a6..c6271c0e94 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st @@ -5,36 +5,38 @@ Description I am a simple command to open the PR review tool. " Class { - #name : #IceTipOpenGitHubPullRequestCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipOpenGitHubPullRequestCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestCommand class >> defaultDescription [ ^ 'Open the Pull Request review tool' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestCommand class >> defaultName [ ^ 'Review pull request' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenGitHubPullRequestCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenGitHubPullRequestCommand >> execute [ self tool viewPullRequest: self item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenGitHubPullRequestCommand >> iconName [ ^ #smallFind diff --git a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st index 8c3107e3c1..8a98bfd62c 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st @@ -1,28 +1,30 @@ Class { - #name : #IceTipOpenGitHubPullRequestInBrowserCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipOpenGitHubPullRequestInBrowserCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestInBrowserCommand class >> defaultDescription [ ^ 'Open the Pull Request in your default web browser' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestInBrowserCommand class >> defaultName [ ^ 'Open pull request in GitHub.com' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenGitHubPullRequestInBrowserCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenGitHubPullRequestInBrowserCommand >> execute [ WebBrowser openOn: self item htmlUrl diff --git a/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st b/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st index 8496430a9b..d38b01d222 100644 --- a/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st @@ -5,24 +5,26 @@ Description I am a simple command to refresh the content of the github pull requests browser " Class { - #name : #IceTipRefreshPullRequestsCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipRefreshPullRequestsCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand class >> defaultDescription [ ^ 'Refresh the pull requests availables' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand class >> defaultName [ ^ 'Refresh' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRefreshPullRequestsCommand >> execute [ UIManager default @@ -30,13 +32,13 @@ IceTipRefreshPullRequestsCommand >> execute [ during: [ self tool refreshPullRequests ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand >> iconName [ ^ #glamorousRefresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st b/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st index d5b825e97e..b7a9c95210 100644 --- a/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st +++ b/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTipRepositoriesBrowser } +Extension { #name : 'IceTipRepositoriesBrowser' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubCommandsWith: presenter forRootGroup: aCommandGroup [ @@ -34,7 +34,7 @@ IceTipRepositoriesBrowser class >> githubCommandsWith: presenter forRootGroup: a ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRootGroup: aCommandGroup [ | thisRemoteGroup | @@ -54,7 +54,7 @@ IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRoo ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRootGroup: aCommandGroup context: aPresenter [ | thisRemoteGroup | diff --git a/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st b/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st index 65215bb52e..7fd0036bed 100644 --- a/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTokenCredentials } +Extension { #name : 'IceTokenCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> applyToRequest: aRequest [ token ifNil: [ ^ self ]. @@ -10,13 +10,13 @@ IceTokenCredentials >> applyToRequest: aRequest [ put: self authorizationHeaderValue ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> authorizationHeaderKey [ ^ 'Authorization' ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> authorizationHeaderValue [ ^ 'Bearer ' , token diff --git a/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st b/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st index 25f8d7bcfa..0ba4c281cd 100644 --- a/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceUrlProtocol } +Extension { #name : 'IceUrlProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceUrlProtocol class >> githubRequestUrlKey [ "Return the key used in github REST responses to get the URL with the correct protocol" self subclassResponsibility diff --git a/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st b/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st index ac14d56d9d..912f1b6c53 100644 --- a/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st +++ b/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginGitHub, - #superclass : #PackageManifest, - #category : 'Iceberg-Plugin-GitHub-Manifest' + #name : 'ManifestIcebergPluginGitHub', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-GitHub-Manifest', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergPluginGitHub class >> description [ ^ 'I contains a plugin to ease the integration of Iceberg with GitHub''s services. diff --git a/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st b/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st index f46ec689e8..62a0d92b40 100644 --- a/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st +++ b/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MorphicUIManager } +Extension { #name : 'MorphicUIManager' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } MorphicUIManager >> inform: aStringOrText actionOnClick: aBlock [ "Display a message for the user to read and then dismiss. When clicked, execute an action." diff --git a/Iceberg-Plugin-GitHub/UIManager.extension.st b/Iceberg-Plugin-GitHub/UIManager.extension.st index a067943440..55b5c9d88d 100644 --- a/Iceberg-Plugin-GitHub/UIManager.extension.st +++ b/Iceberg-Plugin-GitHub/UIManager.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #UIManager } +Extension { #name : 'UIManager' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } UIManager >> inform: aString actionOnClick: aBlock [ "Only the MorphicUIManager should make the growl clickable." diff --git a/Iceberg-Plugin-GitHub/package.st b/Iceberg-Plugin-GitHub/package.st index 109b2a8251..bd2c1112e1 100644 --- a/Iceberg-Plugin-GitHub/package.st +++ b/Iceberg-Plugin-GitHub/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-GitHub' } +Package { #name : 'Iceberg-Plugin-GitHub' } diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloBaselineDecorator.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloBaselineDecorator.class.st index 4b4a223ffd..ed623a2dc2 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloBaselineDecorator.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloBaselineDecorator.class.st @@ -2,12 +2,13 @@ A decorator to react to the fact that a package is a Baseline " Class { - #name : #IceTipMetacelloBaselineDecorator, - #superclass : #IceTipDecorator, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloBaselineDecorator', + #superclass : 'IceTipDecorator', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloBaselineDecorator >> iconNameForPackage: aPackage [ (self isBaseline: aPackage) ifFalse: [ ^ nil ]. @@ -17,13 +18,13 @@ IceTipMetacelloBaselineDecorator >> iconNameForPackage: aPackage [ ifFalse: [ #package ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloBaselineDecorator >> isBaseline: aPackage [ ^ aPackage name beginsWith: 'BaselineOf' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloBaselineDecorator >> isLocked: aPackage [ ^ (MetacelloProjectRegistration diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st index 6dfa8869b8..20a824174b 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st @@ -2,18 +2,19 @@ I'm a general command to install metacello baselines. " Class { - #name : #IceTipMetacelloInstallBaselineCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloInstallBaselineCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloInstallBaselineCommand class >> isAbstract [ ^ self == IceTipMetacelloInstallBaselineCommand ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> basicInstallBaseline: icePackage groups: anArray [ | packageDir sourceDirectory | @@ -34,13 +35,13 @@ IceTipMetacelloInstallBaselineCommand >> basicInstallBaseline: icePackage groups load: anArray ] -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloInstallBaselineCommand >> canBeExecuted [ ^ self packageModel notNil and: [ self package isMetacelloBaseline ] ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> chooseConflictPolicyFor: aMetacelloUpgradeRequest [ | projectName optionA optionB sessionContext | @@ -60,7 +61,7 @@ IceTipMetacelloInstallBaselineCommand >> chooseConflictPolicyFor: aMetacelloUpgr optionB: optionB ] ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> chooseConflictPolicyProject: projectName optionA: optionA optionB: optionB [ ^ UIManager default @@ -74,7 +75,7 @@ IceTipMetacelloInstallBaselineCommand >> chooseConflictPolicyProject: projectNam title: 'Conflicting project versions' ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> chooseUpgradePolicyFor: aMetacelloUpgradeRequest [ | projectName optionA optionB sessionContext | @@ -94,7 +95,7 @@ IceTipMetacelloInstallBaselineCommand >> chooseUpgradePolicyFor: aMetacelloUpgra optionB: optionB ] ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> chooseUpgradePolicyProject: projectName optionA: optionA optionB: optionB [ ^ UIManager default @@ -108,19 +109,19 @@ IceTipMetacelloInstallBaselineCommand >> chooseUpgradePolicyProject: projectName title: 'Duplicated project!' ] -{ #category : #executing } +{ #category : 'executing' } IceTipMetacelloInstallBaselineCommand >> iconName [ ^ #smallLoadProject ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> installBaseline: icePackage [ ^ self installBaseline: icePackage groups: #() ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> installBaseline: icePackage groups: anArray [ IceTipStandardAction new diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineDefaultCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineDefaultCommand.class.st index baef3e03b6..6749a27ab5 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineDefaultCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineDefaultCommand.class.st @@ -2,18 +2,19 @@ I'm a command to install a baseline (default group) " Class { - #name : #IceTipMetacelloInstallBaselineDefaultCommand, - #superclass : #IceTipMetacelloInstallBaselineCommand, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloInstallBaselineDefaultCommand', + #superclass : 'IceTipMetacelloInstallBaselineCommand', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMetacelloInstallBaselineDefaultCommand class >> defaultName [ ^ 'Install baseline (default)' ] -{ #category : #executing } +{ #category : 'executing' } IceTipMetacelloInstallBaselineDefaultCommand >> execute [ self installBaseline: self package diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st index 3a02c189ba..580b67f281 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st @@ -2,18 +2,19 @@ I'm a command to install a baseline (choose the group(s) to install) " Class { - #name : #IceTipMetacelloInstallBaselineGroupCommand, - #superclass : #IceTipMetacelloInstallBaselineCommand, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloInstallBaselineGroupCommand', + #superclass : 'IceTipMetacelloInstallBaselineCommand', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMetacelloInstallBaselineGroupCommand class >> defaultName [ ^ 'Install baseline...' ] -{ #category : #executing } +{ #category : 'executing' } IceTipMetacelloInstallBaselineGroupCommand >> execute [ | result | diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st index 37330b95ab..eb437d3c05 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceTipMetacelloInstallCommandBuilder, - #superclass : #Object, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloInstallCommandBuilder', + #superclass : 'Object', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #builder } +{ #category : 'builder' } IceTipMetacelloInstallCommandBuilder >> addCommandsFor: anIceTipRepositoryModel intoGroup: aSpCommandGroup [ | baselines | @@ -18,7 +19,7 @@ IceTipMetacelloInstallCommandBuilder >> addCommandsFor: anIceTipRepositoryModel self addCommandsForPackage: aPackage intoGroup: aSpCommandGroup ] ] -{ #category : #builder } +{ #category : 'builder' } IceTipMetacelloInstallCommandBuilder >> addCommandsForPackage: aPackage intoGroup: commandGroup [ | defaultBaselineCommand groupBaselineCommand baselineName | diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloPlugin.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloPlugin.class.st index ba2dddadc8..8038554c86 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloPlugin.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloPlugin.class.st @@ -2,12 +2,13 @@ I'm a plugin to add Metacello extensions into IceTip UI. " Class { - #name : #IceTipMetacelloPlugin, - #superclass : #IcePlugin, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloPlugin', + #superclass : 'IcePlugin', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloPlugin class >> isAvailableFor: aRepository [ ^ true ] diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloToggleLockCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloToggleLockCommand.class.st index 4f120e1c76..45e2e3e5d5 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloToggleLockCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloToggleLockCommand.class.st @@ -1,22 +1,23 @@ Class { - #name : #IceTipMetacelloToggleLockCommand, - #superclass : #IceTipMetacelloInstallBaselineCommand, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloToggleLockCommand', + #superclass : 'IceTipMetacelloInstallBaselineCommand', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> baselineName [ ^ self packageName allButFirst: 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> description [ ^ 'Toggle lock/unlock baseline.' ] -{ #category : #executing } +{ #category : 'executing' } IceTipMetacelloToggleLockCommand >> execute [ | metacello | @@ -31,20 +32,20 @@ IceTipMetacelloToggleLockCommand >> execute [ context ifNotNil: [ context refresh ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> iconName [ ^ #smallLock ] -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloToggleLockCommand >> isBaseline [ self packageModel ifNil: [ ^ false ]. ^ self packageName beginsWith: 'BaselineOf' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> isLocked [ self isBaseline ifFalse: [ ^ false ]. @@ -55,7 +56,7 @@ IceTipMetacelloToggleLockCommand >> isLocked [ isLocked ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> name [ self isBaseline ifFalse: [ ^ 'Lock/Unlock' ]. @@ -65,7 +66,7 @@ IceTipMetacelloToggleLockCommand >> name [ ifFalse: [ 'Lock {1}' format: { self baselineName } ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> packageName [ ^ self package name diff --git a/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st b/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st index 622b71193e..8c84f96af2 100644 --- a/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st +++ b/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTipRepositoriesBrowser } +Extension { #name : 'IceTipRepositoriesBrowser' } -{ #category : #'*Iceberg-Plugin-Metacello' } +{ #category : '*Iceberg-Plugin-Metacello' } IceTipRepositoriesBrowser class >> metacelloCommandsWith: presenter forRootGroup: aCommandGroup [ diff --git a/Iceberg-Plugin-Metacello/IceTipWorkingCopyBrowser.extension.st b/Iceberg-Plugin-Metacello/IceTipWorkingCopyBrowser.extension.st index bedc78b966..b1b61540a9 100644 --- a/Iceberg-Plugin-Metacello/IceTipWorkingCopyBrowser.extension.st +++ b/Iceberg-Plugin-Metacello/IceTipWorkingCopyBrowser.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTipWorkingCopyBrowser } +Extension { #name : 'IceTipWorkingCopyBrowser' } -{ #category : #'*Iceberg-Plugin-Metacello' } +{ #category : '*Iceberg-Plugin-Metacello' } IceTipWorkingCopyBrowser class >> metacelloCommandsWith: presenter forRootGroup: aCommandGroup [ | newGroup | @@ -21,7 +21,7 @@ IceTipWorkingCopyBrowser class >> metacelloCommandsWith: presenter forRootGroup: ] -{ #category : #'*Iceberg-Plugin-Metacello' } +{ #category : '*Iceberg-Plugin-Metacello' } IceTipWorkingCopyBrowser class >> metacelloDecorators [ diff --git a/Iceberg-Plugin-Metacello/ManifestIcebergPluginMetacello.class.st b/Iceberg-Plugin-Metacello/ManifestIcebergPluginMetacello.class.st index 9209594dcf..adb7ba29c8 100644 --- a/Iceberg-Plugin-Metacello/ManifestIcebergPluginMetacello.class.st +++ b/Iceberg-Plugin-Metacello/ManifestIcebergPluginMetacello.class.st @@ -2,7 +2,9 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginMetacello, - #superclass : #PackageManifest, - #category : #'Iceberg-Plugin-Metacello-Manifest' + #name : 'ManifestIcebergPluginMetacello', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-Metacello-Manifest', + #package : 'Iceberg-Plugin-Metacello', + #tag : 'Manifest' } diff --git a/Iceberg-Plugin-Metacello/package.st b/Iceberg-Plugin-Metacello/package.st index 3e6a014f91..ca6a4a5ddb 100644 --- a/Iceberg-Plugin-Metacello/package.st +++ b/Iceberg-Plugin-Metacello/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-Metacello' } +Package { #name : 'Iceberg-Plugin-Metacello' } diff --git a/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st b/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st index b7f0770e95..dc49384b0c 100644 --- a/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st +++ b/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st @@ -1,45 +1,47 @@ Class { - #name : #IceConvertFormatAction, - #superclass : #Object, + #name : 'IceConvertFormatAction', + #superclass : 'Object', #instVars : [ 'repository', 'branchName', 'format', 'mergeWithCurrentBranch' ], - #category : #'Iceberg-Plugin-Migration-Conversion' + #category : 'Iceberg-Plugin-Migration-Conversion', + #package : 'Iceberg-Plugin-Migration', + #tag : 'Conversion' } -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> branchName [ ^ branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> branchName: anObject [ branchName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> codeDirectory [ ^ self repository codeDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> codeDirectoryWithDelim [ ^ self repository subdirectory isEmptyOrNil ifTrue: [ '' ] ifFalse: [ self repository subdirectory, '/' ] ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> ensureMCClassOrganisationHasCorrectStructure: mcVersion [ (mcVersion snapshot definitions detect: [ :each | each isOrganizationDefinition ]) packageName ifNil: [ self error: 'I have no package name in the organization definition' ] ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> ensureMCVersionWithClassOrganisation: mcVersion [ "if a package does not has class organisation (happens when package is composed only for extensions, we need to ensure it has one, otherwise package creation will @@ -55,7 +57,7 @@ IceConvertFormatAction >> ensureMCVersionWithClassOrganisation: mcVersion [ snapshot: (MCSnapshot fromDefinitions: { (MCOrganizationDefinition packageName: mcVersion package name) } , mcVersion snapshot definitions) ] ] -{ #category : #execution } +{ #category : 'execution' } IceConvertFormatAction >> execute [ | oldBranch newBranch | @@ -67,27 +69,27 @@ IceConvertFormatAction >> execute [ newBranch merge ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> format [ ^ format ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> format: anObject [ format := anObject ] -{ #category : #testing } +{ #category : 'testing' } IceConvertFormatAction >> isMergeWithCurrentBranch [ ^ mergeWithCurrentBranch ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> mergeWithCurrentBranch: anObject [ mergeWithCurrentBranch := anObject ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> migratePackage: packageName commit: commit [ | filetreePackage srcDir subDirWithDelim mcVersion | @@ -105,7 +107,7 @@ IceConvertFormatAction >> migratePackage: packageName commit: commit [ (subDirWithDelim , (IceLibgitFiletreeWriter directoryNameFor: packageName)) } ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> migrateSources [ | commit | @@ -136,7 +138,7 @@ IceConvertFormatAction >> migrateSources [ andParents: { commit }. ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> removeFiletreeRemnants [ "remove .filetree remaining" | filetreeFiles | @@ -148,17 +150,17 @@ IceConvertFormatAction >> removeFiletreeRemnants [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> repository: anObject [ repository := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> writerClass [ ^ format = #tonel diff --git a/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st b/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st index 123ed18021..fedb08bf82 100644 --- a/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st +++ b/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st @@ -4,18 +4,20 @@ I will be active in repository list browser, when repository is in filetree form " Class { - #name : #IceFiletreeToTonelCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-Migration-Commands' + #name : 'IceFiletreeToTonelCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-Migration-Commands', + #package : 'Iceberg-Plugin-Migration', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceFiletreeToTonelCommand class >> defaultName [ ^ 'Convert repository sources to tonel' ] -{ #category : #testing } +{ #category : 'testing' } IceFiletreeToTonelCommand >> canBeExecuted [ | repository | @@ -28,7 +30,7 @@ IceFiletreeToTonelCommand >> canBeExecuted [ and: [ repository head isUnbornBranch not ] ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceFiletreeToTonelCommand >> execute [ (IceTipFiletreeToTonelDialogPresenter on: self repository) openDialog diff --git a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st index c8f1549d88..0d7fcfaa54 100644 --- a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st +++ b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st @@ -3,8 +3,8 @@ I'm a dialog validate and perform a migration of sources from filetree to tonel. " Class { - #name : #IceTipFiletreeToTonelDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipFiletreeToTonelDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'iconPanel', 'confirmLabel', @@ -12,10 +12,12 @@ Class { 'branchName', 'repository' ], - #category : #'Iceberg-Plugin-Migration-UI' + #category : 'Iceberg-Plugin-Migration-UI', + #package : 'Iceberg-Plugin-Migration', + #tag : 'UI' } -{ #category : #actions } +{ #category : 'actions' } IceTipFiletreeToTonelDialogPresenter >> accept [ IceTipStandardAction new @@ -27,25 +29,25 @@ IceTipFiletreeToTonelDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFiletreeToTonelDialogPresenter >> branchBaseName [ ^ 'migrate-sources-to-tonel' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFiletreeToTonelDialogPresenter >> branchName [ ^ branchName ifNil: [ branchName := self obtainBranchName ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipFiletreeToTonelDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFiletreeToTonelDialogPresenter >> confirmMessage [ ^ 'Convert repository {1} sources from filetree format to tonel. @@ -55,7 +57,7 @@ You can choose to not merge immediately your migration. ARE YOU SURE?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipFiletreeToTonelDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -69,7 +71,7 @@ IceTipFiletreeToTonelDialogPresenter >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipFiletreeToTonelDialogPresenter >> doAccept [ IceConvertFormatAction new @@ -80,13 +82,13 @@ IceTipFiletreeToTonelDialogPresenter >> doAccept [ execute ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipFiletreeToTonelDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> initialExtentForWindow [ ^ (500 @@ -94,7 +96,7 @@ IceTipFiletreeToTonelDialogPresenter >> initialExtentForWindow [ scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> initializePresenters [ super initializePresenters. @@ -113,13 +115,13 @@ IceTipFiletreeToTonelDialogPresenter >> initializePresenters [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipFiletreeToTonelDialogPresenter >> mergeWithMasterCheckbox [ ^ mergeWithMasterCheckbox ] -{ #category : #private } +{ #category : 'private' } IceTipFiletreeToTonelDialogPresenter >> obtainBranchName [ | baseName suffix count | @@ -134,19 +136,19 @@ IceTipFiletreeToTonelDialogPresenter >> obtainBranchName [ suffix := '-' , count asString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFiletreeToTonelDialogPresenter >> repository [ ^ repository ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> setModelBeforeInitialization: anObject [ repository := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> titleForWindow [ ^ 'Convert sources to tonel' diff --git a/Iceberg-Plugin-Migration/ManifestIcebergPluginMigration.class.st b/Iceberg-Plugin-Migration/ManifestIcebergPluginMigration.class.st index 8089b8dbaf..bdfb39c763 100644 --- a/Iceberg-Plugin-Migration/ManifestIcebergPluginMigration.class.st +++ b/Iceberg-Plugin-Migration/ManifestIcebergPluginMigration.class.st @@ -2,7 +2,9 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginMigration, - #superclass : #PackageManifest, - #category : #'Iceberg-Plugin-Migration-Manifest' + #name : 'ManifestIcebergPluginMigration', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-Migration-Manifest', + #package : 'Iceberg-Plugin-Migration', + #tag : 'Manifest' } diff --git a/Iceberg-Plugin-Migration/package.st b/Iceberg-Plugin-Migration/package.st index 57007d9830..2da48e2a97 100644 --- a/Iceberg-Plugin-Migration/package.st +++ b/Iceberg-Plugin-Migration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-Migration' } +Package { #name : 'Iceberg-Plugin-Migration' } diff --git a/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st b/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st index 7db229a57a..3304144db8 100644 --- a/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st +++ b/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st @@ -1,10 +1,12 @@ Class { - #name : #IcePharoPlugin, - #superclass : #IcePlugin, - #category : #'Iceberg-Plugin-Pharo-Core' + #name : 'IcePharoPlugin', + #superclass : 'IcePlugin', + #category : 'Iceberg-Plugin-Pharo-Core', + #package : 'Iceberg-Plugin-Pharo', + #tag : 'Core' } -{ #category : #adding } +{ #category : 'adding' } IcePharoPlugin class >> addIcebergProjectToIceberg [ self @@ -24,7 +26,7 @@ IcePharoPlugin class >> addIcebergProjectToIceberg [ ] -{ #category : #adding } +{ #category : 'adding' } IcePharoPlugin class >> addPharoProjectToIceberg [ "It will take all packages corresponding to Pharo project and it will create an iceberg project with it" @@ -54,7 +56,7 @@ IcePharoPlugin class >> addPharoProjectToIceberg [ BaselineOfUnifiedFFI). ] -{ #category : #adding } +{ #category : 'adding' } IcePharoPlugin class >> addProjectNamed: aName commit: aCommitId baselines: aCollection [ self @@ -64,7 +66,7 @@ IcePharoPlugin class >> addProjectNamed: aName commit: aCommitId baselines: aCol tags: #(#system) ] -{ #category : #adding } +{ #category : 'adding' } IcePharoPlugin class >> addProjectNamed: aName commit: aCommitId baselines: aCollection tags: tagArray [ | repository commit workingCopy | @@ -100,7 +102,7 @@ IcePharoPlugin class >> addProjectNamed: aName commit: aCommitId baselines: aCol repository register ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> commitOfExternalProject: aName [ | externalProject tags branch | @@ -123,7 +125,7 @@ IcePharoPlugin class >> commitOfExternalProject: aName [ ^ branch at: #commit at: #sha ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> getCommitishOfProject: projectName owner: owner repository: repository [ | shortHash | @@ -141,7 +143,7 @@ IcePharoPlugin class >> getCommitishOfProject: projectName owner: owner reposito project: repository) at: #sha ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> icebergCommitHash [ ^ self @@ -150,13 +152,13 @@ IcePharoPlugin class >> icebergCommitHash [ repository: 'iceberg' ] -{ #category : #testing } +{ #category : 'testing' } IcePharoPlugin class >> isAvailableFor: aRepository [ ^ aRepository remotes anySatisfy: [ :each | each projectName = 'pharo' ] ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> libgitCommitHash [ ^ self @@ -165,13 +167,13 @@ IcePharoPlugin class >> libgitCommitHash [ repository: 'libgit2-pharo-bindings' ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> pharoCommitHash [ ^ SystemVersion current commitHash ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> tonelCommitHash [ ^ self @@ -180,7 +182,7 @@ IcePharoPlugin class >> tonelCommitHash [ repository: 'tonel' ] -{ #category : #events } +{ #category : 'events' } IcePharoPlugin >> fetchIfNeeded: aRepository [ (aRepository lookupCommit: SystemVersion current commitHash) isUnknownCommit @@ -193,7 +195,7 @@ IcePharoPlugin >> fetchIfNeeded: aRepository [ ifFound: [ :each | each fetch ] ] ] -{ #category : #events } +{ #category : 'events' } IcePharoPlugin >> repositoryWillBeCreated: aRepository [ SystemVersion current major < 7 ifTrue: [ ^ self ]. diff --git a/Iceberg-Plugin-Pharo/ManifestIcebergPluginPharo.class.st b/Iceberg-Plugin-Pharo/ManifestIcebergPluginPharo.class.st index c73a0fcd6c..7c48386c9b 100644 --- a/Iceberg-Plugin-Pharo/ManifestIcebergPluginPharo.class.st +++ b/Iceberg-Plugin-Pharo/ManifestIcebergPluginPharo.class.st @@ -2,7 +2,9 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginPharo, - #superclass : #PackageManifest, - #category : #'Iceberg-Plugin-Pharo-Manifest' + #name : 'ManifestIcebergPluginPharo', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-Pharo-Manifest', + #package : 'Iceberg-Plugin-Pharo', + #tag : 'Manifest' } diff --git a/Iceberg-Plugin-Pharo/package.st b/Iceberg-Plugin-Pharo/package.st index 09511a9da0..1028c14509 100644 --- a/Iceberg-Plugin-Pharo/package.st +++ b/Iceberg-Plugin-Pharo/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-Pharo' } +Package { #name : 'Iceberg-Plugin-Pharo' } diff --git a/Iceberg-Plugin/IcePlugin.class.st b/Iceberg-Plugin/IcePlugin.class.st index d62d0e9501..9acd5e901a 100644 --- a/Iceberg-Plugin/IcePlugin.class.st +++ b/Iceberg-Plugin/IcePlugin.class.st @@ -6,42 +6,44 @@ I can define - ... (TBD) " Class { - #name : #IcePlugin, - #superclass : #Object, - #category : #'Iceberg-Plugin-Base' + #name : 'IcePlugin', + #superclass : 'Object', + #category : 'Iceberg-Plugin-Base', + #package : 'Iceberg-Plugin', + #tag : 'Base' } -{ #category : #testing } +{ #category : 'testing' } IcePlugin class >> allAvailableFor: aRepository [ ^ self allSubclasses select: [ :each | each isAvailableFor: aRepository ] ] -{ #category : #testing } +{ #category : 'testing' } IcePlugin class >> isAbstract [ ^ self == IcePlugin ] -{ #category : #testing } +{ #category : 'testing' } IcePlugin class >> isAvailableFor: aRepository [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IcePlugin >> checkoutBranchPanelsOnModel: anIceTipCachedModel [ "Hook for subclasses" ^ #() ] -{ #category : #events } +{ #category : 'events' } IcePlugin >> repositoryWasCreated: aRepository [ "Hook. Allows plugins to do an action when a repository is created" ] -{ #category : #events } +{ #category : 'events' } IcePlugin >> repositoryWillBeCreated: aRepository [ "Hook. Allows plugins to do an action when a repository will be added" diff --git a/Iceberg-Plugin/IcePluginManager.class.st b/Iceberg-Plugin/IcePluginManager.class.st index e31242b509..20e22c4059 100644 --- a/Iceberg-Plugin/IcePluginManager.class.st +++ b/Iceberg-Plugin/IcePluginManager.class.st @@ -5,37 +5,39 @@ WARNING: Managers are kept in a weak dictionary with Repository as a key, reason Consider using stateless plugins or instance copies of relevant information instead. " Class { - #name : #IcePluginManager, - #superclass : #Object, + #name : 'IcePluginManager', + #superclass : 'Object', #instVars : [ 'plugins' ], - #category : #'Iceberg-Plugin-Base' + #category : 'Iceberg-Plugin-Base', + #package : 'Iceberg-Plugin', + #tag : 'Base' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IcePluginManager class >> managerFor: aRepository [ ^ self basicNew initializeRepository: aRepository ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IcePluginManager class >> new [ self error: 'Use #managerFor:' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePluginManager >> addPlugin: aPlugin [ plugins := plugins copyWith: aPlugin ] -{ #category : #initialization } +{ #category : 'initialization' } IcePluginManager >> availablePluginsFor: aRepository [ ^ (IcePlugin allAvailableFor: aRepository) collect: #new as: Array ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IcePluginManager >> checkoutBranchPanelsOnModel: aModel [ ^ Array streamContents: [ :stream | @@ -43,23 +45,23 @@ IcePluginManager >> checkoutBranchPanelsOnModel: aModel [ stream nextPutAll: (each checkoutBranchPanelsOnModel: aModel) ]] ] -{ #category : #initialization } +{ #category : 'initialization' } IcePluginManager >> initializeRepository: aRepository [ self initialize. plugins := self availablePluginsFor: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IcePluginManager >> plugins [ ^ plugins ] -{ #category : #events } +{ #category : 'events' } IcePluginManager >> repositoryWasCreated: aRepository [ ^ self plugins do: [ :each | each repositoryWasCreated: aRepository ] ] -{ #category : #events } +{ #category : 'events' } IcePluginManager >> repositoryWillBeCreated: aRepository [ ^ self plugins do: [ :each | each repositoryWillBeCreated: aRepository ] ] diff --git a/Iceberg-Plugin/IceRepository.extension.st b/Iceberg-Plugin/IceRepository.extension.st index ca34abeb2d..72d4a452a9 100644 --- a/Iceberg-Plugin/IceRepository.extension.st +++ b/Iceberg-Plugin/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Plugin' } +{ #category : '*Iceberg-Plugin' } IceRepository >> pluginManager [ ^ IcePluginManager managerFor: self ] diff --git a/Iceberg-Plugin/IceTipBitbucketRepositoryPanel.class.st b/Iceberg-Plugin/IceTipBitbucketRepositoryPanel.class.st index 9f14992175..35dfe8e24c 100644 --- a/Iceberg-Plugin/IceTipBitbucketRepositoryPanel.class.st +++ b/Iceberg-Plugin/IceTipBitbucketRepositoryPanel.class.st @@ -2,36 +2,38 @@ I'm a panel to show and/or manipulate a project definition in a BitBucket git repository. " Class { - #name : #IceTipBitbucketRepositoryPanel, - #superclass : #IceTipGitProviderRepositoryPanel, - #category : #'Iceberg-Plugin-Bitbucket' + #name : 'IceTipBitbucketRepositoryPanel', + #superclass : 'IceTipGitProviderRepositoryPanel', + #category : 'Iceberg-Plugin-Bitbucket', + #package : 'Iceberg-Plugin', + #tag : 'Bitbucket' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipBitbucketRepositoryPanel class >> order [ ^ 110 ] -{ #category : #actions } +{ #category : 'actions' } IceTipBitbucketRepositoryPanel >> configureBuilder: aBuilder [ aBuilder beBitbucket ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBitbucketRepositoryPanel >> iconForWindow [ ^ self iconNamed: #bitbucket ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBitbucketRepositoryPanel >> providerName [ ^ 'Bitbucket' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBitbucketRepositoryPanel >> titleForWindow [ ^ 'Clone from bitbucket.org' diff --git a/Iceberg-Plugin/IceTipDecorator.class.st b/Iceberg-Plugin/IceTipDecorator.class.st index 23137ed71f..42a0d2e787 100644 --- a/Iceberg-Plugin/IceTipDecorator.class.st +++ b/Iceberg-Plugin/IceTipDecorator.class.st @@ -9,12 +9,13 @@ It is expected that more decorators will be created with time. " Class { - #name : #IceTipDecorator, - #superclass : #Object, - #category : #'Iceberg-Plugin' + #name : 'IceTipDecorator', + #superclass : 'Object', + #category : 'Iceberg-Plugin', + #package : 'Iceberg-Plugin' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDecorator >> iconNameForPackage: aPackage [ ^ nil diff --git a/Iceberg-Plugin/IceTipGitLabRepositoryPanel.class.st b/Iceberg-Plugin/IceTipGitLabRepositoryPanel.class.st index 2f11c973fc..1cd40d5852 100644 --- a/Iceberg-Plugin/IceTipGitLabRepositoryPanel.class.st +++ b/Iceberg-Plugin/IceTipGitLabRepositoryPanel.class.st @@ -2,36 +2,38 @@ I'm a panel to show and/or manipulate a project definition in a GitLab git repository. " Class { - #name : #IceTipGitLabRepositoryPanel, - #superclass : #IceTipGitProviderRepositoryPanel, - #category : #'Iceberg-Plugin-Gitlab' + #name : 'IceTipGitLabRepositoryPanel', + #superclass : 'IceTipGitProviderRepositoryPanel', + #category : 'Iceberg-Plugin-Gitlab', + #package : 'Iceberg-Plugin', + #tag : 'Gitlab' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitLabRepositoryPanel class >> order [ ^ 120 ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitLabRepositoryPanel >> configureBuilder: aBuilder [ aBuilder beGitLab ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitLabRepositoryPanel >> iconForWindow [ ^ self iconNamed: #gitlab ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitLabRepositoryPanel >> providerName [ ^ 'GitLab' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitLabRepositoryPanel >> titleForWindow [ ^ 'Clone from gitlab.com' diff --git a/Iceberg-Plugin/ManifestIcebergPlugin.class.st b/Iceberg-Plugin/ManifestIcebergPlugin.class.st index 4b3d16013c..f7bdd9b9f4 100644 --- a/Iceberg-Plugin/ManifestIcebergPlugin.class.st +++ b/Iceberg-Plugin/ManifestIcebergPlugin.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPlugin, - #superclass : #PackageManifest, - #category : 'Iceberg-Plugin-Manifest' + #name : 'ManifestIcebergPlugin', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-Manifest', + #package : 'Iceberg-Plugin', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergPlugin class >> description [ ^ 'I contains a plugin manager for Iceberg. diff --git a/Iceberg-Plugin/package.st b/Iceberg-Plugin/package.st index 2ecd14506b..787eaa69fd 100644 --- a/Iceberg-Plugin/package.st +++ b/Iceberg-Plugin/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin' } +Package { #name : 'Iceberg-Plugin' } diff --git a/Iceberg-Tests-MetacelloIntegration/AbstractIceMetacelloIntegrationTests.class.st b/Iceberg-Tests-MetacelloIntegration/AbstractIceMetacelloIntegrationTests.class.st index 1ddfec9dc4..999e414d0a 100644 --- a/Iceberg-Tests-MetacelloIntegration/AbstractIceMetacelloIntegrationTests.class.st +++ b/Iceberg-Tests-MetacelloIntegration/AbstractIceMetacelloIntegrationTests.class.st @@ -1,49 +1,50 @@ Class { - #name : #AbstractIceMetacelloIntegrationTests, - #superclass : #IceParameterizedTestCase, + #name : 'AbstractIceMetacelloIntegrationTests', + #superclass : 'IceParameterizedTestCase', #instVars : [ 'repository', 'conflictingRepository' ], - #category : 'Iceberg-Tests-MetacelloIntegration' + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } AbstractIceMetacelloIntegrationTests class >> isAbstract [ ^ self name = #AbstractIceMetacelloIntegrationTests ] -{ #category : #accessing } +{ #category : 'accessing' } AbstractIceMetacelloIntegrationTests >> defaultTimeLimit [ ^ 30 seconds ] -{ #category : #tests } +{ #category : 'tests' } AbstractIceMetacelloIntegrationTests >> repositoriesForTest [ ^ IceRepository registry select: [ :e | e name = self repositoryName ] ] -{ #category : #configuring } +{ #category : 'configuring' } AbstractIceMetacelloIntegrationTests >> repository [ ^ 'github://pharo-vcs/' , self repositoryName ] -{ #category : #tests } +{ #category : 'tests' } AbstractIceMetacelloIntegrationTests >> repositoryForTest [ ^ IceRepository registry detect: [ :e | e name = self repositoryName ] ] -{ #category : #configuring } +{ #category : 'configuring' } AbstractIceMetacelloIntegrationTests >> repositoryName [ ^ self subclassResponsibility ] -{ #category : #running } +{ #category : 'running' } AbstractIceMetacelloIntegrationTests >> tearDown [ (self repositoriesForTest, { conflictingRepository }) do: [ :each | each ifNotNil: [ :repo | diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationTests.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationTests.class.st index 069c4281aa..4d8d383c91 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationTests.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationTests.class.st @@ -1,13 +1,14 @@ Class { - #name : #IceMetacelloIntegrationTests, - #superclass : #AbstractIceMetacelloIntegrationTests, + #name : 'IceMetacelloIntegrationTests', + #superclass : 'AbstractIceMetacelloIntegrationTests', #classVars : [ 'CommitishToUse' ], - #category : 'Iceberg-Tests-MetacelloIntegration' + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> commitishConfiguration [ ^ IceTestParameter @@ -18,7 +19,7 @@ IceMetacelloIntegrationTests class >> commitishConfiguration [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> commitishOptions [ ^ { ''. "Without commitish" @@ -28,37 +29,37 @@ IceMetacelloIntegrationTests class >> commitishOptions [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> commitishToUse [ ^ CommitishToUse ifNil: [ '' ] ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> commitishToUse: aValue [ CommitishToUse := aValue ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> isAbstract [ ^ self name = #IceMetacelloIntegrationTests ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> parameters [ ^ { self remoteTypeConfiguration. self commitishConfiguration } ] -{ #category : #creation } +{ #category : 'creation' } IceMetacelloIntegrationTests >> createConflictingRepository [ self createConflictingRepositoryIn: 'temp/test' ] -{ #category : #creation } +{ #category : 'creation' } IceMetacelloIntegrationTests >> createConflictingRepositoryIn: aLocation [ conflictingRepository := (IceRepositoryCreator new @@ -68,19 +69,19 @@ IceMetacelloIntegrationTests >> createConflictingRepositoryIn: aLocation [ yourself. ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationTests >> expectedFileFormat [ ^ self subclassResponsibility ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationTests >> hasProject [ ^ self subclassResponsibility ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> installBaseline [ Metacello new @@ -89,25 +90,25 @@ IceMetacelloIntegrationTests >> installBaseline [ load. ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests >> isTestingHTTPS [ ^ Iceberg remoteTypeSelector = #httpsUrl ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests >> isTestingSSH [ ^ Iceberg remoteTypeSelector = #scpUrl ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationTests >> shouldBeDirty [ ^ false ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWhenNoSSHIsAvailableUsesHTTPS [ "This test is meant to run in the CI using SSH, when SSH is not available. @@ -120,7 +121,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWhenNoSSHIsAvailableUsesHTTPS self assert: repository origin url asUrl scheme equals: 'https' ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWhenSSHIsAvailableUsesSSH [ "This test is meant to run on SSH when SSH is running only. @@ -134,7 +135,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWhenSSHIsAvailableUsesSSH [ self assert: (repository origin url beginsWith: 'git@') ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWhileMissingRepositoryIsInstalledIsPossible [ "Avoid this test if on ssh on the CI" @@ -150,7 +151,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWhileMissingRepositoryIsInsta self assert: repository workingCopy isModified equals: self shouldBeDirty ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWithConflictingRepositoryInDiskThrowsError [ "Avoid this test if on ssh on the CI" @@ -164,7 +165,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWithConflictingRepositoryInDi self installBaseline ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWithConflictingUnrelatedRepositoryInDiskThrowsError [ "Avoid this test if on ssh on the CI" @@ -176,7 +177,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWithConflictingUnrelatedRepos self should: [ self installBaseline ] raise: IceMetacelloDuplicatedNotification ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallingAMetacelloBaselineCreatesAnIcebergRepository [ "Avoid this test if on ssh on the CI" @@ -186,7 +187,7 @@ IceMetacelloIntegrationTests >> testInstallingAMetacelloBaselineCreatesAnIceberg self installBaseline ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testNewRepositoryPackagesAreClean [ "Avoid this test if on ssh on the CI" @@ -199,7 +200,7 @@ IceMetacelloIntegrationTests >> testNewRepositoryPackagesAreClean [ self assert: repository workingCopy isModified equals: self shouldBeDirty ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testProjectDirtiness [ "Avoid this test if on ssh on the CI" @@ -212,7 +213,7 @@ IceMetacelloIntegrationTests >> testProjectDirtiness [ self assert: repository isModified equals: self shouldBeDirty ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testProjectFileFormat [ "Avoid this test if on ssh on the CI" @@ -225,7 +226,7 @@ IceMetacelloIntegrationTests >> testProjectFileFormat [ self assert: repository properties fileFormat equals: self expectedFileFormat. ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testProjectHasDescriptor [ "Avoid this test if on ssh on the CI" diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationUpdateALoadedVersionTest.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationUpdateALoadedVersionTest.class.st index 84bd7b289f..a64504f250 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationUpdateALoadedVersionTest.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationUpdateALoadedVersionTest.class.st @@ -1,16 +1,17 @@ Class { - #name : #IceMetacelloIntegrationUpdateALoadedVersionTest, - #superclass : #AbstractIceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloIntegrationUpdateALoadedVersionTest', + #superclass : 'AbstractIceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationUpdateALoadedVersionTest >> repositoryName [ ^ 'test-project-source-properties-tonel' ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> tearDown [ super tearDown. @@ -27,7 +28,7 @@ IceMetacelloIntegrationUpdateALoadedVersionTest >> tearDown [ ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> testConflictDetectedWithProjectWithDependency [ Metacello new @@ -45,7 +46,7 @@ IceMetacelloIntegrationUpdateALoadedVersionTest >> testConflictDetectedWithProje ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> testIncommingWhenProjectWithDependency [ Metacello new @@ -67,7 +68,7 @@ IceMetacelloIntegrationUpdateALoadedVersionTest >> testIncommingWhenProjectWithD ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> testKeepExistingWhenProjectWithDependency [ Metacello new @@ -89,7 +90,7 @@ IceMetacelloIntegrationUpdateALoadedVersionTest >> testKeepExistingWhenProjectWi ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> testUpdateProjectShouldCheckoutTheNewVersion [ Metacello new diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st index 3882fa7aa1..e30e2db5fd 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st @@ -1,16 +1,17 @@ Class { - #name : #IceMetacelloIntegrationWithMissingClone, - #superclass : #AbstractIceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloIntegrationWithMissingClone', + #superclass : 'AbstractIceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationWithMissingClone >> repositoryName [ ^ 'test-project-source-properties-tonel' ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationWithMissingClone >> setUp [ super setUp. @@ -26,7 +27,7 @@ IceMetacelloIntegrationWithMissingClone >> setUp [ ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationWithMissingClone >> tearDown [ super tearDown. @@ -43,7 +44,7 @@ IceMetacelloIntegrationWithMissingClone >> tearDown [ ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationWithMissingClone >> testMissingRepositoryShouldNotFail [ Metacello new diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourceNoPropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourceNoPropertiesFiletree.class.st index 5224a8367e..df7439e217 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourceNoPropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourceNoPropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectNoSourceNoPropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectNoSourceNoPropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree class >> commitishOptions [ ^ super commitishOptions , { ':d68a059b2e36672b1103d89689412d37462b9ca2' "With commit"} @@ -12,25 +13,25 @@ IceMetacelloNoProjectNoSourceNoPropertiesFiletree class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree >> repositoryName [ ^ 'test-noproject-nosource-noproperties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesFiletree.class.st index 9e4385f923..0b16034657 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectNoSourcePropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectNoSourcePropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectNoSourcePropertiesFiletree class >> commitishOptions [ ^ super commitishOptions , { ':06d29d26ac71072a49f1846f73f5389a89ebc455' "With commit"} @@ -12,25 +13,25 @@ IceMetacelloNoProjectNoSourcePropertiesFiletree class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesFiletree >> repositoryName [ ^ 'test-noproject-nosource-properties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesFiletree >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesTonel.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesTonel.class.st index a06af62533..fea768a516 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesTonel.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesTonel.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectNoSourcePropertiesTonel, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectNoSourcePropertiesTonel', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectNoSourcePropertiesTonel class >> commitishOptions [ ^ super commitishOptions , { ':e29c9ff7ef370ea7349d25d79edf9823488d33e2' "With commit"} @@ -12,25 +13,25 @@ IceMetacelloNoProjectNoSourcePropertiesTonel class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesTonel >> expectedFileFormat [ ^ IceLibgitTonelWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesTonel >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesTonel >> repositoryName [ ^ 'test-noproject-nosource-properties-tonel' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesTonel >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourceNoPropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourceNoPropertiesFiletree.class.st index a600b62c96..6171901e1a 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourceNoPropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourceNoPropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectSourceNoPropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectSourceNoPropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourceNoPropertiesFiletree class >> commitishOptions [ ^ { '/src'. "Without commitish" @@ -15,30 +16,30 @@ IceMetacelloNoProjectSourceNoPropertiesFiletree class >> commitishOptions [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourceNoPropertiesFiletree class >> commitishToUse [ ^ CommitishToUse ifNil: [ '/src' ] ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourceNoPropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourceNoPropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourceNoPropertiesFiletree >> repositoryName [ ^ 'test-noproject-source-noproperties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourceNoPropertiesFiletree >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesFiletree.class.st index a83e194081..1d4c836c9e 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectSourcePropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectSourcePropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourcePropertiesFiletree class >> commitishOptions [ ^ { '/src'. "Without commitish" @@ -15,30 +16,30 @@ IceMetacelloNoProjectSourcePropertiesFiletree class >> commitishOptions [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourcePropertiesFiletree class >> commitishToUse [ ^ CommitishToUse ifNil: [ '/src' ] ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesFiletree >> repositoryName [ ^ 'test-noproject-source-properties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesFiletree >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesTonel.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesTonel.class.st index d0e2965604..18f44167b7 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesTonel.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesTonel.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectSourcePropertiesTonel, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectSourcePropertiesTonel', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourcePropertiesTonel class >> commitishOptions [ ^ { '/src'. "Without commitish" @@ -15,30 +16,30 @@ IceMetacelloNoProjectSourcePropertiesTonel class >> commitishOptions [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourcePropertiesTonel class >> commitishToUse [ ^ CommitishToUse ifNil: [ '/src' ] ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesTonel >> expectedFileFormat [ ^ IceLibgitTonelWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesTonel >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesTonel >> repositoryName [ ^ 'test-noproject-source-properties-tonel' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesTonel >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesFiletree.class.st index 7f52ee155b..b6574c4c5b 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloProjectNoSourcePropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloProjectNoSourcePropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloProjectNoSourcePropertiesFiletree class >> commitishOptions [ ^ super commitishOptions , { ':61024d7e81eac0b752ade9f3e03f6e2bd34ee5bf' "With commit"} @@ -12,24 +13,24 @@ IceMetacelloProjectNoSourcePropertiesFiletree class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesFiletree >> repositoryName [ ^ 'test-project-nosource-properties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesFiletree >> shouldBeDirty [ ^ false diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesTonel.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesTonel.class.st index 9e328145e9..469de17508 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesTonel.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesTonel.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloProjectNoSourcePropertiesTonel, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloProjectNoSourcePropertiesTonel', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloProjectNoSourcePropertiesTonel class >> commitishOptions [ ^ super commitishOptions , { ':06f2b9e4833d38770b11c9126987266a3d757843' "With commit"} @@ -12,24 +13,24 @@ IceMetacelloProjectNoSourcePropertiesTonel class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesTonel >> expectedFileFormat [ ^ IceLibgitTonelWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesTonel >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesTonel >> repositoryName [ ^ 'test-project-nosource-properties-tonel' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesTonel >> shouldBeDirty [ ^ false diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesFiletree.class.st index 4782cc463c..1e0b50d4fa 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloProjectSourcePropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloProjectSourcePropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloProjectSourcePropertiesFiletree class >> commitishOptions [ ^ super commitishOptions , { @@ -20,24 +21,24 @@ IceMetacelloProjectSourcePropertiesFiletree class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesFiletree >> repositoryName [ ^ 'test-project-source-properties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesFiletree >> shouldBeDirty [ ^ false diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesTonel.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesTonel.class.st index 8c915cbccd..7df489bf1e 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesTonel.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesTonel.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloProjectSourcePropertiesTonel, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloProjectSourcePropertiesTonel', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloProjectSourcePropertiesTonel class >> commitishOptions [ ^ super commitishOptions , { @@ -20,24 +21,24 @@ IceMetacelloProjectSourcePropertiesTonel class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesTonel >> expectedFileFormat [ ^ IceLibgitTonelWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesTonel >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesTonel >> repositoryName [ ^ 'test-project-source-properties-tonel' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesTonel >> shouldBeDirty [ ^ false diff --git a/Iceberg-Tests-MetacelloIntegration/package.st b/Iceberg-Tests-MetacelloIntegration/package.st index 082c617b64..c3d7d8d3cf 100644 --- a/Iceberg-Tests-MetacelloIntegration/package.st +++ b/Iceberg-Tests-MetacelloIntegration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Tests-MetacelloIntegration' } +Package { #name : 'Iceberg-Tests-MetacelloIntegration' } diff --git a/Iceberg-TipUI/Clipboard.extension.st b/Iceberg-TipUI/Clipboard.extension.st index c811d6fe5c..21ac6f2c76 100644 --- a/Iceberg-TipUI/Clipboard.extension.st +++ b/Iceberg-TipUI/Clipboard.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Clipboard } +Extension { #name : 'Clipboard' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } Clipboard class >> clipboardText: aText informing: aString [ UIManager inform: aString. ^ self clipboardText: aText diff --git a/Iceberg-TipUI/CmCommandGroup.extension.st b/Iceberg-TipUI/CmCommandGroup.extension.st index 6f36bc0b04..37988d8338 100644 --- a/Iceberg-TipUI/CmCommandGroup.extension.st +++ b/Iceberg-TipUI/CmCommandGroup.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroup } +Extension { #name : 'CmCommandGroup' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroup >> commandOrGroupNamed: aString ifFound: aBlock [ ^ entries diff --git a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st index 8ef6886348..306bf40201 100644 --- a/Iceberg-TipUI/CmCommandGroupDecorator.extension.st +++ b/Iceberg-TipUI/CmCommandGroupDecorator.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmCommandGroupDecorator } +Extension { #name : 'CmCommandGroupDecorator' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmCommandGroupDecorator >> commandOrGroupNamed: aString ifFound: aBlock [ ^ self decoratedGroup commandOrGroupNamed: aString ifFound: aBlock diff --git a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st index f356aa3469..b0c6cb73fc 100644 --- a/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st +++ b/Iceberg-TipUI/CmUICommandDisplayStrategy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUICommandDisplayStrategy } +Extension { #name : 'CmUICommandDisplayStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUICommandDisplayStrategy >> ifVisible: aCmSpecCommand do: aBlock [ self subclassResponsibility diff --git a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st index 7f1636c79c..a9fb4ab426 100644 --- a/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIDisableWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIDisableWhenCantBeRun } +Extension { #name : 'CmUIDisableWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIDisableWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Always visible" diff --git a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st index ff2501af9c..aad5f38218 100644 --- a/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st +++ b/Iceberg-TipUI/CmUIHideWhenCantBeRun.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #CmUIHideWhenCantBeRun } +Extension { #name : 'CmUIHideWhenCantBeRun' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } CmUIHideWhenCantBeRun >> ifVisible: aCmSpecCommand do: aBlock [ "Visible if #canBeExecuted" diff --git a/Iceberg-TipUI/FTBasicItem.extension.st b/Iceberg-TipUI/FTBasicItem.extension.st index 889a7a7367..d4e904d427 100644 --- a/Iceberg-TipUI/FTBasicItem.extension.st +++ b/Iceberg-TipUI/FTBasicItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTBasicItem } +Extension { #name : 'FTBasicItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTBasicItem >> toggle [ self isExpanded ifTrue: [ self collapseAndRefresh ] diff --git a/Iceberg-TipUI/FTRootItem.extension.st b/Iceberg-TipUI/FTRootItem.extension.st index 95874a9068..7aa97b2e24 100644 --- a/Iceberg-TipUI/FTRootItem.extension.st +++ b/Iceberg-TipUI/FTRootItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTRootItem } +Extension { #name : 'FTRootItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTRootItem >> isRoot [ ^ true ] diff --git a/Iceberg-TipUI/FTTableMorph.extension.st b/Iceberg-TipUI/FTTableMorph.extension.st index b5f26040a5..9d329d59d1 100644 --- a/Iceberg-TipUI/FTTableMorph.extension.st +++ b/Iceberg-TipUI/FTTableMorph.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTableMorph } +Extension { #name : 'FTTableMorph' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> selectFirstVisibleRow [ ^ self selectIndex: @@ -9,7 +9,7 @@ FTTableMorph >> selectFirstVisibleRow [ ifEmpty: [ 0 ]) ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTableMorph >> useFunction: aFilterFunctionClass do: aBlock [ function := aFilterFunctionClass table: self. aBlock cull: function cull: self diff --git a/Iceberg-TipUI/FTTreeItem.extension.st b/Iceberg-TipUI/FTTreeItem.extension.st index 252972c9d7..9f7286ecfd 100644 --- a/Iceberg-TipUI/FTTreeItem.extension.st +++ b/Iceberg-TipUI/FTTreeItem.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #FTTreeItem } +Extension { #name : 'FTTreeItem' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } FTTreeItem >> isRoot [ ^ false ] diff --git a/Iceberg-TipUI/IceAbstractCredentials.extension.st b/Iceberg-TipUI/IceAbstractCredentials.extension.st index 533cab5b40..c305485223 100644 --- a/Iceberg-TipUI/IceAbstractCredentials.extension.st +++ b/Iceberg-TipUI/IceAbstractCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceAbstractCredentials } +Extension { #name : 'IceAbstractCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> askForModelClass [ ^ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAbstractCredentials >> editModelClass [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceAddition.extension.st b/Iceberg-TipUI/IceAddition.extension.st index 37dc983ddf..c38ab65190 100644 --- a/Iceberg-TipUI/IceAddition.extension.st +++ b/Iceberg-TipUI/IceAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceAddition } +Extension { #name : 'IceAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceAddition >> icon [ ^ self iconNamed: #changeAdd diff --git a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st index 0771c4e508..d26a6bad1f 100644 --- a/Iceberg-TipUI/IceCheckoutAllPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAllPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAllPackages } +Extension { #name : 'IceCheckoutAllPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAllPackages class >> description [ ^ 'Checkout ALL packages in the repository' ] diff --git a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st index e08c84d409..5b4216bc8f 100644 --- a/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutAlreadyLoadedPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutAlreadyLoadedPackages } +Extension { #name : 'IceCheckoutAlreadyLoadedPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutAlreadyLoadedPackages class >> description [ ^ 'Checkout packages ALREADY LOADED in the image' ] diff --git a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st index 0a9c967d0c..67ec10aa6a 100644 --- a/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st +++ b/Iceberg-TipUI/IceCheckoutDoNotLoadPackages.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceCheckoutDoNotLoadPackages } +Extension { #name : 'IceCheckoutDoNotLoadPackages' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutDoNotLoadPackages class >> description [ ^ 'DO NOT CHECKOUT any packages, I will load them manually (for experts only)' ] diff --git a/Iceberg-TipUI/IceCheckoutStrategy.extension.st b/Iceberg-TipUI/IceCheckoutStrategy.extension.st index 51de95c72f..ac78658726 100644 --- a/Iceberg-TipUI/IceCheckoutStrategy.extension.st +++ b/Iceberg-TipUI/IceCheckoutStrategy.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceCheckoutStrategy } +Extension { #name : 'IceCheckoutStrategy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy >> description [ ^ self class description ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceCheckoutStrategy class >> description [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceClassDefinition.extension.st b/Iceberg-TipUI/IceClassDefinition.extension.st index e5be73baae..857e7aae8c 100644 --- a/Iceberg-TipUI/IceClassDefinition.extension.st +++ b/Iceberg-TipUI/IceClassDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceClassDefinition } +Extension { #name : 'IceClassDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceClassDefinition >> icon [ ^ self iconNamed: #class ] diff --git a/Iceberg-TipUI/IceConflictingOperation.extension.st b/Iceberg-TipUI/IceConflictingOperation.extension.st index 2a2670af63..fd38d1af90 100644 --- a/Iceberg-TipUI/IceConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceConflictingOperation.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceConflictingOperation } +Extension { #name : 'IceConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> operationIcon [ ^ self iconNamed: #changeUpdate ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceCreateBranchCommand.class.st b/Iceberg-TipUI/IceCreateBranchCommand.class.st index 67b297b6be..decf79bec0 100644 --- a/Iceberg-TipUI/IceCreateBranchCommand.class.st +++ b/Iceberg-TipUI/IceCreateBranchCommand.class.st @@ -3,12 +3,14 @@ I'm a command to create a new branch from a commit. this is usefull in the case of commiting changes in unsync repositories (so you open a branch and you commit there) " Class { - #name : #IceCreateBranchCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceCreateBranchCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceCreateBranchCommand >> execute [ | selection | diff --git a/Iceberg-TipUI/IceDefinition.extension.st b/Iceberg-TipUI/IceDefinition.extension.st index 8b2c9bdb7d..c453e2a0df 100644 --- a/Iceberg-TipUI/IceDefinition.extension.st +++ b/Iceberg-TipUI/IceDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDefinition } +Extension { #name : 'IceDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDefinition >> icon [ self subclassResponsibility diff --git a/Iceberg-TipUI/IceDirectoryDefinition.extension.st b/Iceberg-TipUI/IceDirectoryDefinition.extension.st index e16b919e0d..7ad08d0c15 100644 --- a/Iceberg-TipUI/IceDirectoryDefinition.extension.st +++ b/Iceberg-TipUI/IceDirectoryDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceDirectoryDefinition } +Extension { #name : 'IceDirectoryDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceDirectoryDefinition >> icon [ ^ self iconNamed: #emptyPackage ] diff --git a/Iceberg-TipUI/IceErrorVisitor.extension.st b/Iceberg-TipUI/IceErrorVisitor.extension.st index a0d887b790..baf0ab6cc2 100644 --- a/Iceberg-TipUI/IceErrorVisitor.extension.st +++ b/Iceberg-TipUI/IceErrorVisitor.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceErrorVisitor } +Extension { #name : 'IceErrorVisitor' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitExperimentalFeature: aWarning [ "By default experimental features are just accepted when we are not in an interactive mode". aWarning resume ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceErrorVisitor >> visitNoCommitMessage: aWarning [ self visitGenericError: aWarning ] diff --git a/Iceberg-TipUI/IceExperimentalFeature.class.st b/Iceberg-TipUI/IceExperimentalFeature.class.st index ddcaf03e3a..db10719754 100644 --- a/Iceberg-TipUI/IceExperimentalFeature.class.st +++ b/Iceberg-TipUI/IceExperimentalFeature.class.st @@ -4,12 +4,14 @@ Everytime an user tries to use an experimental feature, maybe the UI want to sho This is useful to guarantee the correct keeping of the changes. " Class { - #name : #IceExperimentalFeature, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceExperimentalFeature', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceExperimentalFeature >> acceptError: aVisitor [ aVisitor visitExperimentalFeature: self diff --git a/Iceberg-TipUI/IceExtensionDefinition.extension.st b/Iceberg-TipUI/IceExtensionDefinition.extension.st index 25018c3c79..f16ab89a3f 100644 --- a/Iceberg-TipUI/IceExtensionDefinition.extension.st +++ b/Iceberg-TipUI/IceExtensionDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceExtensionDefinition } +Extension { #name : 'IceExtensionDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceExtensionDefinition >> icon [ ^ self iconNamed: #group ] diff --git a/Iceberg-TipUI/IceFileDefinition.extension.st b/Iceberg-TipUI/IceFileDefinition.extension.st index ec7f3d821f..9ada4d36b9 100644 --- a/Iceberg-TipUI/IceFileDefinition.extension.st +++ b/Iceberg-TipUI/IceFileDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceFileDefinition } +Extension { #name : 'IceFileDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileDefinition >> icon [ ^ self iconNamed: #book ] diff --git a/Iceberg-TipUI/IceFileSystemDefinition.extension.st b/Iceberg-TipUI/IceFileSystemDefinition.extension.st index 6d556411dc..5c26a26b36 100644 --- a/Iceberg-TipUI/IceFileSystemDefinition.extension.st +++ b/Iceberg-TipUI/IceFileSystemDefinition.extension.st @@ -1,13 +1,13 @@ -Extension { #name : #IceFileSystemDefinition } +Extension { #name : 'IceFileSystemDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBeBrowsed [ "It can always be browsed through the libgit file system" ^ true ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceFileSystemDefinition >> canBrowseReferences [ "We do not track file references..." diff --git a/Iceberg-TipUI/IceMergeListWrapper.class.st b/Iceberg-TipUI/IceMergeListWrapper.class.st index e8fb3896b2..3c7447bcfb 100644 --- a/Iceberg-TipUI/IceMergeListWrapper.class.st +++ b/Iceberg-TipUI/IceMergeListWrapper.class.st @@ -2,67 +2,69 @@ I am a morphic list wrapper that wraps iceberg diff tree nodes (potentially with conflicts) " Class { - #name : #IceMergeListWrapper, - #superclass : #ListItemWrapper, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceMergeListWrapper', + #superclass : 'ListItemWrapper', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> = aWrapper [ ^ self item = aWrapper item ] -{ #category : #'morphic-compatibility' } +{ #category : 'morphic-compatibility' } IceMergeListWrapper >> actualClass [ ^ self item value actualClass ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> asString [ ^item value description ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseLocal [ ^ item value selectRight ] -{ #category : #resolution } +{ #category : 'resolution' } IceMergeListWrapper >> chooseRemote [ ^ item value selectLeft ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> contents [ "Answer the contents of the change from the model." ^ item children collect: [ :each | IceMergeListWrapper with: each model: model ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceMergeListWrapper >> hash [ ^ self item hash ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> icon [ ^ item value icon ] -{ #category : #testing } +{ #category : 'testing' } IceMergeListWrapper >> isConflict [ ^ item value isConflict ] -{ #category : #accessing } +{ #category : 'accessing' } IceMergeListWrapper >> preferredColor [ ^ self item value preferredColor diff --git a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st index fd1a3b7e5d..bc9b7f4006 100644 --- a/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st +++ b/Iceberg-TipUI/IceMergeWorkingCopyCommand.class.st @@ -2,12 +2,14 @@ I'm a command to perform a merge of current image sources with head commit. " Class { - #name : #IceMergeWorkingCopyCommand, - #superclass : #IceRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceMergeWorkingCopyCommand', + #superclass : 'IceRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceMergeWorkingCopyCommand >> execute [ | commit | commit := self repository headCommit. diff --git a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st index bed0c4d10d..a8a94cb0b3 100644 --- a/Iceberg-TipUI/IceMethodContainerDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodContainerDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceMethodContainerDefinition } +Extension { #name : 'IceMethodContainerDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> actualClass [ | actualClass | @@ -8,7 +8,7 @@ IceMethodContainerDefinition >> actualClass [ ^ isMeta ifTrue: [ actualClass classSide ] ifFalse: [ actualClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> browse [ | browsed | @@ -17,13 +17,13 @@ IceMethodContainerDefinition >> browse [ browsed browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBeBrowsed [ ^ Smalltalk globals includesKey: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodContainerDefinition >> canBrowseReferences [ ^ self canBeBrowsed diff --git a/Iceberg-TipUI/IceMethodDefinition.extension.st b/Iceberg-TipUI/IceMethodDefinition.extension.st index 7f8cee63e9..48b2d71867 100644 --- a/Iceberg-TipUI/IceMethodDefinition.extension.st +++ b/Iceberg-TipUI/IceMethodDefinition.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceMethodDefinition } +Extension { #name : 'IceMethodDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> browse [ (self contextClass >> name) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBeBrowsed [ ^ self contextClass @@ -14,13 +14,13 @@ IceMethodDefinition >> canBeBrowsed [ ifNil: [ false ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceMethodDefinition >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceModification.extension.st b/Iceberg-TipUI/IceModification.extension.st index 9ecdccb45c..91a3649b5f 100644 --- a/Iceberg-TipUI/IceModification.extension.st +++ b/Iceberg-TipUI/IceModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceModification } +Extension { #name : 'IceModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceModification >> icon [ ^ self iconNamed: #changeUpdate diff --git a/Iceberg-TipUI/IceNoCommitMessage.class.st b/Iceberg-TipUI/IceNoCommitMessage.class.st index 01e8ce6729..7f5ba3de28 100644 --- a/Iceberg-TipUI/IceNoCommitMessage.class.st +++ b/Iceberg-TipUI/IceNoCommitMessage.class.st @@ -3,23 +3,25 @@ I indicate when a commit will be performed without a message comment. This is usually possible, but bad, very bad. Do not do it. " Class { - #name : #IceNoCommitMessage, - #superclass : #IceWarning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceNoCommitMessage', + #superclass : 'IceWarning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage class >> defaultMessageText [ ^ 'You are trying to commit without a message! When this is possible, is not a good practice.' ] -{ #category : #visiting } +{ #category : 'visiting' } IceNoCommitMessage >> acceptError: aVisitor [ aVisitor visitNoCommitMessage: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceNoCommitMessage >> messageText [ ^ messageText ifNil: [ self class defaultMessageText ] ] diff --git a/Iceberg-TipUI/IceNoModification.extension.st b/Iceberg-TipUI/IceNoModification.extension.st index c57e45a902..a49e299b2a 100644 --- a/Iceberg-TipUI/IceNoModification.extension.st +++ b/Iceberg-TipUI/IceNoModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNoModification } +Extension { #name : 'IceNoModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNoModification >> icon [ ^ definition icon diff --git a/Iceberg-TipUI/IceNode.extension.st b/Iceberg-TipUI/IceNode.extension.st index d269a8d67e..cfba09c027 100644 --- a/Iceberg-TipUI/IceNode.extension.st +++ b/Iceberg-TipUI/IceNode.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceNode } +Extension { #name : 'IceNode' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNode >> inspectorItems [ diff --git a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st index 790c80f427..a9a5fe9c83 100644 --- a/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st +++ b/Iceberg-TipUI/IceNodeCodeDisplayVisitor.class.st @@ -3,47 +3,49 @@ I am a IceNode (containing an IceOperationMerge) visitor meant to update a SpCod with the highlighted code. " Class { - #name : #IceNodeCodeDisplayVisitor, - #superclass : #Object, + #name : 'IceNodeCodeDisplayVisitor', + #superclass : 'Object', #instVars : [ 'codePresenter' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceNodeCodeDisplayVisitor class >> onCodePresenter: aSpCodePresenter [ ^ self new codePresenter: aSpCodePresenter ; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter [ ^ codePresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceNodeCodeDisplayVisitor >> codePresenter: aSpCodePresenter [ codePresenter := aSpCodePresenter ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitClassDefinition: anIceClassDefinition [ codePresenter text: anIceClassDefinition contents. codePresenter behavior: nil ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitConflictingOperation: anIceConflictingOperation [ anIceConflictingOperation chosenOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ codePresenter @@ -53,13 +55,13 @@ IceNodeCodeDisplayVisitor >> visitMethodNode: anIceMethodDefinition [ UndefinedObject ]) ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceNodeCodeDisplayVisitor >> visitPackage: anIcePackageDefinition [ codePresenter diff --git a/Iceberg-TipUI/IceNonConflictingOperation.extension.st b/Iceberg-TipUI/IceNonConflictingOperation.extension.st index a9d80139e9..e1735a623d 100644 --- a/Iceberg-TipUI/IceNonConflictingOperation.extension.st +++ b/Iceberg-TipUI/IceNonConflictingOperation.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceNonConflictingOperation } +Extension { #name : 'IceNonConflictingOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> operationIcon [ ^ operation icon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceNonConflictingOperation >> preferredColor [ ^ self isResolved diff --git a/Iceberg-TipUI/IceOperation.extension.st b/Iceberg-TipUI/IceOperation.extension.st index e247689488..bafe10e4da 100644 --- a/Iceberg-TipUI/IceOperation.extension.st +++ b/Iceberg-TipUI/IceOperation.extension.st @@ -1,30 +1,30 @@ -Extension { #name : #IceOperation } +Extension { #name : 'IceOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> browse [ ^ self leftDefinition browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBeBrowsed [ ^ self leftDefinition canBeBrowsed ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> icon [ self subclassResponsibility ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperation >> preferredColor [ "Use the default color" diff --git a/Iceberg-TipUI/IceOperationMerge.extension.st b/Iceberg-TipUI/IceOperationMerge.extension.st index 8d9566c0cb..fa98848b61 100644 --- a/Iceberg-TipUI/IceOperationMerge.extension.st +++ b/Iceberg-TipUI/IceOperationMerge.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceOperationMerge } +Extension { #name : 'IceOperationMerge' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> icon [ self isRightChosen ifTrue: [ ^ self iconNamed: #changeBlock ]. @@ -9,7 +9,7 @@ IceOperationMerge >> icon [ ^ self operationIcon ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceOperationMerge >> operationIcon [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IcePackage.extension.st b/Iceberg-TipUI/IcePackage.extension.st index b932cb71e4..d205ceaf37 100644 --- a/Iceberg-TipUI/IcePackage.extension.st +++ b/Iceberg-TipUI/IcePackage.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePackage } +Extension { #name : 'IcePackage' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackage >> browse [ (RPackageOrganizer default packageNamed: self name) browse diff --git a/Iceberg-TipUI/IcePackageDefinition.extension.st b/Iceberg-TipUI/IcePackageDefinition.extension.st index 4839af1d7a..36f9b23914 100644 --- a/Iceberg-TipUI/IcePackageDefinition.extension.st +++ b/Iceberg-TipUI/IcePackageDefinition.extension.st @@ -1,25 +1,25 @@ -Extension { #name : #IcePackageDefinition } +Extension { #name : 'IcePackageDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> browse [ "Open a browser on the package, if it exists." (self packageOrganizer packageNamed: name ifAbsent: [ ^ self ]) browse ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBeBrowsed [ ^ self packageOrganizer hasPackage: name ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> canBrowseReferences [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePackageDefinition >> icon [ ^ self iconNamed: #package ] diff --git a/Iceberg-TipUI/IcePlaintextCredentials.extension.st b/Iceberg-TipUI/IcePlaintextCredentials.extension.st index 2280cbb78b..77fc415434 100644 --- a/Iceberg-TipUI/IcePlaintextCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IcePlaintextCredentials } +Extension { #name : 'IcePlaintextCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClass [ ^ IceTipAskForPlaintextCredentialsPresenter ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> askForModelClassOn: aString [ ^ (aString includesSubstring: 'github.com' caseSensitive: false) @@ -13,7 +13,7 @@ IcePlaintextCredentials >> askForModelClassOn: aString [ ifFalse: [ self askForModelClass ] ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextCredentials >> editModelClass [ ^ IceTipEditPlaintextCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st index c69cf7dd5e..01215e50ad 100644 --- a/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-TipUI/IcePlaintextOtpCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextOtpCredentials } +Extension { #name : 'IcePlaintextOtpCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IcePlaintextOtpCredentials >> askForModelClass [ ^ IceTipAskForPlaintextOtpCredentialsPresenter ] diff --git a/Iceberg-TipUI/IcePullRemoteCommand.class.st b/Iceberg-TipUI/IcePullRemoteCommand.class.st index 35ba209da8..92f9253947 100644 --- a/Iceberg-TipUI/IcePullRemoteCommand.class.st +++ b/Iceberg-TipUI/IcePullRemoteCommand.class.st @@ -2,27 +2,29 @@ I'm a command to perform a pull from a remote. " Class { - #name : #IcePullRemoteCommand, - #superclass : #IceRepositoryCommand, + #name : 'IcePullRemoteCommand', + #superclass : 'IceRepositoryCommand', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IcePullRemoteCommand >> execute [ self repository branch pullFrom: self remote. self beSuccess ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IcePullRemoteCommand >> remote: anObject [ remote := anObject ] diff --git a/Iceberg-TipUI/IceRemoval.extension.st b/Iceberg-TipUI/IceRemoval.extension.st index fb9aaa8acc..9887f589e2 100644 --- a/Iceberg-TipUI/IceRemoval.extension.st +++ b/Iceberg-TipUI/IceRemoval.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRemoval } +Extension { #name : 'IceRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRemoval >> icon [ ^ self iconNamed: #changeRemove diff --git a/Iceberg-TipUI/IceRepository.extension.st b/Iceberg-TipUI/IceRepository.extension.st index ce7f0e2d32..17235036b4 100644 --- a/Iceberg-TipUI/IceRepository.extension.st +++ b/Iceberg-TipUI/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceRepository >> inspectorItems [ diff --git a/Iceberg-TipUI/IceRepositoryCommand.class.st b/Iceberg-TipUI/IceRepositoryCommand.class.st index 1c769a782e..0e64b96592 100644 --- a/Iceberg-TipUI/IceRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceRepositoryCommand.class.st @@ -2,56 +2,58 @@ I'm a generic command for iceberg repositories. " Class { - #name : #IceRepositoryCommand, - #superclass : #Object, + #name : 'IceRepositoryCommand', + #superclass : 'Object', #instVars : [ 'repository', 'success', 'context' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand class >> isAbstract [ ^ self == IceRepositoryCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> beSuccess [ success := true ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> execute [ self subclassResponsibility ] -{ #category : #execute } +{ #category : 'execute' } IceRepositoryCommand >> executeWithContext: aContext [ context := aContext. self execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCommand >> initialize [ super initialize. success := false ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCommand >> isSuccess [ ^ success ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCommand >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceSavedPackageVersion.extension.st b/Iceberg-TipUI/IceSavedPackageVersion.extension.st index b699275f27..66160db0c5 100644 --- a/Iceberg-TipUI/IceSavedPackageVersion.extension.st +++ b/Iceberg-TipUI/IceSavedPackageVersion.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceSavedPackageVersion } +Extension { #name : 'IceSavedPackageVersion' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSavedPackageVersion >> description [ ^ self commit description ] diff --git a/Iceberg-TipUI/IceSortingStrategy.class.st b/Iceberg-TipUI/IceSortingStrategy.class.st index 45945aeaaa..0c9b0ea815 100644 --- a/Iceberg-TipUI/IceSortingStrategy.class.st +++ b/Iceberg-TipUI/IceSortingStrategy.class.st @@ -15,26 +15,28 @@ Internal Representation and Key Implementation Points. last: Represent the entities to display last. " Class { - #name : #IceSortingStrategy, - #superclass : #Object, + #name : 'IceSortingStrategy', + #superclass : 'Object', #instVars : [ 'first', 'last' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy class >> possibleValues [ ^ #(#none #modified #notLoaded) ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first [ ^ first ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> first: anObject [ first := anObject. @@ -42,19 +44,19 @@ IceSortingStrategy >> first: anObject [ ifTrue: [ self last: #none ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceSortingStrategy >> initialize [ super initialize. first := #modified. last := #notLoaded ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last [ ^ last ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> last: anObject [ last := anObject. @@ -62,7 +64,7 @@ IceSortingStrategy >> last: anObject [ ifTrue: [ self first: #none ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ aSymbol = #modified ifTrue: [ ^ aCollection select: #isModified ]. @@ -71,7 +73,7 @@ IceSortingStrategy >> selectMatching: aSymbol from: aCollection [ self error: 'This sorting is not accepted: ' , aSymbol ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sort: aListOfPackages [ | result packages lasts | packages := aListOfPackages. @@ -85,12 +87,12 @@ IceSortingStrategy >> sort: aListOfPackages [ ^ result ] -{ #category : #sorting } +{ #category : 'sorting' } IceSortingStrategy >> sortByName: aCollection [ ^ aCollection sorted: #packageName ascending ] -{ #category : #accessing } +{ #category : 'accessing' } IceSortingStrategy >> withOthers: aSymbol [ self first = aSymbol ifTrue: [ self first: nil ]. self last = aSymbol ifTrue: [ self last: nil ] diff --git a/Iceberg-TipUI/IceSshCredentials.extension.st b/Iceberg-TipUI/IceSshCredentials.extension.st index e3ad3fed5c..6c5858fbf7 100644 --- a/Iceberg-TipUI/IceSshCredentials.extension.st +++ b/Iceberg-TipUI/IceSshCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceSshCredentials } +Extension { #name : 'IceSshCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceSshCredentials >> editModelClass [ ^ IceTipEditSSHCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st index 0c1558c81a..1d47f72c91 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialCommand.class.st @@ -2,24 +2,26 @@ I am the common class of all the commands over an specific credential. " Class { - #name : #IceTipAbstractCredentialCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> credential [ ^ self item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialCommand >> store [ ^ self context model diff --git a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st index fdb3e9165c..1742f97fae 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialStoreCommand.class.st @@ -2,30 +2,32 @@ I am the abstract class of all the general commands in the credentials list. " Class { - #name : #IceTipAbstractCredentialStoreCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAbstractCredentialStoreCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand class >> isAbstract [ ^ self == IceTipAbstractCredentialStoreCommand ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialStoreCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialStoreCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAbstractCredentialStoreCommand >> store [ ^ self context store diff --git a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st index ec0f14565a..ff95d0bfdc 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st @@ -5,8 +5,8 @@ to ask / add / edit credentials. There are subclasses to each of the actions and the types of keys. " Class { - #name : #IceTipAbstractCredentialsPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAbstractCredentialsPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'storeCheckbox', 'credentialStore', @@ -15,10 +15,12 @@ Class { 'credentials', 'askingHostname' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAddAction [ credentials := self newCredentials. @@ -31,7 +33,7 @@ IceTipAbstractCredentialsPresenter >> acceptAddAction [ tool refresh ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptAskAction [ credentials := self newCredentials. @@ -45,7 +47,7 @@ IceTipAbstractCredentialsPresenter >> acceptAskAction [ ^ credentials ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> acceptEditAction [ self refreshCredentialsFromPresenter. @@ -55,19 +57,19 @@ IceTipAbstractCredentialsPresenter >> acceptEditAction [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> askingHostname: aString [ askingHostname := aString ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAction [ "Action to execute on cancel." ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> cancelAskAction [ accepted := true. @@ -75,43 +77,43 @@ IceTipAbstractCredentialsPresenter >> cancelAskAction [ LGitNoCredentialsProvided signal ] -{ #category : #actions } +{ #category : 'actions' } IceTipAbstractCredentialsPresenter >> closeAction [ accepted ifFalse: [ self cancelAction ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentialStore: aStore [ credentialStore := aStore ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> credentials: anIceCredentials [ credentials := anIceCredentials. self refreshPresenterFromCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> hostnameFromInput [ "Answer the remoote hostname for the credentials." ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initialize [ super initialize. accepted := false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPresenter [ super initializeDialogWindow: aDialogWindowPresenter. @@ -121,7 +123,7 @@ IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPrese ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initializePresenters [ storeCheckbox := self newCheckBox @@ -131,27 +133,27 @@ IceTipAbstractCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> isOkEnabled [ "Determite if the user should be enabled to press on the accept button." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> newCredentials [ "Answer a new instance of the credentials using the form inputs." ^ self subclassResponsibility ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> okButton [ ^ self window buttons first ] -{ #category : #'API - opening' } +{ #category : 'API - opening' } IceTipAbstractCredentialsPresenter >> open [ self openModal. @@ -159,36 +161,36 @@ IceTipAbstractCredentialsPresenter >> open [ ^ self credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshCredentialsFromPresenter [ "Hook to update the credentials object from the presenter inputs." ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> refreshPresenterFromCredentials [ "Hook to update the presenter input fields from the credentials object." ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractCredentialsPresenter >> shouldStoreCredentials [ ^ storeCheckbox state ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> storeCheckbox [ ^ storeCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractCredentialsPresenter >> tool: aBrowser [ "Set the tool that triggered this dialog, and therefore might need a #refresh after the users accepts the dialog and it produces an effect on the system." tool := aBrowser ] -{ #category : #updating } +{ #category : 'updating' } IceTipAbstractCredentialsPresenter >> updateOkButton [ self window ifNil: [ ^ self ]. diff --git a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st index 24f88809b7..654595d3ee 100644 --- a/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractPlaintextCredentialsPresenter.class.st @@ -3,18 +3,20 @@ I implement the basic behavior of all the plaintext credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameLabel', 'usernameInput', 'passwordLabel', 'passwordInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipAbstractPlaintextCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractPlaintextCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self password isNotEmpty ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ ^ IcePlaintextCredentials new @@ -47,31 +49,31 @@ IceTipAbstractPlaintextCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> password [ ^ passwordInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> passwordInput [ ^ passwordInput ] -{ #category : #private } +{ #category : 'private' } IceTipAbstractPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Password:' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractPlaintextCredentialsPresenter >> username [ ^ usernameInput text ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAbstractPlaintextCredentialsPresenter >> usernameInput [ ^ usernameInput diff --git a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st index d0f96fe3b3..4b529092fd 100644 --- a/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractSSHCredentialsPresenter.class.st @@ -3,8 +3,8 @@ I implement the basic behavior of all the ssh credentials. My subclasses implements the specific behavior for each of the operations. " Class { - #name : #IceTipAbstractSSHCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAbstractSSHCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'usernameInput', 'usernameLabel', @@ -15,10 +15,12 @@ Class { 'publicKeyLabel', 'privateKeyLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -56,20 +58,20 @@ IceTipAbstractSSHCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAbstractSSHCredentialsPresenter >> isOkEnabled [ ^ self username isNotEmpty and: [ self publicKey isNotEmpty and: [ self privateKey isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> passphrase [ ^ passphraseInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> privateKey [ ^ privateKeyInput location @@ -77,7 +79,7 @@ IceTipAbstractSSHCredentialsPresenter >> privateKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> publicKey [ ^ publicKeyInput location @@ -85,7 +87,7 @@ IceTipAbstractSSHCredentialsPresenter >> publicKey [ ifNotNil: [ :x | x pathString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAbstractSSHCredentialsPresenter >> username [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAction.class.st b/Iceberg-TipUI/IceTipAction.class.st index c062c89d67..7f2a1337db 100644 --- a/Iceberg-TipUI/IceTipAction.class.st +++ b/Iceberg-TipUI/IceTipAction.class.st @@ -2,41 +2,43 @@ I'm like a lightweight command, used in general for apply concrete actions. " Class { - #name : #IceTipAction, - #superclass : #Object, + #name : 'IceTipAction', + #superclass : 'Object', #instVars : [ 'context', 'repository', 'successBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipAction class >> isAbstract [ ^ self == IceTipAction ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> basicExecute [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> context: aContext [ context := aContext ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> execute [ | result | @@ -48,19 +50,19 @@ IceTipAction >> execute [ ^ result. ] -{ #category : #executing } +{ #category : 'executing' } IceTipAction >> executeWithContext: aContext [ self context: aContext. ^ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> finishSuccess [ successBlock ifNotNil: [ successBlock value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> onSuccess: aBlock [ "Some actions need to execute something right after finish. Like a refresh of panels, etc. If a block is defined here, it will be evaluated right after the command is executed, if @@ -68,17 +70,17 @@ IceTipAction >> onSuccess: aBlock [ successBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAction >> repository: anObject [ repository := anObject ] -{ #category : #private } +{ #category : 'private' } IceTipAction >> withErrorHandlingDo: aBlock [ aBlock on: IceError, IceWarning diff --git a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st index 5604783f88..cb70097b35 100644 --- a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st @@ -2,8 +2,8 @@ I am an small dialog to ask the user to select new packages to load. New packages are packages in the commit but not in the image. " Class { - #name : #IceTipAddNewPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddNewPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'packagesList', 'selectedPackages', @@ -12,10 +12,12 @@ Class { 'checkoutModel', 'checkoutPreviewWindow' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterInstance forRoot: rootCommandGroup [ rootCommandGroup register: @@ -25,7 +27,7 @@ IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterIn yourself) ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddNewPackagesDialogPresenter >> accept [ | selectedPackageNames | @@ -42,19 +44,19 @@ IceTipAddNewPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutModel: anIceTipCheckoutModel [ checkoutModel := anIceTipCheckoutModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> checkoutPreviewWindow: anIceTipCheckoutPreviewBrowser [ checkoutPreviewWindow := anIceTipCheckoutPreviewBrowser ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddNewPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -63,13 +65,13 @@ IceTipAddNewPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ packagesList @@ -90,7 +92,7 @@ IceTipAddNewPackagesDialogPresenter >> initializePackagesList [ contextMenu: [ (self rootCommandsGroup / 'package list commands') beRoot asMenuPresenter ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -108,49 +110,49 @@ Please select the packages if you wish to load them in the image'. self initializePackagesList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddNewPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages [ ^ selectedPackages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddNewPackagesDialogPresenter >> selectedPackages: anObject [ selectedPackages := anObject ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipAddNewPackagesDialogPresenter >> setModelBeforeInitialization: somePackages [ packages := somePackages ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> titleForWindow [ ^ 'Select New Packages to Load'. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddNewPackagesDialogPresenter >> updatePresenter [ packagesList items: packages ] -{ #category : #validation } +{ #category : 'validation' } IceTipAddNewPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPackageCommand.class.st b/Iceberg-TipUI/IceTipAddPackageCommand.class.st index b426fd154f..abb62edab1 100644 --- a/Iceberg-TipUI/IceTipAddPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPackageCommand.class.st @@ -2,24 +2,26 @@ Command that opens a dialog to add a/many package/s into the selected repository. " Class { - #name : #IceTipAddPackageCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddPackageCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultDescription [ ^ 'Adds an existing package to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPackageCommand class >> defaultName [ ^ 'Add package' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPackageCommand >> execute [ (IceTipAddPackagesDialogPresenter @@ -30,19 +32,19 @@ IceTipAddPackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackageCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPackageCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st index 94800447f8..4b476f9977 100644 --- a/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPackagesDialogPresenter.class.st @@ -2,18 +2,20 @@ I'm a dialog to add packages to a repository. " Class { - #name : #IceTipAddPackagesDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddPackagesDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'packagesList', 'packageNameText', 'selectedPackages' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddPackagesDialogPresenter >> accept [ "ensure window goes away (in case accept comes from a keybinding and not the ok button)" @@ -25,7 +27,7 @@ IceTipAddPackagesDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackages [ ^ RPackageOrganizer default packages @@ -33,7 +35,7 @@ IceTipAddPackagesDialogPresenter >> allPackages [ sort: [ :a :b | a name < b name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ | currentPackagesNames | @@ -42,7 +44,7 @@ IceTipAddPackagesDialogPresenter >> allPackagesNotRegistered [ currentPackagesNames includes: rPackage name ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPackagesDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,13 +53,13 @@ IceTipAddPackagesDialogPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> iconForWindow [ ^ self iconNamed: #branch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackageNameText [ packageNameText @@ -66,7 +68,7 @@ IceTipAddPackagesDialogPresenter >> initializePackageNameText [ whenTextChangedDo: [ :text | self refresh ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePackagesList [ packagesList addColumn: (SpCompositeTableColumn new @@ -86,7 +88,7 @@ IceTipAddPackagesDialogPresenter >> initializePackagesList [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> initializePresenters [ selectedPackages := OrderedCollection new. @@ -97,32 +99,32 @@ IceTipAddPackagesDialogPresenter >> initializePresenters [ self initializePackageNameText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> model: anObject [ model := anObject. self refresh ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packageNameText [ ^ packageNameText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddPackagesDialogPresenter >> packagesList [ ^ packagesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> refresh [ packagesList items: (packageNameText text @@ -135,31 +137,31 @@ IceTipAddPackagesDialogPresenter >> refresh [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> selectedPackage [ ^ packagesList selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> titleForWindow [ ^ 'Add packages' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPackagesDialogPresenter >> updatePresenter [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPackagesDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st index ff725f569e..0bda874a9b 100644 --- a/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddPlainTextCredentialCommand.class.st @@ -2,22 +2,24 @@ I create a new plaintext credential on the credential store. " Class { - #name : #IceTipAddPlainTextCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddPlainTextCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultDescription [ ^ 'Add a new plain text credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddPlainTextCredentialCommand class >> defaultName [ ^ 'Plain Text' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddPlainTextCredentialCommand >> execute [ ((IceTipAddPlaintextCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st index 34e65aa27d..9d957b8259 100644 --- a/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddPlaintextCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add plaintext credentials. " Class { - #name : #IceTipAddPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, + #name : 'IceTipAddPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -30,20 +32,20 @@ IceTipAddPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddPlaintextCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -54,13 +56,13 @@ IceTipAddPlaintextCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddPlaintextCredentialsPresenter >> isOkEnabled [ ^ super isOkEnabled and: [ self hostnameFromInput isNotEmpty ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Add new Plain Text Credential' diff --git a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st index 9664e8295b..4cf7dfdbe0 100644 --- a/Iceberg-TipUI/IceTipAddRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteCommand.class.st @@ -2,31 +2,33 @@ Command that opens a dialog to add a remote to a repository. " Class { - #name : #IceTipAddRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultDescription [ ^ 'Adds a remote to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRemoteCommand class >> defaultName [ ^ 'Add remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> canBeExecuted [ "Any repository can have more remotes." ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRemoteCommand >> execute [ (IceTipAddRemoteDialogPresenter @@ -37,13 +39,13 @@ IceTipAddRemoteCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteCommand >> iconName [ ^ #add ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRemoteCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st index a7e1f9eb46..a5964fae34 100644 --- a/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddRemoteDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog to add remotes to a repository. " Class { - #name : #IceTipAddRemoteDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipAddRemoteDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'nameLabel', @@ -12,10 +12,12 @@ Class { 'nameText', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> accept [ self validate. @@ -27,7 +29,7 @@ IceTipAddRemoteDialogPresenter >> accept [ ^ acceptBlock ifNotNil: [ acceptBlock cull: self remoteName ] ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddRemoteDialogPresenter >> defaultLayout [ ^ SpGridLayout new @@ -41,7 +43,7 @@ IceTipAddRemoteDialogPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -51,7 +53,7 @@ IceTipAddRemoteDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -70,73 +72,73 @@ IceTipAddRemoteDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> nameText [ ^ nameText ] -{ #category : #events } +{ #category : 'events' } IceTipAddRemoteDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteName [ ^ self nameText text trimmed ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRemoteDialogPresenter >> remoteUrl [ ^ self urlText text trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddRemoteDialogPresenter >> titleForWindow [ ^ 'Add remote' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlLabel [ ^ urlLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipAddRemoteDialogPresenter >> urlText [ ^ urlText ] -{ #category : #actions } +{ #category : 'actions' } IceTipAddRemoteDialogPresenter >> validate [ self diff --git a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st index 0aa7d9688d..0ac4f307df 100644 --- a/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipAddRepositoryCommand.class.st @@ -3,31 +3,33 @@ I register Iceberg projects. I will open a dialog to take the new possible repository (from available options) and I will register it into the IceRepository>>#registry list. " Class { - #name : #IceTipAddRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAddRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultDescription [ ^ 'Add a repository (new, local, cloned) to your managed repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddRepositoryCommand class >> defaultName [ ^ 'Add' ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddRepositoryCommand >> execute [ (IceTipRegisterRepositoryDialogPresenter newApplication: context application) @@ -36,19 +38,19 @@ IceTipAddRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> iconName [ ^ #add ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddRepositoryCommand >> shortcutKey [ ^ $n meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st index 57f671869e..0d5ea539bb 100644 --- a/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddSSHCredentialsPresenter.class.st @@ -2,22 +2,24 @@ I implement the dialog to add SSH credentials. " Class { - #name : #IceTipAddSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, + #name : 'IceTipAddSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', #instVars : [ 'hostLabel', 'hostInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAddSSHCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -31,20 +33,20 @@ IceTipAddSSHCredentialsPresenter >> defaultLayout [ add: passphraseLabel; add: passphraseInput; nextRow ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 7 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -57,7 +59,7 @@ IceTipAddSSHCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddSSHCredentialsPresenter >> newCredentials [ ^ IceSshCredentials new @@ -68,7 +70,7 @@ IceTipAddSSHCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddSSHCredentialsPresenter >> titleForWindow [ ^ 'Add SSH credential' diff --git a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st index db86f547fd..49a17d55b3 100644 --- a/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddSshCredentialCommand.class.st @@ -2,22 +2,24 @@ I add a new IceSshCredentials to the store " Class { - #name : #IceTipAddSshCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddSshCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultDescription [ ^ 'Add a SSH pair of credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddSshCredentialCommand class >> defaultName [ ^ 'SSH Pair' ] -{ #category : #execution } +{ #category : 'execution' } IceTipAddSshCredentialCommand >> execute [ ((IceTipAddSSHCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st index a1570d8283..6d47533e52 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialCommand.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipAddTokenCredentialCommand, - #superclass : #IceTipAbstractCredentialStoreCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAddTokenCredentialCommand', + #superclass : 'IceTipAbstractCredentialStoreCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultDescription [ ^ 'Add a new token credential' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAddTokenCredentialCommand class >> defaultName [ ^ 'Token' ] -{ #category : #executing } +{ #category : 'executing' } IceTipAddTokenCredentialCommand >> execute [ ((IceTipAddTokenCredentialsPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st index e6b33e71f7..c4931d633d 100644 --- a/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddTokenCredentialsPresenter.class.st @@ -2,8 +2,8 @@ I am a dialog to add token credentials. " Class { - #name : #IceTipAddTokenCredentialsPresenter, - #superclass : #IceTipAbstractCredentialsPresenter, + #name : 'IceTipAddTokenCredentialsPresenter', + #superclass : 'IceTipAbstractCredentialsPresenter', #instVars : [ 'hostInput', 'tokenInput', @@ -12,16 +12,18 @@ Class { 'usernameInput', 'usernameLabel' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> accept [ self acceptAddAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAddTokenCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -36,19 +38,19 @@ IceTipAddTokenCredentialsPresenter >> defaultLayout [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> hostnameFromInput [ ^ hostInput text ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ (self class inputTextHeight * 5 + self class buttonHeight)) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -80,7 +82,7 @@ IceTipAddTokenCredentialsPresenter >> initializePresenters [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipAddTokenCredentialsPresenter >> isOkEnabled [ ^ self usernameFromInput isNotEmpty and: [ @@ -88,7 +90,7 @@ IceTipAddTokenCredentialsPresenter >> isOkEnabled [ self tokenFromInput isNotEmpty ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> newCredentials [ ^ IceTokenCredentials new @@ -98,19 +100,19 @@ IceTipAddTokenCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAddTokenCredentialsPresenter >> titleForWindow [ ^ 'Add token credentials' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> tokenFromInput [ ^ tokenInput text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAddTokenCredentialsPresenter >> usernameFromInput [ ^ usernameInput text diff --git a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st index 7942ae2db3..f6c3ef79f8 100644 --- a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st @@ -5,37 +5,39 @@ I won't modify the loaded code, but will calculate the differences between the loaded packages and the new commit, to mark packages as dirty. " Class { - #name : #IceTipAdoptCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipAdoptCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipAdoptCommitCommand class >> defaultDescription [ ^ 'Sets this commit as the commit of your working copy. It will not modify your loaded code, but it will calculate the differences between your loaded packages and the the new commit to mark packages as dirty.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> defaultNameFromContext [ ^ 'Adopt commit ' , self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipAdoptCommitCommand >> execute [ self selectedCommitish adopt. Iceberg announcer announce: (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> iconName [ ^ #recoverLostChanges ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAdoptCommitCommand >> name [ "Answer the name for the command. In order to have a specialized string for certain parameters of the context, and given the fact that sometimes the context is nil (e.g. when a context menu is calculated when the selection is empty)." @@ -45,7 +47,7 @@ IceTipAdoptCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAdoptCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipAnnouncement.class.st b/Iceberg-TipUI/IceTipAnnouncement.class.st index dbdedd4dc5..e41c5c55a8 100644 --- a/Iceberg-TipUI/IceTipAnnouncement.class.st +++ b/Iceberg-TipUI/IceTipAnnouncement.class.st @@ -3,7 +3,9 @@ I'm a general announcement for Tip UI events. (the announcements happened here are just for UI consumption) " Class { - #name : #IceTipAnnouncement, - #superclass : #IceAnnouncement, - #category : #'Iceberg-TipUI-Announcements' + #name : 'IceTipAnnouncement', + #superclass : 'IceAnnouncement', + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } diff --git a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st index 365540a064..07247e0c33 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextCredentialsPresenter.class.st @@ -3,30 +3,32 @@ I implement the dialog to ask plaintext credentials. This dialog is used when the IceTipInteractiveCredentialsProvider needs to ask a plaintext credential. " Class { - #name : #IceTipAskForPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskForPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancel [ self cancelAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskForPlaintextCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -44,13 +46,13 @@ IceTipAskForPlaintextCredentialsPresenter >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (450 @ 180) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Please log in to ' , askingHostname diff --git a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st index eaa0b052c5..b288110683 100644 --- a/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskForPlaintextOtpCredentialsPresenter.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipAskForPlaintextOtpCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, + #name : 'IceTipAskForPlaintextOtpCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', #instVars : [ 'tokenLabel', 'tokenInput' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #layout } +{ #category : 'layout' } IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -26,13 +28,13 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 210) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ super initializePresenters. @@ -43,7 +45,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ ^ IcePlaintextOtpCredentials new @@ -53,7 +55,7 @@ IceTipAskForPlaintextOtpCredentialsPresenter >> newCredentials [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskForPlaintextOtpCredentialsPresenter >> token [ ^ tokenInput text diff --git a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st index a9c3aba0a3..b99c95dd5d 100644 --- a/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskGithubForPlaintextCredentialsPresenter.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipAskGithubForPlaintextCredentialsPresenter, - #superclass : #IceTipAskForPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskGithubForPlaintextCredentialsPresenter', + #superclass : 'IceTipAskForPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #private } +{ #category : 'private' } IceTipAskGithubForPlaintextCredentialsPresenter >> passwordLabel [ ^ 'Token:' diff --git a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st index 19347ecf1f..792093d429 100644 --- a/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAskSSHCredentialsPresenter.class.st @@ -2,24 +2,26 @@ I am a dialog to ask for SSH credentials. " Class { - #name : #IceTipAskSSHCredentialsPresenter, - #superclass : #IceTipEditSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipAskSSHCredentialsPresenter', + #superclass : 'IceTipEditSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> accept [ ^ self acceptAskAction ] -{ #category : #actions } +{ #category : 'actions' } IceTipAskSSHCredentialsPresenter >> cancelAction [ self cancelAskAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipAskSSHCredentialsPresenter >> newCredentials [ self refreshCredentialsFromPresenter. diff --git a/Iceberg-TipUI/IceTipBranchModel.class.st b/Iceberg-TipUI/IceTipBranchModel.class.st index b12d7e9824..bb754a13e1 100644 --- a/Iceberg-TipUI/IceTipBranchModel.class.st +++ b/Iceberg-TipUI/IceTipBranchModel.class.st @@ -2,17 +2,19 @@ I expose data of a branch. " Class { - #name : #IceTipBranchModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipBranchModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> checkoutStrategies [ ^ IceCheckoutStrategy allStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -24,12 +26,12 @@ IceTipBranchModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> commits [ self shouldBeImplemented. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> description [ ^ self entity isRemote @@ -37,49 +39,49 @@ IceTipBranchModel >> description [ ifFalse: [ self name ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> descriptionDecorator [ self entity isHead ifTrue: [ ^ IceTipDescriptionDecorator head ]. ^ super descriptionDecorator ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffFromHead [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> diffToWorkingCopy [ | commitModel | commitModel := IceTipCommitModel on: self entity commit. ^ commitModel diffToWorkingCopy ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> hasUpstream [ ^ entity hasUpstream ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isHead [ ^ self entity isHead ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchModel >> isLocal [ ^ self entity isLocal ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ @@ -91,7 +93,7 @@ IceTipBranchModel >> newCheckoutWithStrategyAction: aCheckoutStrategy [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDeleteAction [ @@ -103,7 +105,7 @@ IceTipBranchModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newDirectMergeAction [ @@ -115,7 +117,7 @@ IceTipBranchModel >> newDirectMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> newSwitchAndMergeAction [ @@ -127,7 +129,7 @@ IceTipBranchModel >> newSwitchAndMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before @@ -137,7 +139,7 @@ IceTipBranchModel >> previewCheckout [ (IceTipCheckoutPreviewBrowser onBranch: self) open ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchModel >> previewMerge: aMergeType [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" @@ -147,7 +149,7 @@ IceTipBranchModel >> previewMerge: aMergeType [ open ] -{ #category : #printing } +{ #category : 'printing' } IceTipBranchModel >> printOn: aStream [ super printOn: aStream. aStream @@ -156,12 +158,12 @@ IceTipBranchModel >> printOn: aStream [ nextPut: $] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipBranchModel >> resetToCommit: anIceTipCachedModel [ entity resetToCommit: anIceTipCachedModel entity diff --git a/Iceberg-TipUI/IceTipBranchPanel.class.st b/Iceberg-TipUI/IceTipBranchPanel.class.st index bd527e9559..223476e280 100644 --- a/Iceberg-TipUI/IceTipBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipBranchPanel.class.st @@ -3,22 +3,24 @@ I'm a generic panel to checkout panels. My children will define different strategies to checkout (select an existing branch -local or remote-, or enter a new branch name) " Class { - #name : #IceTipBranchPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipBranchPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipBranchPanel class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> accept [ self validate. @@ -26,49 +28,49 @@ IceTipBranchPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipBranchPanel >> doAccept [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipBranchPanel >> isNewBranch [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> model: anObject [ model := anObject ] -{ #category : #events } +{ #category : 'events' } IceTipBranchPanel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBranchPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBranchPanel >> validate [ ^ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipBrowseCommand.class.st b/Iceberg-TipUI/IceTipBrowseCommand.class.st index 4f1a7e77d5..0e0dcaef76 100644 --- a/Iceberg-TipUI/IceTipBrowseCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseCommand.class.st @@ -2,43 +2,45 @@ I'm a command to ""browse"" a change definition (method, class or package). " Class { - #name : #IceTipBrowseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultDescription [ ^ 'Browse the selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseCommand class >> defaultName [ ^ 'Browse...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowseCommand >> canBeExecuted [ "In the case of a method removal it is not possible to browse the selected element." ^ self hasSelectedItem and: [ self item value definition canBeBrowsed ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseCommand >> execute [ self item value definition browse ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowseCommand >> iconName [ ^ #smallSystemBrowser ] -{ #category : #activation } +{ #category : 'activation' } IceTipBrowseCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st index 25f9b31ca2..421c10e49f 100644 --- a/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowsePackageCommand.class.st @@ -2,36 +2,38 @@ Command that browses the selected package as it is loaded in the image. " Class { - #name : #IceTipBrowsePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowsePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultDescription [ ^ 'Browse the selected package as it is loaded in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowsePackageCommand class >> defaultName [ ^ 'Browse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowsePackageCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isPackageLoaded ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowsePackageCommand >> execute [ self packageModel browsePackage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowsePackageCommand >> shortcutKey [ ^ $b meta diff --git a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st index 47509f917b..94a27379a2 100644 --- a/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipBrowseRepositoryPackageVersionCommand.class.st @@ -4,24 +4,26 @@ Command that opens a browser on the code of the repository. The current implementation relies on a monticello MCSnapshotBrowser " Class { - #name : #IceTipBrowseRepositoryPackageVersionCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipBrowseRepositoryPackageVersionCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultDescription [ ^ 'Browse the version in the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipBrowseRepositoryPackageVersionCommand class >> defaultName [ ^ 'Browse this version in Monticello' ] -{ #category : #executing } +{ #category : 'executing' } IceTipBrowseRepositoryPackageVersionCommand >> execute [ self packageModel browseRepositoryVersion diff --git a/Iceberg-TipUI/IceTipBrowser.class.st b/Iceberg-TipUI/IceTipBrowser.class.st index dc8780dad2..1ed279f6d2 100644 --- a/Iceberg-TipUI/IceTipBrowser.class.st +++ b/Iceberg-TipUI/IceTipBrowser.class.st @@ -9,16 +9,18 @@ Some design remarks: * Browsers have a context menu on list or table items, that provide commands that are specific for the selection. " Class { - #name : #IceTipBrowser, - #superclass : #IceTipPresenter, + #name : 'IceTipBrowser', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'toolbar' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ | generalCommandGroup selectionCommandGroup selectionExtraCommandGroup | @@ -42,81 +44,81 @@ IceTipBrowser class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ self subclassResponsibility ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec. aCommandGroup register: IceFiletreeToTonelCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> generalCommandGroupName [ ^ 'General' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionCommandGroupName [ ^ 'Selection' ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser class >> selectionExtraCommandGroupName [ ^ 'Extra' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> connectPresenters [ self mainList whenSelectionChangedDo: [ self refreshCommands ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> defaultKeyboardFocus [ ^ self mainList ] -{ #category : #testing } +{ #category : 'testing' } IceTipBrowser >> hasSelectedItem [ ^ self mainList selection isEmpty not ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> iconForWindow [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -125,31 +127,31 @@ IceTipBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> refresh [ "Update the UI elements given a possible update in the model." ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshCommands [ | rootGroup | @@ -163,7 +165,7 @@ IceTipBrowser >> refreshCommands [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ "Update context menu (for mainList)." @@ -173,7 +175,7 @@ IceTipBrowser >> refreshMainListContextMenuWith: rootGroup [ self mainList contextMenuFromCommandsGroup: subgroup ]. ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshShortcutsWith: rootGroup [ "Update shortcuts with available commands" @@ -184,7 +186,7 @@ IceTipBrowser >> refreshShortcutsWith: rootGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipBrowser >> refreshToolbarWith: rootGroup [ "Update toolbar (in window)." @@ -208,31 +210,31 @@ IceTipBrowser >> refreshToolbarWith: rootGroup [ self window toolbar: toolbar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> repositoryModel [ "Answer the IceTipRepositoryModel associated to this presenter." ^ self model repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBrowser >> selectedItem [ "Answer the object selected in the main list of this browser. The answer is nil when there isn't a selection." ^ self mainList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBrowser >> subscribeToAnnouncements [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipBrowser >> toolbar [ ^ toolbar diff --git a/Iceberg-TipUI/IceTipCache.class.st b/Iceberg-TipUI/IceTipCache.class.st index 363621bbfd..cc06b437d3 100644 --- a/Iceberg-TipUI/IceTipCache.class.st +++ b/Iceberg-TipUI/IceTipCache.class.st @@ -5,70 +5,72 @@ I'm used to cache values to be used on the UI. I can be reseted (sending #reset), but responsibility of reset caches belongs to presenters who use them. " Class { - #name : #IceTipCache, - #superclass : #Object, + #name : 'IceTipCache', + #superclass : 'Object', #instVars : [ 'proxy', 'objects' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCache class >> proxy: aProxy [ ^ self new proxy: aProxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsent: anObject [ ^ objects at: aKey ifAbsent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifAbsentPut: anObject [ ^ objects at: aKey ifAbsentPut: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey ifPresent: anObject [ ^ objects at: aKey ifPresent: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> at: aKey put: anObject [ ^ objects at: aKey put: anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> initialize [ super initialize. self reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> objects [ ^ objects ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy [ ^ proxy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCache >> proxy: anObject [ proxy := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCache >> reset [ objects := SmallDictionary new ] diff --git a/Iceberg-TipUI/IceTipCachedModel.class.st b/Iceberg-TipUI/IceTipCachedModel.class.st index f69b645173..b522f0299b 100644 --- a/Iceberg-TipUI/IceTipCachedModel.class.st +++ b/Iceberg-TipUI/IceTipCachedModel.class.st @@ -4,28 +4,30 @@ I take all unary messages sent to my realObject and I cache their values. I keep a cache with rules for reset it, which can be accessedon the #resetOn: family of messages. " Class { - #name : #IceTipCachedModel, - #superclass : #Object, + #name : 'IceTipCachedModel', + #superclass : 'Object', #instVars : [ 'realObject', 'cache' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCachedModel class >> for: anObject [ ^ self basicNew initializeObject: anObject ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> = aObject [ self species ~= aObject species ifTrue: [ ^ false ]. ^ self realObject = aObject realObject ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> doesNotUnderstand: aMessage [ aMessage selector isUnary ifTrue: [ @@ -42,27 +44,27 @@ IceTipCachedModel >> doesNotUnderstand: aMessage [ ^ self forwardMessage: aMessage ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipCachedModel >> forwardMessage: aMessage [ ^ realObject perform: aMessage selector withArguments: aMessage arguments ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipCachedModel >> hash [ ^ self realObject hash ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCachedModel >> initializeObject: anObject [ realObject := anObject. cache := IceTipCache proxy: self. self initialize ] -{ #category : #printing } +{ #category : 'printing' } IceTipCachedModel >> printOn: aStream [ super printOn: aStream. aStream nextPut: $(. @@ -70,12 +72,12 @@ IceTipCachedModel >> printOn: aStream [ aStream nextPut: $) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> realObject [ ^ realObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCachedModel >> reset [ cache reset ] diff --git a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st index b7408e9fe8..d188d62fe5 100644 --- a/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipCalculateDirtyPackagesCommand.class.st @@ -2,25 +2,27 @@ I'm a command that makes a working copy to recalculate the dirty packages (via #forceCalculateDirtyPackages). " Class { - #name : #IceTipCalculateDirtyPackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCalculateDirtyPackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCalculateDirtyPackagesCommand class >> defaultName [ ^ 'Recalculate dirty packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCalculateDirtyPackagesCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipCalculateDirtyPackagesCommand >> execute [ IceTipStandardAction new @@ -31,7 +33,7 @@ IceTipCalculateDirtyPackagesCommand >> execute [ executeWithContext: context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCalculateDirtyPackagesCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st index f846b99bd8..790e79a87f 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchCommand.class.st @@ -2,36 +2,38 @@ Command that opens a dialog to checkout a (new or already existing) branch. " Class { - #name : #IceTipCheckoutBranchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutBranchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultDescription [ ^ 'Checkout a new or existing branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutBranchCommand class >> defaultToolbarItemName [ ^ 'Branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutBranchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutBranchCommand >> execute [ (IceTipCheckoutBranchDialog @@ -42,7 +44,7 @@ IceTipCheckoutBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st index 8371ddd3c5..4c0ac85745 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchDialog.class.st @@ -4,28 +4,30 @@ I'm a dialog to perform a checkout of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipCheckoutBranchDialog, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipCheckoutBranchDialog', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutBranchDialog class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> allTypes [ ^ types ifNil: [ types := self createCheckoutBranchTypes ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ | allTypes | @@ -49,50 +51,50 @@ IceTipCheckoutBranchDialog >> createCheckoutBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchDialog >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> model [ ^ model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutBranchDialog >> titleForWindow [ ^ 'Checkout branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withOnlyNewBranch [ types := self allTypes select: #isNewBranch. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withTypes: aCollection [ types := aCollection. typeList items: types. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutBranchDialog >> withoutNewBranch [ types := self allTypes reject: #isNewBranch. typeList items: types. diff --git a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st index a03e98d39b..69d4df247d 100644 --- a/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutBranchPanel.class.st @@ -2,12 +2,14 @@ I'm a panel to peform the checkout of an existing branch. " Class { - #name : #IceTipCheckoutBranchPanel, - #superclass : #IceTipExistingBranchPanel, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipCheckoutBranchPanel', + #superclass : 'IceTipExistingBranchPanel', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutBranchPanel >> doAccept [ self selectedBranch previewCheckout diff --git a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st index 69cc6b43da..410e447df7 100644 --- a/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutCommitCommand.class.st @@ -3,37 +3,39 @@ I checkout a specific commit from history. I will let your repository in detach mode! " Class { - #name : #IceTipCheckoutCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultDescription [ ^ 'Set the selected commit as current commit and load the code in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutCommitCommand class >> defaultName [ ^ 'Checkout' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutCommitCommand >> execute [ (IceTipCheckoutPreviewBrowser onBranch: self selectedCommit) open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> iconName [ ^ #refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutCommitCommand >> selectedCommit [ ^ self context selectedCommit diff --git a/Iceberg-TipUI/IceTipCheckoutModel.class.st b/Iceberg-TipUI/IceTipCheckoutModel.class.st index 50cdb34b4a..c1290c529e 100644 --- a/Iceberg-TipUI/IceTipCheckoutModel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipCheckoutModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipCheckoutModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'checkoutStrategy', 'checkoutStrategies' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> calculateDiff [ ^ commitish entity diffTo: self repository workingCopy ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> checkout [ checkoutStrategy @@ -24,30 +26,30 @@ IceTipCheckoutModel >> checkout [ self commitish checkout: checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategies [ ^ checkoutStrategies ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy [ ^ checkoutStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> checkoutStrategy: aStrategy [ checkoutStrategy := aStrategy ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutModel >> hasNewPackages [ ^ diffModel tree anySatisfy:[ :aNode | aNode isAddition and: [ aNode definition isPackageDefinition]] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutModel >> initialize [ super initialize. @@ -55,7 +57,7 @@ IceTipCheckoutModel >> initialize [ checkoutStrategy := checkoutStrategies first. ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutModel >> newCheckoutAction [ @@ -67,7 +69,7 @@ IceTipCheckoutModel >> newCheckoutAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutModel >> newPackages [ | packageNodes | diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st index e7fa896dcc..c1ba72ea9d 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchCommand.class.st @@ -3,24 +3,26 @@ Action to start the creation of a new branch from the selected commit. Then checkout the selected branch. " Class { - #name : #IceTipCheckoutNewBranchCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutNewBranchCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultDescription [ ^ 'Create a new branch from the selected commit and switch to it' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutNewBranchCommand class >> defaultName [ ^ 'Branch...' ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutNewBranchCommand >> execute [ ((IceTipCheckoutNewBranchPanel @@ -33,13 +35,13 @@ IceTipCheckoutNewBranchCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> iconName [ ^ #branch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchCommand >> selectedCommit [ ^ self item entity diff --git a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st index fc93346154..c902606842 100644 --- a/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipCheckoutNewBranchPanel.class.st @@ -2,8 +2,8 @@ I'm a panel to create a new local branch " Class { - #name : #IceTipCheckoutNewBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipCheckoutNewBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'currentBranchLabel', 'branchLabel', @@ -11,40 +11,42 @@ Class { 'branchCommitish', 'callback' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchInputText [ ^ branchInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> branchLabel [ ^ branchLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> branchName [ ^ self branchInputText text asString trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> commitish: anIceTipModel [ branchCommitish := anIceTipModel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutNewBranchPanel >> currentBranchLabel [ ^ currentBranchLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutNewBranchPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -60,7 +62,7 @@ IceTipCheckoutNewBranchPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutNewBranchPanel >> doAccept [ (self model @@ -72,26 +74,26 @@ IceTipCheckoutNewBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializeCurrentBranchLabel [ currentBranchLabel := self newLabel label: 'Current branch: ', self model branchName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -103,13 +105,13 @@ IceTipCheckoutNewBranchPanel >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutNewBranchPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> openDialog [ ^ self asDialogWindow @@ -117,13 +119,13 @@ IceTipCheckoutNewBranchPanel >> openDialog [ open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutNewBranchPanel >> titleForWindow [ ^ 'New branch' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutNewBranchPanel >> validate [ self @@ -134,7 +136,7 @@ IceTipCheckoutNewBranchPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCheckoutNewBranchPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st index 6757094f5f..7ce1870ee7 100644 --- a/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCheckoutPreviewBrowser.class.st @@ -4,23 +4,25 @@ I preview the changes that will be introduced in the image when a checkout occur (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipCheckoutPreviewBrowser, - #superclass : #IceTipPreviewBrowser, + #name : 'IceTipCheckoutPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', #instVars : [ 'checkoutStrategyLabel', 'checkoutStrategyList', 'selectedCheckoutStrategy' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipCheckoutPreviewBrowser class >> maxBranchNameLength [ ^ 32 ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipCheckoutModel new @@ -28,19 +30,19 @@ IceTipCheckoutPreviewBrowser class >> onBranch: aBranch [ yourself) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyLabel [ ^ checkoutStrategyLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCheckoutPreviewBrowser >> checkoutStrategyList [ ^ checkoutStrategyList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCheckoutPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -57,7 +59,7 @@ IceTipCheckoutPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCheckoutPreviewBrowser >> doCheckout [ (self model hasNewPackages and: [ self model checkoutStrategy isLoadAlreadyLoadedStrategy ]) @@ -69,7 +71,7 @@ IceTipCheckoutPreviewBrowser >> doCheckout [ executeWithContext: self ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ | checkoutStrategies | @@ -81,7 +83,7 @@ IceTipCheckoutPreviewBrowser >> initializeCheckoutStrategyList [ self model checkoutStrategy: aStrategy ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -96,7 +98,7 @@ IceTipCheckoutPreviewBrowser >> initializePresenters [ self initializeCheckoutStrategyList ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCheckoutPreviewBrowser >> newActionButton [ ^ self newButton @@ -107,7 +109,7 @@ IceTipCheckoutPreviewBrowser >> newActionButton [ yourself ] -{ #category : #operations } +{ #category : 'operations' } IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ ((IceTipAddNewPackagesDialogPresenter @@ -120,13 +122,13 @@ IceTipCheckoutPreviewBrowser >> openAddNewPackagesDialog [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutPreviewBrowser >> selectedCheckoutStrategy [ ^ selectedCheckoutStrategy ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCheckoutPreviewBrowser >> titleForWindow [ ^ 'Preview checkout of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st index 2dbcfef159..5e9ecbb7d4 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedBranchCommand.class.st @@ -2,36 +2,38 @@ Command that checks out the selected branch " Class { - #name : #IceTipCheckoutSelectedBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultDescription [ ^ 'Checkout this branch' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedBranchCommand class >> defaultName [ ^ 'Checkout branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedBranchCommand >> actsOnBranch: aBranchModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedBranchCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedBranchCommand >> iconName [ ^ #branch ] diff --git a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st index c1d25d3348..4d2092de3c 100644 --- a/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCheckoutSelectedTagCommand.class.st @@ -2,35 +2,37 @@ Command that checks out the selected tag " Class { - #name : #IceTipCheckoutSelectedTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCheckoutSelectedTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultDescription [ ^ 'Checkout this tag for this repository. Repository will then be in Detached Head state!' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCheckoutSelectedTagCommand class >> defaultName [ ^ 'Checkout tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCheckoutSelectedTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipCheckoutSelectedTagCommand >> execute [ self item previewCheckout ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCheckoutSelectedTagCommand >> iconName [ ^ #branch diff --git a/Iceberg-TipUI/IceTipCherryPickCommand.class.st b/Iceberg-TipUI/IceTipCherryPickCommand.class.st index 373462f0e1..d93f271031 100644 --- a/Iceberg-TipUI/IceTipCherryPickCommand.class.st +++ b/Iceberg-TipUI/IceTipCherryPickCommand.class.st @@ -2,38 +2,40 @@ Generic command to cherry pick changes " Class { - #name : #IceTipCherryPickCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCherryPickCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultDescription [ ^ 'Cherrypick this commit and apply changes to the working copy' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCherryPickCommand class >> defaultName [ ^ 'Cherrypick' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCherryPickCommand >> canBeExecuted [ self flag: #pharoTodo. "TODO: Still not ready" ^ false ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> execute [ (IceTipCherrypickPreviewBrowser onCommitish: self selectedCommitish) open ] -{ #category : #executing } +{ #category : 'executing' } IceTipCherryPickCommand >> selectedCommitish [ ^ self context selectedCommit realObject entity diff --git a/Iceberg-TipUI/IceTipCherrypickModel.class.st b/Iceberg-TipUI/IceTipCherrypickModel.class.st index b3ec970b3a..125c2afe8c 100644 --- a/Iceberg-TipUI/IceTipCherrypickModel.class.st +++ b/Iceberg-TipUI/IceTipCherrypickModel.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceTipCherrypickModel, - #superclass : #IceTipModel, + #name : 'IceTipCherrypickModel', + #superclass : 'IceTipModel', #instVars : [ 'mergeTree', 'commitish' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickModel class >> onCommitish: aCommitish [ ^ self new @@ -16,33 +18,33 @@ IceTipCherrypickModel class >> onCommitish: aCommitish [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish [ ^commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> commitish: aCommistish [ commitish := aCommistish. mergeTree := commitish repository cherryPickFrom: aCommistish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> diff [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> mergeTree [ ^mergeTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> repository [ ^commitish repository. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickModel >> treeToShow [ " Return the tree to display in windows " ^ self mergeTree diff --git a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st index 71727fdcec..42dd79ac32 100644 --- a/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipCherrypickPreviewBrowser.class.st @@ -1,39 +1,41 @@ Class { - #name : #IceTipCherrypickPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCherrypickPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'buttonBar' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipCherrypickPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCherrypickPreviewBrowser class >> onCommitish: aCommitish [ ^ self on: (IceTipCherrypickModel onCommitish: aCommitish) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> buttonBar [ ^ buttonBar ] -{ #category : #layout } +{ #category : 'layout' } IceTipCherrypickPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,13 +44,13 @@ IceTipCherrypickPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipCherrypickPreviewBrowser >> doCherryPick [ | root | @@ -58,13 +60,13 @@ IceTipCherrypickPreviewBrowser >> doCherryPick [ self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel := self @@ -76,20 +78,20 @@ IceTipCherrypickPreviewBrowser >> initializePresenters [ diffPanel rightLabel: ' With Cherrypicked commit ' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCherrypickPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCherrypickPreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipCherrypickPreviewBrowser >> newActionButton [ ^ self newButton @@ -100,7 +102,7 @@ IceTipCherrypickPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCherrypickPreviewBrowser >> titleForWindow [ ^ 'Preview result of Cherrypick' diff --git a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st index bf24223abd..d97c3a3ad8 100644 --- a/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st +++ b/Iceberg-TipUI/IceTipCleanCommandGroupVisitor.class.st @@ -3,18 +3,20 @@ I'm a CmVisitor that in one hand, tells each command to be hidden if it can't be " Class { - #name : #IceTipCleanCommandGroupVisitor, - #superclass : #CmVisitor, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCleanCommandGroupVisitor', + #superclass : 'CmVisitor', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommand: aCmCommand [ aCmCommand beHiddenWhenCantBeRun ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipCleanCommandGroupVisitor >> visitCommandGroup: aCmCommandsGroup [ super visitCommandGroup: aCmCommandsGroup. diff --git a/Iceberg-TipUI/IceTipCommand.class.st b/Iceberg-TipUI/IceTipCommand.class.st index 5df99320f2..bd90248921 100644 --- a/Iceberg-TipUI/IceTipCommand.class.st +++ b/Iceberg-TipUI/IceTipCommand.class.st @@ -2,31 +2,33 @@ I'm the superclass of all commands of the IceTip UI. " Class { - #name : #IceTipCommand, - #superclass : #CmCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommand', + #superclass : 'CmCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommand class >> defaultToolbarItemName [ ^ self defaultName ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand class >> isAbstract [ ^ self == IceTipCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> application [ ^ SpApplication defaultApplication ] -{ #category : #converting } +{ #category : 'converting' } IceTipCommand >> asSpecCommand [ | spCommand | @@ -45,31 +47,31 @@ IceTipCommand >> asSpecCommand [ ^ spCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> badge [ "Answer a number as extra information in the button. An answer of nil means no information." ^ nil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasRepository [ ^ self repositoryModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasSelectedItem [ ^ self context selectedItem notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> hasUnbornProject [ ^ self repositoryModel hasUnbornProject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> iconName [ "Answer the icon name (a Symbol) for this command." @@ -77,13 +79,13 @@ IceTipCommand >> iconName [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryDetached [ ^ self repositoryModel isNil or: [ self repositoryModel isDetached ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryMissing [ ^ self hasRepository and: [ @@ -91,32 +93,32 @@ IceTipCommand >> isRepositoryMissing [ self repositoryModel isCodeMissing ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> isRepositoryOperational [ ^ self isRepositoryMissing not and: [ self isRepositoryDetached not and: [ self hasUnbornProject not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommand >> item [ ^ self context selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> repositoryModel [ ^ self context repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> shortcutKey [ "Answer the key combination to execute this command. Answer nil if there isn't a key combination." @@ -124,31 +126,31 @@ IceTipCommand >> shortcutKey [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> tool [ ^ self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolAnnouncer [ ^ self tool announcer ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> toolbarItemName [ ^ self class defaultToolbarItemName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommand >> withErrorHandlingDo: aBlock [ aBlock diff --git a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st index 43fac26d0a..e1963c220c 100644 --- a/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st +++ b/Iceberg-TipUI/IceTipCommandToPresenterBuildingStrategy.class.st @@ -4,18 +4,20 @@ I'm an abstract strategy to build Spec2 buttons wrapping a IceTipSpCommand. My c " Class { - #name : #IceTipCommandToPresenterBuildingStrategy, - #superclass : #Object, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipCommandToPresenterBuildingStrategy', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipCommandToPresenterBuildingStrategy >> buttonPresenterClass [ ^ self subclassResponsibility ] -{ #category : #public } +{ #category : 'public' } IceTipCommandToPresenterBuildingStrategy >> resultOn: aCommand [ ^ self buttonPresenterClass new diff --git a/Iceberg-TipUI/IceTipCommentPanel.class.st b/Iceberg-TipUI/IceTipCommentPanel.class.st index 77166b9f7b..49adb26e1c 100644 --- a/Iceberg-TipUI/IceTipCommentPanel.class.st +++ b/Iceberg-TipUI/IceTipCommentPanel.class.st @@ -3,8 +3,8 @@ I'm a comment panel. I can obtain a comment text and certain ""commit specific"" options. " Class { - #name : #IceTipCommentPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCommentPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'repositoryModel', 'commentText', @@ -15,34 +15,36 @@ Class { 'fixesLabel', 'optionsButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> clear [ commentText text: '' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commentText [ ^ commentText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> commitButton [ ^ commitButton ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommentPanel >> defaultLayout [ self flag: #pharoTodo. "FIXES ISSUE NUMBER INPUT is disabled. See below. @@ -63,19 +65,19 @@ IceTipCommentPanel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesField [ ^ fixesField ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> fixesLabel [ ^ fixesLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> initializePresenters [ | fixesHelpString | @@ -132,25 +134,25 @@ IceTipCommentPanel >> initializePresenters [ yourself) ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isPushing [ ^ IceTipCommitSettings pushOnCommit and: [ self repositoryModel branchModel hasUpstream ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isRunningCriticsOnCommit [ ^ IceTipCommitSettings critiquesOnCommit ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommentPanel >> isSaving [ ^ IceTipCommitSettings saveImageOnCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> message [ self fixesField text isAllDigits ifFalse: [ @@ -163,7 +165,7 @@ IceTipCommentPanel >> message [ nextPutAll: self fixesField number asString ] ] -{ #category : #events } +{ #category : 'events' } IceTipCommentPanel >> onCommit: aBlock [ commitButton action: [ @@ -172,62 +174,62 @@ IceTipCommentPanel >> onCommit: aBlock [ cull: self isPushing ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommentPanel >> pushCheckbox [ ^ pushCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> pushOnCommit: aBoolean [ IceTipCommitSettings pushOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> refresh [ commitButton help: ('Commit your changes to {1}' format: { self repositoryName }). pushCheckbox label: ('Push changes to {1}' format: { self repositoryRemoteName }) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> repositoryModel [ ^ repositoryModel ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceTipCommentPanel >> repositoryRemoteName [ ^ self repositoryModel pushRemoteName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> runCriticsOnCommit: aBoolean [ IceTipCommitSettings critiquesOnCommit: aBoolean ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommentPanel >> saveOnCommit: aBoolean [ IceTipCommitSettings saveImageOnCommit: aBoolean ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommentPanel >> setModelBeforeInitialization: aRepositoryModel [ repositoryModel := aRepositoryModel ] -{ #category : #specs } +{ #category : 'specs' } IceTipCommentPanel >> titleForWindow [ ^ 'Comment' diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index 094b708f93..de9362e209 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -2,17 +2,19 @@ I perform a commit " Class { - #name : #IceTipCommitAction, - #superclass : #IceTipAction, + #name : 'IceTipCommitAction', + #superclass : 'IceTipAction', #instVars : [ 'diff', 'items', 'message' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipCommitAction >> basicExecute [ self validateCanCommit. UIManager default @@ -25,49 +27,49 @@ IceTipCommitAction >> basicExecute [ Iceberg announcer announce: (IceCommited for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> diff: anObject [ diff := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items [ ^ items ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> items: anObject [ items := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitAction >> message: anObject [ message := anObject ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateCanCommit [ self validateMessageNotEmpty ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateChangeListNotEmpty [ "If there are no selected changed, no point on commiting :)" items ifEmpty: [ IceNothingToCommit signal ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipCommitAction >> validateMessageNotEmpty [ self message ifEmpty: [ IceNoCommitMessage signal ] ] diff --git a/Iceberg-TipUI/IceTipCommitBrowser.class.st b/Iceberg-TipUI/IceTipCommitBrowser.class.st index f03933e7a0..f763966e4f 100644 --- a/Iceberg-TipUI/IceTipCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCommitBrowser.class.st @@ -4,23 +4,25 @@ I'm a browser to commit changes to a repository. (self onRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipCommitBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCommitBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'commentPanel', 'saveAction' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipRefreshCommitCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -37,31 +39,31 @@ IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCom ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipCommitBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> accept [ ^ self doCommit ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel [ ^ commentPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> commentPanel: aSpPresenter [ commentPanel := aSpPresenter ] -{ #category : #layout } +{ #category : 'layout' } IceTipCommitBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,25 +73,25 @@ IceTipCommitBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> diffPanel: aSpPresenter [ diffPanel := aSpPresenter ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCollapseSelection [ diffPanel doCollapseSelection ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit [ | selectedItems message isPushing isSaving commitBlock| @@ -111,7 +113,7 @@ IceTipCommitBrowser >> doCommit [ openIfCritiques ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBoolean saving: savingBoolean [ self model newCommitAction @@ -127,26 +129,26 @@ IceTipCommitBrowser >> doCommit: aCollection message: aString pushing: pushingBo executeWithContext: self ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitBrowser >> doExpandSelection [ diffPanel doExpandSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initialize [ super initialize. saveAction := IceTipSaveImageAction new ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeAcceptShortcut [ self @@ -159,7 +161,7 @@ IceTipCommitBrowser >> initializeAcceptShortcut [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffSelectingPanel on: self model workingCopyDiff. @@ -172,27 +174,27 @@ IceTipCommitBrowser >> initializePresenters [ self initializeAcceptShortcut ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCommitBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> refresh [ diffPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) @@ -201,13 +203,13 @@ IceTipCommitBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitBrowser >> saveAction: anAction [ saveAction := anAction ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> subscribeToAnnouncements [ self announcer @@ -216,7 +218,7 @@ IceTipCommitBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitBrowser >> titleForWindow [ ^ 'Commit on {1} branch {2}' format: { @@ -224,7 +226,7 @@ IceTipCommitBrowser >> titleForWindow [ self model branchName } ] -{ #category : #private } +{ #category : 'private' } IceTipCommitBrowser >> verifyNeedsRefreshOrClose [ "Verifies if there are remaining changes to commit. In case there are none, close the window." diff --git a/Iceberg-TipUI/IceTipCommitCommand.class.st b/Iceberg-TipUI/IceTipCommitCommand.class.st index 8020364cbb..2f4e759cfa 100644 --- a/Iceberg-TipUI/IceTipCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipCommitCommand.class.st @@ -2,30 +2,32 @@ I open a the commit window, with all latest changes. " Class { - #name : #IceTipCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultDescription [ ^ 'Commit changes to this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCommitCommand class >> defaultName [ ^ 'Commit' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipCommitCommand >> execute [ (IceTipCommitBrowser @@ -34,13 +36,13 @@ IceTipCommitCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> iconName [ ^ #smallOk ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitCommand >> shortcutKey [ ^ $s meta diff --git a/Iceberg-TipUI/IceTipCommitDiffModel.class.st b/Iceberg-TipUI/IceTipCommitDiffModel.class.st index c9b056036f..4265e1cb76 100644 --- a/Iceberg-TipUI/IceTipCommitDiffModel.class.st +++ b/Iceberg-TipUI/IceTipCommitDiffModel.class.st @@ -3,12 +3,14 @@ I'm a ""static"" diff. I represent a diff between two concrete commits. " Class { - #name : #IceTipCommitDiffModel, - #superclass : #IceTipDiffModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitDiffModel', + #superclass : 'IceTipDiffModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitDiffModel >> diff [ ^ self entity ] diff --git a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st index 55ac9d5b45..43aa07baaf 100644 --- a/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st +++ b/Iceberg-TipUI/IceTipCommitInfoPresenter.class.st @@ -4,8 +4,8 @@ I'm a panel to show the history of a commitish (usually a branch or a tag). I di I'm usually used as part of an IceTipHistoryBrowser. " Class { - #name : #IceTipCommitInfoPresenter, - #superclass : #SpPresenter, + #name : 'IceTipCommitInfoPresenter', + #superclass : 'SpPresenter', #instVars : [ 'model', 'selectedModel', @@ -16,10 +16,12 @@ Class { 'headPage', 'ancestorPage' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #layout } +{ #category : 'layout' } IceTipCommitInfoPresenter class >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -27,21 +29,21 @@ IceTipCommitInfoPresenter class >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForCommit [ headTabContainer := IceTipHistoryDiffFromHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> beForMerge [ headTabContainer := IceTipHistoryDiffToHead tab: headPage. ancestorTabContainer := IceTipHistoryDiffToAncestor tab: ancestorPage ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> commitInfo [ selectedModel ifNil: [ ^ self newEmpty ]. @@ -50,28 +52,28 @@ IceTipCommitInfoPresenter >> commitInfo [ application: self application ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromAncestor [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (ancestorTabContainer diffFor: selectedModel) ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> diffFromHead [ selectedModel ifNil: [ ^ self newEmpty ]. ^ IceTipDiffPanel on: (headTabContainer diffFor: selectedModel) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initialize [ self beForCommit. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -87,14 +89,14 @@ IceTipCommitInfoPresenter >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> initializePresenters [ notebookPanel := self newNotebook. self initializeCommitPanel ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newDiffPage [ ^ SpNotebookPage @@ -103,7 +105,7 @@ IceTipCommitInfoPresenter >> newDiffPage [ provider: [ "It will be overriden" ] ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newEmpty [ ^ self newLabel @@ -111,7 +113,7 @@ IceTipCommitInfoPresenter >> newEmpty [ yourself ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipCommitInfoPresenter >> newInfoPage [ ^ SpNotebookPage @@ -120,7 +122,7 @@ IceTipCommitInfoPresenter >> newInfoPage [ provider: [ self commitInfo ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> refresh [ selectedModel ifNil: [ ^ self ]. @@ -130,38 +132,38 @@ IceTipCommitInfoPresenter >> refresh [ notebookPanel resetAllPageContents ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestor [ ancestorTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromAncestorLabel [ ancestorTabContainer updateLabelOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHead [ headTabContainer updateContentsOn: selectedModel ] -{ #category : #private } +{ #category : 'private' } IceTipCommitInfoPresenter >> refreshDiffFromHeadLabel [ headTabContainer updateLabelOn: selectedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitInfoPresenter >> selectedModel: aModel [ selectedModel := aModel. self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCommitInfoPresenter >> setModelBeforeInitialization: anObject [ model := anObject diff --git a/Iceberg-TipUI/IceTipCommitModel.class.st b/Iceberg-TipUI/IceTipCommitModel.class.st index 661a5e0c07..dc14b81d9e 100644 --- a/Iceberg-TipUI/IceTipCommitModel.class.st +++ b/Iceberg-TipUI/IceTipCommitModel.class.st @@ -2,42 +2,44 @@ I'm a model for IceCommit entries. " Class { - #name : #IceTipCommitModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitModel', + #superclass : 'IceTipCommitishModel', #traits : 'TIceCopyCommitId', #classTraits : 'TIceCopyCommitId classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceTipCommitModel >> adopt [ self entity adopt ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortId [ ^ self entity ancestors first shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestorShortIdOrOrigin [ ^ self entity ancestors ifNotEmpty: [ self ancestorShortId ] ifEmpty: [ 'Origin' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> ancestors [ ^ self entity ancestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> author [ ^ self entity author ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> calculateDiff: aBlock [ | diff | @@ -50,18 +52,18 @@ IceTipCommitModel >> calculateDiff: aBlock [ ^ diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> comment [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> commitModels [ | commits | commits := OrderedCollection new. @@ -73,18 +75,18 @@ IceTipCommitModel >> commitModels [ ^ commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> datetime [ ^ self entity datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> description [ ^ self entity comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromFirstAncestor [ | diff ancestorCommit | @@ -97,7 +99,7 @@ IceTipCommitModel >> diffFromFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffFromHead [ | head diff | @@ -108,7 +110,7 @@ IceTipCommitModel >> diffFromHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToFirstAncestor [ | diff ancestorCommit | @@ -121,7 +123,7 @@ IceTipCommitModel >> diffToFirstAncestor [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToHead [ | head diff | @@ -132,7 +134,7 @@ IceTipCommitModel >> diffToHead [ on: diff ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> diffToWorkingCopy [ | diff | diff := self calculateDiff: [ self entity diffToWorkingCopy ]. @@ -141,18 +143,18 @@ IceTipCommitModel >> diffToWorkingCopy [ on: diff ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> hasMultipleAncestors [ ^ self entity hasMultipleAncestors ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> id [ ^ self entity id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> info [ ^ {('Commit:' -> ('[' , self shortId , '] ' , self id)). ('Parents:' -> (self entity ancestors collect: #shortId) asCommaString). @@ -162,12 +164,12 @@ IceTipCommitModel >> info [ ('Comment:' -> self entity comment)} ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitModel >> isMerged [ ^ self entity isMerged ] -{ #category : #private } +{ #category : 'private' } IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ ^ (IceTipCommitRangeModel repositoryModel: self repositoryModel @@ -176,44 +178,44 @@ IceTipCommitModel >> mergeHistoryFromAncestor: anIceGitCommit [ beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipCommitModel >> mergeHistoryFromSecondAncestor [ ^ self mergeHistoryFromAncestor: self entity ancestors second ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> name [ ^ self entity description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> shortId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagDecorator [ ^ IceTipTagDecorator uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagNames [ ^ self entity tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> tagsDescription [ ^ ', ' join: self tagNames ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitModel >> timeStamp [ ^ self entity timeStamp ] diff --git a/Iceberg-TipUI/IceTipCommitRangeModel.class.st b/Iceberg-TipUI/IceTipCommitRangeModel.class.st index 7672e2d0dd..b0c9f2c5dd 100644 --- a/Iceberg-TipUI/IceTipCommitRangeModel.class.st +++ b/Iceberg-TipUI/IceTipCommitRangeModel.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipCommitRangeModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipCommitRangeModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'toCommit' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> commitModels [ ^ (self fromCommit newCommitWalk uptoCommit: self toCommit) commits collect: [ :each | @@ -18,24 +20,24 @@ IceTipCommitRangeModel >> commitModels [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> fromCommit [ ^ self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> name [ ^ 'Commits from {1} to {2}' format: { self fromCommit shortId. self toCommit shortId } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit [ ^ toCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitRangeModel >> toCommit: anObject [ toCommit := anObject ] diff --git a/Iceberg-TipUI/IceTipCommitishModel.class.st b/Iceberg-TipUI/IceTipCommitishModel.class.st index d861e067e4..608716641e 100644 --- a/Iceberg-TipUI/IceTipCommitishModel.class.st +++ b/Iceberg-TipUI/IceTipCommitishModel.class.st @@ -3,35 +3,37 @@ I'm a base model for all commitish models to be used. I can provide #commitModels which changes depending on concrete model. " Class { - #name : #IceTipCommitishModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipCommitishModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitId [ ^ self entity commit id ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> commitModels [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipCommitishModel >> isCommitish [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> shortCommitId [ ^ self entity shortId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCommitishModel >> tagModels [ ^ self repositoryModel tagModels diff --git a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st index 34a2e6480d..3806ee454a 100644 --- a/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st +++ b/Iceberg-TipUI/IceTipCopyCommitishCommand.class.st @@ -2,36 +2,38 @@ Command that copies the selected entity short commit ID to the clipboard " Class { - #name : #IceTipCopyCommitishCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCopyCommitishCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultDescription [ ^ 'Copy the selected short commit ID (7 characters long) to the clipboard' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCopyCommitishCommand class >> defaultName [ ^ 'Copy commitish ID' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCopyCommitishCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item commitId isNotNil ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipCopyCommitishCommand >> execute [ self item copyCommitIDToClipboard ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCopyCommitishCommand >> iconName [ ^ #book diff --git a/Iceberg-TipUI/IceTipCreateTagCommand.class.st b/Iceberg-TipUI/IceTipCreateTagCommand.class.st index 025f5e7a76..9d82bf01e3 100644 --- a/Iceberg-TipUI/IceTipCreateTagCommand.class.st +++ b/Iceberg-TipUI/IceTipCreateTagCommand.class.st @@ -2,30 +2,32 @@ I an a commander command that will be activated on any commitish or repository and ask the selected item to create a tag on itself. " Class { - #name : #IceTipCreateTagCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipCreateTagCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultDescription [ ^ 'Creates a tag for the selected commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipCreateTagCommand class >> defaultName [ ^ 'Create tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagCommand >> canBeExecuted [ ^ self repositoryModel isNotNil ] -{ #category : #executing } +{ #category : 'executing' } IceTipCreateTagCommand >> execute [ (IceTipCreateTagPanel @@ -36,7 +38,7 @@ IceTipCreateTagCommand >> execute [ open ] -{ #category : #activation } +{ #category : 'activation' } IceTipCreateTagCommand >> iconName [ ^ #glamorousBookmark diff --git a/Iceberg-TipUI/IceTipCreateTagPanel.class.st b/Iceberg-TipUI/IceTipCreateTagPanel.class.st index 665f1d5753..4784ee9aa5 100644 --- a/Iceberg-TipUI/IceTipCreateTagPanel.class.st +++ b/Iceberg-TipUI/IceTipCreateTagPanel.class.st @@ -5,8 +5,8 @@ I have a form with a label and an input, and the commitish to tag. I'm done to be embedded in a dialog, so I implement doAccept to execute my action. " Class { - #name : #IceTipCreateTagPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipCreateTagPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'callback', 'tagNameInputText', @@ -19,10 +19,12 @@ Class { 'minorButton', 'patchButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> accept [ self validate. @@ -30,25 +32,25 @@ IceTipCreateTagPanel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitish: anIceTipCachedModel [ commitishToTag := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> commitishToTag [ ^ commitishToTag ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> currentCommitishLabel [ ^ currentCommitishLabel ] -{ #category : #layout } +{ #category : 'layout' } IceTipCreateTagPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -72,7 +74,7 @@ IceTipCreateTagPanel >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipCreateTagPanel >> doAccept [ self validate. @@ -85,19 +87,19 @@ IceTipCreateTagPanel >> doAccept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> existingTagsList [ ^ existingTagsList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeCurrentBranchLabel [ currentCommitishLabel := self newLabel @@ -106,7 +108,7 @@ IceTipCreateTagPanel >> initializeCurrentBranchLabel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeExistingTagsList [ existingTagsList := self newList. @@ -117,7 +119,7 @@ IceTipCreateTagPanel >> initializeExistingTagsList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializeNextTagPanel [ | parts prefix nextMajor nextMinor nextPatch toString | @@ -142,7 +144,7 @@ IceTipCreateTagPanel >> initializeNextTagPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> initializePresenters [ self initializeCurrentBranchLabel. @@ -159,18 +161,18 @@ IceTipCreateTagPanel >> initializePresenters [ self initializeExistingTagsList ] -{ #category : #testing } +{ #category : 'testing' } IceTipCreateTagPanel >> isNewBranch [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagParts [ ^ self latestTagPartsIn: (commitishToTag tagModels collect: #name) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ | prefix parts | @@ -191,17 +193,17 @@ IceTipCreateTagPanel >> latestTagPartsIn: tagNames [ ^ parts ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> majorButton [ ^ majorButton ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> minorButton [ ^ minorButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> openDialog [ ^ self asDialogWindow @@ -209,43 +211,43 @@ IceTipCreateTagPanel >> openDialog [ open ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> patchButton [ ^ patchButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> setModelBeforeInitialization: aCommitish [ self commitish: aCommitish ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagName [ ^ self tagNameInputText text asString trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameInputText [ ^ tagNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCreateTagPanel >> tagNameLabel [ ^ tagNameLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCreateTagPanel >> titleForWindow [ ^ 'New tag of ' , commitishToTag name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCreateTagPanel >> validate [ self @@ -256,7 +258,7 @@ IceTipCreateTagPanel >> validate [ description: 'You can''t have spaces in your branch name.' ] -{ #category : #callbacks } +{ #category : 'callbacks' } IceTipCreateTagPanel >> withResultDo: aBlockClosure [ callback := aBlockClosure diff --git a/Iceberg-TipUI/IceTipCredentialsSettings.class.st b/Iceberg-TipUI/IceTipCredentialsSettings.class.st index 7e39ca364c..ee86be1c80 100644 --- a/Iceberg-TipUI/IceTipCredentialsSettings.class.st +++ b/Iceberg-TipUI/IceTipCredentialsSettings.class.st @@ -1,26 +1,28 @@ Class { - #name : #IceTipCredentialsSettings, - #superclass : #Object, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipCredentialsSettings', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonAction [ IceTipCredentialsStoreBrowser new open. ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonLabel [ ^ 'Edit' ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> editButtonState [ ^ true ] -{ #category : #settings } +{ #category : 'settings' } IceTipCredentialsSettings class >> settingsOn: aBuilder [ diff --git a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st index 8bfeb9a0f4..7c0ffb3388 100644 --- a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st +++ b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st @@ -2,15 +2,17 @@ I am the browser used to show a credentials store. " Class { - #name : #IceTipCredentialsStoreBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipCredentialsStoreBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'credentialsList' ], - #category : #'Iceberg-TipUI-Credentials' + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddPlainTextCredentialCommand. @@ -20,7 +22,7 @@ IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter f aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipEditCredentialCommand. @@ -29,19 +31,19 @@ IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipInspectCommand forSpec ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> credentialsList [ ^ credentialsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipCredentialsStoreBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -49,14 +51,14 @@ IceTipCredentialsStoreBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initialize [ model ifNil: [ model := IceCredentialStore current ]. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializeCredentialsList [ credentialsList @@ -78,32 +80,32 @@ IceTipCredentialsStoreBrowser >> initializeCredentialsList [ evaluated: #description) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> initializePresenters [ credentialsList := self newTable. self initializeCredentialsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipCredentialsStoreBrowser >> mainList [ ^ credentialsList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> refresh [ credentialsList items: self model allCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCredentialsStoreBrowser >> store [ ^ self model ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> titleForWindow [ ^ model isCurrent @@ -111,7 +113,7 @@ IceTipCredentialsStoreBrowser >> titleForWindow [ ifFalse: [ 'Credentials of ' , model printString ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCredentialsStoreBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st index f96e633058..7b82ab06f0 100644 --- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st @@ -2,8 +2,8 @@ I am a dialog to be used before commit so we can check if the code to commit has critiques on it " Class { - #name : #IceTipCritiquesBeforeCommitBrowser, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipCritiquesBeforeCommitBrowser', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'commitModel', 'onAcceptAction', @@ -15,41 +15,43 @@ Class { 'browseButton', 'autofixButton' ], - #category : #'Iceberg-TipUI-View-Commit' + #category : 'Iceberg-TipUI-View-Commit', + #package : 'Iceberg-TipUI', + #tag : 'View-Commit' } -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #commands } +{ #category : 'commands' } IceTipCritiquesBeforeCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> accept [ self closeWindow. onAcceptAction value ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel [ ^ commitModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> commitModel: anObject [ commitModel := anObject ] -{ #category : #layout } +{ #category : 'layout' } IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -67,7 +69,7 @@ IceTipCritiquesBeforeCommitBrowser >> defaultLayout [ yourself ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ self withWindowDo: [ :window | @@ -77,7 +79,7 @@ IceTipCritiquesBeforeCommitBrowser >> disableCommitAfterChanges [ window buttons third label: 'Close' ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doAutofix [ critiquesList selectedItem ifNotNil: [ :aCritique | @@ -98,13 +100,13 @@ IceTipCritiquesBeforeCommitBrowser >> doAutofix [ centered ]) actOnCritic: aCritique ofEntity: aCritique entity ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> doBrowse [ critiquesList selectedItem ifNotNil: [ :aCritique | aCritique entity browse ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ critiquesList := self newTable. @@ -128,7 +130,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeCritiquesList [ whenSelectionChangedDo: (MessageSend receiver: self selector: #updateSelectedCritique) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ detailPanel := self newText @@ -139,7 +141,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDetailPanel [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -161,7 +163,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ browseButton := self newButton. @@ -179,7 +181,7 @@ IceTipCritiquesBeforeCommitBrowser >> initializePresenters [ self initializeDetailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> initializeReasonPanel [ reasonPanel := self newText @@ -193,18 +195,18 @@ Select each critique to see a detailed message of each critique.'. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipCritiquesBeforeCommitBrowser >> onAccept: aFullBlockClosure [ onAcceptAction := aFullBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ "If the setting is disabled we just commit" @@ -220,13 +222,13 @@ IceTipCritiquesBeforeCommitBrowser >> openIfCritiques [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipCritiquesBeforeCommitBrowser >> setModelBeforeInitialization: someNodes [ model := someNodes ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ ^ 'Critiques for Commit on {1} branch {2}' format: { @@ -234,7 +236,7 @@ IceTipCritiquesBeforeCommitBrowser >> titleForWindow [ commitModel branchName } ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ super updatePresenter. @@ -250,7 +252,7 @@ IceTipCritiquesBeforeCommitBrowser >> updatePresenter [ ] -{ #category : #updating } +{ #category : 'updating' } IceTipCritiquesBeforeCommitBrowser >> updateSelectedCritique [ critiquesList selectedItem diff --git a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st index e6e7553bd8..d811fc6fa2 100644 --- a/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteBranchCommand.class.st @@ -2,36 +2,38 @@ Command that deletes the selected branch " Class { - #name : #IceTipDeleteBranchCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteBranchCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultDescription [ ^ 'Delete this branch for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteBranchCommand class >> defaultName [ ^ 'Delete branch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteBranchCommand >> actsOnBranch: aBranchModel [ ^ aBranchModel isLocal ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteBranchCommand >> execute [ self item newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteBranchCommand >> iconName [ ^ #delete diff --git a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st index 2ceedd53fe..72ade8f5c3 100644 --- a/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected remote " Class { - #name : #IceTipDeleteRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultDescription [ ^ 'Delete this remote for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteRemoteCommand class >> defaultName [ ^ 'Delete remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> execute [ self remoteModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteRemoteCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st index dbbcff7b76..33a461bf49 100644 --- a/Iceberg-TipUI/IceTipDeleteTagCommand.class.st +++ b/Iceberg-TipUI/IceTipDeleteTagCommand.class.st @@ -2,42 +2,44 @@ Command that deletes the selected tag " Class { - #name : #IceTipDeleteTagCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDeleteTagCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultDescription [ ^ 'Delete this tag for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDeleteTagCommand class >> defaultName [ ^ 'Delete tag' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDeleteTagCommand >> actsOnTag: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> execute [ self tagModel newDeleteAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDeleteTagCommand >> iconName [ ^ #delete ] -{ #category : #executing } +{ #category : 'executing' } IceTipDeleteTagCommand >> tagModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st index cb9e666a4f..7fb84e4e1e 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecorator.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecorator.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceTipDescriptionDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> head [ ^ IceTipDescriptionDecoratorHead uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> modified [ ^ IceTipDescriptionDecoratorModified uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecorator class >> notLoaded [ ^ IceTipDescriptionDecoratorNotLoaded uniqueInstance diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st index 719dc586a1..2197e5dc20 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorHead.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorHead, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorHead', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceTipDescriptionDecoratorHead >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st index 47b9c2c22d..cb74929623 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorModified.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorModified, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorModified', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorModified >> color [ ^ Smalltalk ui theme successTextColor diff --git a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st index 8092e02645..47ff354917 100644 --- a/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st +++ b/Iceberg-TipUI/IceTipDescriptionDecoratorNotLoaded.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDescriptionDecoratorNotLoaded, - #superclass : #IceTipDescriptionDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipDescriptionDecoratorNotLoaded', + #superclass : 'IceTipDescriptionDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDescriptionDecoratorNotLoaded >> color [ ^ Smalltalk ui theme disabledTextColor diff --git a/Iceberg-TipUI/IceTipDialogPresenter.class.st b/Iceberg-TipUI/IceTipDialogPresenter.class.st index 28f57f6119..701c18a670 100644 --- a/Iceberg-TipUI/IceTipDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipDialogPresenter.class.st @@ -3,24 +3,26 @@ I'm a general dialog. I implement a default accept method that needs to be overriden my children and some utility methods to easier build a dialog. " Class { - #name : #IceTipDialogPresenter, - #superclass : #IceTipPresenter, - #category : #'Iceberg-TipUI-View' + #name : 'IceTipDialogPresenter', + #superclass : 'IceTipPresenter', + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> accept [ "override this if you want a dialog" ] -{ #category : #actions } +{ #category : 'actions' } IceTipDialogPresenter >> cancel [ "override this if you want a dialog" self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. diff --git a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st index 8538e7c551..533808c3ad 100644 --- a/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st +++ b/Iceberg-TipUI/IceTipDiffEntryRemoved.class.st @@ -4,25 +4,27 @@ I announce when an entry (a method, a class or a package) has been reverted. I'm used to refresh diff panels without recalculate everything again. " Class { - #name : #IceTipDiffEntryRemoved, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffEntryRemoved', + #superclass : 'IceTipAnnouncement', #instVars : [ 'entry' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffEntryRemoved class >> entry: anObject [ ^ self new entry: anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry [ ^ entry ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffEntryRemoved >> entry: anObject [ entry := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffModel.class.st b/Iceberg-TipUI/IceTipDiffModel.class.st index 6d62e59e96..e58cbf43a8 100644 --- a/Iceberg-TipUI/IceTipDiffModel.class.st +++ b/Iceberg-TipUI/IceTipDiffModel.class.st @@ -2,34 +2,36 @@ I'm a base model to present diffs. " Class { - #name : #IceTipDiffModel, - #superclass : #IceTipEntityModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipDiffModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> new [ ^ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffModel class >> on: aDiff [ ^ self basicNew initializeEntity: aDiff; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> copyWithOnly: aCollection [ ^ self diff copyWithOnly: aCollection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> diff [ ^ self subclassResponsibility ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffModel >> reset [ UIManager default informUser: 'Refreshing changes' @@ -39,17 +41,17 @@ IceTipDiffModel >> reset [ self diff ] ] -{ #category : #private } +{ #category : 'private' } IceTipDiffModel >> resetDiff [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> tree [ ^ self diff treeToShow ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffModel >> treeRoots [ ^ self tree children ] diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st index 1a9898f73b..6a999df1f2 100644 --- a/Iceberg-TipUI/IceTipDiffPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffPanel.class.st @@ -7,23 +7,25 @@ also #elements answer should be a collection of elements that also understand el (IceTipDiffPanel onDiff: (IceRepository registry first workingCopyDiff)) openWithSpec " Class { - #name : #IceTipDiffPanel, - #superclass : #IceTipPresenter, + #name : 'IceTipDiffPanel', + #superclass : 'IceTipPresenter', #instVars : [ 'model', 'diffPanel', 'iceNodesTree' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffPanel class >> onDiff: aDiff [ ^ self on: (IceTipCommitDiffModel on: aDiff) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> basicRefresh [ self resetDiffContents. @@ -32,7 +34,7 @@ IceTipDiffPanel >> basicRefresh [ expandAll ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeDescriptionColumn [ ^ SpStringTableColumn new @@ -40,7 +42,7 @@ IceTipDiffPanel >> changeDescriptionColumn [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -52,7 +54,7 @@ IceTipDiffPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> collapsePath: aPath [ iceNodesTree @@ -60,7 +62,7 @@ IceTipDiffPanel >> collapsePath: aPath [ selectPath: aPath ] -{ #category : #layout } +{ #category : 'layout' } IceTipDiffPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -70,7 +72,7 @@ IceTipDiffPanel >> defaultLayout [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ diffPanel @@ -82,25 +84,25 @@ IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ rightText: rightString ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> diffPanel [ ^ diffPanel ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doCollapseSelection [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipDiffPanel >> doExpandSelection [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> expandPath: aPath [ iceNodesTree @@ -108,38 +110,38 @@ IceTipDiffPanel >> expandPath: aPath [ selectPath: aPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowLeft [ self collapsePath: iceNodesTree selection selectedPath ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> handleArrowRight [ self expandPath: iceNodesTree selection selectedPath ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipDiffPanel >> iceNodesTree [ ^ iceNodesTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initialize [ super initialize. self subscribeToAnnouncements ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeDiffPanel [ diffPanel showOptions: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializePresenters [ iceNodesTree := self newTreeTable. @@ -149,7 +151,7 @@ IceTipDiffPanel >> initializePresenters [ self initializeDiffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> initializeTree [ iceNodesTree @@ -163,19 +165,19 @@ IceTipDiffPanel >> initializeTree [ toAction: [ self handleArrowRight ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> leftLabel: aString [ diffPanel leftLabel: aString. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> refresh [ self model reset. @@ -183,25 +185,25 @@ IceTipDiffPanel >> refresh [ ] -{ #category : #private } +{ #category : 'private' } IceTipDiffPanel >> resetDiffContents [ self diffContentsLeft: '' right: '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> rightLabel: aString [ diffPanel rightLabel: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPanel >> selectedItem [ ^ iceNodesTree selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipDiffPanel >> selectionChanged [ | itemValue | @@ -212,13 +214,13 @@ IceTipDiffPanel >> selectionChanged [ right: itemValue leftContents ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> subscribeToAnnouncements [ self announcer @@ -228,13 +230,13 @@ IceTipDiffPanel >> subscribeToAnnouncements [ ] -{ #category : #specs } +{ #category : 'specs' } IceTipDiffPanel >> titleForWindow [ ^ 'Diff' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffPanel >> updatePresenter [ self basicRefresh diff --git a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st index c59d12d568..c783d8158d 100644 --- a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st +++ b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st @@ -1,31 +1,33 @@ Class { - #name : #IceTipDiffPreviewModel, - #superclass : #IceTipModel, + #name : 'IceTipDiffPreviewModel', + #superclass : 'IceTipModel', #instVars : [ 'commitish', 'diffModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> calculateDiff [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish [ ^ commitish entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> commitish: aCommitish [ commitish := aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> diff [ ^ diffModel ifNil: [ | diff | @@ -37,19 +39,19 @@ IceTipDiffPreviewModel >> diff [ on: diff ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repository [ ^ commitish repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> repositoryName [ ^ self repository name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffPreviewModel >> targetName [ ^ commitish name diff --git a/Iceberg-TipUI/IceTipDiffRefreshed.class.st b/Iceberg-TipUI/IceTipDiffRefreshed.class.st index 4be166e6fd..0f5ae0833b 100644 --- a/Iceberg-TipUI/IceTipDiffRefreshed.class.st +++ b/Iceberg-TipUI/IceTipDiffRefreshed.class.st @@ -2,25 +2,27 @@ I announce when a diff has been refreshed. " Class { - #name : #IceTipDiffRefreshed, - #superclass : #IceTipAnnouncement, + #name : 'IceTipDiffRefreshed', + #superclass : 'IceTipAnnouncement', #instVars : [ 'repository' ], - #category : #'Iceberg-TipUI-Announcements' + #category : 'Iceberg-TipUI-Announcements', + #package : 'Iceberg-TipUI', + #tag : 'Announcements' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiffRefreshed class >> for: aRepository [ ^ self new repository: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffRefreshed >> repository: anObject [ repository := anObject ] diff --git a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st index 2d1fad7eff..ccdc9c09d8 100644 --- a/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffSelectingPanel.class.st @@ -10,15 +10,17 @@ also #elements answer should be a collection of elements that also understand el " Class { - #name : #IceTipDiffSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipDiffSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> activateItem: iceNode [ checkedIceNodes add: iceNode. @@ -31,7 +33,7 @@ IceTipDiffSelectingPanel >> activateItem: iceNode [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -49,7 +51,7 @@ IceTipDiffSelectingPanel >> changeListColumn [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> deactivateItem: iceNode [ checkedIceNodes remove: iceNode. @@ -61,7 +63,7 @@ IceTipDiffSelectingPanel >> deactivateItem: iceNode [ self refreshCheckbox. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initialize [ super initialize. @@ -72,7 +74,7 @@ IceTipDiffSelectingPanel >> initialize [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiffSelectingPanel >> initializeTree [ super initializeTree. @@ -81,7 +83,7 @@ IceTipDiffSelectingPanel >> initializeTree [ toAction: [ self toggleActivationItem: iceNodesTree selectedItem ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refresh [ super refresh. @@ -89,20 +91,20 @@ IceTipDiffSelectingPanel >> refresh [ root withAllChildrenDo: [ :each | checkedIceNodes add: each ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> refreshCheckbox [ "Refresh after a checkbox state has changed. When a node with children changes this state, all children might change too. That's the reason of this special refresh. When a leave node changed such state, this refresh is redundant." iceNodesTree refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiffSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #private } +{ #category : 'private' } IceTipDiffSelectingPanel >> toggleActivationItem: iceNode [ (checkedIceNodes includes: iceNode) diff --git a/Iceberg-TipUI/IceTipDirectMergeType.class.st b/Iceberg-TipUI/IceTipDirectMergeType.class.st index 496b7b0bef..435ef190da 100644 --- a/Iceberg-TipUI/IceTipDirectMergeType.class.st +++ b/Iceberg-TipUI/IceTipDirectMergeType.class.st @@ -7,12 +7,14 @@ I will perform a simple merge: This is the default merge mechanism (what users do most of the time) " Class { - #name : #IceTipDirectMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDirectMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipDirectMergeType >> newMergeAction: aModel [ ^ aModel newDirectMergeAction diff --git a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st index 1ce6ddf7df..dd3ef54559 100644 --- a/Iceberg-TipUI/IceTipDirectoryPresenter.class.st +++ b/Iceberg-TipUI/IceTipDirectoryPresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose directories. " Class { - #name : #IceTipDirectoryPresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipDirectoryPresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipDirectoryPresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st index 6c0db8b7a6..e3adc08fca 100644 --- a/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllChangesPreviewBrowser.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipDiscardAllChangesPreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipDiscardAllChangesPreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepository [ ^ self on: (IceTipDiscardAllModel new @@ -13,7 +15,7 @@ IceTipDiscardAllChangesPreviewBrowser class >> onRepository: anIceModelRepositor yourself) ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ self model newDiscardAction @@ -21,13 +23,13 @@ IceTipDiscardAllChangesPreviewBrowser >> doDiscardAll [ executeWithContext: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initialExtentForWindow [ ^ (900 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ super initializePresenters. @@ -37,7 +39,7 @@ IceTipDiscardAllChangesPreviewBrowser >> initializePresenters [ rightLabel: 'Commit to load: ', self loadCommitShortId ] -{ #category : #private } +{ #category : 'private' } IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ | shortId | @@ -47,7 +49,7 @@ IceTipDiscardAllChangesPreviewBrowser >> loadCommitShortId [ ifFalse: [ shortId ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ ^ self newButton @@ -58,7 +60,7 @@ IceTipDiscardAllChangesPreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipDiscardAllChangesPreviewBrowser >> titleForWindow [ ^ 'Preview Changes to Discard' diff --git a/Iceberg-TipUI/IceTipDiscardAllModel.class.st b/Iceberg-TipUI/IceTipDiscardAllModel.class.st index ebba7aa80c..67acf77adc 100644 --- a/Iceberg-TipUI/IceTipDiscardAllModel.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllModel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipDiscardAllModel, - #superclass : #IceTipModel, + #name : 'IceTipDiscardAllModel', + #superclass : 'IceTipModel', #instVars : [ 'workingCopy', 'diffModel', 'repository' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> calculateDiff [ ^ workingCopy referenceCommit diffTo: workingCopy ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> diff [ ^ diffModel ifNil: [ @@ -28,13 +30,13 @@ IceTipDiscardAllModel >> diff [ on: diff ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> discardAll [ workingCopy discardChanges ] -{ #category : #operations } +{ #category : 'operations' } IceTipDiscardAllModel >> newDiscardAction [ @@ -46,24 +48,24 @@ IceTipDiscardAllModel >> newDiscardAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> repository: anIceTipCachedModel [ repository := anIceTipCachedModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy [ ^ workingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardAllModel >> workingCopy: anObject [ workingCopy := anObject diff --git a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st index 187f996cb8..a6ba03553b 100644 --- a/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st +++ b/Iceberg-TipUI/IceTipDiscardChangesCommand.class.st @@ -2,24 +2,26 @@ Command that discard all changes in the repository " Class { - #name : #IceTipDiscardChangesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipDiscardChangesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultDescription [ ^ 'Discard all changes in this working copy.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipDiscardChangesCommand class >> defaultName [ ^ 'Discard all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> canBeExecuted [ ^ self isRepositoryMissing not and: [ @@ -28,7 +30,7 @@ IceTipDiscardChangesCommand >> canBeExecuted [ aCommit isCollection not and: [ aCommit isUnknownCommit not ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipDiscardChangesCommand >> execute [ (IceTipDiscardAllChangesPreviewBrowser onRepository: self repositoryModel) @@ -37,13 +39,13 @@ IceTipDiscardChangesCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipDiscardChangesCommand >> iconName [ ^ #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipDiscardChangesCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st index faab93d8da..bce29f97be 100644 --- a/Iceberg-TipUI/IceTipEditCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipEditCredentialCommand.class.st @@ -4,24 +4,26 @@ I colaborate with the credential to know the specific class of the dialog model. Check #editModelClass in IceSshCredentials and IcePlaintextCredentials " Class { - #name : #IceTipEditCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultDescription [ ^ 'Edits the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditCredentialCommand class >> defaultName [ ^ 'Edit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditCredentialCommand >> execute [ ((self item editModelClass newApplication: context application) @@ -33,13 +35,13 @@ IceTipEditCredentialCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> iconName [ ^ #edit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditCredentialCommand >> shortcutKey [ ^ $e meta diff --git a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st index e05dfb7673..962f411b2d 100644 --- a/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditPlaintextCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit plaintext credentials. " Class { - #name : #IceTipEditPlaintextCredentialsPresenter, - #superclass : #IceTipAbstractPlaintextCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditPlaintextCredentialsPresenter', + #superclass : 'IceTipAbstractPlaintextCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipEditPlaintextCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> initialExtentForWindow [ ^ (350 @ 160) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -39,14 +41,14 @@ IceTipEditPlaintextCredentialsPresenter >> refreshCredentialsFromPresenter [ password: self password ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditPlaintextCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. passwordInput text: credentials password ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditPlaintextCredentialsPresenter >> titleForWindow [ ^ 'Edit credential for ' , credentials host diff --git a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st index 3694af7c87..0f08da0b7f 100644 --- a/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditProjectDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipEditProjectDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipEditProjectDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -18,10 +18,12 @@ Class { 'removeButton', 'addButton' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> accept [ IceTipStandardAction new @@ -43,13 +45,13 @@ IceTipEditProjectDialogPresenter >> accept [ acceptCallback value ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> acceptCallback [ ^ acceptCallback ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> addDirectory [ | newDirectoryName newDirectory previousSelection | @@ -70,7 +72,7 @@ IceTipEditProjectDialogPresenter >> addDirectory [ self expandAndSelect: previousSelection ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> connectPresenters [ super connectPresenters. @@ -87,13 +89,13 @@ IceTipEditProjectDialogPresenter >> connectPresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> defaultFormat [ ^ defaultFormat ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditProjectDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -128,7 +130,7 @@ IceTipEditProjectDialogPresenter >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ @@ -155,25 +157,25 @@ IceTipEditProjectDialogPresenter >> expandAndSelect: aRelativePath [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatLabel [ ^ formatLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> formatList [ ^ formatList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> formats [ ^ formats ] -{ #category : #'format-management' } +{ #category : 'format-management' } IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ "We take as guinea pig a sub-directory to guess what format it is on. @@ -192,13 +194,13 @@ IceTipEditProjectDialogPresenter >> guessFormatFromDirectory: aFileReference [ ifNone: [ ^ defaultFormat ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> hasToShowWarning [ ^ model repository workingCopy packages isNotEmpty ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ^ self hasToShowWarning @@ -213,7 +215,7 @@ IceTipEditProjectDialogPresenter >> initialExtentForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initialize [ selectedDirectoryPath := RelativePath new. @@ -223,7 +225,7 @@ IceTipEditProjectDialogPresenter >> initialize [ super initialize. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ sourceDirectoryTree @@ -241,7 +243,7 @@ IceTipEditProjectDialogPresenter >> initializeDirectoryTree [ self sourceDirectorySelectionChanged: announcement selectedPaths ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializeMessagePanel [ | icon | @@ -254,7 +256,7 @@ IceTipEditProjectDialogPresenter >> initializeMessagePanel [ messageText text: self warningMessage ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -292,43 +294,43 @@ IceTipEditProjectDialogPresenter >> initializePresenters [ self initializeDirectoryTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageIcon [ ^ messageIcon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> messageText [ ^ messageText ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> removeDirectory [ | toRemove newSelection | @@ -346,31 +348,31 @@ IceTipEditProjectDialogPresenter >> removeDirectory [ self expandAndSelect: newSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> selectedDirectoryPath [ ^ selectedDirectoryPath ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditProjectDialogPresenter >> selectedFileFormat [ ^ formatList selectedItem ] -{ #category : #events } +{ #category : 'events' } IceTipEditProjectDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryLabel [ ^ sourceDirectoryLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPaths [ | selection | @@ -386,25 +388,25 @@ IceTipEditProjectDialogPresenter >> sourceDirectorySelectionChanged: selectedPat selectedDirectoryPath := selection relativeTo: self model fileSystem. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipEditProjectDialogPresenter >> sourceDirectoryTree [ ^ sourceDirectoryTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditProjectDialogPresenter >> titleForWindow [ ^ 'Edit Project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> username [ ^ self nameInput text trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditProjectDialogPresenter >> warningMessage [ ^ 'Be careful. You should choose the actual format of the current repository. diff --git a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st index c0b67c816d..10013324e4 100644 --- a/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipEditRepositoryCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to edit a repository meta-data " Class { - #name : #IceTipEditRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipEditRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultDescription [ ^ 'Edit repository data' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipEditRepositoryCommand class >> defaultName [ ^ 'Edit...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipEditRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipEditRepositoryCommand >> execute [ self flag: #TODO. "Demeter's law" @@ -37,7 +39,7 @@ IceTipEditRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditRepositoryCommand >> iconName [ ^ #edit diff --git a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st index b7d805fe72..6ba89b4467 100644 --- a/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditSSHCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I implement the dialog to edit SSH credentials. " Class { - #name : #IceTipEditSSHCredentialsPresenter, - #superclass : #IceTipAbstractSSHCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditSSHCredentialsPresenter', + #superclass : 'IceTipAbstractSSHCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #layout } +{ #category : 'layout' } IceTipEditSSHCredentialsPresenter >> defaultLayout [ ^ SpGridLayout new @@ -27,13 +29,13 @@ IceTipEditSSHCredentialsPresenter >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> initialExtentForWindow [ ^ (500@230) scaledByDisplayScaleFactor ] -{ #category : #actions } +{ #category : 'actions' } IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -43,7 +45,7 @@ IceTipEditSSHCredentialsPresenter >> refreshCredentialsFromPresenter [ keyPassphrase: self passphrase ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -52,7 +54,7 @@ IceTipEditSSHCredentialsPresenter >> refreshPresenterFromCredentials [ publicKeyInput location: credentials publicKey ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditSSHCredentialsPresenter >> titleForWindow [ ^ 'Edit SSH keys for ' , self credentials hostDescription diff --git a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st index 3d3b8c23a9..d42a7e3b60 100644 --- a/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipEditTokenCredentialsPresenter.class.st @@ -2,18 +2,20 @@ I am a dialog to edit token credentials. " Class { - #name : #IceTipEditTokenCredentialsPresenter, - #superclass : #IceTipAddTokenCredentialsPresenter, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipEditTokenCredentialsPresenter', + #superclass : 'IceTipAddTokenCredentialsPresenter', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> accept [ ^ self acceptEditAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ credentials @@ -23,7 +25,7 @@ IceTipEditTokenCredentialsPresenter >> refreshCredentialsFromPresenter [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ usernameInput text: credentials username. @@ -32,7 +34,7 @@ IceTipEditTokenCredentialsPresenter >> refreshPresenterFromCredentials [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEditTokenCredentialsPresenter >> titleForWindow [ ^ 'Edit token credentials' diff --git a/Iceberg-TipUI/IceTipEntityModel.class.st b/Iceberg-TipUI/IceTipEntityModel.class.st index 49b9933bf4..7c9c4c177d 100644 --- a/Iceberg-TipUI/IceTipEntityModel.class.st +++ b/Iceberg-TipUI/IceTipEntityModel.class.st @@ -2,28 +2,30 @@ I'm a generic model for Iceberg entities (tipically, repositories, commits, packages, etc., etc., etc.) " Class { - #name : #IceTipEntityModel, - #superclass : #IceTipModel, + #name : 'IceTipEntityModel', + #superclass : 'IceTipModel', #instVars : [ 'entity', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> new [ self error: 'Use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> on: anObject [ ^ self basicNew initializeEntity: anObject; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ ^ self basicNew initializeEntity: anObject; @@ -31,54 +33,54 @@ IceTipEntityModel class >> repositoryModel: aRepositoryModel on: anObject [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> description [ "A decorated description of this entity. It can return a text (in case decorations apply) or a simple string." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> descriptionDecorator [ ^ IceTipTextDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> displayString [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> entity [ ^ entity ] -{ #category : #fetching } +{ #category : 'fetching' } IceTipEntityModel >> fetch [ self entity fetch ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipEntityModel >> initializeEntity: anObject [ entity := anObject. self initialize ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isCommitish [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipEntityModel >> isModelOf: anObject [ ^ self entity = anObject ] -{ #category : #tagging } +{ #category : 'tagging' } IceTipEntityModel >> newCreateTagAction: aString [ @@ -90,17 +92,17 @@ IceTipEntityModel >> newCreateTagAction: aString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipEntityModel >> shortDescription [ ^ self description asString diff --git a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st index dc2d41d517..6e52aea96d 100644 --- a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st @@ -7,24 +7,26 @@ My model is an exception that I'll freeze for further debugging. (IceTipErrorDialog on: anError) openDialogWithSpec " Class { - #name : #IceTipErrorDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipErrorDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'exception', 'errorLabel', 'iconPanel' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> accept [ self closeWindow. exception debug. ] -{ #category : #layout } +{ #category : 'layout' } IceTipErrorDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -35,31 +37,31 @@ IceTipErrorDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> errorLabel [ ^ errorLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception [ ^ exception ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipErrorDialogPresenter >> exception: anException [ exception := anException freeze ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipErrorDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -69,7 +71,7 @@ IceTipErrorDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ aWindow @@ -80,7 +82,7 @@ IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ do: [ :presenter | presenter close ]. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> initializePresenters [ iconPanel := self newImage. @@ -91,13 +93,13 @@ IceTipErrorDialogPresenter >> initializePresenters [ errorLabel editable: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> setModelBeforeInitialization: aDomainObject [ self exception: aDomainObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipErrorDialogPresenter >> titleForWindow [ ^ 'Error' diff --git a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st index eae8c778d0..e7254a06fa 100644 --- a/Iceberg-TipUI/IceTipExistingBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipExistingBranchPanel.class.st @@ -3,29 +3,31 @@ I'm a panel (that will be part of a dialog) to perform actions on existing panel Actions themselves needs to be defined by my children. " Class { - #name : #IceTipExistingBranchPanel, - #superclass : #IceTipBranchPanel, + #name : 'IceTipExistingBranchPanel', + #superclass : 'IceTipBranchPanel', #instVars : [ 'branchesList', 'title', 'icon' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> branchModels [ ^ self model branchModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> branchesList [ ^ branchesList ] -{ #category : #layout } +{ #category : 'layout' } IceTipExistingBranchPanel >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -33,25 +35,25 @@ IceTipExistingBranchPanel >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon [ ^ icon ifNil: [ self iconNamed: #branch ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> icon: anIcon [ icon := anIcon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> iconForWindow [ ^ self icon ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializeBranchesList [ branchesList @@ -68,32 +70,32 @@ IceTipExistingBranchPanel >> initializeBranchesList [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> initializePresenters [ branchesList := self newTable. self initializeBranchesList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> selectedBranch [ ^ self branchesList selection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipExistingBranchPanel >> titleForWindow [ ^ title ifNil: [ self model name ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipExistingBranchPanel >> titleForWindow: aString [ title := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipExistingBranchPanel >> validate [ self selectedBranch ifNil: [ diff --git a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st index 738ba20fd4..d026f08d94 100644 --- a/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchAllProjectCommand.class.st @@ -2,31 +2,33 @@ I'm a command to perform a fetch operation on all registered projects. " Class { - #name : #IceTipFetchAllProjectCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchAllProjectCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from all repositories in your list.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchAllProjectCommand class >> defaultName [ ^ 'Fetch all' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchAllProjectCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> execute [ | repositories | @@ -47,13 +49,13 @@ IceTipFetchAllProjectCommand >> execute [ Iceberg announcer announce: IceRepositoryModified new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchAllProjectCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchAllProjectCommand >> isConfirmed [ ^ self application newConfirm diff --git a/Iceberg-TipUI/IceTipFetchCommand.class.st b/Iceberg-TipUI/IceTipFetchCommand.class.st index faf109579a..d878f30cc3 100644 --- a/Iceberg-TipUI/IceTipFetchCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchCommand.class.st @@ -2,24 +2,26 @@ I'm a command to perform a fetch operation on selected project. " Class { - #name : #IceTipFetchCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultDescription [ ^ 'Fetch (bring new commits) from this repositories.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchCommand >> canBeExecuted [ ^ super canBeExecuted and: [ @@ -27,19 +29,19 @@ IceTipFetchCommand >> canBeExecuted [ self repositoryModel hasRemotes ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchCommand >> execute [ self repositoryModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> iconName [ ^ #smallUpdate ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchCommand >> shortcutKey [ ^ $f meta diff --git a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st index 119d3c33b9..630fd29e06 100644 --- a/Iceberg-TipUI/IceTipFetchInPullCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchInPullCommand.class.st @@ -1,29 +1,31 @@ Class { - #name : #IceTipFetchInPullCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchInPullCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultDescription [ ^ 'Fetch from the selected remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchInPullCommand class >> defaultName [ ^ 'Fetch' ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchInPullCommand >> execute [ context model remoteModel newFetchAction executeWithContext: self context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchInPullCommand >> iconName [ ^ #smallUpdate diff --git a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st index 7c1b56024b..0c722b8509 100644 --- a/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st +++ b/Iceberg-TipUI/IceTipFetchRemoteCommand.class.st @@ -2,42 +2,44 @@ Command that fetches from remote repositories " Class { - #name : #IceTipFetchRemoteCommand, - #superclass : #IceTipRemotesTreeCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipFetchRemoteCommand', + #superclass : 'IceTipRemotesTreeCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultDescription [ ^ 'Fetch commits from this remote' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipFetchRemoteCommand class >> defaultName [ ^ 'Fetch remote' ] -{ #category : #testing } +{ #category : 'testing' } IceTipFetchRemoteCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> execute [ self remoteModel fetch ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFetchRemoteCommand >> iconName [ ^ #smallUpdate ] -{ #category : #executing } +{ #category : 'executing' } IceTipFetchRemoteCommand >> remoteModel [ ^ self item diff --git a/Iceberg-TipUI/IceTipFilePresenter.class.st b/Iceberg-TipUI/IceTipFilePresenter.class.st index 721985a143..a0e7c32f33 100644 --- a/Iceberg-TipUI/IceTipFilePresenter.class.st +++ b/Iceberg-TipUI/IceTipFilePresenter.class.st @@ -2,12 +2,14 @@ I'm a model to choose files. " Class { - #name : #IceTipFilePresenter, - #superclass : #IceTipLocationPresenter, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipFilePresenter', + #superclass : 'IceTipLocationPresenter', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipFilePresenter >> chooseReference [ ^ UIManager default diff --git a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st index bf9876ab0d..413d50a79f 100644 --- a/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipForgetRepositoryCommand.class.st @@ -3,24 +3,26 @@ I will allow the ""forget"" of a repository (remote it from list of registered r I also add the possibility of remove the repository from file system. " Class { - #name : #IceTipForgetRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipForgetRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultDescription [ ^ 'Removes this repository from the list of managed repositories (it will not remove any local repository)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipForgetRepositoryCommand class >> defaultName [ ^ 'Forget repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipForgetRepositoryCommand >> execute [ (IceTipRemoveRepositoryDialogPresenter @@ -31,13 +33,13 @@ IceTipForgetRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipForgetRepositoryCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st index 49ac8a3bc4..977e81d533 100644 --- a/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitProviderRepositoryPanel.class.st @@ -6,8 +6,8 @@ for each provider. " Class { - #name : #IceTipGitProviderRepositoryPanel, - #superclass : #IceTipGitRepositoryPanel, + #name : 'IceTipGitProviderRepositoryPanel', + #superclass : 'IceTipGitRepositoryPanel', #instVars : [ 'userNameLabel', 'userNameInputText', @@ -16,22 +16,24 @@ Class { 'protocolDropList', 'protocolLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipGitProviderRepositoryPanel class >> isAbstract [ ^ super isAbstract or: [ self = IceTipGitProviderRepositoryPanel ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitProviderRepositoryPanel >> configureBuilder: aBuilder [ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitProviderRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -45,7 +47,7 @@ IceTipGitProviderRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitProviderRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -79,7 +81,7 @@ IceTipGitProviderRepositoryPanel >> initializePresenters [ ] -{ #category : #private } +{ #category : 'private' } IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ^ (self userName isEmpty and: [ self projectName isEmpty ]) @@ -88,43 +90,43 @@ IceTipGitProviderRepositoryPanel >> projectAsPathToAppend [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> projectName [ ^ self projectNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolDropList [ ^ protocolDropList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> protocolLabel [ ^ protocolLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> providerName [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> remoteUrl [ | builder | @@ -135,31 +137,31 @@ IceTipGitProviderRepositoryPanel >> remoteUrl [ ^ builder buildUrl ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> selectedProtocol [ ^ self protocolDropList selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> userName [ ^ self userNameInputText text asString trimmed ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameInputText [ ^ userNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitProviderRepositoryPanel >> userNameLabel [ ^ userNameLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitProviderRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st index 4408387fe1..fdd7ef3847 100644 --- a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st @@ -3,18 +3,20 @@ I'm a presenter to define remote repositories. Repositories needs to have a valid url (one that can be parsed by IceRemote) and a valid location (where to place the clone) " Class { - #name : #IceTipGitRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipGitRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel class >> order [ ^ 1000 "to the end" ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -26,7 +28,7 @@ IceTipGitRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #utilities } +{ #category : 'utilities' } IceTipGitRepositoryPanel >> extractProjectName: aString [ ^ [ (IceGitRemote url: aString) projectName ] @@ -34,13 +36,13 @@ IceTipGitRepositoryPanel >> extractProjectName: aString [ do: [ 'invalid-url' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> iconForWindow [ ^ self iconNamed: #git ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -53,7 +55,7 @@ IceTipGitRepositoryPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> newRepository [ UIManager default @@ -66,19 +68,19 @@ IceTipGitRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> remoteUrl [ ^ self remoteInputText text asString trimmed ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitRepositoryPanel >> titleForWindow [ ^ 'Clone remote repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitRepositoryPanel >> validate [ | remoteString | diff --git a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st index 7103019d4a..17a42bdec6 100644 --- a/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipGitUsernameAndEmailDialogPresenter.class.st @@ -2,8 +2,8 @@ I'm a dialog for asking ""user.name"" and ""user.email"" . " Class { - #name : #IceTipGitUsernameAndEmailDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipGitUsernameAndEmailDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'nameLabel', 'nameInput', @@ -13,10 +13,12 @@ Class { 'model', 'acceptCallback' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipGitUsernameAndEmailDialogPresenter >> accept [ self username isEmptyOrNil ifTrue: [ ^ self window alert: 'user.name is required.' ]. @@ -32,7 +34,7 @@ IceTipGitUsernameAndEmailDialogPresenter >> accept [ acceptCallback value ]. ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -50,36 +52,36 @@ IceTipGitUsernameAndEmailDialogPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> email [ ^ self emailInput text trimBoth ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailInput [ ^ emailInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> emailLabel [ ^ emailLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> globalCheckbox [ ^ globalCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initialExtentForWindow [ ^ (400@200) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ nameLabel := self newLabel @@ -102,43 +104,43 @@ IceTipGitUsernameAndEmailDialogPresenter >> initializePresenters [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipGitUsernameAndEmailDialogPresenter >> isGlobal [ ^ self globalCheckbox state ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameInput [ ^ nameInput ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitUsernameAndEmailDialogPresenter >> nameLabel [ ^ nameLabel ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> onAccept: aBlockClosure [ acceptCallback := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipGitUsernameAndEmailDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitUsernameAndEmailDialogPresenter >> titleForWindow [ ^ 'Please provide Git missing properties' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitUsernameAndEmailDialogPresenter >> username [ ^ self nameInput text trimBoth diff --git a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st index e78130b7b5..c23045931f 100644 --- a/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltComponentHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltComponentHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltComponentHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltComponentHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,13 +29,13 @@ IceTipHiedraAltComponentHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeCommitList [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -62,7 +64,7 @@ IceTipHiedraAltComponentHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ commitList := self newComponentList. @@ -73,13 +75,13 @@ IceTipHiedraAltComponentHistoryBrowser >> initializePresenters [ self initializeHiedraColumn ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -87,20 +89,20 @@ IceTipHiedraAltComponentHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ | commitModels | @@ -111,7 +113,7 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshCommitList [ commitInfoTabs selectedModel: (commitModels ifNotEmpty: #first ifEmpty: [ nil ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -133,19 +135,19 @@ IceTipHiedraAltComponentHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ifNotNil: #item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltComponentHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltComponentHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st index 28565664db..73df2f5bef 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryBrowser.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTipHiedraAltHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraAltHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> availableCommands [ | rootGroup | @@ -16,7 +18,7 @@ IceTipHiedraAltHistoryBrowser >> availableCommands [ ^ rootGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self availableCommands @@ -27,7 +29,7 @@ IceTipHiedraAltHistoryBrowser >> contextMenuCommands [ self error: 'Should not arrive here' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeCommitList [ commitList @@ -63,7 +65,7 @@ IceTipHiedraAltHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -92,7 +94,7 @@ IceTipHiedraAltHistoryBrowser >> initializeHiedraColumn [ hiedraColumnController renderer rowHeight: 20 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -104,13 +106,13 @@ IceTipHiedraAltHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> initializeWindow: aWindowPresenter [ super initializeWindow: aWindowPresenter. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ ^ self @@ -118,20 +120,20 @@ IceTipHiedraAltHistoryBrowser >> newCommitRow: index commit: item [ on: { (hiedraColumnController formAtRow: index). item } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipHiedraAltHistoryBrowser >> refreshCommands [ self refreshToolbarWith: self availableCommands ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ | ancestorIds walk | @@ -153,13 +155,13 @@ IceTipHiedraAltHistoryBrowser >> refreshHiedraColumn [ linksBlock: [ :id | ancestorIds at: id ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryBrowser >> selectedItem [ ^ self selectedCommit ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryBrowser >> updatePresenter [ "self refresh" diff --git a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st index b4d9f6b312..e2b6ea1bc2 100644 --- a/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st +++ b/Iceberg-TipUI/IceTipHiedraAltHistoryRowPresenter.class.st @@ -1,12 +1,14 @@ Class { - #name : #IceTipHiedraAltHistoryRowPresenter, - #superclass : #SpPresenter, + #name : 'IceTipHiedraAltHistoryRowPresenter', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', - #category : #'Iceberg-TipUI-View-Repository-HiedraAlt' + #category : 'Iceberg-TipUI-View-Repository-HiedraAlt', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository-HiedraAlt' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ | tagNames tagLayout | @@ -30,13 +32,13 @@ IceTipHiedraAltHistoryRowPresenter >> addTagsTo: aLayout [ aLayout add: tagLayout expand: false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> form [ ^ self model first ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ self layout: (SpBoxLayout newLeftToRight @@ -51,7 +53,7 @@ IceTipHiedraAltHistoryRowPresenter >> initializePresenters [ yourself). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraAltHistoryRowPresenter >> item [ ^ self model second diff --git a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st index f481a468c0..dc81c98649 100644 --- a/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHiedraHistoryBrowser.class.st @@ -2,15 +2,17 @@ I add a Hiedra column to the browser defined by my superclass. This column visualizes the relationship between commits in the history list. " Class { - #name : #IceTipHiedraHistoryBrowser, - #superclass : #IceTipHistoryBrowser, + #name : 'IceTipHiedraHistoryBrowser', + #superclass : 'IceTipHistoryBrowser', #instVars : [ 'hiedraColumnController' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeCommitList [ "Add the Hiedra column at the beginning. The Datasource has the logic to render it." @@ -23,7 +25,7 @@ IceTipHiedraHistoryBrowser >> initializeCommitList [ super initializeCommitList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ | ancestorIds | @@ -50,21 +52,21 @@ IceTipHiedraHistoryBrowser >> initializeHiedraColumn [ cellWidth: 5.25 ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHiedraHistoryBrowser >> initializePresenters [ super initializePresenters. self initializeHiedraColumn ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refresh [ self refreshHiedraColumn. super refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHiedraHistoryBrowser >> refreshHiedraColumn [ | ancestorIds | diff --git a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st index 16ad2d0857..63008dd9c3 100644 --- a/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryActionBrowser.class.st @@ -2,47 +2,49 @@ I'm a base browser for pull/push action browser. " Class { - #name : #IceTipHistoryActionBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryActionBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitsPanel', 'actionButtonBar', 'button' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> accept [ button performAction ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> actionButtonBar [ ^ actionButtonBar ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel [ ^ commitsPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryActionBrowser >> commitsPanel: aSpPresenter [ commitsPanel := aSpPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initialExtentForWindow [ ^ (800@600) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> initializePresenters [ commitsPanel := self instantiate: IceTipHistoryBrowser on: self model. @@ -50,7 +52,7 @@ IceTipHistoryActionBrowser >> initializePresenters [ actionButtonBar add: (button := self newActionButton) ] -{ #category : #actions } +{ #category : 'actions' } IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ aRemoteModel ifNil: [ ^ self ]. @@ -61,26 +63,26 @@ IceTipHistoryActionBrowser >> moveToRemote: aRemoteModel [ self updateTitle ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipHistoryActionBrowser >> newActionButton [ "Answer a new instance of SpButton to be placed at bottom, as the main action of the window." ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refresh [ self refreshCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryActionBrowser >> refreshCommits [ commitsPanel refresh ] -{ #category : #private } +{ #category : 'private' } IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ (self model repositoryModel isModelOf: ann repository) @@ -89,7 +91,7 @@ IceTipHistoryActionBrowser >> refreshWhenRepository: ann [ self refresh ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryActionBrowser >> subscribeToAnnouncements [ self announcer diff --git a/Iceberg-TipUI/IceTipHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHistoryBrowser.class.st index 3c5dfdee58..71a6d22f46 100644 --- a/Iceberg-TipUI/IceTipHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryBrowser.class.st @@ -5,22 +5,24 @@ I'm usually used as part of an IceTipRepositoryBrowser. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'commitInfoTabs' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipAdoptCommitCommand. @@ -35,7 +37,7 @@ IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCo ] -{ #category : #specs } +{ #category : 'specs' } IceTipHistoryBrowser class >> panelSpec [ ^ SpPanedLayout newTopToBottom @@ -44,25 +46,25 @@ IceTipHistoryBrowser class >> panelSpec [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> beForMerge [ self commitInfoTabs beForMerge ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitInfoTabs [ ^ commitInfoTabs ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -71,13 +73,13 @@ IceTipHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initialExtentForWindow [ ^ (700 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializeCommitList [ commitList @@ -102,7 +104,7 @@ IceTipHistoryBrowser >> initializeCommitList [ whenSelectionChangedDo: [ :aSelection | self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -111,27 +113,27 @@ IceTipHistoryBrowser >> initializePresenters [ self initializeCommitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refresh [ self refreshCommitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> refreshCommitList [ | commitModels | @@ -141,19 +143,19 @@ IceTipHistoryBrowser >> refreshCommitList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryBrowser >> selectedCommit [ ^ commitList selection selectedItem ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipHistoryBrowser >> selectionChanged: anElement [ commitInfoTabs selectedModel: anElement ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> titleForWindow [ ^ self model @@ -162,13 +164,13 @@ IceTipHistoryBrowser >> titleForWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipHistoryBrowser >> updatePresenter [ self refresh ] -{ #category : #events } +{ #category : 'events' } IceTipHistoryBrowser >> whenSelectionChangedDo: aBlock [ commitList whenSelectionChangedDo: aBlock diff --git a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st index 16b04a9a5b..06ef203e2b 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffFromHead.class.st @@ -3,17 +3,19 @@ I keep a diff from HEAD to WorkingCopy. " Class { - #name : #IceTipHistoryDiffFromHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffFromHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> diffFor: aCommitModel [ ^ aCommitModel diffFromHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffFromHead >> labelFor: aCommitModel [ ^ 'HEAD to {1}' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st index d0b9344fa1..12aab5b16c 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToAncestor.class.st @@ -2,17 +2,19 @@ I keep a diff from a commit to his mail parent. " Class { - #name : #IceTipHistoryDiffToAncestor, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToAncestor', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> diffFor: aCommitModel [ ^ aCommitModel diffToFirstAncestor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToAncestor >> labelFor: aCommitModel [ ^ '{1} to {2}' format: { aCommitModel shortId. diff --git a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st index d1dcb6fca4..2bff338b13 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffToHead.class.st @@ -3,17 +3,19 @@ I keep a diff from WorkingCopy to HEAD. " Class { - #name : #IceTipHistoryDiffToHead, - #superclass : #IceTipHistoryDiffUpdater, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipHistoryDiffToHead', + #superclass : 'IceTipHistoryDiffUpdater', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> diffFor: aCommitModel [ ^ aCommitModel diffToHead ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffToHead >> labelFor: aCommitModel [ ^ '{1} to HEAD' format: { aCommitModel ifNotNil: #shortId } ] diff --git a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st index 0cfc0e00fc..2c33f2fa79 100644 --- a/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st +++ b/Iceberg-TipUI/IceTipHistoryDiffUpdater.class.st @@ -4,64 +4,66 @@ Since orders may change for different operations, I need a different approach fo " Class { - #name : #IceTipHistoryDiffUpdater, - #superclass : #Object, + #name : 'IceTipHistoryDiffUpdater', + #superclass : 'Object', #instVars : [ 'tab' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #testing } +{ #category : 'testing' } IceTipHistoryDiffUpdater class >> isAbstract [ ^ self == IceTipHistoryDiffUpdater ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipHistoryDiffUpdater class >> tab: aTab [ ^ self new tab: aTab; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> diffFor: aCommitModel [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> labelFor: aCommitModel [ ^ self subclassResponsibility ] -{ #category : #'private factory' } +{ #category : 'private factory' } IceTipHistoryDiffUpdater >> newDiffPanelFor: aDiffModel [ ^ IceTipDiffPanel on: aDiffModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab [ ^ tab ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipHistoryDiffUpdater >> tab: anObject [ tab := anObject ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateContentsOn: aCommitModel [ aCommitModel ifNil: [ ^ self ]. self tab contents: (self newDiffPanelFor: (self diffFor: aCommitModel)) build ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateLabelOn: aCommitModel [ self tab label: (self labelFor: aCommitModel) ] -{ #category : #updating } +{ #category : 'updating' } IceTipHistoryDiffUpdater >> updateOn: aCommitModel [ self updateLabelOn: aCommitModel. self updateContentsOn: aCommitModel diff --git a/Iceberg-TipUI/IceTipInspectCommand.class.st b/Iceberg-TipUI/IceTipInspectCommand.class.st index d50a4ee13d..f5ef0d83c4 100644 --- a/Iceberg-TipUI/IceTipInspectCommand.class.st +++ b/Iceberg-TipUI/IceTipInspectCommand.class.st @@ -2,42 +2,44 @@ I am a command implementing the inspect option. I have several context activations to be able to inspect different objects in Iceberg's UI " Class { - #name : #IceTipInspectCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInspectCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultDescription [ ^ 'Inspect the selected element' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInspectCommand class >> defaultName [ ^ 'Inspect...' ] -{ #category : #testing } +{ #category : 'testing' } IceTipInspectCommand >> canBeExecuted [ ^ self context hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipInspectCommand >> execute [ self item inspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> iconName [ ^ #glamorousInspect ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInspectCommand >> item [ | maybeCachedObject | diff --git a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st index a11c718b99..fbbaad2497 100644 --- a/Iceberg-TipUI/IceTipInstallVersionCommand.class.st +++ b/Iceberg-TipUI/IceTipInstallVersionCommand.class.st @@ -3,36 +3,38 @@ Command used in the version browser, inside the code browser. This command takes the selected version and installs it (also called revert). " Class { - #name : #IceTipInstallVersionCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipInstallVersionCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultDescription [ ^ 'Revert to the selected version' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipInstallVersionCommand class >> defaultName [ ^ 'Install this version' ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> execute [ self version install ] -{ #category : #activation } +{ #category : 'activation' } IceTipInstallVersionCommand >> iconName [ ^ #smallRedo ] -{ #category : #execution } +{ #category : 'execution' } IceTipInstallVersionCommand >> version [ ^ self context selectedItem diff --git a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st index e74a3465c0..e76f8c4c84 100644 --- a/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st +++ b/Iceberg-TipUI/IceTipInteractiveCredentialsProvider.class.st @@ -2,23 +2,25 @@ I am a credential provider that requires the missing plaintext credential to the user. " Class { - #name : #IceTipInteractiveCredentialsProvider, - #superclass : #IceCredentialsProvider, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipInteractiveCredentialsProvider', + #superclass : 'IceCredentialsProvider', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceTipInteractiveCredentialsProvider class >> initialize [ self providerType: nil ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider class >> isDefault [ ^ true ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ | returnedCred | @@ -30,7 +32,7 @@ IceTipInteractiveCredentialsProvider >> obtainCredentials: credentialsToReturn [ credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsToReturn [ | returnedCred | @@ -43,7 +45,7 @@ IceTipInteractiveCredentialsProvider >> obtainPlaintextCredentials: credentialsT credentialsToReturn readFrom: returnedCred ] -{ #category : #private } +{ #category : 'private' } IceTipInteractiveCredentialsProvider >> obtainSshCredentials: credentialsToReturn [ | returnedCred | diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index 533f52c029..a420c950b2 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -3,22 +3,24 @@ I'm a visitor to provide users with an interactive way to react to iceberg error " Class { - #name : #IceTipInteractiveErrorVisitor, - #superclass : #IceErrorVisitor, + #name : 'IceTipInteractiveErrorVisitor', + #superclass : 'IceErrorVisitor', #instVars : [ 'context', 'repository' ], - #category : #'Iceberg-TipUI-Exceptions' + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext [ ^ self newContext: aContext repository: nil ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ ^ self new @@ -27,40 +29,40 @@ IceTipInteractiveErrorVisitor class >> newContext: aContext repository: aModel [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipInteractiveErrorVisitor class >> on: aModel [ ^ self new repository: aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> context: anObject [ context := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository: anObject [ repository := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ self defaultApplication label: anError messageText; @@ -68,7 +70,7 @@ IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ self defaultApplication @@ -77,7 +79,7 @@ IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ self defaultApplication @@ -88,7 +90,7 @@ IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ self defaultApplication @@ -98,7 +100,7 @@ IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ | proceed | @@ -112,7 +114,7 @@ IceTipInteractiveErrorVisitor >> visitExperimentalFeature: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitGenericError: anError [ (IceTipErrorDialogPresenter @@ -123,7 +125,7 @@ IceTipInteractiveErrorVisitor >> visitGenericError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMergeAborted: anError [ self defaultApplication @@ -135,7 +137,7 @@ WARNING: If you have external files, you may need to verify the conflicts there. openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ ((IceTipGitUsernameAndEmailDialogPresenter @@ -147,7 +149,7 @@ IceTipInteractiveErrorVisitor >> visitMissingCredentialsError: anError [ open ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ | proceed | @@ -162,7 +164,7 @@ IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ aWarning resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoRemote: anError [ self defaultApplication @@ -172,7 +174,7 @@ Add one before continue.'; openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ self defaultApplication newInform @@ -180,7 +182,7 @@ IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ self defaultApplication newInform @@ -189,7 +191,7 @@ IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ openModal ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteDesynchronizedError: anError [ | continue command | @@ -222,7 +224,7 @@ You need to pull remote changes before continue and push your changes.' anError retry ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitShouldCommitBeforePullError: anError [ | continue | @@ -239,7 +241,7 @@ We recommend that you commit first and then pull incoming changes again.'; anError resume ] -{ #category : #visiting } +{ #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitWorkingCopyDesynchronizedError: anError [ | solveStrategy command | diff --git a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st index 577cf69282..c2d502942e 100644 --- a/Iceberg-TipUI/IceTipLoadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipLoadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that loads the current non-loaded selected package " Class { - #name : #IceTipLoadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipLoadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultDescription [ ^ 'Load selected package in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipLoadPackageCommand class >> defaultName [ ^ 'Load' ] -{ #category : #testing } +{ #category : 'testing' } IceTipLoadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded not ] -{ #category : #executing } +{ #category : 'executing' } IceTipLoadPackageCommand >> execute [ self packageModel newLoadAction executeWithContext: self context. @@ -33,7 +35,7 @@ IceTipLoadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLoadPackageCommand >> iconName [ ^ #add diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 9e3bcd9b5d..73ba56fba6 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -3,18 +3,20 @@ I will define a repository that already exists. " Class { - #name : #IceTipLocalRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipLocalRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel class >> order [ ^ 20 ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocalRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -25,13 +27,13 @@ IceTipLocalRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallOpen ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> initialExtentForWindow [ ^ (500@( @@ -41,25 +43,25 @@ IceTipLocalRepositoryPanel >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #testing } +{ #category : 'testing' } IceTipLocalRepositoryPanel >> isLocalRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location [ ^ self projectLocation location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> location: aReferenceOrString [ ^ self projectLocation location: aReferenceOrString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> newRepository [ UIManager default @@ -71,13 +73,13 @@ IceTipLocalRepositoryPanel >> newRepository [ createRepository ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocalRepositoryPanel >> titleForWindow [ ^ 'Import from existing clone' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocalRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipLocationPresenter.class.st b/Iceberg-TipUI/IceTipLocationPresenter.class.st index b62a028a13..7278835716 100644 --- a/Iceberg-TipUI/IceTipLocationPresenter.class.st +++ b/Iceberg-TipUI/IceTipLocationPresenter.class.st @@ -3,8 +3,8 @@ I'm an abstract model to provide locations (directories or files). I need to be included in other components (search references to my children for examples) " Class { - #name : #IceTipLocationPresenter, - #superclass : #SpPresenter, + #name : 'IceTipLocationPresenter', + #superclass : 'SpPresenter', #instVars : [ 'locationInput', 'chooseButton', @@ -12,16 +12,18 @@ Class { 'chooseBlock', 'keptLocation' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipLocationPresenter class >> isAbstract [ ^ self == IceTipLocationPresenter ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> appendPath: aString [ keptLocation ifNil: [ keptLocation := self location ]. @@ -31,13 +33,13 @@ IceTipLocationPresenter >> appendPath: aString [ ifEmpty: [ keptLocation ]). ] -{ #category : #private } +{ #category : 'private' } IceTipLocationPresenter >> basicLocation: aReference [ locationInput text: aReference pathString ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> choose [ self chooseReference ifNotNil: [ :reference | @@ -45,43 +47,43 @@ IceTipLocationPresenter >> choose [ self onChoose ifNotNil: #value ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> chooseButton [ ^ chooseButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipLocationPresenter >> chooseReference [ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle [ ^ chooseTitle ifNil: [ self defaultChooseDialogTitle ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> chooseTitle: aString [ chooseTitle := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultChooseDialogTitle [ ^ 'Choose directory' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> defaultLabel [ ^ 'Directory' ] -{ #category : #layout } +{ #category : 'layout' } IceTipLocationPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -93,13 +95,13 @@ IceTipLocationPresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> icon [ ^ self iconNamed: #open ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipLocationPresenter >> initializePresenters [ locationInput := self newTextInput @@ -113,7 +115,7 @@ IceTipLocationPresenter >> initializePresenters [ chooseButton action: [ self choose ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location [ "This method return the location to use in the repository If the location is relative to IceLibgitRepository >> #localRepositoriesLocation @@ -135,7 +137,7 @@ IceTipLocationPresenter >> location [ ^ IceLibgitRepository localRepositoriesLocation resolvePath: relativePath ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipLocationPresenter >> location: aReferenceOrString [ | ref | @@ -152,26 +154,26 @@ IceTipLocationPresenter >> location: aReferenceOrString [ self basicLocation: ref ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipLocationPresenter >> locationInput [ ^ locationInput ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose [ ^ chooseBlock ] -{ #category : #hook } +{ #category : 'hook' } IceTipLocationPresenter >> onChoose: aBlockClosure [ "I allow to set a hook to execute when the user select a location." chooseBlock := aBlockClosure ] -{ #category : #events } +{ #category : 'events' } IceTipLocationPresenter >> whenTextChanged: aBlockClosure [ self locationInput whenTextChangedDo: aBlockClosure diff --git a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st index 10c1f65a81..e0f99435cf 100644 --- a/Iceberg-TipUI/IceTipManagePackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipManagePackagesCommand.class.st @@ -2,24 +2,26 @@ I'm a command to open the package manager browser for a project. " Class { - #name : #IceTipManagePackagesCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManagePackagesCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultDescription [ ^ 'Open packages manager browser for this repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManagePackagesCommand class >> defaultName [ ^ 'Packages' ] -{ #category : #executing } +{ #category : 'executing' } IceTipManagePackagesCommand >> execute [ (IceTipWorkingCopyBrowser @@ -28,13 +30,13 @@ IceTipManagePackagesCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> iconName [ ^ #package ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManagePackagesCommand >> shortcutKey [ ^ $p meta diff --git a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st index 25acd74669..4d0185f541 100644 --- a/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipManageRepositoryCommand.class.st @@ -3,36 +3,38 @@ I'm a command to show the repository manager for a repository model. " Class { - #name : #IceTipManageRepositoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipManageRepositoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultDescription [ ^ 'Open repository manager browser for this repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultName [ ^ 'Open Repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipManageRepositoryCommand class >> defaultToolbarItemName [ ^ 'Repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryMissing not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipManageRepositoryCommand >> execute [ (IceTipRepositoryBrowser @@ -41,19 +43,19 @@ IceTipManageRepositoryCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> iconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipManageRepositoryCommand >> shortcutKey [ ^ $r meta ] -{ #category : #testing } +{ #category : 'testing' } IceTipManageRepositoryCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st index fbd509f795..9a1252f105 100644 --- a/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchDialogPresenter.class.st @@ -4,34 +4,36 @@ I'm a dialog to perform a merge of a branch. (self onRepository: IceRepository registry anyOne) openDialogWithSpec " Class { - #name : #IceTipMergeBranchDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipMergeBranchDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'model', 'types' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeBranchDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> allTypes [ ^ types ifNil: [ types := self createMergeBranchTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> beSwitchAndMerge [ self allTypes do: #beSwitchAndMerge ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ | allTypes | @@ -54,44 +56,44 @@ IceTipMergeBranchDialogPresenter >> createMergeBranchTypes [ ^ allTypes ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchDialogPresenter >> doAccept [ self selectedType doAccept ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> initialExtentForWindow [ ^ (600 @ 400) scaledByDisplayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchDialogPresenter >> model: anObject [ model := anObject. self allTypes do: [ :each | each model: anObject ] ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipMergeBranchDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeBranchDialogPresenter >> titleForWindow [ ^ 'Select branch to merge into ' , (self model branchName contractTo: 45) ] -{ #category : #activation } +{ #category : 'activation' } IceTipMergeBranchDialogPresenter >> updateWindowTitle [ self window title: self titleForWindow diff --git a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st index 24bd011621..608f005030 100644 --- a/Iceberg-TipUI/IceTipMergeBranchPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeBranchPanel.class.st @@ -2,21 +2,23 @@ I'm a panel to peform the merge of an existing branch. " Class { - #name : #IceTipMergeBranchPanel, - #superclass : #IceTipExistingBranchPanel, + #name : 'IceTipMergeBranchPanel', + #superclass : 'IceTipExistingBranchPanel', #instVars : [ 'mergeType' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> beSwitchAndMerge [ self mergeType: IceTipMergeType switchAndMerge ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeBranchPanel >> doAccept [ IceTipStandardAction new @@ -27,19 +29,19 @@ IceTipMergeBranchPanel >> doAccept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType [ ^ mergeType ifNil: [ IceTipMergeType default ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> mergeType: anObject [ mergeType := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeBranchPanel >> withoutHead [ self branchesList items: (self branchModels reject: #isHead). diff --git a/Iceberg-TipUI/IceTipMergeCommand.class.st b/Iceberg-TipUI/IceTipMergeCommand.class.st index 11c5c49cdd..b5345488ef 100644 --- a/Iceberg-TipUI/IceTipMergeCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeCommand.class.st @@ -2,30 +2,32 @@ Command that opens a dialog to select a branch to merge in the current merge " Class { - #name : #IceTipMergeCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultDescription [ ^ 'Merge a given branch into your current branch.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeCommand class >> defaultName [ ^ 'Merge to current' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeCommand >> canBeExecuted [ ^ self isRepositoryOperational ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeCommand >> execute [ (IceTipMergeBranchDialogPresenter @@ -36,7 +38,7 @@ IceTipMergeCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeCommand >> iconName [ ^ #merge diff --git a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st index 1d70eeb9d7..bfe81e157f 100644 --- a/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st +++ b/Iceberg-TipUI/IceTipMergeHistoryCommand.class.st @@ -2,36 +2,38 @@ Command that opens a window showing the history of the selected merged branch. " Class { - #name : #IceTipMergeHistoryCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipMergeHistoryCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultDescription [ ^ 'Show the merged history of the selected merge commit' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMergeHistoryCommand class >> defaultName [ ^ 'Browse merge history' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergeHistoryCommand >> canBeExecuted [ ^ self commitModel hasMultipleAncestors ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> commitModel [ ^ self context selectedCommit ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeHistoryCommand >> execute [ (IceTipHistoryBrowser on: diff --git a/Iceberg-TipUI/IceTipMergeModel.class.st b/Iceberg-TipUI/IceTipMergeModel.class.st index 249baca4a0..3a2be87af4 100644 --- a/Iceberg-TipUI/IceTipMergeModel.class.st +++ b/Iceberg-TipUI/IceTipMergeModel.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceTipMergeModel, - #superclass : #IceTipDiffPreviewModel, + #name : 'IceTipMergeModel', + #superclass : 'IceTipDiffPreviewModel', #instVars : [ 'mergeType', 'mergeAction' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> calculateDiff [ ^ self mergeAction ] -{ #category : #private } +{ #category : 'private' } IceTipMergeModel >> mergeAction [ ^ mergeAction ifNil: [ @@ -24,13 +26,13 @@ IceTipMergeModel >> mergeAction [ yourself ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> mergeType: aMergeType [ mergeType := aMergeType ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newExecuteMergeAction [ @@ -42,13 +44,13 @@ IceTipMergeModel >> newExecuteMergeAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergeModel >> newMergeAction [ ^ mergeType newMergeAction: commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeModel >> repositoryModel [ ^ commitish repositoryModel ] diff --git a/Iceberg-TipUI/IceTipMergeMorph.class.st b/Iceberg-TipUI/IceTipMergeMorph.class.st index f45def3de7..4dc7b9b9f2 100644 --- a/Iceberg-TipUI/IceTipMergeMorph.class.st +++ b/Iceberg-TipUI/IceTipMergeMorph.class.st @@ -2,19 +2,21 @@ I redefine PSMCMergeMorph to be able to use an IceMergePatchMorph as patch morph " Class { - #name : #IceTipMergeMorph, - #superclass : #PSMCMergeMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergeMorph', + #superclass : 'PSMCMergeMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeMorph >> conflictCount [ "Answer the number of conflicts that are unresolved." ^(self model ifNil: [^0]) unresolvedConflictCount ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeMorph >> model: aMerger [ "Set the model and update the window." @@ -26,7 +28,7 @@ IceTipMergeMorph >> model: aMerger [ self patchMorph model: aMerger ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeMorph >> newPatchMorph [ "Answer a new patch morph." diff --git a/Iceberg-TipUI/IceTipMergePatchMorph.class.st b/Iceberg-TipUI/IceTipMergePatchMorph.class.st index 534efa39a0..6a05a76fb0 100644 --- a/Iceberg-TipUI/IceTipMergePatchMorph.class.st +++ b/Iceberg-TipUI/IceTipMergePatchMorph.class.st @@ -2,19 +2,21 @@ I redefine part of monticello's PSMCMergePatchMorph to not require to rebuild a tree but use Iceberg's one directly. I also adapt the patch morph to handle files and several packages at the same time. " Class { - #name : #IceTipMergePatchMorph, - #superclass : #PSMCMergePatchMorph, - #category : #'Iceberg-TipUI-Morphic' + #name : 'IceTipMergePatchMorph', + #superclass : 'PSMCMergePatchMorph', + #category : 'Iceberg-TipUI-Morphic', + #package : 'Iceberg-TipUI', + #tag : 'Morphic' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> changes [ "Answer the changes tree roots." ^ model ifNotNil: [ model mergeTree children collect: [ :each | IceMergeListWrapper with: each model: model ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ "Answer whether there are any conflicts not marked as a conflict." @@ -22,7 +24,7 @@ IceTipMergePatchMorph >> hasAnyNonConflictConflicts [ conflict isConflict and: [ conflict isResolved ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ "Answer whether there are any conflicts not marked as incoming." @@ -31,7 +33,7 @@ IceTipMergePatchMorph >> hasAnyNonIncomingConflicts [ conflict isResolved not or: [conflict isLeftChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ "Answer whether there are any conflicts not marked as keep." @@ -40,7 +42,7 @@ IceTipMergePatchMorph >> hasAnyNonKeptConflicts [ conflict isResolved not or: [conflict isRightChosen ] ] ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> hasConflicts [ "Answer whether there are any conflicts." @@ -48,7 +50,7 @@ IceTipMergePatchMorph >> hasConflicts [ conflict isConflict ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> keepAllCurrentVersion [ "Mark all conflicts as local." @@ -58,7 +60,7 @@ IceTipMergePatchMorph >> keepAllCurrentVersion [ self updateSource ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> markAllAsConflict [ "Mark all conflicts as unresolved." @@ -68,7 +70,7 @@ IceTipMergePatchMorph >> markAllAsConflict [ self updateSource ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> markAsConflict [ "Mark the operation as unresolved conflict." @@ -77,7 +79,7 @@ IceTipMergePatchMorph >> markAsConflict [ self updateSource. ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> nextConflict [ "Answer the next (unresolved) conflict or, nil if none." @@ -92,7 +94,7 @@ IceTipMergePatchMorph >> nextConflict [ ^ IceMergeListWrapper with: node model: model. ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> notAllConflictsResolved [ "Answer whether any conflicts are unresolved." @@ -100,7 +102,7 @@ IceTipMergePatchMorph >> notAllConflictsResolved [ item isConflict and: [item isResolved not]] ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePatchMorph >> selectNextConflict [ "Select the next conflict after the current selection, if any." @@ -109,14 +111,14 @@ IceTipMergePatchMorph >> selectNextConflict [ self changed: {#openPath}, next item path segments ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePatchMorph >> selectedChange [ "Answer the selected change." ^(self selectedChangeWrapper ifNil: [^nil]) item value ] -{ #category : #private } +{ #category : 'private' } IceTipMergePatchMorph >> selectionHasActualClass [ "Answer whether the currently selected change has an actual class in the image." @@ -126,14 +128,14 @@ IceTipMergePatchMorph >> selectionHasActualClass [ ifNotNil: [:w | w item value contextClass notNil] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> selectionIsRemoteChosen [ self selectedChange ifNil: [ ^ false]. ^ self selectedChange isConflict and: [ self selectedChange isRightChosen ] ] -{ #category : #updating } +{ #category : 'updating' } IceTipMergePatchMorph >> updateSource [ "Update the source difference morph." @@ -159,7 +161,7 @@ IceTipMergePatchMorph >> updateSource [ ifFalse: [self diffMorph indicateSrc] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMergePatchMorph >> useAllIncomingVersion [ "Mark all conflicts as remote." diff --git a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st index 5d9d18d743..83535956d8 100644 --- a/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipMergePreviewBrowser.class.st @@ -4,12 +4,14 @@ I preview the changes that will be introduced in the image when a merge occurs. (self onBranch: IceRepository registry anyOne branch) openWithSpec. " Class { - #name : #IceTipMergePreviewBrowser, - #superclass : #IceTipPreviewBrowser, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipMergePreviewBrowser', + #superclass : 'IceTipPreviewBrowser', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergePreviewBrowser class >> onBranch: aBranch [ ^ self on: (IceTipMergeModel new commitish: aBranch; @@ -17,14 +19,14 @@ IceTipMergePreviewBrowser class >> onBranch: aBranch [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipMergePreviewBrowser >> doMerge [ self model newExecuteMergeAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> initializePresenters [ super initializePresenters. @@ -32,13 +34,13 @@ IceTipMergePreviewBrowser >> initializePresenters [ diffPanel rightLabel: 'Merge with ', model targetName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergePreviewBrowser >> mergeType: anObject [ self model mergeType: anObject ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipMergePreviewBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipMergePreviewBrowser >> newActionButton [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergePreviewBrowser >> titleForWindow [ ^ 'Preview merge of {1}/{2}' format: { diff --git a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st index 3f8a4eec31..fdfc258341 100644 --- a/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st +++ b/Iceberg-TipUI/IceTipMergeSelectingPanel.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipMergeSelectingPanel, - #superclass : #IceTipDiffPanel, + #name : 'IceTipMergeSelectingPanel', + #superclass : 'IceTipDiffPanel', #instVars : [ 'codePanel', 'checkedIceNodes' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> basicRefresh [ super basicRefresh. self refreshCodePanel. ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> changeListColumn [ ^ SpCompositeTableColumn new @@ -46,13 +48,13 @@ IceTipMergeSelectingPanel >> changeListColumn [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> codePanel [ ^ codePanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipMergeSelectingPanel >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -66,7 +68,7 @@ IceTipMergeSelectingPanel >> defaultLayout [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initialize [ super initialize. @@ -77,7 +79,7 @@ IceTipMergeSelectingPanel >> initialize [ child value isConflict ifTrue: [ child value selectLeft ] ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipMergeSelectingPanel >> initializePresenters [ codePanel := self newCode. @@ -87,7 +89,7 @@ IceTipMergeSelectingPanel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> refresh [ super refresh. @@ -96,7 +98,7 @@ IceTipMergeSelectingPanel >> refresh [ self refreshCodePanel ] -{ #category : #private } +{ #category : 'private' } IceTipMergeSelectingPanel >> refreshCodePanel [ | visitor mergeNode | @@ -107,13 +109,13 @@ IceTipMergeSelectingPanel >> refreshCodePanel [ ifNotNil: [ mergeNode accept: visitor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeSelectingPanel >> selectedItems [ ^ checkedIceNodes ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipMergeSelectingPanel >> selectionChanged [ super selectionChanged. diff --git a/Iceberg-TipUI/IceTipMergeType.class.st b/Iceberg-TipUI/IceTipMergeType.class.st index 3fa3830c87..6d96c48bec 100644 --- a/Iceberg-TipUI/IceTipMergeType.class.st +++ b/Iceberg-TipUI/IceTipMergeType.class.st @@ -5,47 +5,49 @@ My children define strategies of how to merge two commitish. " Class { - #name : #IceTipMergeType, - #superclass : #Object, + #name : 'IceTipMergeType', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> default [ ^ self direct ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> direct [ ^ IceTipDirectMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMergeType class >> switchAndMerge [ ^ IceTipSwitchAndMergeType uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipMergeType class >> uniqueInstance [ self = IceTipMergeType ifTrue: [ self error: 'I''m an abstract type. Use one of my children' ]. ^ uniqueInstance ifNil: [ uniqueInstance := self basicNew initialize ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> mergeOn: aModel then: aBlock [ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipMergeType >> newMergeAction: aModel [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st index dd81696941..0639cde03a 100644 --- a/Iceberg-TipUI/IceTipModel.class.st +++ b/Iceberg-TipUI/IceTipModel.class.st @@ -4,35 +4,37 @@ Each tip component refers to one (and just one) model, which will provide model Models can be cached using #beCached. " Class { - #name : #IceTipModel, - #superclass : #Object, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipModel', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #converting } +{ #category : 'converting' } IceTipModel >> beCached [ ^ IceTipCachedModel for: self ] -{ #category : #private } +{ #category : 'private' } IceTipModel >> colorForError [ ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipModel >> matches: aString [ "Override this if you want to make this model discoverable" ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> repositoryModel [ "this model does not provides a repository model" ^ nil ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipModel >> reset [ "to provide polymorphism with cached version" ] diff --git a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st index 8d00759a46..e5d2698279 100644 --- a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st @@ -5,24 +5,26 @@ Usually, I'm part of an IceTipRegisterProjectPresenter. I will define location, name and source subdirectory and I will use that to create a #newRepository. " Class { - #name : #IceTipNewRepositoryPanel, - #superclass : #IceTipRepositoryTypePanel, + #name : 'IceTipNewRepositoryPanel', + #superclass : 'IceTipRepositoryTypePanel', #instVars : [ 'projectNameLabel', 'projectNameInputText', 'subdirectoryLabel', 'subdirectoryInputText' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel class >> order [ ^ 10 ] -{ #category : #layout } +{ #category : 'layout' } IceTipNewRepositoryPanel >> defaultLayout [ ^ SpGridLayout new @@ -35,13 +37,13 @@ IceTipNewRepositoryPanel >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> iconForWindow [ ^ self iconNamed: #smallNew ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializePresenters [ super initializePresenters. @@ -58,7 +60,7 @@ IceTipNewRepositoryPanel >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> initializeSourceDirectory [ subdirectoryLabel := self newLabel @@ -72,13 +74,13 @@ IceTipNewRepositoryPanel >> initializeSourceDirectory [ ] -{ #category : #testing } +{ #category : 'testing' } IceTipNewRepositoryPanel >> isNewRepository [ ^ true ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> newRepository [ | repositoryName location subdirectory | @@ -96,37 +98,37 @@ IceTipNewRepositoryPanel >> newRepository [ createNewRepositoryNamed: repositoryName ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameInputText [ ^ projectNameInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> projectNameLabel [ ^ projectNameLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryInputText [ ^ subdirectoryInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipNewRepositoryPanel >> subdirectoryLabel [ ^ subdirectoryLabel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipNewRepositoryPanel >> titleForWindow [ ^ 'New repository' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipNewRepositoryPanel >> validate [ self diff --git a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st index 046c3d4e94..51f0260a57 100644 --- a/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st +++ b/Iceberg-TipUI/IceTipOpenNativelyCommand.class.st @@ -2,24 +2,26 @@ I am a command that, once executed, will open the native file browser on the directory containing the local repository of the git project. " Class { - #name : #IceTipOpenNativelyCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipOpenNativelyCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultDescription [ ^ 'Open the native file browser on the local repository of this project.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenNativelyCommand class >> defaultName [ ^ 'Open in native file browser' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenNativelyCommand >> canBeExecuted [ | location | @@ -28,13 +30,13 @@ IceTipOpenNativelyCommand >> canBeExecuted [ ^ location isNotNil and: [ location exists ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenNativelyCommand >> execute [ self item location openInOSFileBrowser ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenNativelyCommand >> iconName [ ^ #smallWindow diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st index 2f6133367c..c63a4618b6 100644 --- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st @@ -7,17 +7,19 @@ I'm kind of a ""tabbed"" dialog, but my options are ""mac style"": lateral and n This is useful to keep a variable number of options. " Class { - #name : #IceTipOptionDialogPresenter, - #superclass : #IceTipPresenter, + #name : 'IceTipOptionDialogPresenter', + #superclass : 'IceTipPresenter', #instVars : [ 'typeList', 'type', 'contentLayout' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> accept [ [ @@ -28,19 +30,19 @@ IceTipOptionDialogPresenter >> accept [ e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> allTypes [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> contextSelection [ ^ type ] -{ #category : #layout } +{ #category : 'layout' } IceTipOptionDialogPresenter >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -50,19 +52,19 @@ IceTipOptionDialogPresenter >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipOptionDialogPresenter >> doAccept [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter @@ -72,14 +74,14 @@ IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter whenOpenedDo: [ self typeList selectIndex: 1 ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializePresenters [ contentLayout := SpBoxLayout newTopToBottom. self initializeTypeList ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipOptionDialogPresenter >> initializeTypeList [ (typeList := self newList) @@ -90,7 +92,7 @@ IceTipOptionDialogPresenter >> initializeTypeList [ self selectionChanged: selection selectedItem ] ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> replacePanelWith: aType [ contentLayout @@ -98,13 +100,13 @@ IceTipOptionDialogPresenter >> replacePanelWith: aType [ add: aType ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOptionDialogPresenter >> selectedType [ ^ type ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> selectionChanged: aType [ type := aType. @@ -113,13 +115,13 @@ IceTipOptionDialogPresenter >> selectionChanged: aType [ self replacePanelWith: type ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipOptionDialogPresenter >> typeList [ ^ typeList ] -{ #category : #private } +{ #category : 'private' } IceTipOptionDialogPresenter >> updateWindowTitle [ self window title: type titleForWindow diff --git a/Iceberg-TipUI/IceTipPackageCommand.class.st b/Iceberg-TipUI/IceTipPackageCommand.class.st index 2f48f71553..72c5cc9e02 100644 --- a/Iceberg-TipUI/IceTipPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipPackageCommand.class.st @@ -2,45 +2,47 @@ Abstract class representing commands to be applied on top of packages. " Class { - #name : #IceTipPackageCommand, - #superclass : #IceTipCommand, + #name : 'IceTipPackageCommand', + #superclass : 'IceTipCommand', #instVars : [ 'packageModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand class >> isAbstract [ ^ self == IceTipPackageCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> hasPackageModel [ ^ self packageModel notNil ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageCommand >> isPackageLoaded [ ^ self hasPackageModel and: [ self packageModel isLoaded ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> package [ ^ self packageModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel [ ^ packageModel ifNil: [self context packageModel] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageCommand >> packageModel: anIceTipPackageModel [ packageModel := anIceTipPackageModel diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index e37bfc6d98..080c19e5b6 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -2,19 +2,21 @@ I'm a model for IcePackage entries. " Class { - #name : #IceTipPackageModel, - #superclass : #IceTipEntityModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPackageModel', + #superclass : 'IceTipEntityModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browsePackage [ self entity browse ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> browseRepositoryVersion [ | snapshot | @@ -24,7 +26,7 @@ IceTipPackageModel >> browseRepositoryVersion [ showLabelled: 'Snapshot for ', self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> description [ | text | @@ -34,7 +36,7 @@ IceTipPackageModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> descriptionDecorator [ self entity isModified @@ -45,22 +47,22 @@ IceTipPackageModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isLoaded [ ^ self entity isLoaded ] -{ #category : #testing } +{ #category : 'testing' } IceTipPackageModel >> isModified [ ^ self entity isModified ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> newLoadAction [ @@ -75,12 +77,12 @@ IceTipPackageModel >> newLoadAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> packageName [ ^ self entity packageName ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> reload [ @@ -94,7 +96,7 @@ IceTipPackageModel >> reload [ while: [ self entity reload ] ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> remove [ @@ -108,7 +110,7 @@ IceTipPackageModel >> remove [ while: [ self entity remove ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> status [ "entity could be a repository or a package" [ @@ -120,7 +122,7 @@ IceTipPackageModel >> status [ ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPackageModel >> statusDecorator [ self entity isLoaded @@ -128,7 +130,7 @@ IceTipPackageModel >> statusDecorator [ ^ super statusDecorator ] -{ #category : #actions } +{ #category : 'actions' } IceTipPackageModel >> unload [ diff --git a/Iceberg-TipUI/IceTipPresenter.class.st b/Iceberg-TipUI/IceTipPresenter.class.st index bd03d7bd41..e6fa418d83 100644 --- a/Iceberg-TipUI/IceTipPresenter.class.st +++ b/Iceberg-TipUI/IceTipPresenter.class.st @@ -2,54 +2,56 @@ I'm a SpPresenter that is prepared to be wrapped in a window (or a dialog). The way it is prepared is through a system of hooks (template method pattern), but also providing some convenience API. " Class { - #name : #IceTipPresenter, - #superclass : #SpPresenter, + #name : 'IceTipPresenter', + #superclass : 'SpPresenter', #instVars : [ 'decorations' ], - #category : #'Iceberg-TipUI-View' + #category : 'Iceberg-TipUI-View', + #package : 'Iceberg-TipUI', + #tag : 'View' } -{ #category : #decorating } +{ #category : 'decorating' } IceTipPresenter class >> buildDecorations [ ^ (Pragma allNamed: #extensionDecorators in: self class) flatCollect: [ :pragma | self perform: pragma methodSelector ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter class >> currentApplication [ ^ StPresenter currentApplication ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPresenter class >> new [ ^ self newApplication: self currentApplication ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPresenter >> closeWindow [ "Close the window of this presenter" self window close ] -{ #category : #private } +{ #category : 'private' } IceTipPresenter >> decorations [ ^ decorations ifNil: [ decorations := self class buildDecorations ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> iconForWindow [ "Answer a Form to be used during initialization when opening in a SpWindowPresenter." ^ self iconNamed: #smallWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initialExtentForWindow [ "Answer either nil or a Point representing the initial extent of this presenter. It is used during initialization if this presenter is opened inside a SpWindowPresenter. @@ -58,7 +60,7 @@ IceTipPresenter >> initialExtentForWindow [ ^ nil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -70,25 +72,25 @@ IceTipPresenter >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setInitialExtentTo: aSpWindowPresenter [ aSpWindowPresenter initialExtent: self initialExtentForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setTitleTo: aSpWindowPresenter [ aSpWindowPresenter title: self titleForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> setWindowIconTo: aSpWindowPresenter [ aSpWindowPresenter windowIcon: self iconForWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPresenter >> titleForWindow [ "Answer the title to use during initialization when this presenter is being opened in a SpWindowPresenter." @@ -97,7 +99,7 @@ IceTipPresenter >> titleForWindow [ ] -{ #category : #extensions } +{ #category : 'extensions' } IceTipPresenter >> updateTitle [ self withWindowDo: [ :aWindow | aWindow title: self titleForWindow ] diff --git a/Iceberg-TipUI/IceTipPreviewBrowser.class.st b/Iceberg-TipUI/IceTipPreviewBrowser.class.st index 7623877b11..50cb8b30d1 100644 --- a/Iceberg-TipUI/IceTipPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipPreviewBrowser.class.st @@ -3,35 +3,37 @@ I'm a browser to show a preview of an operation that can be made right after. Tipically, I'm using through my chldren, to do a checkout or merge. " Class { - #name : #IceTipPreviewBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipPreviewBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'diffPanel', 'actionPanel', 'button' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipPreviewBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> actionPanel [ ^ actionPanel ] -{ #category : #layout } +{ #category : 'layout' } IceTipPreviewBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -42,19 +44,19 @@ IceTipPreviewBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> diffPanel [ ^ diffPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initialExtentForWindow [ ^ (800 @ 400) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPreviewBrowser >> initializePresenters [ diffPanel := self instantiate: IceTipDiffPanel on: self model diff. @@ -62,14 +64,14 @@ IceTipPreviewBrowser >> initializePresenters [ actionPanel add: (button := self newActionButton) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipPreviewBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ diffPanel iceNodesTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPreviewBrowser >> newActionButton [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipPullBrowser.class.st b/Iceberg-TipUI/IceTipPullBrowser.class.st index 8337cf3717..2f61669678 100644 --- a/Iceberg-TipUI/IceTipPullBrowser.class.st +++ b/Iceberg-TipUI/IceTipPullBrowser.class.st @@ -3,18 +3,20 @@ I perform a pull of incoming commits. " Class { - #name : #IceTipPullBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPullBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPullBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipFetchInPullCommand forSpec ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPullBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPullModel @@ -24,20 +26,20 @@ IceTipPullBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullBrowser >> doPull [ self model newPullAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> labelForRemotePanel [ ^ 'Pull from remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPullBrowser >> newActionButton [ ^ self newButton @@ -49,7 +51,7 @@ IceTipPullBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPullBrowser >> titleForWindow [ ^ 'Pull {1}/{2} from {3}' format: { diff --git a/Iceberg-TipUI/IceTipPullCommand.class.st b/Iceberg-TipUI/IceTipPullCommand.class.st index 52249626c8..f51c0503b4 100644 --- a/Iceberg-TipUI/IceTipPullCommand.class.st +++ b/Iceberg-TipUI/IceTipPullCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a pull of incomming commits. I open a pull view window. " Class { - #name : #IceTipPullCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPullCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultDescription [ ^ 'Pulls into image all commits from your version to the origin remote HEAD' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPullCommand class >> defaultName [ ^ 'Pull' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> badge [ | result | @@ -33,7 +35,7 @@ IceTipPullCommand >> badge [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipPullCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPullCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullCommand >> iconName [ ^ #down diff --git a/Iceberg-TipUI/IceTipPullModel.class.st b/Iceberg-TipUI/IceTipPullModel.class.st index 1dc3fc02fc..a539dc84d4 100644 --- a/Iceberg-TipUI/IceTipPullModel.class.st +++ b/Iceberg-TipUI/IceTipPullModel.class.st @@ -2,12 +2,14 @@ I'm a model to present pull commits and operations. " Class { - #name : #IceTipPullModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPullModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPullModel >> commitModels [ ^ (self entity branch incomingCommitsFrom: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPullModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPullModel >> newPullAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipPushAction.class.st b/Iceberg-TipUI/IceTipPushAction.class.st index 25ab9149af..63e2530b17 100644 --- a/Iceberg-TipUI/IceTipPushAction.class.st +++ b/Iceberg-TipUI/IceTipPushAction.class.st @@ -2,12 +2,14 @@ I perform a push. " Class { - #name : #IceTipPushAction, - #superclass : #IceTipAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushAction', + #superclass : 'IceTipAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipPushAction >> basicExecute [ UIManager default diff --git a/Iceberg-TipUI/IceTipPushBrowser.class.st b/Iceberg-TipUI/IceTipPushBrowser.class.st index 9947a1bdbc..a9fd2695c0 100644 --- a/Iceberg-TipUI/IceTipPushBrowser.class.st +++ b/Iceberg-TipUI/IceTipPushBrowser.class.st @@ -3,18 +3,20 @@ I perform a push of outgoing commits. " Class { - #name : #IceTipPushBrowser, - #superclass : #IceTipRemoteActionBrowser, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipPushBrowser', + #superclass : 'IceTipRemoteActionBrowser', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipPushBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "No commands to add." ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipPushBrowser class >> onRepositoryModel: aModel [ ^ self on: (IceTipPushModel @@ -24,21 +26,21 @@ IceTipPushBrowser class >> onRepositoryModel: aModel [ ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushBrowser >> doPush [ self model newPushAction executeWithContext: self. self closeWindow ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> labelForRemotePanel [ ^ 'Push to remote' ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipPushBrowser >> newActionButton [ ^ self newButton @@ -50,7 +52,7 @@ IceTipPushBrowser >> newActionButton [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipPushBrowser >> titleForWindow [ ^ 'Push {1}/{2} to {3}' format: { diff --git a/Iceberg-TipUI/IceTipPushCommand.class.st b/Iceberg-TipUI/IceTipPushCommand.class.st index 282cc6f6e2..4c8aebefd0 100644 --- a/Iceberg-TipUI/IceTipPushCommand.class.st +++ b/Iceberg-TipUI/IceTipPushCommand.class.st @@ -3,24 +3,26 @@ I'm a command to perform a push of outgoing commits. I open a push view window. " Class { - #name : #IceTipPushCommand, - #superclass : #IceTipRemoteActionCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipPushCommand', + #superclass : 'IceTipRemoteActionCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultDescription [ ^ 'Pushes pending commits to the origin repository (in current branch)' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipPushCommand class >> defaultName [ ^ 'Push' ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> badge [ | result | @@ -34,7 +36,7 @@ IceTipPushCommand >> badge [ ] -{ #category : #executing } +{ #category : 'executing' } IceTipPushCommand >> execute [ self withErrorHandlingDo: [ @@ -42,7 +44,7 @@ IceTipPushCommand >> execute [ (IceTipPushBrowser onRepositoryModel: self repositoryModel) open ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushCommand >> iconName [ ^ #up diff --git a/Iceberg-TipUI/IceTipPushModel.class.st b/Iceberg-TipUI/IceTipPushModel.class.st index 888cfbeccf..c41a476ead 100644 --- a/Iceberg-TipUI/IceTipPushModel.class.st +++ b/Iceberg-TipUI/IceTipPushModel.class.st @@ -2,12 +2,14 @@ I'm a model to present push commits and operations. " Class { - #name : #IceTipPushModel, - #superclass : #IceTipRemoteActionModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipPushModel', + #superclass : 'IceTipRemoteActionModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipPushModel >> commitModels [ ^ (self entity outgoingCommitsTo: self remote) collect: [ :each | @@ -17,7 +19,7 @@ IceTipPushModel >> commitModels [ beCached ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipPushModel >> newPushAction [ ^ IceTipStandardAction new diff --git a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st index c0ff3c884f..a5791aa76d 100644 --- a/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st +++ b/Iceberg-TipUI/IceTipReadOnlyFormBuilder.class.st @@ -15,8 +15,8 @@ IceTipReadOnlyForm new " Class { - #name : #IceTipReadOnlyFormBuilder, - #superclass : #Object, + #name : 'IceTipReadOnlyFormBuilder', + #superclass : 'Object', #instVars : [ 'labelColor', 'labelWidth', @@ -25,10 +25,12 @@ Class { 'spApplication', 'presenter' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpApplication [ "If you want to keep order, just send an OrderedDictionary" @@ -39,13 +41,13 @@ IceTipReadOnlyFormBuilder class >> newBuiltFor: aDictionary application: aSpAppl build ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> application: aSpApplication [ spApplication := aSpApplication ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> build [ presenter := spApplication newPresenter: SpPresenter. @@ -53,7 +55,7 @@ IceTipReadOnlyFormBuilder >> build [ ^ presenter ] -{ #category : #building } +{ #category : 'building' } IceTipReadOnlyFormBuilder >> buildLayout [ | lastLabel fieldPresenter | lastLabel := items associations last key. @@ -84,26 +86,26 @@ IceTipReadOnlyFormBuilder >> buildLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultLabelWidth [ ^ 100 * self currentWorld displayScaleFactor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> defaultRowHeight [ ^ 30 * self currentWorld displayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipReadOnlyFormBuilder >> initialize [ items := OrderedDictionary new. super initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> items: aDictionary [ items removeAll. @@ -111,37 +113,37 @@ IceTipReadOnlyFormBuilder >> items: aDictionary [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor [ ^ labelColor ifNil: [ labelColor := Smalltalk ui theme textColor ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelColor: aColor [ ^ labelColor := aColor ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth [ ^ labelWidth ifNil: [ self defaultLabelWidth ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> labelWidth: aNumber [ ^ labelWidth := aNumber ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight [ ^ rowHeight ifNil: [ rowHeight := self defaultRowHeight ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReadOnlyFormBuilder >> rowHeight: aNumber [ rowHeight := aNumber diff --git a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st index 5ac1bb6832..d96de2a584 100644 --- a/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipRefreshCommitCommand.class.st @@ -2,24 +2,26 @@ Command that launches a refresh of the commit tree during commit " Class { - #name : #IceTipRefreshCommitCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRefreshCommitCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultDescription [ ^ 'Refresh this change tree' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRefreshCommitCommand class >> defaultName [ ^ 'Refresh' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRefreshCommitCommand >> execute [ self repositoryModel reset. @@ -28,13 +30,13 @@ IceTipRefreshCommitCommand >> execute [ self toolAnnouncer announce: (IceTipDiffRefreshed for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> iconName [ ^ #glamorousRefresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshCommitCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st index b93531803d..2388a31c59 100644 --- a/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRegisterRepositoryDialogPresenter.class.st @@ -7,23 +7,25 @@ self new openDialogWithSpec " Class { - #name : #IceTipRegisterRepositoryDialogPresenter, - #superclass : #IceTipOptionDialogPresenter, + #name : 'IceTipRegisterRepositoryDialogPresenter', + #superclass : 'IceTipOptionDialogPresenter', #instVars : [ 'types', 'repository', 'acceptBlock' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> allTypes [ ^ types ifNil: [ types := IceTipRepositoryTypePanel allTypes ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ self withoutNewRepository. @@ -31,7 +33,7 @@ IceTipRegisterRepositoryDialogPresenter >> beForCloneOfRepository: aRepository [ repository := aRepository ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doAccept [ | newRepository | @@ -42,7 +44,7 @@ IceTipRegisterRepositoryDialogPresenter >> doAccept [ acceptBlock ifNotNil: [ acceptBlock cull: self ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ repository @@ -50,32 +52,32 @@ IceTipRegisterRepositoryDialogPresenter >> doEdit: aRepository [ subdirectory: aRepository subdirectory ] -{ #category : #testing } +{ #category : 'testing' } IceTipRegisterRepositoryDialogPresenter >> isEditing [ ^ repository isNotNil ] -{ #category : #events } +{ #category : 'events' } IceTipRegisterRepositoryDialogPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRegisterRepositoryDialogPresenter >> titleForWindow [ ^ 'Register project' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutLocalRepository [ types := self allTypes reject: #isLocalRepository. typeList items: types ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRegisterRepositoryDialogPresenter >> withoutNewRepository [ types := self allTypes reject: #isNewRepository. diff --git a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st index 197067b52f..e09b6bdb88 100644 --- a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st @@ -2,30 +2,32 @@ Command that reloads the code of an already loaded package, discarding all changes done in the meantime that were not committed. " Class { - #name : #IceTipReloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipReloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultDescription [ ^ 'Reload selected package, discarding all changes.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipReloadPackageCommand class >> defaultName [ ^ 'Reload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipReloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipReloadPackageCommand >> execute [ self packageModel reload. @@ -33,7 +35,7 @@ IceTipReloadPackageCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipReloadPackageCommand >> iconName [ ^ #refresh diff --git a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st index 34937c7b68..ae2706a1ef 100644 --- a/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionBrowser.class.st @@ -1,25 +1,27 @@ Class { - #name : #IceTipRemoteActionBrowser, - #superclass : #IceTipHistoryActionBrowser, + #name : 'IceTipRemoteActionBrowser', + #superclass : 'IceTipHistoryActionBrowser', #instVars : [ 'remotePanel', 'remoteLabel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRemoteActionBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "No commands to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRemoteActionBrowser class >> onRepositoryModel: aRepository [ ^ self subclassResponsibility ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoteActionBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -36,7 +38,7 @@ IceTipRemoteActionBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializePresenters [ super initializePresenters. @@ -51,7 +53,7 @@ IceTipRemoteActionBrowser >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> initializeWindow: aWindow [ super initializeWindow: aWindow. @@ -59,25 +61,25 @@ IceTipRemoteActionBrowser >> initializeWindow: aWindow [ aWindow bindKeyCombination: $s meta toAction: [ self accept ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoteActionBrowser >> labelForRemotePanel [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> mainList [ ^ commitsPanel commitList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel [ ^ remotePanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoteActionBrowser >> remotePanel: aSpPresenter [ remotePanel := aSpPresenter diff --git a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st index 88a28a1881..db2bb3ddd6 100644 --- a/Iceberg-TipUI/IceTipRemoteActionCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionCommand.class.st @@ -2,24 +2,26 @@ I'm a the abstract superclass of commands that act on remotes. " Class { - #name : #IceTipRemoteActionCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoteActionCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand class >> isAbstract [ ^ self == IceTipRemoteActionCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionCommand >> canBeExecuted [ ^ self isRepositoryOperational and: [ self repositoryModel hasRemotes ] ] -{ #category : #validating } +{ #category : 'validating' } IceTipRemoteActionCommand >> validateRemotesPresent [ self repositoryModel hasRemotes diff --git a/Iceberg-TipUI/IceTipRemoteActionModel.class.st b/Iceberg-TipUI/IceTipRemoteActionModel.class.st index 20b9262471..bac204af2f 100644 --- a/Iceberg-TipUI/IceTipRemoteActionModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteActionModel.class.st @@ -1,24 +1,26 @@ Class { - #name : #IceTipRemoteActionModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipRemoteActionModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'remote' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> branchName [ ^ entity branchName ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoteActionModel >> isRepositoryDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remote [ ^ remote ifNil: [ | head | head := self repositoryModel entity head. @@ -27,27 +29,27 @@ IceTipRemoteActionModel >> remote [ ifFalse: [ self remoteModels first entity ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModel [ ^ repositoryModel remoteModels detect: [ :e | e entity = self remote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteModels [ ^ self repositoryModel remoteModels ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> remoteName [ ^ self remote name, '/', self entity branch name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteActionModel >> useRemote: aRemoteModel [ remote := aRemoteModel entity. ] diff --git a/Iceberg-TipUI/IceTipRemoteModel.class.st b/Iceberg-TipUI/IceTipRemoteModel.class.st index 88688143f4..520a10d1cd 100644 --- a/Iceberg-TipUI/IceTipRemoteModel.class.st +++ b/Iceberg-TipUI/IceTipRemoteModel.class.st @@ -2,14 +2,16 @@ I'm a model for IceRemote entries. " Class { - #name : #IceTipRemoteModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRemoteModel', + #superclass : 'IceTipEntityModel', #traits : 'TWithBranchModel', #classTraits : 'TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #comparing } +{ #category : 'comparing' } IceTipRemoteModel >> = anotherModel [ self species = anotherModel species ifFalse: [ ^ false ]. @@ -17,23 +19,23 @@ IceTipRemoteModel >> = anotherModel [ ^ entity = anotherModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> branches [ ^ self entity branches ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> description [ ^ '{1} <{2}>' format: { self name. self entity url } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoteModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newDeleteAction [ @@ -45,7 +47,7 @@ IceTipRemoteModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRemoteModel >> newFetchAction [ diff --git a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st index 8007441af0..67ab450880 100644 --- a/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st +++ b/Iceberg-TipUI/IceTipRemotesTreeCommand.class.st @@ -2,36 +2,38 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRemotesTreeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemotesTreeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand class >> isAbstract [ ^ self == IceTipRemotesTreeCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemotesTreeCommand >> canBeExecuted [ ^ self hasSelectedItem and: [ self item canActivateCommand: self ] diff --git a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st index e2b78de9dc..fbf5514850 100644 --- a/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveCredentialCommand.class.st @@ -2,43 +2,45 @@ I remove a credential from the credential store. " Class { - #name : #IceTipRemoveCredentialCommand, - #superclass : #IceTipAbstractCredentialCommand, - #category : #'Iceberg-TipUI-Credentials' + #name : 'IceTipRemoveCredentialCommand', + #superclass : 'IceTipAbstractCredentialCommand', + #category : 'Iceberg-TipUI-Credentials', + #package : 'Iceberg-TipUI', + #tag : 'Credentials' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultDescription [ ^ 'Removes the credential from the store' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveCredentialCommand class >> defaultName [ ^ 'Remove' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRemoveCredentialCommand >> canBeExecuted [ ^ self item isDefault not ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveCredentialCommand >> execute [ self store removeCredential: self item. self tool refresh. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> iconName [ ^ #remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveCredentialCommand >> shortcutKey [ ^ $x meta diff --git a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st index be305dcb9b..371f2f2475 100644 --- a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st @@ -2,30 +2,32 @@ Command that removes a package from the repository, without removing it from the system. " Class { - #name : #IceTipRemoveFromRepositoryPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRemoveFromRepositoryPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultDescription [ ^ 'Removes the current repository from the repository, without removing it from the system' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRemoveFromRepositoryPackageCommand class >> defaultName [ ^ 'Remove from repository' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRemoveFromRepositoryPackageCommand >> execute [ self packageModel remove ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveFromRepositoryPackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st index c1872aeb06..23317b3c2b 100644 --- a/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemovePackageDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRemovePackageDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemovePackageDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', @@ -8,10 +8,12 @@ Class { 'removeFromRepositoryCheckbox', 'unloadFromImageCheckbox' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemovePackageDialogPresenter >> accept [ self removeFromRepositoryCheckbox state @@ -20,19 +22,19 @@ IceTipRemovePackageDialogPresenter >> accept [ ifTrue: [ self model unload ]. ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove package {1}?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemovePackageDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -48,13 +50,13 @@ IceTipRemovePackageDialogPresenter >> defaultLayout [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ ^ (500 @@ -62,7 +64,7 @@ IceTipRemovePackageDialogPresenter >> initialExtentForWindow [ scaledByDisplayScaleFactor "Yes, a magic number" ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -81,37 +83,37 @@ IceTipRemovePackageDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemovePackageDialogPresenter >> removeFromRepositoryCheckbox [ ^ removeFromRepositoryCheckbox ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemovePackageDialogPresenter >> titleForWindow [ ^ 'Remove Package' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemovePackageDialogPresenter >> unloadFromImageCheckbox [ ^ unloadFromImageCheckbox diff --git a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st index 448a16e9ed..71fe70061b 100644 --- a/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRemoveRepositoryDialogPresenter.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRemoveRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRemoveRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'model', 'iconPanel', 'confirmLabel', 'removeFileSystemCheckbox' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #actions } +{ #category : 'actions' } IceTipRemoveRepositoryDialogPresenter >> accept [ (self removeFileSystemCheckbox state @@ -19,18 +21,18 @@ IceTipRemoveRepositoryDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> confirmMessage [ ^ 'Are you sure to remove your repository {1} from your image?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -44,13 +46,13 @@ IceTipRemoveRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ ^ (500@( @@ -60,7 +62,7 @@ IceTipRemoveRepositoryDialogPresenter >> initialExtentForWindow [ )) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ iconPanel := self newImage @@ -74,36 +76,36 @@ IceTipRemoveRepositoryDialogPresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> model: anObject [ model := anObject ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRemoveRepositoryDialogPresenter >> removeFileSystemCheckbox [ ^ removeFileSystemCheckbox ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRemoveRepositoryDialogPresenter >> removeMessage [ ^ 'Also remove repository from file system' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRemoveRepositoryDialogPresenter >> titleForWindow [ ^ 'Remove repository' diff --git a/Iceberg-TipUI/IceTipRepairAction.class.st b/Iceberg-TipUI/IceTipRepairAction.class.st index 32ed347aa6..787abea3ae 100644 --- a/Iceberg-TipUI/IceTipRepairAction.class.st +++ b/Iceberg-TipUI/IceTipRepairAction.class.st @@ -3,15 +3,17 @@ I'm a repair option. Repositories can be broken in several ways. My children will describe them and take the actions needed to perform the re-alignment of an image with its repository. " Class { - #name : #IceTipRepairAction, - #superclass : #IceTipAction, + #name : 'IceTipRepairAction', + #superclass : 'IceTipAction', #instVars : [ 'repositoryModel' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> allAvailableFor: aRepository [ ^ ((self allSubclasses select: [ :each | each isAvailableFor: aRepository ]) @@ -19,38 +21,38 @@ IceTipRepairAction class >> allAvailableFor: aRepository [ collect: #new ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> help [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> icon [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAbstract [ ^ self == IceTipRepairAction ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairAction class >> isAvailableFor: aRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> order [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction class >> title [ ^ self subclassResponsibility ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self context: aContext. @@ -58,7 +60,7 @@ IceTipRepairAction >> executeWithContext: aContext model: aRepositoryModel [ self execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> fetchAllRemotes [ | remotes | remotes := self repository remotes. @@ -72,32 +74,32 @@ IceTipRepairAction >> fetchAllRemotes [ self repository fetchFrom: each ] ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> help [ ^ self class help ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> icon [ ^ self class icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repository [ ^ self repositoryModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> repositoryModel [ ^ repositoryModel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairAction >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairAction >> title [ ^ self class title ] diff --git a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st index cd6c84405b..ff31e7a499 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> help [ ^ 'Discard all changes in your image and checkout an existing branch. This action will checkout the branch in the repository and synchronize your image with your repository. @@ -23,12 +25,12 @@ This action opens a preview window before doing any change. This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> icon [ ^ self iconNamed: #branch ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -38,17 +40,17 @@ IceTipRepairCheckoutBranch class >> isAvailableFor: aRepository [ and: [ aRepository project isUnborn or: [ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutBranch class >> title [ ^ 'Checkout an existing branch discarding image changes' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st index 086cfc6cb7..acfd0b145a 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st @@ -7,12 +7,14 @@ I'm active when: - repository HEAD is detached " Class { - #name : #IceTipRepairCheckoutNewBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCheckoutNewBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> help [ ^ 'It creates a new branch from the commit your image is pointing to. This will not lose any change in the image. @@ -22,12 +24,12 @@ This situation happens because the code loaded in your image does not correspond This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairCheckoutNewBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached or: [ aRepository head isDetached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCheckoutNewBranch class >> title [ ^ 'Create a new branch pointing to your image commit' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCheckoutNewBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st index 2bbf694e4d..229ce41e08 100644 --- a/Iceberg-TipUI/IceTipRepairCloneRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairCloneRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairCloneRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCloneRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> help [ ^ 'Clone again the repository into a new location. @@ -23,29 +25,29 @@ So, this action will very probably let you in a detached status. You will need to re-synchronize your repository with another repair action.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> icon [ ^ self iconNamed: #smallAdd ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCloneRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCloneRepository class >> title [ ^ 'Clone again this repository in a new location' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCloneRepository >> basicExecute [ ((IceTipRegisterRepositoryDialogPresenter newApplication: context application) diff --git a/Iceberg-TipUI/IceTipRepairCommand.class.st b/Iceberg-TipUI/IceTipRepairCommand.class.st index ad3f612190..1ea3fd269e 100644 --- a/Iceberg-TipUI/IceTipRepairCommand.class.st +++ b/Iceberg-TipUI/IceTipRepairCommand.class.st @@ -2,36 +2,38 @@ Command that opens the repair window on a repository " Class { - #name : #IceTipRepairCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultDescription [ ^ 'Helps you to repair your repository when it is detached.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultName [ ^ 'Repair repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRepairCommand class >> defaultToolbarItemName [ ^ 'Repair' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self isRepositoryOperational not ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCommand >> execute [ ((IceTipRepairRepositoryDialogPresenter @@ -42,7 +44,7 @@ IceTipRepairCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCommand >> iconName [ ^ #repair diff --git a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st index db3a15c9fa..9329155783 100644 --- a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st +++ b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairCreateSubdirectory, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairCreateSubdirectory', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> help [ ^ 'Create a new subdirectory for the code. @@ -20,28 +22,28 @@ It is possible that the directory has been deleted or never committed after crea This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> icon [ ^ self iconNamed: #smallNew ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairCreateSubdirectory class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairCreateSubdirectory class >> title [ ^ 'Create code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairCreateSubdirectory >> basicExecute [ self repositoryModel createSourceDirectory. diff --git a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st index fe32425ac2..afc8e2f488 100644 --- a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st +++ b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairDiscardAndLoad, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairDiscardAndLoad', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> help [ ^ 'Discard all changes in your image and checkout the current commit (HEAD) in the repository. @@ -24,12 +26,12 @@ This situation happens because loaded code in your image is from a different com Opens a preview window with the incoming changes before doing any change.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> icon [ ^ self iconNamed: #refresh ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -40,17 +42,17 @@ IceTipRepairDiscardAndLoad class >> isAvailableFor: aRepository [ and: [ aRepository head isDetached not ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> order [ ^ 40 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairDiscardAndLoad class >> title [ ^ 'Discard image changes and load repository version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairDiscardAndLoad >> basicExecute [ (IceTipCheckoutPreviewBrowser onBranch: self repositoryModel branchModel) @@ -58,7 +60,7 @@ IceTipRepairDiscardAndLoad >> basicExecute [ open ] -{ #category : #private } +{ #category : 'private' } IceTipRepairDiscardAndLoad >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairEditRepository.class.st b/Iceberg-TipUI/IceTipRepairEditRepository.class.st index 8850faf7bf..44a93839e4 100644 --- a/Iceberg-TipUI/IceTipRepairEditRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairEditRepository.class.st @@ -5,12 +5,14 @@ I'm active when: - src subdirectory is not found. " Class { - #name : #IceTipRepairEditRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairEditRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> help [ ^ 'You can edit the repository to inform another subdirectory name. Once the new subdirectory is updated, the packages in the repository are available. @@ -20,28 +22,28 @@ This happens because the source code directory has been moved or renamed. ' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> icon [ ^ self iconNamed: #edit ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairEditRepository class >> isAvailableFor: aRepository [ ^ aRepository isMissing not and: [aRepository isCodeMissing] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairEditRepository class >> title [ ^ 'Edit the repository to select the correct code subdirectory' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairEditRepository >> basicExecute [ (IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st index c12b889730..74e0a17e52 100644 --- a/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairFetchRemoteBranch.class.st @@ -6,12 +6,14 @@ matches if: " Class { - #name : #IceTipRepairFetchRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairFetchRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> help [ ^ 'You can fetch commits from a remote to find your image commit in your repository. This will not lose any change in the image or the repository. @@ -23,12 +25,12 @@ After doing the fetch, it is required to create a new branch to commit into the A second repair action will help you.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> icon [ ^ self iconNamed: #smallUpdate ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy referenceCommit isUnknownCommit" @@ -37,24 +39,24 @@ IceTipRepairFetchRemoteBranch class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy referenceCommit isUnknownCommit ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> order [ ^ 15 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairFetchRemoteBranch class >> title [ ^ 'Fetch remote commits including the commits of the image version' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" self fetchAllRemotes ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairFetchRemoteBranch >> finishSuccess [ super finishSuccess. Iceberg announcer announce: (IceRepositoryModified for: self repository) diff --git a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st index 232abefec4..985b9b5f55 100644 --- a/Iceberg-TipUI/IceTipRepairLocateRepository.class.st +++ b/Iceberg-TipUI/IceTipRepairLocateRepository.class.st @@ -6,12 +6,14 @@ I'm active when repository can not be located in disk. Notice that doing this can lead you to another situation that needs repair (like a detached status) " Class { - #name : #IceTipRepairLocateRepository, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairLocateRepository', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> help [ ^ 'Locate this repository in your file system. @@ -23,29 +25,29 @@ You will need to re-synchronize your repository with another repair action. This happens if the repository has been removed from the disk or the image was pointing to a repository in another machine (For example, when sharing images with other machines / people).' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> icon [ ^ self iconNamed: #glamorousFolder ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairLocateRepository class >> isAvailableFor: aRepository [ "active when there is no repository directory" ^ aRepository isMissing ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> order [ ^ 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairLocateRepository class >> title [ ^ 'Locate this repository in your file system' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> basicExecute [ | dialog | @@ -61,12 +63,12 @@ IceTipRepairLocateRepository >> basicExecute [ open. ] -{ #category : #private } +{ #category : 'private' } IceTipRepairLocateRepository >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairLocateRepository >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] diff --git a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st index 13cae27f81..6cbe2c40af 100644 --- a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st @@ -6,12 +6,14 @@ I'm active when: - repository HEAD is NOT detached " Class { - #name : #IceTipRepairMergeWithBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairMergeWithBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> help [ ^ 'This action checkouts an existing branch and loads the code in your image without discarding any change. This will not lose any change in the image but may lead to conflicts. If there are conflicts it opens a merge view. @@ -21,12 +23,12 @@ This situation happens because loaded code in your image is from a different com This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-committed changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> icon [ ^ self iconNamed: #merge ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached @@ -39,17 +41,17 @@ IceTipRepairMergeWithBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ aRepository head isDetached not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> order [ ^ 20 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairMergeWithBranch class >> title [ ^ 'Checkout an existing branch and merge the changes into the image (without discarding image changes)' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairMergeWithBranch >> basicExecute [ self fetchAllRemotes. diff --git a/Iceberg-TipUI/IceTipRepairProject.class.st b/Iceberg-TipUI/IceTipRepairProject.class.st index ce164f63e0..92caae1ec9 100644 --- a/Iceberg-TipUI/IceTipRepairProject.class.st +++ b/Iceberg-TipUI/IceTipRepairProject.class.st @@ -2,12 +2,14 @@ I'm an action to repair a project, which is useful when it answers true to #isUnborn. " Class { - #name : #IceTipRepairProject, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairProject', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> help [ ^ 'Edit the repository to add project meta-data. This action will create a .project file in the root of your repository adding meta information such as source code directory, project name, format and so on. @@ -15,12 +17,12 @@ This action will create a .project file in the root of your repository adding me This situation happens because your project does not have project meta-data and Iceberg does not know how to correctly interpret its data.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> icon [ ^ self iconNamed: #config ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairProject class >> isAvailableFor: aRepository [ "matches if: - workingCopy is atached @@ -32,17 +34,17 @@ IceTipRepairProject class >> isAvailableFor: aRepository [ and: [ aRepository workingCopy project isUnborn ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> order [ ^ 30 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairProject class >> title [ ^ 'Create project meta-data' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairProject >> basicExecute [ ((IceTipEditProjectDialogPresenter diff --git a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st index bd5358853b..39dab6c93d 100644 --- a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st @@ -5,12 +5,14 @@ matches if: - workingCopy is detached AND there is no commit in the current available commits " Class { - #name : #IceTipRepairPullRemoteBranch, - #superclass : #IceTipRepairAction, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepairPullRemoteBranch', + #superclass : 'IceTipRepairAction', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> help [ ^ 'You can pull commits from a remote to put your image and your repository in sync. This will not lose any change in the image. @@ -20,12 +22,12 @@ This situation happens because the code loaded in your image is not in the branc This operation will modify the state of your working copy in disk. All non-committed changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> icon [ ^ self iconNamed: #down ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ "matches if: - workingCopy is detached AND there is no commit in the current available commits" @@ -37,17 +39,17 @@ IceTipRepairPullRemoteBranch class >> isAvailableFor: aRepository [ ^ aRepository workingCopy isDetached and: [ (aRepository includesCommit: aRepository workingCopy referenceCommit) not ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> order [ ^ 17 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairPullRemoteBranch class >> title [ ^ 'Pull remote commits to put your repository in sync' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRepairPullRemoteBranch >> basicExecute [ "Fetching remotes is necessary in case the current image commit is not in the repository. Could be optimized" diff --git a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st index 9284c8ae2d..c67813e158 100644 --- a/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipRepairRepositoryDialogPresenter.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceTipRepairRepositoryDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipRepairRepositoryDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'optionsList', 'detailPanel', @@ -8,16 +8,18 @@ Class { 'selectedOption', 'reasonPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepairRepositoryDialogPresenter class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) beCached ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepairRepositoryDialogPresenter >> accept [ self closeWindow. @@ -26,13 +28,13 @@ IceTipRepairRepositoryDialogPresenter >> accept [ model: self model ] -{ #category : #'api - focus' } +{ #category : 'api - focus' } IceTipRepairRepositoryDialogPresenter >> defaultKeyboardFocus [ ^ optionsList ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepairRepositoryDialogPresenter >> defaultLayout [ self flag: #TODO. "Replace the fixed height with a correct style" @@ -44,19 +46,19 @@ IceTipRepairRepositoryDialogPresenter >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> detailPanel [ ^ detailPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. @@ -70,7 +72,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeDialogWindow: aWindow [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ optionsList @@ -89,7 +91,7 @@ IceTipRepairRepositoryDialogPresenter >> initializeOptionsList [ whenActivatedDo: [ :selection | selection ifNotNil: [ self accept ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> initializePresenters [ reasonPanel := self newText @@ -108,31 +110,31 @@ IceTipRepairRepositoryDialogPresenter >> initializePresenters [ self initializeOptionsList ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> initializeReasonPanel [ reasonPanel text: self model longStatus ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepairRepositoryDialogPresenter >> model [ ^ model ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> optionsList [ ^ optionsList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepairRepositoryDialogPresenter >> reasonPanel [ ^ reasonPanel ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ selectedOption ifNotNil: [ @@ -141,14 +143,14 @@ IceTipRepairRepositoryDialogPresenter >> refreshDetailPanel [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> refreshDialogButtons [ self window ifNotNil: [ :aWindow | aWindow buttons first enabled: (selectedOption isNotNil) ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ selectedOption := selectedItem. @@ -157,13 +159,13 @@ IceTipRepairRepositoryDialogPresenter >> selectionChanged: selectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepairRepositoryDialogPresenter >> titleForWindow [ ^ 'Repair repository' diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 0bf3a8bff7..f10f85f4ff 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -5,17 +5,19 @@ I define basic actions and an entry point to manage each repository individually IceTipRepositoriesBrowser new open. " Class { - #name : #IceTipRepositoriesBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoriesBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'currentGroupPanel', 'repositoryNotebook', 'notifyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipFetchAllProjectCommand. @@ -26,7 +28,7 @@ IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -47,7 +49,7 @@ IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ super buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup. @@ -60,13 +62,13 @@ IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presente ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser class >> iconForWorldMenu [ ^ self iconNamed: #komitterSmalltalkhubRemote ] -{ #category : #'world menu' } +{ #category : 'world menu' } IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ "Add a custom menu item to the world menu" @@ -80,13 +82,13 @@ IceTipRepositoriesBrowser class >> menuCommandOn: aBuilder [ action: [ self new open ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> new [ ^ self newOnRepositoryProvider: IceRepository ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ | application | @@ -104,7 +106,7 @@ IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ notifyPanel layout add: (notifyPanel newLabel @@ -112,7 +114,7 @@ IceTipRepositoriesBrowser >> addLibGitNotAvailableWarning [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> connectPresenters [ repositoryNotebook whenSelectedPageChangedDo: [ :newPage | @@ -120,19 +122,19 @@ IceTipRepositoriesBrowser >> connectPresenters [ aPresenter updatePresenter ] ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> currentGroupPanel [ ^ currentGroupPanel ifNil: [ currentGroupPanel := self layout children first ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> defaultKeyboardFocus [ ^ repositoryNotebook ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoriesBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -141,7 +143,7 @@ IceTipRepositoriesBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> hasSelectedItem [ ^ repositoryNotebook selectedPage @@ -150,19 +152,19 @@ IceTipRepositoriesBrowser >> hasSelectedItem [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> iconForWindow [ ^ self class iconForWorldMenu ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initialExtentForWindow [ ^ (600 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> initializePresenters [ notifyPanel := self newPresenter. @@ -172,14 +174,14 @@ IceTipRepositoriesBrowser >> initializePresenters [ repositoryNotebook := self newNotebook ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoriesBrowser >> mainList [ "should not arrive here" ^ nil ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -187,20 +189,20 @@ IceTipRepositoriesBrowser >> openManagePackagesWindow [ execute ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanel [ "this method is using exclusively for testing." ^ repositoryNotebook pages first activePresenter ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelIsShowingRepository: anIceLibgitRepository [ ^ self projectsPanel isShowingRepository: anIceLibgitRepository ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ "this method is using exclusively for testing. it will answer the repository list form the projects page" @@ -208,21 +210,21 @@ IceTipRepositoriesBrowser >> projectsPanelRepositoryList [ ^ self projectsPanel repositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> projectsPanelRepositoryModels [ "this method is used exclusively for testing" ^ self projectsPanelRepositoryList items ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoriesBrowser >> refresh [ repositoryNotebook selectedPage ifNil: [ ^ self ]. repositoryNotebook selectedPage activePresenter updatePresenter ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> refreshCommands [ | rootGroup | @@ -233,13 +235,13 @@ IceTipRepositoriesBrowser >> refreshCommands [ refreshToolbarWith: rootGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesBrowser >> selectedItem [ ^ repositoryNotebook selectedPage @@ -247,7 +249,7 @@ IceTipRepositoriesBrowser >> selectedItem [ ifNil: [ nil ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -255,7 +257,7 @@ IceTipRepositoriesBrowser >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -264,13 +266,13 @@ IceTipRepositoriesBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> titleForWindow [ ^ 'Repositories' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoriesBrowser >> updatePresenter [ LGitLibrary uniqueInstance isAvailable @@ -287,7 +289,7 @@ IceTipRepositoriesBrowser >> updatePresenter [ self refresh ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoriesBrowser >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoriesModel.class.st b/Iceberg-TipUI/IceTipRepositoriesModel.class.st index 363bd7ed9a..8d3cf107d6 100644 --- a/Iceberg-TipUI/IceTipRepositoriesModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesModel.class.st @@ -2,21 +2,23 @@ I'm a model to provide access to all repositories registered. " Class { - #name : #IceTipRepositoriesModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoriesModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositories [ ^ repositoryProvider repositories collect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryGroups [ | sortGroup groups | @@ -46,7 +48,7 @@ IceTipRepositoriesModel >> repositoryGroups [ group: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoriesModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st index 3932c52a2d..d4c3e05009 100644 --- a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st @@ -3,16 +3,18 @@ I'm a browser to show the internals of a repository. I will show remotes, branches, tags and all possible operations in low level repository (pull, push, branch. But all edit remotes, etc.) " Class { - #name : #IceTipRepositoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipRepositoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'sidebarTree', 'historyPanel' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipAddRemoteCommand. @@ -24,7 +26,7 @@ IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aC aCommandGroup register: each forSpec ] ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ | aGroup | @@ -50,30 +52,30 @@ IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> new [ self error: 'Use #onRepository:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipRepositoryBrowser class >> onRepositoryNamed: aString [ ^ self onRepository: (IceRepository registry detect: [ :each | each name = aString ]) ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipRepositoryBrowser >> commitishSelected: ann [ historyPanel model: ann ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryBrowser >> defaultLayout [ ^ SpPanedLayout newLeftToRight @@ -83,19 +85,19 @@ IceTipRepositoryBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> historyPanel [ ^ historyPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initialExtentForWindow [ ^ (1000 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializePresenters [ sidebarTree := self newTreeTable. @@ -109,7 +111,7 @@ IceTipRepositoryBrowser >> initializePresenters [ self initializeSidebarTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> initializeSidebarTree [ sidebarTree @@ -129,14 +131,14 @@ IceTipRepositoryBrowser >> initializeSidebarTree [ ifTrue: [ self commitishSelected: selection selectedItem ] ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ sidebarTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryBrowser >> refresh [ self refreshCommands. @@ -145,7 +147,7 @@ IceTipRepositoryBrowser >> refresh [ self selectCurrentBranch ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> refreshWhenRepository: ann [ (self model isModelOf: ann repository) ifFalse: [ ^ self ]. @@ -153,7 +155,7 @@ IceTipRepositoryBrowser >> refreshWhenRepository: ann [ self updatePresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> selectCurrentBranch [ | branch | @@ -166,13 +168,13 @@ IceTipRepositoryBrowser >> selectCurrentBranch [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryBrowser >> sidebarTree [ ^ sidebarTree ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipRepositoryBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -181,13 +183,13 @@ IceTipRepositoryBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> titleForWindow [ ^ 'Repository of ' , self model name ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipRepositoryCommand.class.st b/Iceberg-TipUI/IceTipRepositoryCommand.class.st index 31cfa04b4c..42a298249b 100644 --- a/Iceberg-TipUI/IceTipRepositoryCommand.class.st +++ b/Iceberg-TipUI/IceTipRepositoryCommand.class.st @@ -2,42 +2,44 @@ I'm a the abstract superclass of commands that act on repositories. " Class { - #name : #IceTipRepositoryCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRepositoryCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand class >> isAbstract [ ^ self == IceTipRepositoryCommand ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnBranch: aBranchModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnRemote: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> actsOnTag: aTagModel [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryCommand >> announcer [ ^ self context toolAnnouncer ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryCommand >> canBeExecuted [ ^ self repositoryModel isNotNil diff --git a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st index d8aec6c69b..a31676a85a 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupModel.class.st @@ -4,23 +4,25 @@ Repository groups are taken from tags added to the repository metadata (usually NOTICE: first tag will be taken as the group. " Class { - #name : #IceTipRepositoryGroupModel, - #superclass : #IceTipModel, + #name : 'IceTipRepositoryGroupModel', + #superclass : 'IceTipModel', #instVars : [ 'repositoryProvider', 'repositories', 'group' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel class >> defaultLabel [ ^ 'Projects' ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryGroupModel >> containsRepository: aRepository [ (self group isEmpty and: [ aRepository project tags isEmpty ]) @@ -29,19 +31,19 @@ IceTipRepositoryGroupModel >> containsRepository: aRepository [ ^ aRepository project tags includes: self group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group [ ^ group ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> group: aGroup [ group := aGroup ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> label [ ^ self group @@ -49,7 +51,7 @@ IceTipRepositoryGroupModel >> label [ ifEmpty: [ self class defaultLabel ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositories [ ^ repositories := repositoryProvider repositories @@ -57,7 +59,7 @@ IceTipRepositoryGroupModel >> repositories [ thenCollect: [ :each | (IceTipRepositoryModel on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupModel >> repositoryProvider: aProvider [ repositoryProvider := aProvider diff --git a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st index 783b0f3295..fd61359ed0 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipRepositoryGroupPanel, - #superclass : #SpPresenter, + #name : 'IceTipRepositoryGroupPanel', + #superclass : 'SpPresenter', #traits : 'SpTModel', #classTraits : 'SpTModel classTrait', #instVars : [ 'repositoryList', 'repositoryFilter' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: aCommandGroup [ self flag: #HACK. "I extracted this panel from IceTipRepositoriesBrowser, @@ -21,7 +23,7 @@ IceTipRepositoryGroupPanel class >> buildCommandsGroupWith: presenter forRoot: a forRoot: aCommandGroup ] -{ #category : #commands } +{ #category : 'commands' } IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ | rootCommandGroup | @@ -36,13 +38,13 @@ IceTipRepositoryGroupPanel class >> buildRootCommandsGroupFor: aPresenter [ ^ rootCommandGroup ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> allListItems [ ^ self model repositories ] -{ #category : #layout } +{ #category : 'layout' } IceTipRepositoryGroupPanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -51,26 +53,26 @@ IceTipRepositoryGroupPanel >> defaultLayout [ yourself ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> defaultOutputPort [ ^ self outputSelectionPort ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryGroupPanel >> hasSelectedItem [ ^ repositoryList selectedItem notNil ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializePresenters [ repositoryList := self newTable. @@ -78,7 +80,7 @@ IceTipRepositoryGroupPanel >> initializePresenters [ self initializeRepositoryFilter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ repositoryFilter := self newTextInput. @@ -88,7 +90,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryFilter [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> initializeRepositoryList [ repositoryList @@ -122,7 +124,7 @@ IceTipRepositoryGroupPanel >> initializeRepositoryList [ whenActivatedDo: [ self openManagePackagesWindow ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ "this method is using just for test" @@ -130,7 +132,7 @@ IceTipRepositoryGroupPanel >> isShowingRepository: anIceLibgitRepository [ aRepositoryModel entity = anIceLibgitRepository ] ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ^ self rootCommandsGroup @@ -138,7 +140,7 @@ IceTipRepositoryGroupPanel >> keyBindingsCommandsGroup [ ifNone: [ nil ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryGroupPanel >> openManagePackagesWindow [ IceTipManagePackagesCommand new @@ -146,7 +148,7 @@ IceTipRepositoryGroupPanel >> openManagePackagesWindow [ execute ] -{ #category : #transmission } +{ #category : 'transmission' } IceTipRepositoryGroupPanel >> outputSelectionPort [ ^ (SpSelectionPort newPresenter: self) @@ -154,7 +156,7 @@ IceTipRepositoryGroupPanel >> outputSelectionPort [ yourself ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> refreshRepositoryList [ repositoryList updateItemsKeepingSelection: (repositoryFilter text @@ -163,25 +165,25 @@ IceTipRepositoryGroupPanel >> refreshRepositoryList [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryList [ ^ repositoryList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> repositoryModel [ ^ self selectedItem ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryGroupPanel >> selectedItem [ ^ repositoryList selectedItem ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ^ self visibleRootCommandsGroup @@ -189,13 +191,13 @@ IceTipRepositoryGroupPanel >> selectionCommandsGroup [ ifNone: [ nil ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryGroupPanel >> updatePresenter [ self refreshRepositoryList ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryGroupPanel >> visibleRootCommandsGroup [ | rootGroup | diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st index 9f59fb91b9..50453d5757 100644 --- a/Iceberg-TipUI/IceTipRepositoryModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryModel.class.st @@ -2,26 +2,28 @@ I'm a model for IceRepository entries. " Class { - #name : #IceTipRepositoryModel, - #superclass : #IceTipEntityModel, + #name : 'IceTipRepositoryModel', + #superclass : 'IceTipEntityModel', #traits : 'TIceCopyCommitId + TWithBranchModel', #classTraits : 'TIceCopyCommitId classTrait + TWithBranchModel classTrait', - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel class >> unknownBranchLabel [ ^ 'Unknown' ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> = other [ ^ self species = other species and: [ self entity = other entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> allBranchModels [ ^ self entity allBranches collect: [ :each | @@ -31,14 +33,14 @@ IceTipRepositoryModel >> allBranchModels [ beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> availableRepairOptions [ ^ IceTipRepairAction allAvailableFor: self entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModel [ ^ (IceTipBranchModel @@ -47,7 +49,7 @@ IceTipRepositoryModel >> branchModel [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchModelFor: aBranch [ ^ (IceTipBranchModel repositoryModel: self @@ -55,7 +57,7 @@ IceTipRepositoryModel >> branchModelFor: aBranch [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchName [ (self isLibGitAvailable not or: [ self entity isMissing ]) @@ -64,36 +66,36 @@ IceTipRepositoryModel >> branchName [ ^ self entity head description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branchNamed: aString [ ^ self entity branchNamed: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> branches [ ^ self entity localBranches ] -{ #category : #checking } +{ #category : 'checking' } IceTipRepositoryModel >> checkMissing [ self isMissing ifTrue: [ IceError signal: ('You have no repository attached to project "{1}"' format: { self name }) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commit [ ^ self entity workingCopy referenceCommit ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitId [ ^ [ self entity headCommit id ] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> commitModelFor: aCommit [ ^ (IceTipCommitModel repositoryModel: self @@ -101,13 +103,13 @@ IceTipRepositoryModel >> commitModelFor: aCommit [ beCached ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> createSourceDirectory [ entity createSourceDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> description [ | text | @@ -117,7 +119,7 @@ IceTipRepositoryModel >> description [ ^ text ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> descriptionDecorator [ (self isLibGitAvailable and: [ self entity isModified ]) @@ -125,24 +127,24 @@ IceTipRepositoryModel >> descriptionDecorator [ ^ super descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasRemotes [ ^ self entity remotes notEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> hasUnbornProject [ ^ self entity workingCopy project isUnborn ] -{ #category : #comparing } +{ #category : 'comparing' } IceTipRepositoryModel >> hash [ ^ self species hash bitXor: self entity hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> headModel [ | head | @@ -152,12 +154,12 @@ IceTipRepositoryModel >> headModel [ ifFalse: [ self commitModelFor: head ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> incomingCommits [ ^ self entity incomingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> info [ ^ { 'Branch' -> self entity branch name. @@ -166,46 +168,46 @@ IceTipRepositoryModel >> info [ } ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isCodeMissing [ ^ entity isCodeMissing ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isDetached [ ^ self entity workingCopy isDetached or: [ self entity head isDetached ] ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLibGitAvailable [ ^ LGitLibrary uniqueInstance isAvailable ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceTipRepositoryModel >> isLoaded [ ^ self entity loadedPackages notEmpty ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> isMissing [ ^ self entity isMissing ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> localRepositoryMissing [ ^ 'Local repository missing' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> location [ ^ entity location ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> longStatus [ (entity isMissing and: [ entity location isNil ]) @@ -229,17 +231,17 @@ IceTipRepositoryModel >> longStatus [ ^ 'Your repository seems ok. Please report a ticket in Iceberg''s issue tracker. If you can, please send us a backup of your image in this state for debugging.' ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryModel >> matches: aString [ ^ self entity name matchesRegexIgnoringCase: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddPackagesAction: aCollection [ @@ -253,7 +255,7 @@ IceTipRepositoryModel >> newAddPackagesAction: aCollection [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ @@ -268,7 +270,7 @@ IceTipRepositoryModel >> newAddRemoteActionName: aName url: anUrl [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ @@ -279,7 +281,7 @@ IceTipRepositoryModel >> newCheckoutNewBranchNamed: aString inCommit: aCommit [ action: [ self entity createBranch: aString inCommit: aCommit ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newCommitAction [ ^ IceTipCommitAction new @@ -287,7 +289,7 @@ IceTipRepositoryModel >> newCommitAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDeleteAction [ @@ -298,7 +300,7 @@ IceTipRepositoryModel >> newDeleteAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newDiscardChangesAction [ @@ -312,7 +314,7 @@ IceTipRepositoryModel >> newDiscardChangesAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newFetchAction [ @@ -324,7 +326,7 @@ IceTipRepositoryModel >> newFetchAction [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipRepositoryModel >> newForgetAction [ @@ -335,12 +337,12 @@ IceTipRepositoryModel >> newForgetAction [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfIncomingCommits [ ^ self incomingCommits size ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> numberOfOutgoingCommits [ ^ [ | size | self entity branch hasUpstream ifFalse: [ ^ '*' ]. @@ -351,40 +353,40 @@ IceTipRepositoryModel >> numberOfOutgoingCommits [ on: IceNotInBranch do: [ :e | '0' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> outgoingCommits [ ^ self entity outgoingCommits ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> packages [ ^ self entity workingCopy packages ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> pushRemoteName [ ^ self entity branch upstream name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remoteModels [ ^ self entity remotes collect: [ :each | (IceTipRemoteModel repositoryModel: self on: each) beCached ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> remotes [ ^ entity remotes ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModel [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> repositoryModelsByGroup [ | branches tags | branches := self allBranchModels. @@ -422,12 +424,12 @@ IceTipRepositoryModel >> repositoryModelsByGroup [ } ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> shortCommitId [ ^ [self entity headCommit shortId] on: Error do: [ nil ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> status [ [ | status incoming outgoing | @@ -465,7 +467,7 @@ IceTipRepositoryModel >> status [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusDecorator [ [ @@ -488,7 +490,7 @@ IceTipRepositoryModel >> statusDecorator [ ^ IceTipStatusDecorator none ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> statusString [ [ | status incoming outgoing | @@ -525,13 +527,13 @@ IceTipRepositoryModel >> statusString [ do: [ :e | ^ e description ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> subdirectory [ ^ self entity subdirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> tagModels [ ^ self entity tags @@ -542,7 +544,7 @@ IceTipRepositoryModel >> tagModels [ beCached ] ] -{ #category : #operations } +{ #category : 'operations' } IceTipRepositoryModel >> updateLocation: aReference [ "change location" @@ -552,18 +554,18 @@ IceTipRepositoryModel >> updateLocation: aReference [ Iceberg announcer announce: (IceRepositoryModified for: self entity) ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryModel >> verifyDirectoryStructureIfMissing: aBlock [ self entity isMissing ifTrue: [ ^ aBlock value: self localRepositoryMissing ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopy [ ^ IceTipWorkingCopyModel on: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryModel >> workingCopyDiff [ diff --git a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st index 5d7d48dc7e..a5bff37e31 100644 --- a/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryTypePanel.class.st @@ -3,8 +3,8 @@ I'm a generic repository type panel. I'm used as part of the creation dialog and to edit repository properties. " Class { - #name : #IceTipRepositoryTypePanel, - #superclass : #IceTipPresenter, + #name : 'IceTipRepositoryTypePanel', + #superclass : 'IceTipPresenter', #instVars : [ 'projectLocationLabel', 'projectLocation', @@ -12,10 +12,12 @@ Class { 'remoteInputText', 'repository' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> allTypes [ ^ ((self allSubclasses reject: #isAbstract) @@ -23,37 +25,37 @@ IceTipRepositoryTypePanel class >> allTypes [ collect: #new ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel class >> isAbstract [ ^ self = IceTipRepositoryTypePanel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel class >> order [ ^ 0 ] -{ #category : #private } +{ #category : 'private' } IceTipRepositoryTypePanel >> defaultLocation [ ^ IceLibgitRepository repositoriesLocation pathString ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> defaultSubdirectory [ ^ IceLibgitRepository defaultCodeSubdirectory ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializePresenters [ self initializeProjectLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeProjectLocation [ projectLocationLabel := self newLabel label: 'Local directory'. @@ -63,7 +65,7 @@ IceTipRepositoryTypePanel >> initializeProjectLocation [ location: self defaultLocation ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipRepositoryTypePanel >> initializeRemoteURL [ remoteLabel := self newLabel label: 'Remote URL'; yourself. @@ -73,50 +75,50 @@ IceTipRepositoryTypePanel >> initializeRemoteURL [ yourself. ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isLocalRepository [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipRepositoryTypePanel >> isNewRepository [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> newRepository [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> projectLocation [ ^ projectLocation ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteInputText [ ^ remoteInputText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipRepositoryTypePanel >> remoteLabel [ ^ remoteLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> repository: aRepository [ "Used if editing an existing repository" repository := aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRepositoryTypePanel >> validate [ ^ self subclassResponsibility diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index a92054e657..fe4979489e 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -2,37 +2,39 @@ I'm a command to reset the selected branch to the selected commit. It does not modify the working copy. " Class { - #name : #IceTipResetBranchToThisCommitCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipResetBranchToThisCommitCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipResetBranchToThisCommitCommand class >> defaultDescription [ ^ 'Resets the selected branch to the selected commit. It does not modify the working copy (!!).' ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [ ^ 'Reset ', self selectedBranch name, ' to commit ', self selectedCommitish shortId ] -{ #category : #executing } +{ #category : 'executing' } IceTipResetBranchToThisCommitCommand >> execute [ self selectedBranch resetToCommit: self selectedCommitish. Iceberg announcer announce: (IceRepositoryModified for: self repository). ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> iconName [ ^ #bottom ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipResetBranchToThisCommitCommand >> name [ ^ self context @@ -40,13 +42,13 @@ IceTipResetBranchToThisCommitCommand >> name [ ifNotNil: [ self defaultNameFromContext ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedBranch [ ^ self context model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedCommitish [ ^ self item diff --git a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st index 2a35d1e302..32620f7057 100644 --- a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st +++ b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st @@ -3,24 +3,26 @@ I'm a command to install a chunk of code from a commit (shown in a diff) into th ""chunk"" can be a package, class or single method. " Class { - #name : #IceTipRevertChangeCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipRevertChangeCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultDescription [ ^ 'Revert selected change in the image' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipRevertChangeCommand class >> defaultName [ ^ 'Revert change' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> execute [ UIManager default @@ -33,13 +35,13 @@ IceTipRevertChangeCommand >> execute [ (IceRepositoryModified for: self repository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRevertChangeCommand >> iconName [ ^ #smallUndo ] -{ #category : #executing } +{ #category : 'executing' } IceTipRevertChangeCommand >> tool [ "We consider the diffPanel of the context as our tool. This is important because we have to announce in the same Announcer instance that is subscribed for our news." diff --git a/Iceberg-TipUI/IceTipSaveImageAction.class.st b/Iceberg-TipUI/IceTipSaveImageAction.class.st index a60893f771..0dc8f6057b 100644 --- a/Iceberg-TipUI/IceTipSaveImageAction.class.st +++ b/Iceberg-TipUI/IceTipSaveImageAction.class.st @@ -4,12 +4,14 @@ I implement the action of saving the image. I'm used by the presenter that prepares the commit. " Class { - #name : #IceTipSaveImageAction, - #superclass : #Object, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSaveImageAction', + #superclass : 'Object', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #execution } +{ #category : 'execution' } IceTipSaveImageAction >> execute [ Smalltalk saveSession. diff --git a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st index 69334d31e0..4b30645958 100644 --- a/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectAllPackagesCommand.class.st @@ -3,24 +3,26 @@ Implements the select all option behavior in the ""Select New Packages to Load"" " Class { - #name : #IceTipSelectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipSelectAllPackagesCommand class >> defaultName [ ^ 'Select all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSelectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display and they are not all selected " @@ -30,7 +32,7 @@ IceTipSelectAllPackagesCommand >> canBeExecuted [ ^ pkgList items notEmpty and: [ pkgList items size ~= pkgList selectedItems size ] ] -{ #category : #executing } +{ #category : 'executing' } IceTipSelectAllPackagesCommand >> execute [ " Private - Select all the receiver's packages " @@ -38,7 +40,7 @@ IceTipSelectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectAllPackagesCommand >> iconName [ ^ #checkboxSelected diff --git a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st index c8218a5b92..25f6293bb2 100644 --- a/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipSelectPackagesCommand.class.st @@ -2,12 +2,14 @@ Provides common behavior to accesing the packages list presenters in its context. " Class { - #name : #IceTipSelectPackagesCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSelectPackagesCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceTipSelectPackagesCommand >> packagesList [ " Answer a including the receiver's packages " diff --git a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st index 51ece93142..9ed3ec2535 100644 --- a/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st +++ b/Iceberg-TipUI/IceTipSelectRemotePresenter.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceTipSelectRemotePresenter, - #superclass : #SpPresenter, + #name : 'IceTipSelectRemotePresenter', + #superclass : 'SpPresenter', #instVars : [ 'remoteList', 'addButton', 'model' ], - #category : #'Iceberg-TipUI-View-Branch' + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> addButton [ ^ addButton ] -{ #category : #actions } +{ #category : 'actions' } IceTipSelectRemotePresenter >> addRemote [ ((IceTipAddRemoteDialogPresenter @@ -30,7 +32,7 @@ IceTipSelectRemotePresenter >> addRemote [ open ] -{ #category : #layout } +{ #category : 'layout' } IceTipSelectRemotePresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -40,13 +42,13 @@ IceTipSelectRemotePresenter >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> icon [ ^ self iconNamed: #add ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> initializePresenters [ remoteList := self newDropList @@ -60,44 +62,44 @@ IceTipSelectRemotePresenter >> initializePresenters [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> label: aString [ self remoteLabel label: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> refresh [ remoteList items: self model remoteModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipSelectRemotePresenter >> remoteList [ ^ remoteList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSelectRemotePresenter >> selectRemoteNamed: aString [ remoteList selectItem: (self model remoteModels detect: [ :each | each name = aString ]) ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipSelectRemotePresenter >> setModelBeforeInitialization: anObject [ model := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSelectRemotePresenter >> updatePresenter [ self refresh. diff --git a/Iceberg-TipUI/IceTipSettingsCommand.class.st b/Iceberg-TipUI/IceTipSettingsCommand.class.st index 7fd84a78c0..487cfeffdc 100644 --- a/Iceberg-TipUI/IceTipSettingsCommand.class.st +++ b/Iceberg-TipUI/IceTipSettingsCommand.class.st @@ -2,31 +2,33 @@ Command that opens the settings on a repository " Class { - #name : #IceTipSettingsCommand, - #superclass : #IceTipRepositoryCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipSettingsCommand', + #superclass : 'IceTipRepositoryCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultDescription [ ^ 'Open settings browser to configure Iceberg' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipSettingsCommand class >> defaultName [ ^ 'Settings' ] -{ #category : #testing } +{ #category : 'testing' } IceTipSettingsCommand >> canBeExecuted [ "This command can be executed with our without selection" ^ true ] -{ #category : #executing } +{ #category : 'executing' } IceTipSettingsCommand >> execute [ | browser window path | @@ -41,19 +43,19 @@ IceTipSettingsCommand >> execute [ browser expandNodePath: path first contents first contents first path. ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> iconName [ ^ #configuration ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shortcutKey [ ^ $n meta ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSettingsCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-TipUI/IceTipSpCommand.class.st b/Iceberg-TipUI/IceTipSpCommand.class.st index 41ad221c73..02907cc53e 100644 --- a/Iceberg-TipUI/IceTipSpCommand.class.st +++ b/Iceberg-TipUI/IceTipSpCommand.class.st @@ -4,27 +4,29 @@ I am a CmUICommand that is specialized for Iceberg UI. In particular, I'm used to wrap instances of IceTipCommand in a IceTipBrowser. " Class { - #name : #IceTipSpCommand, - #superclass : #CmUICommand, + #name : 'IceTipSpCommand', + #superclass : 'CmUICommand', #instVars : [ 'presenterBuildingStrategy' ], - #category : #'Iceberg-TipUI-Spec2' + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> buildPresenter [ ^ self presenterBuildingStrategy resultOn: self ] -{ #category : #'presenter building' } +{ #category : 'presenter building' } IceTipSpCommand >> configureAsToolbarButton [ self presenterBuildingStrategy: IceTipToolbarButtonStrategy new ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ self displayStrategy @@ -33,30 +35,30 @@ IceTipSpCommand >> displayIn: aMenuGroupOrPresenter do: aBlock [ do: aBlock ] -{ #category : #displaying } +{ #category : 'displaying' } IceTipSpCommand >> ifVisible: aBlock [ self displayStrategy ifVisible: self do: aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipSpCommand >> initialize [ super initialize. self configureAsToolbarButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy [ ^ presenterBuildingStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> presenterBuildingStrategy: aStrategy [ presenterBuildingStrategy := aStrategy ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipSpCommand >> toolbarItemName [ ^ self decoratedCommand toolbarItemName diff --git a/Iceberg-TipUI/IceTipStandardAction.class.st b/Iceberg-TipUI/IceTipStandardAction.class.st index 6d97da6496..205c3bf83c 100644 --- a/Iceberg-TipUI/IceTipStandardAction.class.st +++ b/Iceberg-TipUI/IceTipStandardAction.class.st @@ -4,27 +4,29 @@ I will perform an action by informing user what's happening. I will also check for errors happening while performing the task and try to recover from them. " Class { - #name : #IceTipStandardAction, - #superclass : #IceTipAction, + #name : 'IceTipStandardAction', + #superclass : 'IceTipAction', #instVars : [ 'message', 'successAnnounceBlock', 'actionBlock' ], - #category : #'Iceberg-TipUI-Commands' + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action [ ^ actionBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> action: aBlock [ actionBlock := aBlock ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> basicExecute [ | result | @@ -38,35 +40,35 @@ IceTipStandardAction >> basicExecute [ ^ result ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> do: aBlock [ self action: aBlock. self execute ] -{ #category : #executing } +{ #category : 'executing' } IceTipStandardAction >> execute: aBlock [ self action: aBlock. self execute ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message [ ^ message ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> message: anObject [ message := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessAnnounce: aValuable [ successAnnounceBlock := aValuable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStandardAction >> onSuccessRepositoryModified [ ^ self onSuccessAnnounce: [ IceRepositoryModified for: self repository ] ] diff --git a/Iceberg-TipUI/IceTipStatusDecorator.class.st b/Iceberg-TipUI/IceTipStatusDecorator.class.st index ba1f418e96..47bd5ea718 100644 --- a/Iceberg-TipUI/IceTipStatusDecorator.class.st +++ b/Iceberg-TipUI/IceTipStatusDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> error [ ^ IceTipStatusDecoratorError uniqueInstance ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecorator class >> warning [ ^ IceTipStatusDecoratorWarning uniqueInstance diff --git a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st index c68d74a199..b17b0b0531 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorError.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorError.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipStatusDecoratorError, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorError', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorError >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme dangerTextColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipStatusDecoratorError >> isBold [ ^ true diff --git a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st index 4ab0410f00..27b044612c 100644 --- a/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st +++ b/Iceberg-TipUI/IceTipStatusDecoratorWarning.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipStatusDecoratorWarning, - #superclass : #IceTipStatusDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipStatusDecoratorWarning', + #superclass : 'IceTipStatusDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipStatusDecoratorWarning >> color [ ^ Smalltalk ui theme warningTextColor diff --git a/Iceberg-TipUI/IceTipStyleContributor.class.st b/Iceberg-TipUI/IceTipStyleContributor.class.st index 57fadcd53a..85cad5d70c 100644 --- a/Iceberg-TipUI/IceTipStyleContributor.class.st +++ b/Iceberg-TipUI/IceTipStyleContributor.class.st @@ -4,12 +4,14 @@ This class is call by Spec2 to extend the default stylesheet. Check its superclass to understand the way of working. " Class { - #name : #IceTipStyleContributor, - #superclass : #StPharoStyleContributor, - #category : #'Iceberg-TipUI-Styles' + #name : 'IceTipStyleContributor', + #superclass : 'StPharoStyleContributor', + #category : 'Iceberg-TipUI-Styles', + #package : 'Iceberg-TipUI', + #tag : 'Styles' } -{ #category : #styles } +{ #category : 'styles' } IceTipStyleContributor >> styleSheetContribution [ ^ SpStyle newApplication diff --git a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st index 20245a7b30..2cf032c786 100644 --- a/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st +++ b/Iceberg-TipUI/IceTipSwitchAndMergeType.class.st @@ -8,12 +8,14 @@ I will switch first to the new branch, and then I will perform a merge with curr This strategy is used to re-attach image when it is detached from current development branch. " Class { - #name : #IceTipSwitchAndMergeType, - #superclass : #IceTipMergeType, - #category : #'Iceberg-TipUI-View-Branch' + #name : 'IceTipSwitchAndMergeType', + #superclass : 'IceTipMergeType', + #category : 'Iceberg-TipUI-View-Branch', + #package : 'Iceberg-TipUI', + #tag : 'View-Branch' } -{ #category : #executing } +{ #category : 'executing' } IceTipSwitchAndMergeType >> newMergeAction: aModel [ ^ aModel newSwitchAndMergeAction diff --git a/Iceberg-TipUI/IceTipTagDecorator.class.st b/Iceberg-TipUI/IceTipTagDecorator.class.st index 695df71986..52aafff355 100644 --- a/Iceberg-TipUI/IceTipTagDecorator.class.st +++ b/Iceberg-TipUI/IceTipTagDecorator.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceTipTagDecorator, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagDecorator', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagDecorator >> color [ ^ Smalltalk ui theme disabledColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTagDecorator >> isItalic [ ^ true diff --git a/Iceberg-TipUI/IceTipTagModel.class.st b/Iceberg-TipUI/IceTipTagModel.class.st index cfd67df83a..cc72af64a0 100644 --- a/Iceberg-TipUI/IceTipTagModel.class.st +++ b/Iceberg-TipUI/IceTipTagModel.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTagModel, - #superclass : #IceTipCommitishModel, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTagModel', + #superclass : 'IceTipCommitishModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> commitModels [ | commits | @@ -17,7 +19,7 @@ IceTipTagModel >> commitModels [ ^ commits ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> delete [ @@ -28,19 +30,19 @@ IceTipTagModel >> delete [ do: [ self repositoryModel entity removeTag: self entity ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> description [ ^ self entity name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTagModel >> name [ ^ self entity name ] -{ #category : #actions } +{ #category : 'actions' } IceTipTagModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before actually checking out (checkout operation will be called in my sibling method, #checkout)" diff --git a/Iceberg-TipUI/IceTipTextDecorator.class.st b/Iceberg-TipUI/IceTipTextDecorator.class.st index 879c33d06a..0530538c8a 100644 --- a/Iceberg-TipUI/IceTipTextDecorator.class.st +++ b/Iceberg-TipUI/IceTipTextDecorator.class.st @@ -1,44 +1,46 @@ Class { - #name : #IceTipTextDecorator, - #superclass : #Object, + #name : 'IceTipTextDecorator', + #superclass : 'Object', #classInstVars : [ 'uniqueInstance' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> new [ self error: 'Use #uniqueInstance' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator class >> none [ ^ IceTipTextDecoratorNone uniqueInstance ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTextDecorator class >> uniqueInstance [ self = IceTipTextDecorator ifTrue: [ ^ self error: 'I''m abstract, use one of my children.' ]. ^ uniqueInstance ifNil: [ uniqueInstance := super new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTextDecorator >> color [ self flag: #TODO. "Do not rely on theme, but on settings" ^ Smalltalk ui theme textColor ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isBold [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTextDecorator >> isItalic [ ^ false diff --git a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st index 5bfcdfb1db..79c406d278 100644 --- a/Iceberg-TipUI/IceTipTextDecoratorNone.class.st +++ b/Iceberg-TipUI/IceTipTextDecoratorNone.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTextDecoratorNone, - #superclass : #IceTipTextDecorator, - #category : #'Iceberg-TipUI-Model' + #name : 'IceTipTextDecoratorNone', + #superclass : 'IceTipTextDecorator', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } diff --git a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st index 610e84556c..ceb50f8d8a 100644 --- a/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st +++ b/Iceberg-TipUI/IceTipToolbarButtonStrategy.class.st @@ -3,18 +3,20 @@ I'm a strategy to build Spec2 buttons foro a toolar wrapping a IceTipSpCommand. " Class { - #name : #IceTipToolbarButtonStrategy, - #superclass : #IceTipCommandToPresenterBuildingStrategy, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarButtonStrategy', + #superclass : 'IceTipCommandToPresenterBuildingStrategy', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #hook } +{ #category : 'hook' } IceTipToolbarButtonStrategy >> buttonPresenterClass [ ^ SpToolbarButtonPresenter ] -{ #category : #public } +{ #category : 'public' } IceTipToolbarButtonStrategy >> resultOn: aCommand [ | aButtonPresenter | diff --git a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st index 67f6838fb7..91cc8f7fce 100644 --- a/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st +++ b/Iceberg-TipUI/IceTipToolbarPresenterBuilder.class.st @@ -3,12 +3,14 @@ I'm a SpToolbarPresenterBuilder that delegates to the command the decision to ac " Class { - #name : #IceTipToolbarPresenterBuilder, - #superclass : #SpToolbarPresenterBuilder, - #category : #'Iceberg-TipUI-Spec2' + #name : 'IceTipToolbarPresenterBuilder', + #superclass : 'SpToolbarPresenterBuilder', + #category : 'Iceberg-TipUI-Spec2', + #package : 'Iceberg-TipUI', + #tag : 'Spec2' } -{ #category : #visiting } +{ #category : 'visiting' } IceTipToolbarPresenterBuilder >> visitCommand: anEntry [ anEntry ifVisible: [ super visitCommand: anEntry ] diff --git a/Iceberg-TipUI/IceTipTreeBranch.class.st b/Iceberg-TipUI/IceTipTreeBranch.class.st index 2c2c76c0ba..048ef0aeb2 100644 --- a/Iceberg-TipUI/IceTipTreeBranch.class.st +++ b/Iceberg-TipUI/IceTipTreeBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeBranch, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeBranch', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeBranch >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnBranch: self ] diff --git a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st index abe4c6c3f2..6d6c8e77c2 100644 --- a/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeCollapseCommand.class.st @@ -3,31 +3,33 @@ A generic command to collapse a tree. It sends `doCollapseSelection` message to its context. " Class { - #name : #IceTipTreeCollapseCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeCollapseCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultDescription [ ^ 'Collapse selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeCollapseCommand class >> defaultName [ ^ 'Collapse' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeCollapseCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeCollapseCommand >> execute [ self context doCollapseSelection diff --git a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st index b3e6aab770..c7ff5ac195 100644 --- a/Iceberg-TipUI/IceTipTreeExpandCommand.class.st +++ b/Iceberg-TipUI/IceTipTreeExpandCommand.class.st @@ -2,37 +2,39 @@ A generic command to expand tree items within a tree. " Class { - #name : #IceTipTreeExpandCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipTreeExpandCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultDescription [ ^ 'Expand selected item' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipTreeExpandCommand class >> defaultName [ ^ 'Expand' ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeExpandCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipTreeExpandCommand >> execute [ self context doExpandSelection ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeExpandCommand >> iconName [ ^ nil diff --git a/Iceberg-TipUI/IceTipTreeGroup.class.st b/Iceberg-TipUI/IceTipTreeGroup.class.st index bf0b91e110..3de0ec917c 100644 --- a/Iceberg-TipUI/IceTipTreeGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeGroup.class.st @@ -4,16 +4,18 @@ I keep groups with elements. I can provide also a contexts for menu operations and other kind of options to be associated with group. " Class { - #name : #IceTipTreeGroup, - #superclass : #IceTipTreeNode, + #name : 'IceTipTreeGroup', + #superclass : 'IceTipTreeNode', #instVars : [ 'name', 'children' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName children: aCollection [ ^ self new name: aName; @@ -21,7 +23,7 @@ IceTipTreeGroup class >> name: aName children: aCollection [ yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ ^ self new name: aName; @@ -30,7 +32,7 @@ IceTipTreeGroup class >> name: aName icon: anIcon children: aCollection [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> addChild: anObject [ children ifNil: [ children := OrderedCollection new ]. children add: anObject. @@ -38,23 +40,23 @@ IceTipTreeGroup >> addChild: anObject [ ^ anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children [ ^ children ifNil: [ #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> children: aCollection [ children := aCollection. children do: [ :each | each parent: self ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> ensurePath: aPath [ | first next | @@ -67,34 +69,34 @@ IceTipTreeGroup >> ensurePath: aPath [ ifEmpty: [ next ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isGroup [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeGroup >> isSameAs: aNode [ ^ aNode species = self species and: [ self name = aNode name and: [ aNode name notNil ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name [ ^ name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> name: anObject [ name := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock [ ^ self traversingDo: aBlock parents: #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeGroup >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray. self children do: [ :each | diff --git a/Iceberg-TipUI/IceTipTreeItem.class.st b/Iceberg-TipUI/IceTipTreeItem.class.st index bea3c80b69..62ce9f9737 100644 --- a/Iceberg-TipUI/IceTipTreeItem.class.st +++ b/Iceberg-TipUI/IceTipTreeItem.class.st @@ -2,36 +2,38 @@ I'm a leaf element of a tree. " Class { - #name : #IceTipTreeItem, - #superclass : #IceTipTreeNode, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeItem', + #superclass : 'IceTipTreeNode', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> description [ ^ self model description ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> descriptionDecorator [ ^ self model descriptionDecorator ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeItem >> isSameAs: aNode [ ^ aNode species = self species and: [ self model = aNode model ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> shortDescription [ ^ self model shortDescription ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeItem >> traversingDo: aBlock parents: anArray [ aBlock cull: self cull: anArray diff --git a/Iceberg-TipUI/IceTipTreeNode.class.st b/Iceberg-TipUI/IceTipTreeNode.class.st index 43b31c752c..932a612b46 100644 --- a/Iceberg-TipUI/IceTipTreeNode.class.st +++ b/Iceberg-TipUI/IceTipTreeNode.class.st @@ -5,38 +5,40 @@ I understand - icon " Class { - #name : #IceTipTreeNode, - #superclass : #Object, + #name : 'IceTipTreeNode', + #superclass : 'Object', #instVars : [ 'model', 'parent', 'icon' ], - #category : #'Iceberg-TipUI-View-Repository' + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipTreeNode class >> on: aModel [ ^ self new model: aModel ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> canActivateCommand: aCommandClass [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> children [ ^ #() ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> description [ ^ self subclassResponsibility ] -{ #category : #'reflective operations' } +{ #category : 'reflective operations' } IceTipTreeNode >> doesNotUnderstand: aMessage [ "redirect to model to provide polymorphism." self flag: #pharoTodo. "I'm not sure this is good practice... we'll see how it works" @@ -44,59 +46,59 @@ IceTipTreeNode >> doesNotUnderstand: aMessage [ ^ aMessage sendTo: self model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon [ ^ icon ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> icon: anIcon [ icon := anIcon ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isGroup [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isLeaf [ ^ self isGroup not ] -{ #category : #testing } +{ #category : 'testing' } IceTipTreeNode >> isSameAs: aNode [ ^ self subclassResponsibility ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model [ ^ model ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> model: anObject [ model := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent [ ^ parent ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> parent: anObject [ parent := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> path [ ^ self parent ifNotNil: [ :p | p path, { self } ] ifNil: [ { self } ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipTreeNode >> traversingDo: aBlock parents: anArray [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceTipTreeRemote.class.st b/Iceberg-TipUI/IceTipTreeRemote.class.st index ca4a7d6761..df832c0592 100644 --- a/Iceberg-TipUI/IceTipTreeRemote.class.st +++ b/Iceberg-TipUI/IceTipTreeRemote.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeRemote, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRemote', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeRemote >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnRemote: self ] diff --git a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st index 641cdf415b..34b4cacef9 100644 --- a/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeRepositoryGroup.class.st @@ -1,5 +1,7 @@ Class { - #name : #IceTipTreeRepositoryGroup, - #superclass : #IceTipTreeGroup, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeRepositoryGroup', + #superclass : 'IceTipTreeGroup', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } diff --git a/Iceberg-TipUI/IceTipTreeTag.class.st b/Iceberg-TipUI/IceTipTreeTag.class.st index 1f930e5759..5369001c4b 100644 --- a/Iceberg-TipUI/IceTipTreeTag.class.st +++ b/Iceberg-TipUI/IceTipTreeTag.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTipTreeTag, - #superclass : #IceTipTreeItem, - #category : #'Iceberg-TipUI-View-Repository' + #name : 'IceTipTreeTag', + #superclass : 'IceTipTreeItem', + #category : 'Iceberg-TipUI-View-Repository', + #package : 'Iceberg-TipUI', + #tag : 'View-Repository' } -{ #category : #testing } +{ #category : 'testing' } IceTipTreeTag >> canActivateCommand: aCommandClass [ ^ aCommandClass actsOnTag: self ] diff --git a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st index 799a7e886a..95664d05d8 100644 --- a/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadAndRemovePackageCommand.class.st @@ -7,30 +7,32 @@ It gives the user with two checkboxes to choose: Right now this is only shown for loaded packages. " Class { - #name : #IceTipUnloadAndRemovePackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadAndRemovePackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultDescription [ ^ 'Opens a dialog to choose between unloading from system and/or removing a package from the repository' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadAndRemovePackageCommand class >> defaultName [ ^ 'Unload and/or remove from repository' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadAndRemovePackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadAndRemovePackageCommand >> execute [ (IceTipRemovePackageDialogPresenter @@ -41,7 +43,7 @@ IceTipUnloadAndRemovePackageCommand >> execute [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadAndRemovePackageCommand >> iconName [ ^ #glamorousTrash diff --git a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st index 6ca10d560f..ba89f54d03 100644 --- a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st @@ -2,36 +2,38 @@ Command to unload a package from the system, keeping it in the repository " Class { - #name : #IceTipUnloadPackageCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnloadPackageCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultDescription [ ^ 'Unload selected package from the system, but keep it in the repository.' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnloadPackageCommand class >> defaultName [ ^ 'Unload' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnloadPackageCommand >> canBeExecuted [ ^ self isPackageLoaded ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnloadPackageCommand >> execute [ self packageModel unload ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnloadPackageCommand >> iconName [ ^ #smallCancel diff --git a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st index 9527d0f50e..f2b6ae1931 100644 --- a/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st +++ b/Iceberg-TipUI/IceTipUnselectAllPackagesCommand.class.st @@ -3,24 +3,26 @@ Implements the unselect all option behavior in the ""Select New Packages to Load " Class { - #name : #IceTipUnselectAllPackagesCommand, - #superclass : #IceTipSelectPackagesCommand, - #category : #'Iceberg-TipUI-Commands' + #name : 'IceTipUnselectAllPackagesCommand', + #superclass : 'IceTipSelectPackagesCommand', + #category : 'Iceberg-TipUI-Commands', + #package : 'Iceberg-TipUI', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipUnselectAllPackagesCommand class >> defaultDescription [ ^ 'Opens a dialog to choose select and/or removing new package(s) from the repository' ] -{ #category : #default } +{ #category : 'default' } IceTipUnselectAllPackagesCommand class >> defaultName [ ^ 'Unselect all packages' ] -{ #category : #testing } +{ #category : 'testing' } IceTipUnselectAllPackagesCommand >> canBeExecuted [ " Answer if the receiver has items to display " @@ -30,7 +32,7 @@ IceTipUnselectAllPackagesCommand >> canBeExecuted [ ^ pkgList items notEmpty ] -{ #category : #executing } +{ #category : 'executing' } IceTipUnselectAllPackagesCommand >> execute [ " Private - Unselect all the receiver's packages " @@ -38,7 +40,7 @@ IceTipUnselectAllPackagesCommand >> execute [ self packagesList refresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipUnselectAllPackagesCommand >> iconName [ ^ #checkboxUnselected diff --git a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st index c21462781d..57a7aa7cd3 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st @@ -8,8 +8,8 @@ For versions, I show the same commands of a regular history browser, but add som " Class { - #name : #IceTipVersionHistoryBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipVersionHistoryBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'commitList', 'selectedModel', @@ -17,16 +17,18 @@ Class { 'diffPage', 'commitPanel' ], - #category : #'Iceberg-TipUI-View-Versions' + #category : 'Iceberg-TipUI-View-Versions', + #package : 'Iceberg-TipUI', + #tag : 'View-Versions' } -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipInstallVersionCommand } @@ -35,7 +37,7 @@ IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter f ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ ^ self on: (IceTipVersionHistoryModel @@ -44,13 +46,13 @@ IceTipVersionHistoryBrowser class >> onRepository: aRepository method: aMethod [ beCached ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> commitList [ ^ commitList ] -{ #category : #layout } +{ #category : 'layout' } IceTipVersionHistoryBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -59,13 +61,13 @@ IceTipVersionHistoryBrowser >> defaultLayout [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initialExtentForWindow [ ^ (700@700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitList [ commitList @@ -94,7 +96,7 @@ IceTipVersionHistoryBrowser >> initializeCommitList [ self selectionChanged: aSelection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializeCommitPanel [ "This will be initialised in fact on the first refresh" @@ -106,7 +108,7 @@ IceTipVersionHistoryBrowser >> initializeCommitPanel [ yourself) ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> initializePresenters [ commitList := self newTable. @@ -116,21 +118,21 @@ IceTipVersionHistoryBrowser >> initializePresenters [ self initializeCommitPanel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipVersionHistoryBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commitList ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> model: anObject [ super model: anObject. self refresh ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPage [ ^ SpNotebookPage @@ -139,7 +141,7 @@ IceTipVersionHistoryBrowser >> newDiffPage [ provider: [ self newDiffPresenter ] ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ ^ (self instantiate: SpDiffPresenter) @@ -148,7 +150,7 @@ IceTipVersionHistoryBrowser >> newDiffPanelLeft: leftString right: rightString [ showOptions: false ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newDiffPresenter [ selectedModel ifNil: [ ^ self ]. @@ -159,7 +161,7 @@ IceTipVersionHistoryBrowser >> newDiffPresenter [ right: selectedModel source ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipVersionHistoryBrowser >> newInfoPage [ ^ SpNotebookPage @@ -169,14 +171,14 @@ IceTipVersionHistoryBrowser >> newInfoPage [ ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> newVersionInfoPresenter [ selectedModel ifNil: [ ^ self ]. ^ IceTipReadOnlyFormBuilder newBuiltFor: selectedModel info application: self application ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryBrowser >> refresh [ commitList items: self model commitModels. @@ -186,7 +188,7 @@ IceTipVersionHistoryBrowser >> refresh [ self refreshCommitTabPanel ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ selectedModel ifNil: [ ^ self ]. @@ -198,14 +200,14 @@ IceTipVersionHistoryBrowser >> refreshCommitTabPanel [ commitPanel resetAllPageContents ] -{ #category : #'event handling' } +{ #category : 'event handling' } IceTipVersionHistoryBrowser >> selectionChanged: aSelectedItem [ selectedModel := aSelectedItem. self refreshCommitTabPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> titleForWindow [ ^ self model @@ -213,7 +215,7 @@ IceTipVersionHistoryBrowser >> titleForWindow [ ifNil: [ 'Versions' ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipVersionHistoryBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st index 59bfc94f75..b5fd22c176 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st @@ -2,22 +2,24 @@ I'm a model to provide the history of a method. " Class { - #name : #IceTipVersionHistoryModel, - #superclass : #IceTipCommitishModel, + #name : 'IceTipVersionHistoryModel', + #superclass : 'IceTipCommitishModel', #instVars : [ 'commitModels' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModelAfter: aModel [ ^ self commitModels after: aModel ifAbsent: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> commitModels [ ^ commitModels ifNil: [ commitModels := self retrieveHistory collect: [ :each | @@ -27,18 +29,18 @@ IceTipVersionHistoryModel >> commitModels [ beCached ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> description [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionHistoryModel >> name [ ^ '{1}>>{2}' format: { self entity origin name. self entity selector } ] -{ #category : #private } +{ #category : 'private' } IceTipVersionHistoryModel >> retrieveHistory [ self repositoryModel checkMissing. diff --git a/Iceberg-TipUI/IceTipVersionModel.class.st b/Iceberg-TipUI/IceTipVersionModel.class.st index a416351dc2..4382df60ce 100644 --- a/Iceberg-TipUI/IceTipVersionModel.class.st +++ b/Iceberg-TipUI/IceTipVersionModel.class.st @@ -5,12 +5,14 @@ I'm a model for IceLogVersion entries. - I can install a certain method version. " Class { - #name : #IceTipVersionModel, - #superclass : #IceTipCommitModel, - #category : 'Iceberg-TipUI-Model' + #name : 'IceTipVersionModel', + #superclass : 'IceTipCommitModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #private } +{ #category : 'private' } IceTipVersionModel >> basicInstall [ | definition | @@ -20,12 +22,12 @@ IceTipVersionModel >> basicInstall [ classified: definition category ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> commit [ ^ self entity commit ] -{ #category : #actions } +{ #category : 'actions' } IceTipVersionModel >> install [ @@ -36,7 +38,7 @@ IceTipVersionModel >> install [ execute: [ self basicInstall ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipVersionModel >> source [ ^ self entity source ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st index ebf9dd35c6..e9379df0ba 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st @@ -5,17 +5,19 @@ I show the packages managed by this repository and a series of actions to proper (IceTipPackagesBrowser forRepository: IceRepository registry anyOne) openWithSpec " Class { - #name : #IceTipWorkingCopyBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipWorkingCopyBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'statusBar', 'packagesTable', 'filterInput' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ { IceTipRepairCommand. @@ -33,7 +35,7 @@ IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: a ] -{ #category : #commands } +{ #category : 'commands' } IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { IceTipBrowsePackageCommand. @@ -47,19 +49,19 @@ IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> allListItems [ ^ self model packageModels ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ | commandClass | @@ -72,7 +74,7 @@ IceTipWorkingCopyBrowser >> browsePackage: aPackageModel [ execute ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> connectPresenters [ super connectPresenters. @@ -82,7 +84,7 @@ IceTipWorkingCopyBrowser >> connectPresenters [ ] -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -91,20 +93,20 @@ IceTipWorkingCopyBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> filterInput [ ^ filterInput ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> filteredItemsFor: pattern [ ^ self allListItems select: [ :each | each name asLowercase includesSubstring: pattern asLowercase ] ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> iconFor: aPackage [ self decorations do: [ :each | @@ -114,13 +116,13 @@ IceTipWorkingCopyBrowser >> iconFor: aPackage [ ^ self iconNamed: #package ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initialExtentForWindow [ ^ (700 @ 500) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePackagesTable [ packagesTable @@ -147,7 +149,7 @@ IceTipWorkingCopyBrowser >> initializePackagesTable [ whenActivatedDo: [ :selection | self browsePackage: selection selectedItem ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializePresenters [ filterInput := self newTextInput. @@ -156,7 +158,7 @@ IceTipWorkingCopyBrowser >> initializePresenters [ statusBar := self instantiate: IceTipWorkingCopyStatusBarPresenter ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ super initializeWindow: aSpWindowPresenter. @@ -165,25 +167,25 @@ IceTipWorkingCopyBrowser >> initializeWindow: aSpWindowPresenter [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> mainList [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> packageModel [ ^ packagesTable selectedItem ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> packagesTable [ ^ packagesTable ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyBrowser >> refresh [ self refreshCommands. @@ -191,7 +193,7 @@ IceTipWorkingCopyBrowser >> refresh [ self refreshPackagesTable ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshPackagesTable [ packagesTable items: (filterInput text @@ -200,13 +202,13 @@ IceTipWorkingCopyBrowser >> refreshPackagesTable [ ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshStatusBar [ statusBar model: self model ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ (ann repository isNil or: [ @@ -217,25 +219,25 @@ IceTipWorkingCopyBrowser >> refreshWhenRepository: ann [ ] -{ #category : #'accessing - model' } +{ #category : 'accessing - model' } IceTipWorkingCopyBrowser >> setModelBeforeInitialization: aRepositoryModel [ self model: ( IceTipWorkingCopyModel on: aRepositoryModel ) ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyBrowser >> showsPackageNamed: aString [ ^ packagesTable items anySatisfy: [ :packageModel | packageModel name = aString ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipWorkingCopyBrowser >> statusBar [ ^ statusBar ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ Iceberg announcer weak @@ -244,13 +246,13 @@ IceTipWorkingCopyBrowser >> subscribeToAnnouncements [ to: self ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> titleForWindow [ ^ 'Working copy of ', self model repositoryName ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st index e116fd4bcb..507b1e2c59 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyDiffModel.class.st @@ -2,30 +2,32 @@ I'm a diff model that represents a diff between the HEAD commit and the image working copy. " Class { - #name : #IceTipWorkingCopyDiffModel, - #superclass : #IceTipDiffModel, + #name : 'IceTipWorkingCopyDiffModel', + #superclass : 'IceTipDiffModel', #instVars : [ 'diff' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyDiffModel >> diff [ ^ diff ifNil: [ diff := self newDiff ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyDiffModel >> isEmpty [ ^ self diff isEmpty ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceTipWorkingCopyDiffModel >> newDiff [ ^ self entity workingCopyDiff ] -{ #category : #private } +{ #category : 'private' } IceTipWorkingCopyDiffModel >> resetDiff [ diff := nil ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st index 21b5734be7..201e8943a9 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyModel.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyModel.class.st @@ -2,51 +2,53 @@ I'm a model to for IceWorkingCopy entries. " Class { - #name : #IceTipWorkingCopyModel, - #superclass : #IceTipModel, + #name : 'IceTipWorkingCopyModel', + #superclass : 'IceTipModel', #instVars : [ 'sortingStrategy', 'repositoryModel' ], - #category : #'Iceberg-TipUI-Model' + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> new [ self error: 'use #for:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipWorkingCopyModel class >> on: aRepositoryModel [ ^ self basicNew initializeRepositoryModel: aRepositoryModel; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> branchName [ ^ self repositoryModel branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> commitId [ ^ repositoryModel commitId ] -{ #category : #operations } +{ #category : 'operations' } IceTipWorkingCopyModel >> copyCommitIDToClipboard [ repositoryModel copyCommitIDToClipboard ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyModel >> initializeRepositoryModel: aRepositoryModel [ repositoryModel := aRepositoryModel. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> packageModels [ ^ self sortingStrategy sort: (self repositoryModel entity workingCopy packages collect: [ :each | @@ -56,37 +58,37 @@ IceTipWorkingCopyModel >> packageModels [ beCached ]) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> repositoryName [ ^ self repositoryModel name ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> reset [ self repositoryModel reset ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> shortCommitId [ ^ repositoryModel shortCommitId ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> sortingStrategy [ ^ sortingStrategy ifNil: [ sortingStrategy := IceSortingStrategy new first: #modified ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> status [ ^ self repositoryModel status ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyModel >> statusDecorator [ ^ self repositoryModel statusDecorator diff --git a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st index 03e34062ab..8cbcf3dfce 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyStatusBarPresenter.class.st @@ -2,17 +2,19 @@ I'm the status bar for a IceTipWorkingCopyBrowser. " Class { - #name : #IceTipWorkingCopyStatusBarPresenter, - #superclass : #SpPresenter, + #name : 'IceTipWorkingCopyStatusBarPresenter', + #superclass : 'SpPresenter', #instVars : [ 'branchLabel', 'commitLink', 'statusLabel' ], - #category : #'Iceberg-TipUI-View-WorkingCopy' + #category : 'Iceberg-TipUI-View-WorkingCopy', + #package : 'Iceberg-TipUI', + #tag : 'View-WorkingCopy' } -{ #category : #layout } +{ #category : 'layout' } IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -25,20 +27,20 @@ IceTipWorkingCopyStatusBarPresenter class >> defaultLayout [ yourself ] -{ #category : #testing } +{ #category : 'testing' } IceTipWorkingCopyStatusBarPresenter >> canTakeKeyboardFocus [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipWorkingCopyStatusBarPresenter >> initializePresenters [ branchLabel := self newLabel. statusLabel := self newLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> model: aModel [ "Fill labels from a IceTipWorkingCopyModel." @@ -52,7 +54,7 @@ IceTipWorkingCopyStatusBarPresenter >> model: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ branchLabel label: ('{1} at ' format: { aModel branchName }). @@ -64,7 +66,7 @@ IceTipWorkingCopyStatusBarPresenter >> refreshWithCommitId: aModel [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipWorkingCopyStatusBarPresenter >> refreshWithoutCommitId: aModel [ branchLabel label: aModel branchName. diff --git a/Iceberg-TipUI/IceTokenCredentials.extension.st b/Iceberg-TipUI/IceTokenCredentials.extension.st index 5b476eeb69..7164335fb8 100644 --- a/Iceberg-TipUI/IceTokenCredentials.extension.st +++ b/Iceberg-TipUI/IceTokenCredentials.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #IceTokenCredentials } +Extension { #name : 'IceTokenCredentials' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> askForModelClass [ ^ self notYetImplemented ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTokenCredentials >> editModelClass [ ^ IceTipEditTokenCredentialsPresenter ] diff --git a/Iceberg-TipUI/IceTraitDefinition.extension.st b/Iceberg-TipUI/IceTraitDefinition.extension.st index d072826557..03b023e483 100644 --- a/Iceberg-TipUI/IceTraitDefinition.extension.st +++ b/Iceberg-TipUI/IceTraitDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTraitDefinition } +Extension { #name : 'IceTraitDefinition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceTraitDefinition >> icon [ ^ self iconNamed: #trait ] diff --git a/Iceberg-TipUI/IceWarning.class.st b/Iceberg-TipUI/IceWarning.class.st index 2015f64db3..9b64da1319 100644 --- a/Iceberg-TipUI/IceWarning.class.st +++ b/Iceberg-TipUI/IceWarning.class.st @@ -2,12 +2,14 @@ I'm a general warning in the context of iceberg UI. " Class { - #name : #IceWarning, - #superclass : #Warning, - #category : #'Iceberg-TipUI-Exceptions' + #name : 'IceWarning', + #superclass : 'Warning', + #category : 'Iceberg-TipUI-Exceptions', + #package : 'Iceberg-TipUI', + #tag : 'Exceptions' } -{ #category : #visiting } +{ #category : 'visiting' } IceWarning >> acceptError: aVisitor [ self subclassResponsibility ] diff --git a/Iceberg-TipUI/IceWorkingCopy.extension.st b/Iceberg-TipUI/IceWorkingCopy.extension.st index 77e8f52665..c95aa1cc69 100644 --- a/Iceberg-TipUI/IceWorkingCopy.extension.st +++ b/Iceberg-TipUI/IceWorkingCopy.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceWorkingCopy } +Extension { #name : 'IceWorkingCopy' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } IceWorkingCopy >> description [ ^ self workingCopyState description diff --git a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st index 6806b57051..13901f838c 100644 --- a/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st +++ b/Iceberg-TipUI/LGitCredentialsPlaintext.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitCredentialsPlaintext } +Extension { #name : 'LGitCredentialsPlaintext' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } LGitCredentialsPlaintext >> askForModelClassOn: aString [ ^ IceTipAskForPlaintextCredentialsPresenter diff --git a/Iceberg-TipUI/MCAddition.extension.st b/Iceberg-TipUI/MCAddition.extension.st index 86d577821e..eb93d60d68 100644 --- a/Iceberg-TipUI/MCAddition.extension.st +++ b/Iceberg-TipUI/MCAddition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCAddition } +Extension { #name : 'MCAddition' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCAddition >> icon [ ^ self iconNamed: #changeAdd ] diff --git a/Iceberg-TipUI/MCModification.extension.st b/Iceberg-TipUI/MCModification.extension.st index e38d6d6886..2e6b693643 100644 --- a/Iceberg-TipUI/MCModification.extension.st +++ b/Iceberg-TipUI/MCModification.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCModification } +Extension { #name : 'MCModification' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCModification >> icon [ ^ self iconNamed: #changeUpdate ] diff --git a/Iceberg-TipUI/MCPatchOperation.extension.st b/Iceberg-TipUI/MCPatchOperation.extension.st index 8c55a52b83..e1f00ea122 100644 --- a/Iceberg-TipUI/MCPatchOperation.extension.st +++ b/Iceberg-TipUI/MCPatchOperation.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCPatchOperation } +Extension { #name : 'MCPatchOperation' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCPatchOperation >> canBeBrowsed [ ^ true ] diff --git a/Iceberg-TipUI/MCRemoval.extension.st b/Iceberg-TipUI/MCRemoval.extension.st index 0eb55e9bd1..64ad429fed 100644 --- a/Iceberg-TipUI/MCRemoval.extension.st +++ b/Iceberg-TipUI/MCRemoval.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #MCRemoval } +Extension { #name : 'MCRemoval' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> canBeBrowsed [ ^ false ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } MCRemoval >> icon [ ^ self iconNamed: #changeRemove ] diff --git a/Iceberg-TipUI/ManifestIcebergTipUI.class.st b/Iceberg-TipUI/ManifestIcebergTipUI.class.st index a47a98479d..22b6f421f0 100644 --- a/Iceberg-TipUI/ManifestIcebergTipUI.class.st +++ b/Iceberg-TipUI/ManifestIcebergTipUI.class.st @@ -2,22 +2,24 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergTipUI, - #superclass : #PackageManifest, - #category : #'Iceberg-TipUI-Manifest' + #name : 'ManifestIcebergTipUI', + #superclass : 'PackageManifest', + #category : 'Iceberg-TipUI-Manifest', + #package : 'Iceberg-TipUI', + #tag : 'Manifest' } -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleAnySatisfyRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #guessFormatFromDirectory: #false)) #'2021-01-05T16:19:22.932793-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleNotEliminationRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipBrowser #hasSelectedItem #false)) #'2020-12-17T18:54:45.342746-03:00') #(#(#RGMethodDefinition #(#IceTipRepositoryBrowser #initializeSidebarTree #false)) #'2021-01-05T16:19:22.920159-03:00') ) ] -{ #category : #'code-critics' } +{ #category : 'code-critics' } ManifestIcebergTipUI class >> ruleReGuardClauseRuleV1FalsePositive [ ^ #(#(#(#RGMethodDefinition #(#IceTipEditProjectDialogPresenter #initializeMessagePanel #false)) #'2021-01-05T16:19:22.928248-03:00') ) ] diff --git a/Iceberg-TipUI/PharoDarkTheme.extension.st b/Iceberg-TipUI/PharoDarkTheme.extension.st index 197cd482cc..25b3e1736e 100644 --- a/Iceberg-TipUI/PharoDarkTheme.extension.st +++ b/Iceberg-TipUI/PharoDarkTheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #PharoDarkTheme } +Extension { #name : 'PharoDarkTheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeColor [ ^ Color red alpha: 0.5 ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoDarkTheme >> badgeTextColor [ ^ self textColor ] diff --git a/Iceberg-TipUI/PharoShortcuts.extension.st b/Iceberg-TipUI/PharoShortcuts.extension.st index df7e450e6d..fa394b6cfb 100644 --- a/Iceberg-TipUI/PharoShortcuts.extension.st +++ b/Iceberg-TipUI/PharoShortcuts.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #PharoShortcuts } +Extension { #name : 'PharoShortcuts' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } PharoShortcuts >> openIcebergShortcut [ ^ $o meta, $i meta ] diff --git a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st index d61a72635f..2f13adf7b3 100644 --- a/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st +++ b/Iceberg-TipUI/SpToolbarButtonPresenter.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #SpToolbarButtonPresenter } +Extension { #name : 'SpToolbarButtonPresenter' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } SpToolbarButtonPresenter >> hasBadge [ ^ badge isNotNil ] diff --git a/Iceberg-TipUI/TIceCopyCommitId.trait.st b/Iceberg-TipUI/TIceCopyCommitId.trait.st index 66a989ae08..ad1849ee58 100644 --- a/Iceberg-TipUI/TIceCopyCommitId.trait.st +++ b/Iceberg-TipUI/TIceCopyCommitId.trait.st @@ -5,17 +5,19 @@ Description I am a simple Trait allowing to copy a commit ID to the clipboard without duplicating the code in Iceberg. " Trait { - #name : #TIceCopyCommitId, - #category : #'Iceberg-TipUI-Model' + #name : 'TIceCopyCommitId', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyCommitIDToClipboard [ self copyToClipboardId: self commitId ] -{ #category : #copying } +{ #category : 'copying' } TIceCopyCommitId >> copyToClipboardId: id [ Clipboard clipboardText: id informing: ('Commitish ID copied to clipboard ({1})' format: {id}) ] diff --git a/Iceberg-TipUI/TWithBranchModel.trait.st b/Iceberg-TipUI/TWithBranchModel.trait.st index 9b2a646f4a..836a8e7053 100644 --- a/Iceberg-TipUI/TWithBranchModel.trait.st +++ b/Iceberg-TipUI/TWithBranchModel.trait.st @@ -1,19 +1,21 @@ Trait { - #name : #TWithBranchModel, - #category : #'Iceberg-TipUI-Model' + #name : 'TWithBranchModel', + #category : 'Iceberg-TipUI-Model', + #package : 'Iceberg-TipUI', + #tag : 'Model' } -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branchModels [ ^ self branches collect: [ :each | (IceTipBranchModel repositoryModel: self repositoryModel on: each) beCached ] ] -{ #category : #branches } +{ #category : 'branches' } TWithBranchModel >> branches [ ^ self explicitRequirement ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> defaultBranchSelection [ ^ self branchModels detect: #isHead @@ -21,12 +23,12 @@ TWithBranchModel >> defaultBranchSelection [ ifTrue: [ self branchModels ifNotEmpty: #anyOne ] ] ] -{ #category : #testing } +{ #category : 'testing' } TWithBranchModel >> hasBranches [ ^ self branches isNotEmpty ] -{ #category : #accessing } +{ #category : 'accessing' } TWithBranchModel >> repositoryModel [ ^ self explicitRequirement ] diff --git a/Iceberg-TipUI/Text.extension.st b/Iceberg-TipUI/Text.extension.st index 74d7bfde6c..0ae90973d7 100644 --- a/Iceberg-TipUI/Text.extension.st +++ b/Iceberg-TipUI/Text.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Text } +Extension { #name : 'Text' } -{ #category : #'*Iceberg-TipUI-Spec' } +{ #category : '*Iceberg-TipUI-Spec' } Text >> threeWayCompareTo: anotherText [ ^ self asString threeWayCompareTo: anotherText asString diff --git a/Iceberg-TipUI/ToolShortcutsCategory.extension.st b/Iceberg-TipUI/ToolShortcutsCategory.extension.st index 39e8ed6bf0..22fbb318cc 100644 --- a/Iceberg-TipUI/ToolShortcutsCategory.extension.st +++ b/Iceberg-TipUI/ToolShortcutsCategory.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #ToolShortcutsCategory } +Extension { #name : 'ToolShortcutsCategory' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } ToolShortcutsCategory >> openIceberg [ diff --git a/Iceberg-TipUI/UITheme.extension.st b/Iceberg-TipUI/UITheme.extension.st index 45eef9230e..b1aee015ae 100644 --- a/Iceberg-TipUI/UITheme.extension.st +++ b/Iceberg-TipUI/UITheme.extension.st @@ -1,11 +1,11 @@ -Extension { #name : #UITheme } +Extension { #name : 'UITheme' } -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeColor [ ^ Color red ] -{ #category : #'*Iceberg-TipUI' } +{ #category : '*Iceberg-TipUI' } UITheme >> badgeTextColor [ ^ Color white ] diff --git a/Iceberg-TipUI/package.st b/Iceberg-TipUI/package.st index 34a4b630d6..c1b5ad7667 100644 --- a/Iceberg-TipUI/package.st +++ b/Iceberg-TipUI/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-TipUI' } +Package { #name : 'Iceberg-TipUI' } From 01a152b1562f3ba2b8323fd4b5cb5abfff4b0086 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 17:37:56 +0100 Subject: [PATCH 53/83] Update IceMetacelloPharoPlatform.class.st --- .../IceMetacelloPharoPlatform.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index 693a3f9c08..f2c5092a3a 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -6,7 +6,7 @@ Class { #category : 'Iceberg-Metacello-Integration-Platform', #package : 'Iceberg-Metacello-Integration', #tag : 'Platform' - #name : 'IceMetacelloPharoPlatform', + #name : 'IceMetacelloPharoPlatform' } { #category : 'class initialization' } From 7f7054cf4d9737779815c9299060a404cf2d3c12 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 17:40:08 +0100 Subject: [PATCH 54/83] Update IceMetacelloPharoPlatform.class.st --- .../IceMetacelloPharoPlatform.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index f2c5092a3a..e1fdfb097e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -2,11 +2,11 @@ I'm a class to add support for iceberg to metacello. " Class { + #name : 'IceMetacelloPharoPlatform', #superclass : 'MetacelloPlatform', #category : 'Iceberg-Metacello-Integration-Platform', #package : 'Iceberg-Metacello-Integration', #tag : 'Platform' - #name : 'IceMetacelloPharoPlatform' } { #category : 'class initialization' } From dbb753b5defba4726e60b891f447db8ac5678696 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 21:19:16 +0100 Subject: [PATCH 55/83] Avoid useless garbage collects Some garbage collects seems useless in Iceberg tests (I ran the tests multiple times without troubles) and are slowing down Iceberg tests --- Iceberg-Tests/IceGitTestFactory.class.st | 3 +-- Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Iceberg-Tests/IceGitTestFactory.class.st b/Iceberg-Tests/IceGitTestFactory.class.st index d7af8c424d..016429626a 100644 --- a/Iceberg-Tests/IceGitTestFactory.class.st +++ b/Iceberg-Tests/IceGitTestFactory.class.st @@ -106,10 +106,9 @@ IceGitTestFactory >> remoteFileUrl [ { #category : 'initialization' } IceGitTestFactory >> tearDownWithRepository: aRepository [ - + aRepository ifNotNil: [ aRepository free. - Smalltalk garbageCollect. aRepository location ifNotNil: #ensureDeleteAll ]. self remoteFileUrl asFileReference ensureDeleteAll ] diff --git a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st index 744e62fc7e..43bd0bf752 100644 --- a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st +++ b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st @@ -110,6 +110,5 @@ IceNotYetClonedRepositoryFixture >> setUp [ { #category : 'running' } IceNotYetClonedRepositoryFixture >> tearDown [ - Smalltalk garbageCollect. - self location ifNotNil: #ensureDeleteAll. + self location ifNotNil: #ensureDeleteAll ] From a377d0d00119d2d882787d22657d9f47a9335787 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 21:35:29 +0100 Subject: [PATCH 56/83] Add back the GC as fallback for windows only --- Iceberg-Tests/IceGitTestFactory.class.st | 6 +++++- Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Iceberg-Tests/IceGitTestFactory.class.st b/Iceberg-Tests/IceGitTestFactory.class.st index 016429626a..0e3bf7b59c 100644 --- a/Iceberg-Tests/IceGitTestFactory.class.st +++ b/Iceberg-Tests/IceGitTestFactory.class.st @@ -109,6 +109,10 @@ IceGitTestFactory >> tearDownWithRepository: aRepository [ aRepository ifNotNil: [ aRepository free. - aRepository location ifNotNil: #ensureDeleteAll ]. + [ aRepository location ifNotNil: #ensureDeleteAll ] + on: CannotDeleteFileException + do: [ "On windows it is possible we need to finalize everything before deleting the files. We do not do it directly to avoid to lose too much speed" + Smalltalk garbageCollect. + aRepository location ifNotNil: #ensureDeleteAll ] ]. self remoteFileUrl asFileReference ensureDeleteAll ] diff --git a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st index 43bd0bf752..8449d10f25 100644 --- a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st +++ b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st @@ -110,5 +110,9 @@ IceNotYetClonedRepositoryFixture >> setUp [ { #category : 'running' } IceNotYetClonedRepositoryFixture >> tearDown [ - self location ifNotNil: #ensureDeleteAll + [ self location ifNotNil: #ensureDeleteAll ] + on: CannotDeleteFileException + do: [ "On windows it is possible we need to finalize everything before deleting the files. We do not do it directly to avoid to lose too much speed" + Smalltalk garbageCollect. + self location ifNotNil: #ensureDeleteAll ] ] From b6c46b9ebd46aba2f759940020af6f833e6f4e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Thu, 23 Nov 2023 10:49:32 +0100 Subject: [PATCH 57/83] cleaning the UIManager bad use --- .../IceGitHubAction.class.st | 6 ------ .../IceGitHubRemoveBranchesAction.class.st | 2 +- .../IceGitHubViewPullRequestAction.class.st | 2 +- ...ceTipGitHubPullRequestListBrowser.class.st | 2 +- .../IceTipGitHubRepositoryPanel.class.st | 2 +- .../IceTipRefreshPullRequestsCommand.class.st | 2 +- Iceberg-Plugin/IceTipDecorator.class.st | 5 +++-- Iceberg-TipUI/IceTipAction.class.st | 6 ++++++ Iceberg-TipUI/IceTipCommand.class.st | 2 +- Iceberg-TipUI/IceTipCommitAction.class.st | 2 +- .../IceTipGitRepositoryPanel.class.st | 2 +- .../IceTipInteractiveErrorVisitor.class.st | 19 ++++++++++--------- .../IceTipLocalRepositoryPanel.class.st | 2 +- .../IceTipNewRepositoryPanel.class.st | 2 +- Iceberg-TipUI/IceTipPushAction.class.st | 2 +- Iceberg-TipUI/IceTipStandardAction.class.st | 5 ++--- 16 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st index b25a0b4725..44a5b5dc38 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st @@ -25,12 +25,6 @@ IceGitHubAction >> credentials [ ^ credentials ifNil: [ credentials := self obtainCredentials ] ] -{ #category : 'private' } -IceGitHubAction >> defaultApplication [ - - ^ SpApplication defaultApplication -] - { #category : 'executing' } IceGitHubAction >> execute [ self withErrorHandlingDo: [ diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st index 854ba15eab..e7faf907fc 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st @@ -16,7 +16,7 @@ Class { { #category : 'execute' } IceGitHubRemoveBranchesAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. - UIManager default + context application informUser: ('Retrieving branch information from {1}' format: {self remote url}) during: [ self cacheAllBranches ]. diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st index 2a0627cf35..7addacd182 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st @@ -13,7 +13,7 @@ Class { IceGitHubViewPullRequestAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. - UIManager default + self defaultApplication informUser: ('Retrieving pull requests from {1}' format: {self remote}) during: [ (IceTipGitHubPullRequestListBrowser onRepository: self repository) diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st index 9817279f26..d874d6adc0 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st @@ -203,7 +203,7 @@ IceTipGitHubPullRequestListBrowser >> updateSelectedPullRequest: aSpSingleSelect { #category : 'actions' } IceTipGitHubPullRequestListBrowser >> viewPullRequest: aPullRequest [ - UIManager default + self application informUser: ( 'Opening pull request {1} {2}' format: { aPullRequest number. diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st index 8979de690d..a1801f9929 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st @@ -49,7 +49,7 @@ IceTipGitHubRepositoryPanel >> newRepository [ | newRepository | newRepository := super newRepository. - UIManager default + self application informUser: 'Configuring Remotes...' during: [ | githubRepository | githubRepository := self getGitHubRepository. diff --git a/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st b/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st index d38b01d222..2155096a2f 100644 --- a/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st @@ -27,7 +27,7 @@ IceTipRefreshPullRequestsCommand class >> defaultName [ { #category : 'executing' } IceTipRefreshPullRequestsCommand >> execute [ - UIManager default + self application informUser: 'Refreshing pull request list' during: [ self tool refreshPullRequests ] ] diff --git a/Iceberg-Plugin/IceTipDecorator.class.st b/Iceberg-Plugin/IceTipDecorator.class.st index 42a0d2e787..0fb2d96907 100644 --- a/Iceberg-Plugin/IceTipDecorator.class.st +++ b/Iceberg-Plugin/IceTipDecorator.class.st @@ -11,8 +11,9 @@ It is expected that more decorators will be created with time. Class { #name : 'IceTipDecorator', #superclass : 'Object', - #category : 'Iceberg-Plugin', - #package : 'Iceberg-Plugin' + #category : 'Iceberg-Plugin-Base', + #package : 'Iceberg-Plugin', + #tag : 'Base' } { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipAction.class.st b/Iceberg-TipUI/IceTipAction.class.st index 7f2a1337db..86c904d814 100644 --- a/Iceberg-TipUI/IceTipAction.class.st +++ b/Iceberg-TipUI/IceTipAction.class.st @@ -38,6 +38,12 @@ IceTipAction >> context: aContext [ context := aContext ] +{ #category : 'private' } +IceTipAction >> defaultApplication [ + "why this is not context application?" + ^ SpApplication defaultApplication +] + { #category : 'executing' } IceTipAction >> execute [ diff --git a/Iceberg-TipUI/IceTipCommand.class.st b/Iceberg-TipUI/IceTipCommand.class.st index bd90248921..005bce13f9 100644 --- a/Iceberg-TipUI/IceTipCommand.class.st +++ b/Iceberg-TipUI/IceTipCommand.class.st @@ -24,7 +24,7 @@ IceTipCommand class >> isAbstract [ { #category : 'accessing' } IceTipCommand >> application [ - + "why not context application?" ^ SpApplication defaultApplication ] diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index de9362e209..4b7c339890 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -17,7 +17,7 @@ Class { { #category : 'executing' } IceTipCommitAction >> basicExecute [ self validateCanCommit. - UIManager default + self defaultApplication informUser: 'Committing...' during: [ self repository diff --git a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st index fdd7ef3847..08fc1bfb98 100644 --- a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st @@ -58,7 +58,7 @@ IceTipGitRepositoryPanel >> initializePresenters [ { #category : 'accessing' } IceTipGitRepositoryPanel >> newRepository [ - UIManager default + self application informUser: ('Cloning repository {1}' format: { self remoteUrl }) during: [ ^ IceRepositoryCreator new diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index a420c950b2..0a4518a14a 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -48,7 +48,8 @@ IceTipInteractiveErrorVisitor >> context: anObject [ { #category : 'visiting' } IceTipInteractiveErrorVisitor >> defaultApplication [ - + "why this is not ^ context application" + ^ SpApplication defaultApplication ] @@ -64,7 +65,7 @@ IceTipInteractiveErrorVisitor >> repository: anObject [ { #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ - self defaultApplication + context application label: anError messageText; title: 'Iceberg authentication Error'; openModal @@ -73,7 +74,7 @@ IceTipInteractiveErrorVisitor >> visitAuthenticationError: anError [ { #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ - self defaultApplication + context application label: anError messageText; title: 'Iceberg conflicts while checking out'; openModal @@ -82,7 +83,7 @@ IceTipInteractiveErrorVisitor >> visitCheckoutConflict: anError [ { #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ - self defaultApplication + context application label: ('The clone location {1} already exists' format: { anError location }); @@ -93,7 +94,7 @@ IceTipInteractiveErrorVisitor >> visitCloneLocationAlreadyExists: anError [ { #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitCloneRemoteNotFound: anError [ - self defaultApplication + context application label: ('The clone remote {1} could not been found' format: { anError remoteUrl }); title: 'Clone action failed'; @@ -128,7 +129,7 @@ IceTipInteractiveErrorVisitor >> visitGenericError: anError [ { #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitMergeAborted: anError [ - self defaultApplication + context application label: (anError messageText ifNil: [ 'Automatic (fast-forward) merge is not possible. Please perform the merge manually, then proceed with your previous operation. @@ -167,7 +168,7 @@ IceTipInteractiveErrorVisitor >> visitNoCommitMessage: aWarning [ { #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNoRemote: anError [ - self defaultApplication + context application label: 'There are no remotes defined for this repository. Add one before continue.'; title: 'Remote action failed'; @@ -177,7 +178,7 @@ Add one before continue.'; { #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ - self defaultApplication newInform + context application newInform title: 'There is nothing to commit.'; openModal ] @@ -185,7 +186,7 @@ IceTipInteractiveErrorVisitor >> visitNothingToCommitError: anError [ { #category : 'visiting' } IceTipInteractiveErrorVisitor >> visitRemoteAlreadyExistError: anError [ - self defaultApplication newInform + context application newInform title: ('Remote "{1}" already exists.' format: { anError remoteName }); openModal diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 73ba56fba6..2009235d39 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -64,7 +64,7 @@ IceTipLocalRepositoryPanel >> location: aReferenceOrString [ { #category : 'accessing' } IceTipLocalRepositoryPanel >> newRepository [ - UIManager default + self application informUser: ('Importing repository from {1}' format: { self location fullName }) during: [ ^ IceRepositoryCreator new diff --git a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st index e5d2698279..b4508d0349 100644 --- a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st @@ -88,7 +88,7 @@ IceTipNewRepositoryPanel >> newRepository [ location := self projectLocation location. subdirectory := self subdirectoryInputText text asString trimmed. - UIManager default + self application informUser: ('Cloning repository {1} at {2}' format: { repositoryName. location fullName }) during: [ ^ IceRepositoryCreator new diff --git a/Iceberg-TipUI/IceTipPushAction.class.st b/Iceberg-TipUI/IceTipPushAction.class.st index 63e2530b17..e6b6ecb308 100644 --- a/Iceberg-TipUI/IceTipPushAction.class.st +++ b/Iceberg-TipUI/IceTipPushAction.class.st @@ -12,7 +12,7 @@ Class { { #category : 'executing' } IceTipPushAction >> basicExecute [ - UIManager default + context application informUser: 'Pushing...' during: [ self repository push ]. Iceberg announcer announce: (IceRepositoryModified for: self repository). diff --git a/Iceberg-TipUI/IceTipStandardAction.class.st b/Iceberg-TipUI/IceTipStandardAction.class.st index 205c3bf83c..3eafe02547 100644 --- a/Iceberg-TipUI/IceTipStandardAction.class.st +++ b/Iceberg-TipUI/IceTipStandardAction.class.st @@ -30,18 +30,17 @@ IceTipStandardAction >> action: aBlock [ IceTipStandardAction >> basicExecute [ | result | - - UIManager default + context application informUser: self message during: [ result := actionBlock cull: self context ]. successAnnounceBlock ifNotNil: [ Iceberg announcer announce: successAnnounceBlock value ]. - ^ result ] { #category : 'executing' } IceTipStandardAction >> do: aBlock [ + self action: aBlock. self execute ] From 9fbeb109b29c30e2801275af7b81acb8ba179ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Thu, 23 Nov 2023 10:49:35 +0100 Subject: [PATCH 58/83] cleaning the UIManager bad use From 1df6488e7a072b7068de6e7dd8608426b74fd916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Thu, 23 Nov 2023 11:48:29 +0100 Subject: [PATCH 59/83] introducing application in model and fixing simple informUser:during: --- Iceberg-TipUI/IceTipCommitModel.class.st | 5 ++--- Iceberg-TipUI/IceTipDiffModel.class.st | 2 +- Iceberg-TipUI/IceTipDiffPreviewModel.class.st | 2 +- Iceberg-TipUI/IceTipDiscardAllModel.class.st | 2 +- Iceberg-TipUI/IceTipModel.class.st | 6 ++++++ Iceberg-TipUI/IceTipRepositoriesBrowser.class.st | 1 + Iceberg-TipUI/IceTipRevertChangeCommand.class.st | 2 +- Iceberg-TipUI/IceTipVersionHistoryModel.class.st | 4 ++-- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Iceberg-TipUI/IceTipCommitModel.class.st b/Iceberg-TipUI/IceTipCommitModel.class.st index dc14b81d9e..2f6a1bf44c 100644 --- a/Iceberg-TipUI/IceTipCommitModel.class.st +++ b/Iceberg-TipUI/IceTipCommitModel.class.st @@ -41,14 +41,13 @@ IceTipCommitModel >> author [ { #category : 'private' } IceTipCommitModel >> calculateDiff: aBlock [ + | diff | - - UIManager default + self application informUser: 'Calculating diff' during: [ diff := aBlock value. diff build ]. - ^ diff ] diff --git a/Iceberg-TipUI/IceTipDiffModel.class.st b/Iceberg-TipUI/IceTipDiffModel.class.st index e58cbf43a8..55462964b9 100644 --- a/Iceberg-TipUI/IceTipDiffModel.class.st +++ b/Iceberg-TipUI/IceTipDiffModel.class.st @@ -33,7 +33,7 @@ IceTipDiffModel >> diff [ { #category : 'actions' } IceTipDiffModel >> reset [ - UIManager default + self application informUser: 'Refreshing changes' during: [ self resetDiff. diff --git a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st index c783d8158d..6ee742d64a 100644 --- a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st +++ b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st @@ -31,7 +31,7 @@ IceTipDiffPreviewModel >> commitish: aCommitish [ IceTipDiffPreviewModel >> diff [ ^ diffModel ifNil: [ | diff | - UIManager default + self application informUser: 'Calculating diff' during: [ diff := self calculateDiff ]. diffModel := IceTipCommitDiffModel diff --git a/Iceberg-TipUI/IceTipDiscardAllModel.class.st b/Iceberg-TipUI/IceTipDiscardAllModel.class.st index 67acf77adc..87bd429aa5 100644 --- a/Iceberg-TipUI/IceTipDiscardAllModel.class.st +++ b/Iceberg-TipUI/IceTipDiscardAllModel.class.st @@ -22,7 +22,7 @@ IceTipDiscardAllModel >> diff [ ^ diffModel ifNil: [ | diff | - UIManager default + self application informUser: 'Calculating diff' during: [ diff := self calculateDiff ]. diffModel := IceTipCommitDiffModel diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st index 0639cde03a..2b52e71a2f 100644 --- a/Iceberg-TipUI/IceTipModel.class.st +++ b/Iceberg-TipUI/IceTipModel.class.st @@ -11,6 +11,12 @@ Class { #tag : 'Model' } +{ #category : 'accessing' } +IceTipModel >> application [ + "we should address the singleton later by passing the application to the model" + ^ StPharoApplication current +] + { #category : 'converting' } IceTipModel >> beCached [ ^ IceTipCachedModel for: self diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 6f732e32db..288f2a994a 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -96,6 +96,7 @@ IceTipRepositoriesBrowser class >> newOnRepositoryProvider: aProvider [ But in case is present, I want iceberg to run within the same context" application := (self environment classNamed: #StPharoApplication) ifNotNil: [ :c | c current ]. + "SD: why not using self application?" ^ self basicNew application: application; diff --git a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st index 32620f7057..5ae09636f0 100644 --- a/Iceberg-TipUI/IceTipRevertChangeCommand.class.st +++ b/Iceberg-TipUI/IceTipRevertChangeCommand.class.st @@ -25,7 +25,7 @@ IceTipRevertChangeCommand class >> defaultName [ { #category : 'executing' } IceTipRevertChangeCommand >> execute [ - UIManager default + context application informUser: 'Reverting change...' during: [ self repository workingCopy discardChanges: self item ]. diff --git a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st index b5fd22c176..8ecaaa2c7d 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st @@ -44,7 +44,7 @@ IceTipVersionHistoryModel >> name [ IceTipVersionHistoryModel >> retrieveHistory [ self repositoryModel checkMissing. - UIManager default + self application informUser: ('Retrieving history of {1}' format: { self entity printString }) - during: [ ^ self repositoryModel entity log historyOfMethod: self entity ] + during: [ self repositoryModel entity log historyOfMethod: self entity ] ] From e0177ceb81f6077817f809bd87b5262c974449a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Thu, 23 Nov 2023 11:48:31 +0100 Subject: [PATCH 60/83] introducing application in model and fixing simple informUser:during: From 7c7e0ea948d0c8edf672aff07b0775bba2d8a6b4 Mon Sep 17 00:00:00 2001 From: Guille Polito Date: Mon, 27 Nov 2023 10:04:16 +0100 Subject: [PATCH 61/83] Fix iceberg metacello integration to return the result of execute, otherwise the record command does not work --- .../IceBitbucketRepositoryType.class.st | 10 +++-- .../IceGitLocalRepositoryType.class.st | 16 ++++---- .../IceGitRepositoryType.class.st | 12 +++--- .../IceGithubRepositoryType.class.st | 12 +++--- .../IceGitlabRepositoryType.class.st | 10 +++-- .../IceMetacelloLoadChoice.class.st | 26 +++++++------ .../IceMetacelloLoadSession.class.st | 14 ++++--- .../IceMetacelloLoadSessionContext.class.st | 8 ++-- .../IceMetacelloPharoPlatform.class.st | 18 +++++---- .../IceMetacelloRepositoryType.class.st | 32 ++++++++-------- .../IceProviderRepositoryType.class.st | 20 +++++----- .../IceRepository.extension.st | 4 +- .../MCGitRemoteRepository.class.st | 38 ++++++++++--------- ...nifestIcebergMetacelloIntegration.class.st | 10 +++-- .../MetacelloPlatform.extension.st | 4 +- .../MetacelloScriptApiExecutor.extension.st | 6 +-- Iceberg-Metacello-Integration/package.st | 2 +- 17 files changed, 134 insertions(+), 108 deletions(-) diff --git a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st index 9f4ffef342..fb260621cb 100644 --- a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Bitbucket repositories " Class { - #name : #IceBitbucketRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceBitbucketRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceBitbucketRepositoryType class >> type [ ^ 'bitbucket' ] diff --git a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st index 1c2f49f152..bf150ca7e2 100644 --- a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st @@ -20,22 +20,24 @@ Metacello new " Class { - #name : #IceGitLocalRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitLocalRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType class >> type [ ^ 'gitlocal' ] -{ #category : #testing } +{ #category : 'testing' } IceGitLocalRepositoryType >> isGitRoot: aReference [ ^ IceRepositoryCreator isGitRoot: aReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType >> mcRepository [ | repository tuple extractedLocation | @@ -57,7 +59,7 @@ IceGitLocalRepositoryType >> mcRepository [ ^ repository metacelloAdapter: repository head description. ] -{ #category : #private } +{ #category : 'private' } IceGitLocalRepositoryType >> splitRootAndSubdirectoryFromLocation [ | root subDir | (self location beginsWith: (self class type, '://')) diff --git a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st index d8f91b3b32..2b2b031127 100644 --- a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st @@ -7,18 +7,20 @@ git:https://github.com/user/project.git git:git@github.com:user/project.git " Class { - #name : #IceGitRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType class >> type [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType >> mcRepositoryClass [ ^ MCGitRemoteRepository diff --git a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st index 3d42910506..00b3bf513c 100644 --- a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st @@ -2,17 +2,19 @@ I resolve Github repositories " Class { - #name : #IceGithubRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGithubRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType class >> type [ ^ 'github' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType >> mcRepository [ | baseRepo | diff --git a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st index 597dcee6da..620b0f0811 100644 --- a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Gilab repositories " Class { - #name : #IceGitlabRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitlabRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitlabRepositoryType class >> type [ ^ 'gitlab' ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st index 3ab968801a..2f7b4b760e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st @@ -3,60 +3,62 @@ I'm a recorded choice when installing a metacello baseline/configuration. A choice is created whenever there is a conflict between two project versions (loaded and incomming). Due the nature of Matacello, this choice can be asked several times... A choice keeps track of what user selected to avoid asking him every time. " Class { - #name : #IceMetacelloLoadChoice, - #superclass : #Object, + #name : 'IceMetacelloLoadChoice', + #superclass : 'Object', #instVars : [ 'projectName', 'optionA', 'optionB', 'choosen' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen [ ^ choosen ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen: anObject [ choosen := anObject ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloLoadChoice >> isChoiceBetween: firstOption and: secondOption [ ^ (self optionA = firstOption) and: [ self optionB = secondOption ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA [ ^ optionA ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA: anObject [ optionA := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB [ ^ optionB ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB: anObject [ optionB := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st index 71cd94a286..1e0f8d7831 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st @@ -5,28 +5,30 @@ I will be active during the context of a ""metacello load"" command, and it will Tipically, I will be used to keep some state needed during the full execution, like a choice of what whas selected when conflicting or upgraded versions acts. " Class { - #name : #IceMetacelloLoadSession, - #superclass : #Object, + #name : 'IceMetacelloLoadSession', + #superclass : 'Object', #instVars : [ 'choices' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloLoadSession >> initialize [ super initialize. choices := Set new ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoice: anIceMetacelloLoadChoice [ ^ choices add: anIceMetacelloLoadChoice ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoiceProject: projectName optionA: optionA optionB: optionB ifAbsentAnswer: aBlock [ ^ choices diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st index 20c708ea70..ff4a76cf1a 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st @@ -2,7 +2,9 @@ I'm a dynamic variable to keep a load session. " Class { - #name : #IceMetacelloLoadSessionContext, - #superclass : #DynamicVariable, - #category : #'Iceberg-Metacello-Integration-Session' + #name : 'IceMetacelloLoadSessionContext', + #superclass : 'DynamicVariable', + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index 84a2c88bbf..25e20e3cda 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -2,23 +2,25 @@ I'm a class to add support for iceberg to metacello. " Class { - #name : #IceMetacelloPharoPlatform, - #superclass : #MetacelloPharoPlatform, - #category : #'Iceberg-Metacello-Integration-Platform' + #name : 'IceMetacelloPharoPlatform', + #superclass : 'MetacelloPharoPlatform', + #category : 'Iceberg-Metacello-Integration-Platform', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Platform' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceMetacelloPharoPlatform class >> initialize [ self select ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloPharoPlatform >> canHandleType: type [ ^ Iceberg enableMetacelloIntegration and: [ IceMetacelloRepositoryType canHandleType: type ] ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ (self canHandleType: aRepositorySpec type) ifTrue: [ ^ Iceberg mcRepositoryFor: aRepositorySpec description ]. @@ -26,7 +28,7 @@ IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ ^ super createRepository: aRepositorySpec ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ (description beginsWith: 'ftp://') ifTrue: [ ^'ftp' ]. @@ -36,7 +38,7 @@ IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ ^ super extractTypeFromDescription: description ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceMetacelloPharoPlatform >> withMetacelloLoadSessionDo: aBlock [ | context | diff --git a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st index ad7653c809..57f5b0a2c1 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st @@ -3,21 +3,23 @@ I'm a base class to provide different type of MCRepositories from iceberg, so me My children define specific types, visit them to have more details of what you can do. " Class { - #name : #IceMetacelloRepositoryType, - #superclass : #Object, + #name : 'IceMetacelloRepositoryType', + #superclass : 'Object', #instVars : [ 'location' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> allTypes [ ^ self allSubclasses reject: [ :each | each isAbstract ] ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> canHandleType: aType [ ^ self allTypes @@ -25,35 +27,35 @@ IceMetacelloRepositoryType class >> canHandleType: aType [ ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> extractTypeOf: aString [ ^ aString copyUpTo: $: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMetacelloRepositoryType class >> for: aLocationString [ ^ (self allTypes detect: [ :each | each isSuitableForLocation: aLocationString ]) location: aLocationString ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isAbstract [ ^ self = IceMetacelloRepositoryType ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForLocation: aLocationString [ ^ self isSuitableForType: (self extractTypeOf: aLocationString) ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForType: aType [ ^ self type = aType ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> location: aLocationString [ self = IceMetacelloRepositoryType ifTrue: [ self error: 'I''m an abstract class, use one of my children instead.' ]. @@ -63,23 +65,23 @@ IceMetacelloRepositoryType class >> location: aLocationString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> type [ ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloRepositoryType >> initializeLocation: aString [ location := aString. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> mcRepository [ self subclassResponsibility ] diff --git a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st index ae7b35ddbb..4036cf4c81 100644 --- a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st @@ -20,18 +20,20 @@ Metacello new load: 'mongo tests'. " Class { - #name : #IceProviderRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceProviderRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #testing } +{ #category : 'testing' } IceProviderRepositoryType class >> isAbstract [ ^ super isAbstract or: [ self = IceProviderRepositoryType ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> guessRegisteredRepository [ "I get the project name and try to find it into the already registered projects. If I find it, I will use this instead cloning a new one." @@ -41,7 +43,7 @@ IceProviderRepositoryType >> guessRegisteredRepository [ ifNone: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepository [ | baseRepo | @@ -55,7 +57,7 @@ IceProviderRepositoryType >> mcRepository [ ^ baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepositoryClass [ ^ (MCGitBasedNetworkRepository allSubclasses @@ -63,13 +65,13 @@ IceProviderRepositoryType >> mcRepositoryClass [ detect: [ :each | each basicDescription = self class type ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectName [ ^ (self location substrings: '/') third copyUpTo: $: ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectVersion [ ^ (location substrings: '/') third copyAfter: $: diff --git a/Iceberg-Metacello-Integration/IceRepository.extension.st b/Iceberg-Metacello-Integration/IceRepository.extension.st index fcb43e92a5..e9f60ebc90 100644 --- a/Iceberg-Metacello-Integration/IceRepository.extension.st +++ b/Iceberg-Metacello-Integration/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } IceRepository >> metacelloAdapter: version [ ^ IceMetacelloRepositoryAdapter for: self withVersion: version ] diff --git a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st index a698e9d6d7..6874e90140 100644 --- a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st +++ b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st @@ -9,30 +9,32 @@ git@github.com:user/project.git WARNING: This repository is meant to be used with iceberg and it will not work with plain Monticello/Metacello (because there is no way to know how to download a zip) " Class { - #name : #MCGitRemoteRepository, - #superclass : #MCGitBasedNetworkRepository, + #name : 'MCGitRemoteRepository', + #superclass : 'MCGitBasedNetworkRepository', #instVars : [ 'host', 'port', 'path', 'user' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> basicDescription [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> description [ ^ self basicDescription , ':' ] -{ #category : #private } +{ #category : 'private' } MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ ^ self new @@ -40,13 +42,13 @@ MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> host [ ^ host ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> httpsUrl [ ^ 'https://{1}{2}/{3}.git' format: { @@ -57,13 +59,13 @@ MCGitRemoteRepository >> httpsUrl [ self path } ] -{ #category : #initialization } +{ #category : 'initialization' } MCGitRemoteRepository >> initialize [ super initialize. ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseHTTPLocation: aString [ | url | @@ -73,7 +75,7 @@ MCGitRemoteRepository >> parseHTTPLocation: aString [ path := self pathFrom: url path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseLocation: aString [ (#('http:' 'https:') @@ -82,7 +84,7 @@ MCGitRemoteRepository >> parseLocation: aString [ ifFalse: [ self parseSSHLocation: aString ] ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseSSHLocation: aString [ | segments | @@ -92,13 +94,13 @@ MCGitRemoteRepository >> parseSSHLocation: aString [ path := self pathFrom: segments third ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> path [ ^ path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> pathFrom: aString [ ^ (aString endsWith: '.git') @@ -106,19 +108,19 @@ MCGitRemoteRepository >> pathFrom: aString [ ifFalse: [ aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> port [ ^ port ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> projectPath [ ^ self path ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> scpUrl [ ^ '{1}@{2}/{3}.git' format: { @@ -127,7 +129,7 @@ MCGitRemoteRepository >> scpUrl [ self path } ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> user [ ^ user diff --git a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st index db10aae91b..d60493f9b4 100644 --- a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st +++ b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergMetacelloIntegration, - #superclass : #PackageManifest, - #category : 'Iceberg-Metacello-Integration-Manifest' + #name : 'ManifestIcebergMetacelloIntegration', + #superclass : 'PackageManifest', + #category : 'Iceberg-Metacello-Integration-Manifest', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergMetacelloIntegration class >> description [ ^ 'I contains the code related to the Metacello integration of Iceberg. diff --git a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st index 6c833fb9fe..28bb44563a 100644 --- a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloPlatform } +Extension { #name : 'MetacelloPlatform' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloPlatform >> withMetacelloLoadSessionDo: aBlock [ aBlock value diff --git a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st index 00384fd4ac..8a9d63486f 100644 --- a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st @@ -1,8 +1,8 @@ -Extension { #name : #MetacelloScriptApiExecutor } +Extension { #name : 'MetacelloScriptApiExecutor' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloScriptApiExecutor >> execute: statements [ MetacelloPlatform current withMetacelloLoadSessionDo: [ - super execute: statements ] + ^ super execute: statements ] ] diff --git a/Iceberg-Metacello-Integration/package.st b/Iceberg-Metacello-Integration/package.st index c5a00f7fb1..228e3a9d15 100644 --- a/Iceberg-Metacello-Integration/package.st +++ b/Iceberg-Metacello-Integration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Metacello-Integration' } +Package { #name : 'Iceberg-Metacello-Integration' } From 977180da16058c12b1e14ce124744da26c808334 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Mon, 27 Nov 2023 11:19:26 +0100 Subject: [PATCH 62/83] - Removing #defaultApplication and using #application - Remove uses of SPApplication - Creating Commands with contexts - Moving the use of progress info to the UI out of the model. --- .../IceGitHubAction.class.st | 2 +- .../IceGitHubCreatePullRequestModel.class.st | 2 +- .../IceGitHubNewBranchFromIssuePanel.class.st | 6 ------ .../IceGitHubNewPullRequestAction.class.st | 4 ++-- .../IceGitHubOpenOnGithubAction.class.st | 4 ++-- .../IceGitHubPullRequestDetailModel.class.st | 2 +- .../IceGitHubRemoveBranchesAction.class.st | 2 +- .../IceGitHubViewPullRequestAction.class.st | 2 +- ...tHubViewPullRequestOnGithubAction.class.st | 4 ++-- ...ceTipGitHubPullRequestListBrowser.class.st | 2 +- .../IceTipRepositoriesBrowser.extension.st | 2 +- ...TipMetacelloInstallCommandBuilder.class.st | 9 +++++--- .../IceTipRepositoriesBrowser.extension.st | 2 +- ...eSinglePackageLocalRepositoryTest.class.st | 16 ++++++++------ Iceberg-TipUI/IceTipAction.class.st | 12 +++++------ ...eTipAddNewPackagesDialogPresenter.class.st | 4 ++-- .../IceTipAdoptCommitCommand.class.st | 5 ++++- Iceberg-TipUI/IceTipBranchModel.class.st | 5 +++++ Iceberg-TipUI/IceTipBrowser.class.st | 4 ++-- Iceberg-TipUI/IceTipCommand.class.st | 4 ++-- Iceberg-TipUI/IceTipCommitAction.class.st | 2 +- Iceberg-TipUI/IceTipCommitBrowser.class.st | 21 ++++++++++--------- .../IceTipCredentialsStoreBrowser.class.st | 6 +++--- Iceberg-TipUI/IceTipDiffModel.class.st | 9 +++----- Iceberg-TipUI/IceTipHistoryBrowser.class.st | 2 +- .../IceTipInteractiveErrorVisitor.class.st | 7 ------- Iceberg-TipUI/IceTipModel.class.st | 6 ------ Iceberg-TipUI/IceTipPullBrowser.class.st | 2 +- .../IceTipRepositoriesBrowser.class.st | 6 +++--- .../IceTipRepositoryBrowser.class.st | 6 +++--- ...TipResetBranchToThisCommitCommand.class.st | 6 +++++- .../IceTipVersionHistoryBrowser.class.st | 2 +- .../IceTipWorkingCopyBrowser.class.st | 4 ++-- 33 files changed, 85 insertions(+), 87 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st index 44a5b5dc38..cac5d5cc98 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st @@ -70,7 +70,7 @@ IceGitHubAction >> reportError: error [ message := error messageBody. message = 'Invalid field: head' ifTrue: [ message := 'Branch does not exist on github. Please commit and push your changes.' ]. - self defaultApplication newInform + self application newInform label: message; title: 'Error creating pull request: ' , error messageText; openModal diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st index 56a27acda2..a3cd63eb2e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st @@ -62,7 +62,7 @@ IceGitHubCreatePullRequestModel >> accept [ | title | title := self titlePanel text trim. title ifEmpty: [ - SpApplication defaultApplication newInform + self application newInform label: 'You need to specify a title for the pull request.'; title: 'Error'; openModal. diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st index 33ae0a516f..dfe0e1a711 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st @@ -31,12 +31,6 @@ IceGitHubNewBranchFromIssuePanel >> branchName [ issueText text trim }. ] -{ #category : 'private' } -IceGitHubNewBranchFromIssuePanel >> defaultApplication [ - - ^ SpApplication defaultApplication -] - { #category : 'layout' } IceGitHubNewBranchFromIssuePanel >> defaultLayout [ diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st index 2cb8a64469..3c1cfd866c 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st @@ -46,7 +46,7 @@ IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ pullRequestDatas := pullRequest send. url := pullRequestDatas at: 'html_url'. - self defaultApplication newInform + self application newInform title: 'Pull request created. Click to view on Github.'; onAccept: [ WebBrowser openOn: url ]; openModal. @@ -65,7 +65,7 @@ IceGitHubNewPullRequestAction >> validateMakePullRequestOn: aRepository [ '{1} not published' format: { commits size } ]. status ifEmpty: [ ^ true ]. - ^ self defaultApplication newConfirm + ^ self application newConfirm title: ('{1} has ongoing modifications.' format: { aRepository name }); label: ('{2} diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st index 567af5269e..67a74113f3 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st @@ -45,14 +45,14 @@ IceGitHubOpenOnGithubAction >> basicExecute [ at: #WebBrowser ifPresent: [ :webBrowser | webBrowser openOn: url ] ifAbsent: [ - self defaultApplication + self application title: ('Cannot open "{1}"' format: { url }); label: 'Because the project WebBrowser is not present by default in Pharo 6.'; openModal ] ] on: IceGitHubError do: [ - self defaultApplication + self application title: 'Invalid Github repository.'; label: ('No project named "{1}" found for the owner "{2}"' format: { diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st index 2c08055388..4c2ea4d039 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st @@ -34,7 +34,7 @@ IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntanc rootCommandGroup register: ((CmCommandGroup named: 'checks commands') asSpecGroup - register: IceTipOpenCheckUrlCommand forSpec) + register: (IceTipOpenCheckUrlCommand forSpecContext: presenterIntance)) ] { #category : 'accessing - ui' } diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st index e7faf907fc..a0d4d7c504 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st @@ -64,7 +64,7 @@ IceGitHubRemoveBranchesAction >> removeBranch: json [ deleteBranch: self remote owner project: self remote projectBasename name: branchName. - self defaultApplication + self application title: ('Branch {1} removed.' format: { branchName }); openModal ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st index 7addacd182..f4f84ac682 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st @@ -13,7 +13,7 @@ Class { IceGitHubViewPullRequestAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. - self defaultApplication + self application informUser: ('Retrieving pull requests from {1}' format: {self remote}) during: [ (IceTipGitHubPullRequestListBrowser onRepository: self repository) diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st index 1cd03b3202..fb508d3ccd 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st @@ -31,14 +31,14 @@ IceGitHubViewPullRequestOnGithubAction >> basicExecute [ at: #WebBrowser ifPresent: [ :webBrowser | webBrowser openOn: url ] ifAbsent: [ - self defaultApplication newInform + self application newInform title: ('Cannot open "{1}"' format: { url }); label: 'Because the project WebBrowser is not present by default in Pharo 6.'; openModal ] ] on: IceGitHubError do: [ - SpApplication defaultApplication newInform + self application newInform title: 'Invalid Github repository.'; label: ('No project named "{1}" found for the owner "{2}"' format: { diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st index d874d6adc0..ef510efd63 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st @@ -29,7 +29,7 @@ Class { { #category : 'commands' } IceTipGitHubPullRequestListBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ - aCommandGroup register: IceTipRefreshPullRequestsCommand forSpec + aCommandGroup register: (IceTipRefreshPullRequestsCommand forSpecContext: presenter) ] { #category : 'commands' } diff --git a/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st b/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st index b7a9c95210..c1d1e9a204 100644 --- a/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st +++ b/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st @@ -17,7 +17,7 @@ IceTipRepositoriesBrowser class >> githubCommandsWith: presenter forRootGroup: a yourself. { IceGitHubNewBranchFromIssueCommand } - do: [ :each | pluginGroup register: each forSpec ]. + do: [ :each | pluginGroup register: (each forSpecContext: presenter) ]. (aCommandGroup / self selectionCommandGroupName) register: pluginGroup. diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st index eb437d3c05..b857476417 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st @@ -6,7 +6,7 @@ Class { } { #category : 'builder' } -IceTipMetacelloInstallCommandBuilder >> addCommandsFor: anIceTipRepositoryModel intoGroup: aSpCommandGroup [ +IceTipMetacelloInstallCommandBuilder >> addCommandsFor: anIceTipRepositoryModel intoGroup: aSpCommandGroup context: context [ | baselines | @@ -16,11 +16,11 @@ IceTipMetacelloInstallCommandBuilder >> addCommandsFor: anIceTipRepositoryModel baselines do: [ :aPackage | - self addCommandsForPackage: aPackage intoGroup: aSpCommandGroup ] + self addCommandsForPackage: aPackage intoGroup: aSpCommandGroup context: context ] ] { #category : 'builder' } -IceTipMetacelloInstallCommandBuilder >> addCommandsForPackage: aPackage intoGroup: commandGroup [ +IceTipMetacelloInstallCommandBuilder >> addCommandsForPackage: aPackage intoGroup: commandGroup context: context [ | defaultBaselineCommand groupBaselineCommand baselineName | baselineName := aPackage name allButFirst: 'BaselineOf' size. @@ -28,14 +28,17 @@ IceTipMetacelloInstallCommandBuilder >> addCommandsForPackage: aPackage intoGrou defaultBaselineCommand := IceTipMetacelloInstallBaselineDefaultCommand new. defaultBaselineCommand name: ('Install baseline of {1} (Default)' format: { baselineName }). defaultBaselineCommand packageModel: aPackage. + defaultBaselineCommand context: context. commandGroup register: defaultBaselineCommand asSpecCommand. groupBaselineCommand := IceTipMetacelloInstallBaselineGroupCommand new. groupBaselineCommand name: ('Install baseline of {1} ...' format: { baselineName }). groupBaselineCommand packageModel: aPackage. + groupBaselineCommand context: context. commandGroup register: groupBaselineCommand asSpecCommand. commandGroup register: (IceTipMetacelloToggleLockCommand new packageModel: aPackage; + context: context; asSpecCommand) ] diff --git a/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st b/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st index 8c84f96af2..c1ce68ed44 100644 --- a/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st +++ b/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st @@ -14,6 +14,6 @@ IceTipRepositoriesBrowser class >> metacelloCommandsWith: presenter forRootGroup presenter selectedItem ifNotNil: [ IceTipMetacelloInstallCommandBuilder new - addCommandsFor: presenter selectedItem intoGroup: newGroup ] + addCommandsFor: presenter selectedItem intoGroup: newGroup context: presenter ] ] diff --git a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st index def459f8f5..5d01c6960f 100644 --- a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st @@ -423,13 +423,15 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInI message := 'Added IceGeneratedClassForTesting'. "This is a Ring working copy" - self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol. + self repository workingCopy + createClass: 'IceGeneratedClassForTesting' + inPackage: self packageName1 asSymbol. self repository commitWithMessage: message. self repository unload. - self deny: (PackageOrganizer default includesPackageNamed: self packageName1). - + self deny: (PackageOrganizer default hasPackage: self packageName1). + self repository head checkoutAllPackages. self assertClassExists: #IceGeneratedClassForTesting. self assertPackageExists: self packageName1 @@ -449,13 +451,15 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ message := 'Added IceGeneratedClassForTesting'. "This is a Ring working copy" - self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol. + self repository workingCopy + createClass: 'IceGeneratedClassForTesting' + inPackage: self packageName1 asSymbol. self repository commitWithMessage: message. self repository unload. - self deny: (PackageOrganizer default includesPackageNamed: self packageName1). - + self deny: (PackageOrganizer default hasPackage: self packageName1). + self repository branch commit checkoutAllPackages. self assertClassExists: #IceGeneratedClassForTesting. self assertPackageExists: self packageName1 diff --git a/Iceberg-TipUI/IceTipAction.class.st b/Iceberg-TipUI/IceTipAction.class.st index 86c904d814..5c50d78654 100644 --- a/Iceberg-TipUI/IceTipAction.class.st +++ b/Iceberg-TipUI/IceTipAction.class.st @@ -20,6 +20,12 @@ IceTipAction class >> isAbstract [ ^ self == IceTipAction ] +{ #category : 'private' } +IceTipAction >> application [ + + ^ context application +] + { #category : 'executing' } IceTipAction >> basicExecute [ self subclassResponsibility @@ -38,12 +44,6 @@ IceTipAction >> context: aContext [ context := aContext ] -{ #category : 'private' } -IceTipAction >> defaultApplication [ - "why this is not context application?" - ^ SpApplication defaultApplication -] - { #category : 'executing' } IceTipAction >> execute [ diff --git a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st index cb70097b35..20a3a64e6b 100644 --- a/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipAddNewPackagesDialogPresenter.class.st @@ -22,8 +22,8 @@ IceTipAddNewPackagesDialogPresenter class >> buildCommandsGroupWith: presenterIn rootCommandGroup register: ((CmCommandGroup named: 'package list commands') asSpecGroup - register: IceTipSelectAllPackagesCommand forSpec; - register: IceTipUnselectAllPackagesCommand forSpec; + register: (IceTipSelectAllPackagesCommand forSpecContext: presenterInstance); + register: (IceTipUnselectAllPackagesCommand forSpecContext: presenterInstance); yourself) ] diff --git a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st index f6c3ef79f8..0d6b0220c9 100644 --- a/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipAdoptCommitCommand.class.st @@ -21,7 +21,10 @@ IceTipAdoptCommitCommand class >> defaultDescription [ { #category : 'accessing' } IceTipAdoptCommitCommand >> defaultNameFromContext [ - ^ 'Adopt commit ' , self selectedCommitish shortId + | shortId | + shortId := self selectedCommitish ifNotNil: [ :commitish | commitish shortId ] ifNil: ['']. + + ^ 'Adopt commit ' , shortId. ] { #category : 'executing' } diff --git a/Iceberg-TipUI/IceTipBranchModel.class.st b/Iceberg-TipUI/IceTipBranchModel.class.st index bb754a13e1..61d42f52d0 100644 --- a/Iceberg-TipUI/IceTipBranchModel.class.st +++ b/Iceberg-TipUI/IceTipBranchModel.class.st @@ -9,6 +9,11 @@ Class { #tag : 'Model' } +{ #category : 'accessing' } +IceTipBranchModel >> branchName [ + ^ self entity name +] + { #category : 'accessing' } IceTipBranchModel >> checkoutStrategies [ ^ IceCheckoutStrategy allStrategies diff --git a/Iceberg-TipUI/IceTipBrowser.class.st b/Iceberg-TipUI/IceTipBrowser.class.st index 1ed279f6d2..4124363bc7 100644 --- a/Iceberg-TipUI/IceTipBrowser.class.st +++ b/Iceberg-TipUI/IceTipBrowser.class.st @@ -59,8 +59,8 @@ IceTipBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGr { #category : 'commands' } IceTipBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ - aCommandGroup register: IceTipInspectCommand forSpec. - aCommandGroup register: IceFiletreeToTonelCommand forSpec + aCommandGroup register: (IceTipInspectCommand forSpecContext: presenter). + aCommandGroup register: (IceFiletreeToTonelCommand forSpecContext: presenter) ] { #category : 'commands' } diff --git a/Iceberg-TipUI/IceTipCommand.class.st b/Iceberg-TipUI/IceTipCommand.class.st index 005bce13f9..587b696def 100644 --- a/Iceberg-TipUI/IceTipCommand.class.st +++ b/Iceberg-TipUI/IceTipCommand.class.st @@ -24,8 +24,8 @@ IceTipCommand class >> isAbstract [ { #category : 'accessing' } IceTipCommand >> application [ - "why not context application?" - ^ SpApplication defaultApplication + + ^ context application ] { #category : 'converting' } diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index 4b7c339890..3e4048e133 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -17,7 +17,7 @@ Class { { #category : 'executing' } IceTipCommitAction >> basicExecute [ self validateCanCommit. - self defaultApplication + self application informUser: 'Committing...' during: [ self repository diff --git a/Iceberg-TipUI/IceTipCommitBrowser.class.st b/Iceberg-TipUI/IceTipCommitBrowser.class.st index e04852bebc..fb97c73957 100644 --- a/Iceberg-TipUI/IceTipCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCommitBrowser.class.st @@ -19,7 +19,7 @@ Class { { #category : 'commands' } IceTipCommitBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ - aCommandGroup register: IceTipRefreshCommitCommand forSpec + aCommandGroup register: (IceTipRefreshCommitCommand forSpecContext: presenter) ] { #category : 'commands' } @@ -29,12 +29,12 @@ IceTipCommitBrowser class >> buildSelectionCommandGroupWith: presenter for: aCom IceTipBrowseCommand. IceTipRevertChangeCommand. } - do: [ :each | aCommandGroup register: each forSpec ]. + do: [ :each | aCommandGroup register: (each forSpecContext: presenter) ]. aCommandGroup register: ((CmCommandGroup named: 'Edit') asSpecGroup beDisplayedAsGroup; - register: IceTipTreeExpandCommand forSpec; - register: IceTipTreeCollapseCommand forSpec; + register: (IceTipTreeExpandCommand forSpecContext: presenter); + register: (IceTipTreeCollapseCommand forSpecContext: presenter); yourself). ] @@ -232,11 +232,12 @@ IceTipCommitBrowser >> titleForWindow [ IceTipCommitBrowser >> verifyNeedsRefreshOrClose [ "Verifies if there are remaining changes to commit. In case there are none, close the window." - - self model reset. - diffPanel model reset. - diffPanel model isEmpty - ifTrue: [ ^ self closeWindow ]. - self commentPanel clear. + + self application informUser: 'Refreshing changes' during: [ + self model reset. + diffPanel model reset ]. + + diffPanel model isEmpty ifTrue: [ ^ self closeWindow ]. + self commentPanel clear. diffPanel basicRefresh ] diff --git a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st index 7c0ffb3388..8cbbb7c868 100644 --- a/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st +++ b/Iceberg-TipUI/IceTipCredentialsStoreBrowser.class.st @@ -19,7 +19,7 @@ IceTipCredentialsStoreBrowser class >> buildGeneralCommandGroupWith: presenter f IceTipAddSshCredentialCommand. IceTipAddTokenCredentialCommand } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] { #category : 'commands' } @@ -28,13 +28,13 @@ IceTipCredentialsStoreBrowser class >> buildSelectionCommandGroupWith: presenter { IceTipEditCredentialCommand. IceTipRemoveCredentialCommand } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] { #category : 'commands' } IceTipCredentialsStoreBrowser class >> buildSelectionExtraCommandGroupWith: presenter for: aCommandGroup [ - aCommandGroup register: IceTipInspectCommand forSpec + aCommandGroup register: (IceTipInspectCommand forSpecContext: presenter) ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipDiffModel.class.st b/Iceberg-TipUI/IceTipDiffModel.class.st index 55462964b9..b7537d7f08 100644 --- a/Iceberg-TipUI/IceTipDiffModel.class.st +++ b/Iceberg-TipUI/IceTipDiffModel.class.st @@ -33,12 +33,9 @@ IceTipDiffModel >> diff [ { #category : 'actions' } IceTipDiffModel >> reset [ - self application - informUser: 'Refreshing changes' - during: [ - self resetDiff. - "ask for diff to force a build" - self diff ] + + self resetDiff. + self diff ] { #category : 'private' } diff --git a/Iceberg-TipUI/IceTipHistoryBrowser.class.st b/Iceberg-TipUI/IceTipHistoryBrowser.class.st index 71a6d22f46..59dce412ad 100644 --- a/Iceberg-TipUI/IceTipHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipHistoryBrowser.class.st @@ -33,7 +33,7 @@ IceTipHistoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCo IceTipCopyCommitishCommand. IceTipCherryPickCommand. } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index 0a4518a14a..5b8d900423 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -46,13 +46,6 @@ IceTipInteractiveErrorVisitor >> context: anObject [ context := anObject ] -{ #category : 'visiting' } -IceTipInteractiveErrorVisitor >> defaultApplication [ - "why this is not ^ context application" - - ^ SpApplication defaultApplication -] - { #category : 'accessing' } IceTipInteractiveErrorVisitor >> repository [ ^ repository diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st index 2b52e71a2f..0639cde03a 100644 --- a/Iceberg-TipUI/IceTipModel.class.st +++ b/Iceberg-TipUI/IceTipModel.class.st @@ -11,12 +11,6 @@ Class { #tag : 'Model' } -{ #category : 'accessing' } -IceTipModel >> application [ - "we should address the singleton later by passing the application to the model" - ^ StPharoApplication current -] - { #category : 'converting' } IceTipModel >> beCached [ ^ IceTipCachedModel for: self diff --git a/Iceberg-TipUI/IceTipPullBrowser.class.st b/Iceberg-TipUI/IceTipPullBrowser.class.st index 2f61669678..a0ebefe10a 100644 --- a/Iceberg-TipUI/IceTipPullBrowser.class.st +++ b/Iceberg-TipUI/IceTipPullBrowser.class.st @@ -13,7 +13,7 @@ Class { { #category : 'commands' } IceTipPullBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ - aCommandGroup register: IceTipFetchInPullCommand forSpec + aCommandGroup register: (IceTipFetchInPullCommand forSpecContext: presenter) ] { #category : 'instance creation' } diff --git a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st index 288f2a994a..d802ed8cba 100644 --- a/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoriesBrowser.class.st @@ -24,7 +24,7 @@ IceTipRepositoriesBrowser class >> buildGeneralCommandGroupWith: presenter for: IceTipAddRepositoryCommand. IceTipSettingsCommand } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] @@ -45,7 +45,7 @@ IceTipRepositoriesBrowser class >> buildSelectionCommandGroupWith: presenter for IceTipEditRepositoryCommand. IceTipForgetRepositoryCommand. } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] @@ -58,7 +58,7 @@ IceTipRepositoriesBrowser class >> buildSelectionExtraCommandGroupWith: presente IceTipCopyCommitishCommand. IceTipOpenNativelyCommand. } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] diff --git a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st index d4c3e05009..4d0f627c61 100644 --- a/Iceberg-TipUI/IceTipRepositoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipRepositoryBrowser.class.st @@ -23,7 +23,7 @@ IceTipRepositoryBrowser class >> buildGeneralCommandGroupWith: presenter for: aC IceTipFetchCommand. IceTipCheckoutBranchCommand. IceTipMergeCommand } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] { #category : 'commands' } @@ -38,7 +38,7 @@ IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: IceTipCheckoutSelectedTagCommand. IceTipDeleteRemoteCommand } do: [ :each | - aCommandGroup register: each forSpec ]. + aCommandGroup register: (each forSpecContext: presenter) ]. aGroup := (CmCommandGroup named: 'GitHub' ) asSpecGroup icon: (self iconNamed: #github); @@ -48,7 +48,7 @@ IceTipRepositoryBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup register: aGroup. IceGitHubTreeCommand allSubclasses do: [ :each | - aGroup register: each forSpec ] + aGroup register: (each forSpecContext: presenter) ] ] diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index fe4979489e..fb5aa6da38 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -18,7 +18,11 @@ IceTipResetBranchToThisCommitCommand class >> defaultDescription [ { #category : 'executing' } IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [ - ^ 'Reset ', self selectedBranch name, ' to commit ', self selectedCommitish shortId + | shortId branchName | + shortId := self selectedCommitish ifNotNil: [ :commitish | commitish shortId ] ifNil: ['']. + branchName := self selectedBranch ifNotNil: [:branch | branch branchName] ifNil: [ '' ]. + + ^ 'Reset ', branchName, ' to commit ', shortId ] { #category : 'executing' } diff --git a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st index 57a7aa7cd3..f19b6d060b 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryBrowser.class.st @@ -33,7 +33,7 @@ IceTipVersionHistoryBrowser class >> buildSelectionCommandGroupWith: presenter f { IceTipInstallVersionCommand } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] diff --git a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st index e9379df0ba..88b94bc493 100644 --- a/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st +++ b/Iceberg-TipUI/IceTipWorkingCopyBrowser.class.st @@ -31,7 +31,7 @@ IceTipWorkingCopyBrowser class >> buildGeneralCommandGroupWith: presenter for: a IceTipDiscardChangesCommand. IceTipAddPackageCommand } do: [ :each | - aCommandGroup register: each forSpec ] + aCommandGroup register: (each forSpecContext: presenter) ] ] @@ -45,7 +45,7 @@ IceTipWorkingCopyBrowser class >> buildSelectionCommandGroupWith: presenter for: IceTipUnloadPackageCommand. IceTipUnloadAndRemovePackageCommand. IceTipRemoveFromRepositoryPackageCommand } - do: [ :each | aCommandGroup register: each forSpec ] + do: [ :each | aCommandGroup register: (each forSpecContext: presenter) ] ] From 0c4d94a8844015e07def7d4930f25bfc0cca1a31 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 29 Nov 2023 13:45:13 +0100 Subject: [PATCH 63/83] Adding application in model temporarly --- Iceberg-TipUI/IceTipDiffPreviewModel.class.st | 13 ++++++------- Iceberg-TipUI/IceTipModel.class.st | 6 ++++++ Iceberg-TipUI/IceTipPreviewBrowser.class.st | 4 +++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st index 6ee742d64a..3b85d5488d 100644 --- a/Iceberg-TipUI/IceTipDiffPreviewModel.class.st +++ b/Iceberg-TipUI/IceTipDiffPreviewModel.class.st @@ -30,13 +30,12 @@ IceTipDiffPreviewModel >> commitish: aCommitish [ { #category : 'accessing' } IceTipDiffPreviewModel >> diff [ - ^ diffModel ifNil: [ | diff | - self application - informUser: 'Calculating diff' - during: [ diff := self calculateDiff ]. - diffModel := IceTipCommitDiffModel - repositoryModel: self repositoryModel - on: diff ] + ^ diffModel ifNil: [ + | diff | + diff := self calculateDiff. + diffModel := IceTipCommitDiffModel + repositoryModel: self repositoryModel + on: diff ] ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipModel.class.st b/Iceberg-TipUI/IceTipModel.class.st index 0639cde03a..e317ece9fb 100644 --- a/Iceberg-TipUI/IceTipModel.class.st +++ b/Iceberg-TipUI/IceTipModel.class.st @@ -11,6 +11,12 @@ Class { #tag : 'Model' } +{ #category : 'accessing' } +IceTipModel >> application [ + + ^ StPharoApplication current +] + { #category : 'converting' } IceTipModel >> beCached [ ^ IceTipCachedModel for: self diff --git a/Iceberg-TipUI/IceTipPreviewBrowser.class.st b/Iceberg-TipUI/IceTipPreviewBrowser.class.st index 50cb8b30d1..406c9837ef 100644 --- a/Iceberg-TipUI/IceTipPreviewBrowser.class.st +++ b/Iceberg-TipUI/IceTipPreviewBrowser.class.st @@ -59,7 +59,9 @@ IceTipPreviewBrowser >> initialExtentForWindow [ { #category : 'initialization' } IceTipPreviewBrowser >> initializePresenters [ - diffPanel := self instantiate: IceTipDiffPanel on: self model diff. + self application + informUser: 'Calculating diff' + during: [ diffPanel := self instantiate: IceTipDiffPanel on: self model diff]. actionPanel := self newButtonBar. actionPanel add: (button := self newActionButton) ] From 11e88ba2249c6978bf54331d32e668c361c08446 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Wed, 29 Nov 2023 16:23:13 +0100 Subject: [PATCH 64/83] InformUser is not returning the return of the block, just adding a variable. --- Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 2009235d39..fad665fab0 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -64,13 +64,16 @@ IceTipLocalRepositoryPanel >> location: aReferenceOrString [ { #category : 'accessing' } IceTipLocalRepositoryPanel >> newRepository [ + | repo | self application informUser: ('Importing repository from {1}' format: { self location fullName }) during: [ - ^ IceRepositoryCreator new + repo := IceRepositoryCreator new repository: repository; location: self location; - createRepository ] + createRepository ]. + + ^ repo ] { #category : 'initialization' } From 32d31504dbd162fab2dc68dddcc3033f1173ffc2 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Fri, 1 Dec 2023 10:16:25 +0100 Subject: [PATCH 65/83] Fixing the code as the return of informDuring: now works --- .../IceTipGitRepositoryPanel.class.st | 14 ++++++------- .../IceTipLocalRepositoryPanel.class.st | 19 +++++++++--------- .../IceTipNewRepositoryPanel.class.st | 20 ++++++++++--------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st index 08fc1bfb98..eb361361b9 100644 --- a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st @@ -58,14 +58,14 @@ IceTipGitRepositoryPanel >> initializePresenters [ { #category : 'accessing' } IceTipGitRepositoryPanel >> newRepository [ - self application + ^ self application informUser: ('Cloning repository {1}' format: { self remoteUrl }) - during: [ - ^ IceRepositoryCreator new - repository: repository; - remote: (IceGitRemote url: self remoteUrl); - location: self projectLocation location; - createRepository ] + during: [ + IceRepositoryCreator new + repository: repository; + remote: (IceGitRemote url: self remoteUrl); + location: self projectLocation location; + createRepository ] ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index fad665fab0..8e2a42f95e 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -64,16 +64,15 @@ IceTipLocalRepositoryPanel >> location: aReferenceOrString [ { #category : 'accessing' } IceTipLocalRepositoryPanel >> newRepository [ - | repo | - self application - informUser: ('Importing repository from {1}' format: { self location fullName }) - during: [ - repo := IceRepositoryCreator new - repository: repository; - location: self location; - createRepository ]. - - ^ repo + ^ self application + informUser: + ('Importing repository from {1}' format: { self location fullName }) + during: [ + IceRepositoryCreator new + repository: repository; + location: self location; + createRepository ]. + ] { #category : 'initialization' } diff --git a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st index b4508d0349..0b4e333c58 100644 --- a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st @@ -87,15 +87,17 @@ IceTipNewRepositoryPanel >> newRepository [ repositoryName := self projectNameInputText text trimmed. location := self projectLocation location. subdirectory := self subdirectoryInputText text asString trimmed. - - self application - informUser: ('Cloning repository {1} at {2}' format: { repositoryName. location fullName }) - during: [ - ^ IceRepositoryCreator new - repository: repository; - location: location; - subdirectory: subdirectory; - createNewRepositoryNamed: repositoryName ] + + ^ self application + informUser: ('Cloning repository {1} at {2}' format: { + repositoryName. + location fullName }) + during: [ + IceRepositoryCreator new + repository: repository; + location: location; + subdirectory: subdirectory; + createNewRepositoryNamed: repositoryName ] ] { #category : 'accessing - ui' } From c0fe582a14f5174ccf020aa80d4c56aec8bd5dcf Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Tue, 5 Dec 2023 23:37:02 +0100 Subject: [PATCH 66/83] IceTipTagModel>>doesNotUnderstand: #branchName when browsing tags Fix #1775 --- Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index fb5aa6da38..3eb142b8bf 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -20,7 +20,7 @@ IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [ | shortId branchName | shortId := self selectedCommitish ifNotNil: [ :commitish | commitish shortId ] ifNil: ['']. - branchName := self selectedBranch ifNotNil: [:branch | branch branchName] ifNil: [ '' ]. + branchName := self selectedBranch ifNotNil: [:branch | branch name ] ifNil: [ '' ]. ^ 'Reset ', branchName, ' to commit ', shortId ] From 61007b485bc015e9c9ec5f36a10e140d6e76a112 Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Tue, 5 Dec 2023 23:39:28 +0100 Subject: [PATCH 67/83] IceTipTagModel>>doesNotUnderstand: #branchName when browsing tags Fix #1775 --- Iceberg-TipUI/IceTipEntityModel.class.st | 6 ++++++ Iceberg-TipUI/IceTipTagModel.class.st | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Iceberg-TipUI/IceTipEntityModel.class.st b/Iceberg-TipUI/IceTipEntityModel.class.st index 7c9c4c177d..bcb03bed95 100644 --- a/Iceberg-TipUI/IceTipEntityModel.class.st +++ b/Iceberg-TipUI/IceTipEntityModel.class.st @@ -80,6 +80,12 @@ IceTipEntityModel >> isModelOf: anObject [ ^ self entity = anObject ] +{ #category : 'accessing' } +IceTipEntityModel >> name [ + + ^ self entity name +] + { #category : 'tagging' } IceTipEntityModel >> newCreateTagAction: aString [ diff --git a/Iceberg-TipUI/IceTipTagModel.class.st b/Iceberg-TipUI/IceTipTagModel.class.st index cc72af64a0..6d978a09d2 100644 --- a/Iceberg-TipUI/IceTipTagModel.class.st +++ b/Iceberg-TipUI/IceTipTagModel.class.st @@ -36,12 +36,6 @@ IceTipTagModel >> description [ ^ self entity name ] -{ #category : 'accessing' } -IceTipTagModel >> name [ - - ^ self entity name -] - { #category : 'actions' } IceTipTagModel >> previewCheckout [ "this will open a 'checkout browser' that will allow user to validate the changes before From 8e759725a16ed80eccab7a24bef582a63147a741 Mon Sep 17 00:00:00 2001 From: Torsten Bergmann Date: Tue, 5 Dec 2023 23:56:52 +0100 Subject: [PATCH 68/83] Cleanup: notNil -> isNotNil and notEmpy -> isNotEmpty in Iceberg-* packages. (second PR) Fix #1762 --- Iceberg-Libgit/IceGitCommit.class.st | 2 +- Iceberg-Libgit/IceRepositoryCreator.class.st | 4 ++-- .../IceGitLocalRepositoryType.class.st | 2 +- Iceberg-Plugin-GitHub/IceGitHubAPI.class.st | 2 +- Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st | 2 +- .../IceTipMetacelloInstallBaselineCommand.class.st | 2 +- Iceberg-TipUI/IceTipCommand.class.st | 4 ++-- Iceberg-TipUI/IceTipGitRepositoryPanel.class.st | 2 +- Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st | 2 +- Iceberg-TipUI/IceTipMergePatchMorph.class.st | 2 +- Iceberg-TipUI/IceTipNewRepositoryPanel.class.st | 2 +- Iceberg-TipUI/IceTipPackageCommand.class.st | 2 +- Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st | 2 +- Iceberg-TipUI/IceTipTreeGroup.class.st | 2 +- Iceberg/IceCommit.class.st | 2 +- Iceberg/IceMethodDefinition.class.st | 2 +- Iceberg/IceNode.class.st | 2 +- Iceberg/IceOperationMerge.class.st | 2 +- Iceberg/IceProxyMCVersionInfo.class.st | 4 ++-- Iceberg/LGitCommit.extension.st | 2 +- Iceberg/MCMethodDefinition.extension.st | 1 - 21 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Iceberg-Libgit/IceGitCommit.class.st b/Iceberg-Libgit/IceGitCommit.class.st index 85fc953dac..6526a8ef3c 100644 --- a/Iceberg-Libgit/IceGitCommit.class.st +++ b/Iceberg-Libgit/IceGitCommit.class.st @@ -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 ] ] diff --git a/Iceberg-Libgit/IceRepositoryCreator.class.st b/Iceberg-Libgit/IceRepositoryCreator.class.st index 213999bf6d..d64f5ee447 100644 --- a/Iceberg-Libgit/IceRepositoryCreator.class.st +++ b/Iceberg-Libgit/IceRepositoryCreator.class.st @@ -198,7 +198,7 @@ IceRepositoryCreator >> initialize [ { #category : 'private - testing' } IceRepositoryCreator >> isCloning [ - ^ self remoteToUse notNil + ^ self remoteToUse isNotNil ] { #category : 'accessing' } @@ -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: [ diff --git a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st index bf150ca7e2..69d67f04d7 100644 --- a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st @@ -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 diff --git a/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st b/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st index e43b1d23a5..7410398eaf 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st @@ -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 = $/ diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st index ea12946868..9fba4ce958 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st @@ -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' } diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st index 20a824174b..4fdfde5c9c 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st @@ -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' } diff --git a/Iceberg-TipUI/IceTipCommand.class.st b/Iceberg-TipUI/IceTipCommand.class.st index 587b696def..e49f3fe479 100644 --- a/Iceberg-TipUI/IceTipCommand.class.st +++ b/Iceberg-TipUI/IceTipCommand.class.st @@ -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' } diff --git a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st index eb361361b9..9bc444384c 100644 --- a/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipGitRepositoryPanel.class.st @@ -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).' ] diff --git a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st index 8e2a42f95e..d9382932e6 100644 --- a/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st @@ -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 diff --git a/Iceberg-TipUI/IceTipMergePatchMorph.class.st b/Iceberg-TipUI/IceTipMergePatchMorph.class.st index 6a05a76fb0..4748e2153d 100644 --- a/Iceberg-TipUI/IceTipMergePatchMorph.class.st +++ b/Iceberg-TipUI/IceTipMergePatchMorph.class.st @@ -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' } diff --git a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st index 0b4e333c58..5627423007 100644 --- a/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st +++ b/Iceberg-TipUI/IceTipNewRepositoryPanel.class.st @@ -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).' ] diff --git a/Iceberg-TipUI/IceTipPackageCommand.class.st b/Iceberg-TipUI/IceTipPackageCommand.class.st index 72c5cc9e02..2950c42b68 100644 --- a/Iceberg-TipUI/IceTipPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipPackageCommand.class.st @@ -21,7 +21,7 @@ IceTipPackageCommand class >> isAbstract [ { #category : 'testing' } IceTipPackageCommand >> hasPackageModel [ - ^ self packageModel notNil + ^ self packageModel isNotNil ] { #category : 'testing' } diff --git a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st index fd61359ed0..93c44c6ac6 100644 --- a/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryGroupPanel.class.st @@ -69,7 +69,7 @@ IceTipRepositoryGroupPanel >> filteredItemsFor: pattern [ { #category : 'testing' } IceTipRepositoryGroupPanel >> hasSelectedItem [ - ^ repositoryList selectedItem notNil + ^ repositoryList selectedItem isNotNil ] { #category : 'initialization' } diff --git a/Iceberg-TipUI/IceTipTreeGroup.class.st b/Iceberg-TipUI/IceTipTreeGroup.class.st index 3de0ec917c..ec17a0748b 100644 --- a/Iceberg-TipUI/IceTipTreeGroup.class.st +++ b/Iceberg-TipUI/IceTipTreeGroup.class.st @@ -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' } diff --git a/Iceberg/IceCommit.class.st b/Iceberg/IceCommit.class.st index a92c564384..c4f79c1488 100644 --- a/Iceberg/IceCommit.class.st +++ b/Iceberg/IceCommit.class.st @@ -179,7 +179,7 @@ IceCommit >> diffToWorkingCopyForPackages: aCollection [ IceCommit >> hasMultipleAncestors [ | ancestors | ancestors := self ancestors. - ^ ancestors notNil + ^ ancestors isNotNil and: [ ancestors size > 1 ] ] diff --git a/Iceberg/IceMethodDefinition.class.st b/Iceberg/IceMethodDefinition.class.st index 8f85c4f61b..616d9754f8 100644 --- a/Iceberg/IceMethodDefinition.class.st +++ b/Iceberg/IceMethodDefinition.class.st @@ -114,7 +114,7 @@ IceMethodDefinition >> install [ { #category : 'morphic - compatibility' } IceMethodDefinition >> isLoadable [ - ^ self contextClass notNil + ^ self contextClass isNotNil ] { #category : 'testing' } diff --git a/Iceberg/IceNode.class.st b/Iceberg/IceNode.class.st index 493f5b415b..3721452fc2 100644 --- a/Iceberg/IceNode.class.st +++ b/Iceberg/IceNode.class.st @@ -242,7 +242,7 @@ IceNode >> hasChanges [ { #category : 'testing' } IceNode >> hasParent [ - ^ self parent notNil + ^ self parent isNotNil ] { #category : 'comparing' } diff --git a/Iceberg/IceOperationMerge.class.st b/Iceberg/IceOperationMerge.class.st index f8ed377709..a694c6151b 100644 --- a/Iceberg/IceOperationMerge.class.st +++ b/Iceberg/IceOperationMerge.class.st @@ -74,7 +74,7 @@ IceOperationMerge >> isLoadable [ { #category : 'testing' } IceOperationMerge >> isResolved [ - ^ chosen notNil + ^ chosen isNotNil ] { #category : 'resolution' } diff --git a/Iceberg/IceProxyMCVersionInfo.class.st b/Iceberg/IceProxyMCVersionInfo.class.st index a06a411b54..3b81cfa892 100644 --- a/Iceberg/IceProxyMCVersionInfo.class.st +++ b/Iceberg/IceProxyMCVersionInfo.class.st @@ -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 ] ] @@ -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. diff --git a/Iceberg/LGitCommit.extension.st b/Iceberg/LGitCommit.extension.st index bcab6164f7..cbb126c0dc 100644 --- a/Iceberg/LGitCommit.extension.st +++ b/Iceberg/LGitCommit.extension.st @@ -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 ] diff --git a/Iceberg/MCMethodDefinition.extension.st b/Iceberg/MCMethodDefinition.extension.st index 2a59ce3e6b..e11406cada 100644 --- a/Iceberg/MCMethodDefinition.extension.st +++ b/Iceberg/MCMethodDefinition.extension.st @@ -1,6 +1,5 @@ Extension { #name : 'MCMethodDefinition' } - { #category : '*Iceberg-Changes' } MCMethodDefinition >> method [ ^ self actualClass >> self selector From 46ab1c1427b656bf0f1c705ef714b2c98d371410 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Fri, 15 Dec 2023 17:38:01 +0100 Subject: [PATCH 69/83] fix commit order --- Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st index 7b82ab06f0..d38ce6e473 100644 --- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st @@ -155,8 +155,8 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ action: (MessageSend receiver: self selector: #updatePresenter); yourself). - aWindow buttons second label: 'Force Commit'. - aWindow buttons third label: 'Cancel Commit'. + aWindow buttons second label: 'Cancel Commit'. + aWindow buttons third label: 'Force Commit'. aWindow bindKeyCombination: Character cr asShortcut toAction: [ self accept]. From 968578da075b156f7e0a8c313aace282b6389956 Mon Sep 17 00:00:00 2001 From: Daniel Slomovits Date: Fri, 15 Dec 2023 19:37:38 -0500 Subject: [PATCH 70/83] Remove only the reverted diff entry rather than recompute the whole diff after revert (fixes #1745) --- Iceberg-TipUI/IceTipDiffPanel.class.st | 28 +++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st index 6a999df1f2..5290375562 100644 --- a/Iceberg-TipUI/IceTipDiffPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffPanel.class.st @@ -84,6 +84,29 @@ IceTipDiffPanel >> diffContentsLeft: leftString right: rightString [ rightText: rightString ] +{ #category : 'initialization' } +IceTipDiffPanel >> diffEntryRemoved: announcement [ + + | parent | + (parent := announcement entry parent) removeChild: announcement entry. + "Removing all changes to a class should remove the class node too, + unless the class definition has changed as well. Extension definitions + may appear as an 'addition' or 'removal', but can only exist when methods + of that class have changed. Repeat this process to check if the containing + package no longer has any changes. Cannot remove the root node as it has + 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 isEmpty and: [ + parent value isNoModification or: [ + parent value definition isExtensionDefinition ] ] ] ] whileTrue: [ + parent parent removeChild: parent. + parent := parent parent ]. + + self basicRefresh +] + { #category : 'accessing - ui' } IceTipDiffPanel >> diffPanel [ @@ -224,10 +247,9 @@ IceTipDiffPanel >> setModelBeforeInitialization: anObject [ IceTipDiffPanel >> subscribeToAnnouncements [ self announcer - when: IceTipDiffEntryRemoved - send: #refresh + when: IceTipDiffEntryRemoved + send: #diffEntryRemoved: to: self - ] { #category : 'specs' } From f839d8cd01c0fa0593da28c1754e7485d00272ef Mon Sep 17 00:00:00 2001 From: Daniel Slomovits Date: Fri, 15 Dec 2023 20:22:47 -0500 Subject: [PATCH 71/83] Hide "Reset to " when a tag is selected (fixes #1783) --- Iceberg-TipUI/IceTipCommitishModel.class.st | 6 ++++++ Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Iceberg-TipUI/IceTipCommitishModel.class.st b/Iceberg-TipUI/IceTipCommitishModel.class.st index 608716641e..4b420ce7b4 100644 --- a/Iceberg-TipUI/IceTipCommitishModel.class.st +++ b/Iceberg-TipUI/IceTipCommitishModel.class.st @@ -21,6 +21,12 @@ IceTipCommitishModel >> commitModels [ self subclassResponsibility ] +{ #category : 'testing' } +IceTipCommitishModel >> isBranch [ + + ^ self entity isBranch +] + { #category : 'testing' } IceTipCommitishModel >> isCommitish [ diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index fb5aa6da38..9c0a69f18b 100644 --- a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st +++ b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st @@ -15,6 +15,12 @@ IceTipResetBranchToThisCommitCommand class >> defaultDescription [ ^ 'Resets the selected branch to the selected commit. It does not modify the working copy (!!).' ] +{ #category : 'testing' } +IceTipResetBranchToThisCommitCommand >> canBeExecuted [ + + ^ self selectedBranch notNil and: [ self selectedBranch isBranch ] +] + { #category : 'executing' } IceTipResetBranchToThisCommitCommand >> defaultNameFromContext [ From b26aa96bb420abdb4605d68fe1a322a90f3343a8 Mon Sep 17 00:00:00 2001 From: Daniel Slomovits Date: Fri, 15 Dec 2023 20:47:38 -0500 Subject: [PATCH 72/83] Actually have to return nil from selectedBranch to prevent the original error, even though the command is disabled --- Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st b/Iceberg-TipUI/IceTipResetBranchToThisCommitCommand.class.st index 9c0a69f18b..ea6141bfc0 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 and: [ self selectedBranch isBranch ] + ^ self selectedBranch notNil ] { #category : 'executing' } @@ -55,7 +55,9 @@ IceTipResetBranchToThisCommitCommand >> name [ { #category : 'accessing' } IceTipResetBranchToThisCommitCommand >> selectedBranch [ - ^ self context model + | selected | + selected := self context model. + ^ (selected notNil and: [ selected isBranch ]) ifTrue: [ selected ] ] { #category : 'accessing' } From 4085d0bc342a6e41fb431f07f3de907235cf4a0a Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Wed, 20 Dec 2023 10:32:48 +0100 Subject: [PATCH 73/83] fix dialog button positions --- .../IceGitHubAcceptPullRequestModel.class.st | 6 +++--- .../IceGitHubCreatePullRequestModel.class.st | 7 ++++--- .../IceGitHubRejectPullRequestModel.class.st | 6 +++--- .../IceGitHubRemoveBranchesModel.class.st | 8 ++++---- Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st | 6 +++--- Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st | 4 ++-- Iceberg-TipUI/IceTipDialogPresenter.class.st | 7 +++---- Iceberg-TipUI/IceTipErrorDialogPresenter.class.st | 7 ++----- Iceberg-TipUI/IceTipOptionDialogPresenter.class.st | 4 ++-- 9 files changed, 26 insertions(+), 29 deletions(-) diff --git a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st index 5a19df5eec..7934afd4cd 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st @@ -66,11 +66,11 @@ IceGitHubAcceptPullRequestModel >> initialExtentForWindow [ IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter - addButton: 'Accept' do: [ :presenter | - self accept ]; addButton: 'Cancel' do: [ :presenter | presenter triggerCancelAction. - presenter close ] + presenter close ]; + addDefaultButton: 'Accept' do: [ :presenter | + self accept ] ] { #category : 'initialization' } diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st index a3cd63eb2e..5d0be11000 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st @@ -254,11 +254,12 @@ IceGitHubCreatePullRequestModel >> initialExtentForWindow [ IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ aWindow - addButton: 'Create' do: [ - self accept ]; addButton: 'Cancel' do: [ :presenter | presenter triggerCancelAction. - presenter close ] + presenter close ]; + addDefaultButton: 'Create' do: [ + self accept ] + ] { #category : 'initialization' } diff --git a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st index 29d86d03e1..2ff980871a 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st @@ -62,11 +62,11 @@ IceGitHubRejectPullRequestModel >> initialExtentForWindow [ IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter - addButton: 'Reject' do: [ :presenter | - presenter triggerOkAction. - presenter close ]; addButton: 'Cancel' do: [ :presenter | presenter triggerCancelAction. + presenter close ]; + addDefaultButton: 'Reject' do: [ :presenter | + presenter triggerOkAction. presenter close ] ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st index fc8e1b1965..79841ebbb5 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st @@ -55,12 +55,12 @@ IceGitHubRemoveBranchesModel >> initialize [ IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter - addButton: 'Remove' do: [ :presenter | - self triggerAcceptAction. - presenter close ]; addButton: 'Cancel' do: [ :presenter | presenter triggerCancelAction. - presenter close ] + presenter close ]; + addDefaultButton: 'Remove' do: [ :presenter | + self triggerAcceptAction. + presenter close ] ] { #category : 'initialization' } diff --git a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st index ff95d0bfdc..e73ca98441 100644 --- a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st +++ b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st @@ -113,14 +113,14 @@ IceTipAbstractCredentialsPresenter >> initialize [ accepted := false ] -{ #category : 'accessing' } +{ #category : 'initialization' } IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPresenter [ super initializeDialogWindow: aDialogWindowPresenter. self updateOkButton. - aDialogWindowPresenter whenClosedDo: [ accepted ifFalse: [ self cancelAskAction ] ] - + aDialogWindowPresenter whenClosedDo: [ + accepted ifFalse: [ self cancelAskAction ] ] ] { #category : 'initialization' } diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st index d38ce6e473..6197b1a9c7 100644 --- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st +++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st @@ -155,8 +155,8 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [ action: (MessageSend receiver: self selector: #updatePresenter); yourself). - aWindow buttons second label: 'Cancel Commit'. - aWindow buttons third label: 'Force Commit'. + aWindow buttons second label: 'Cancel'. + aWindow buttons third label: 'Commit'. aWindow bindKeyCombination: Character cr asShortcut toAction: [ self accept]. diff --git a/Iceberg-TipUI/IceTipDialogPresenter.class.st b/Iceberg-TipUI/IceTipDialogPresenter.class.st index 701c18a670..08a0b90e29 100644 --- a/Iceberg-TipUI/IceTipDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipDialogPresenter.class.st @@ -28,8 +28,7 @@ IceTipDialogPresenter >> initializeDialogWindow: aWindow [ super initializeDialogWindow: aWindow. aWindow - okAction: [ self accept ]; - cancelAction: [ self cancel ]; - bindKeyCombination: Character escape asShortcut toAction: [ self cancel ]. - + okAction: [ self accept ]; + cancelAction: [ self cancel ]; + bindKeyCombination: Character escape asShortcut toAction: [ self cancel ] ] diff --git a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st index 6e52aea96d..7576a4ca0a 100644 --- a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st @@ -75,11 +75,8 @@ IceTipErrorDialogPresenter >> initialExtentForWindow [ IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [ aWindow - addButton: 'Debug' - do: [ :presenter | self accept. presenter close ]. - aWindow - addButton: 'Ignore' - do: [ :presenter | presenter close ]. + addButton: 'Ignore' do: [ :presenter | presenter close ]; + addDefaultButton: 'Debug' do: [ :presenter | self accept. presenter close ] ] { #category : 'initialization' } diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st index c63a4618b6..0febb5c23c 100644 --- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st +++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st @@ -68,8 +68,8 @@ IceTipOptionDialogPresenter >> initialExtentForWindow [ IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [ aWindowPresenter - addButton: 'Ok' do: [ :presenter | self accept ]; - addButton: 'Cancel' do: [ :presenter | presenter close ]. + addButton: 'Cancel' do: [ :presenter | presenter close ]; + addDefaultButton: 'Ok' do: [ :presenter | self accept ]. aWindowPresenter whenOpenedDo: [ self typeList selectIndex: 1 ] ] From c3fb5be240eb16e51485530205474e5dd9459c16 Mon Sep 17 00:00:00 2001 From: Marcus Denker Date: Wed, 20 Dec 2023 17:13:57 +0100 Subject: [PATCH 74/83] replace refs to transcript --- Iceberg/IceCredentialsProvider.class.st | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Iceberg/IceCredentialsProvider.class.st b/Iceberg/IceCredentialsProvider.class.st index c8311e0cfd..59e4c9b924 100644 --- a/Iceberg/IceCredentialsProvider.class.st +++ b/Iceberg/IceCredentialsProvider.class.st @@ -169,7 +169,7 @@ IceCredentialsProvider >> providePlaintextCredentialsTo: credentials [ tries := tries + 1. tries >= 3 ifTrue: [ - Transcript show: 'aborting'; cr. + 'aborting' traceCr. LGitNoCredentialsProvided signal: 'There where already three failed attempts, aborting' ]. tries = 1 & self plaintextCredentials isPresent @@ -184,7 +184,7 @@ IceCredentialsProvider >> provideSshAgentCredentialsTo: credentials [ "Just check for tries to ensure we do not enter an infinite cycle in libgit2" tries := tries + 1. tries >= 3 ifTrue: [ - Transcript show: 'aborting'; cr. + 'aborting' traceCr. LGitNoCredentialsProvided signal: 'No ssh-agent credentials found.' ] ] @@ -193,7 +193,7 @@ IceCredentialsProvider >> provideSshCredentialsTo: credentials [ tries := tries + 1. tries >= 3 ifTrue: [ - Transcript show: 'aborting'; cr. + 'aborting' traceCr. LGitNoCredentialsProvided signal: 'There where already three failed attempts, aborting' ]. tries = 1 & self sshCredentials isPresent From 38db4f4a724bfb0a3834a31d73daacd1de100b82 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Tue, 26 Dec 2023 15:33:05 +0100 Subject: [PATCH 75/83] fix history From 40062f8b95e8c6e71f0b97fc7f926922d1aba36e Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Tue, 26 Dec 2023 15:34:59 +0100 Subject: [PATCH 76/83] now fix for real --- Iceberg-TipUI/IceTipVersionHistoryModel.class.st | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st index 8ecaaa2c7d..97d9227f61 100644 --- a/Iceberg-TipUI/IceTipVersionHistoryModel.class.st +++ b/Iceberg-TipUI/IceTipVersionHistoryModel.class.st @@ -42,9 +42,11 @@ IceTipVersionHistoryModel >> name [ { #category : 'private' } IceTipVersionHistoryModel >> retrieveHistory [ + | history | self repositoryModel checkMissing. self application informUser: ('Retrieving history of {1}' format: { self entity printString }) - during: [ self repositoryModel entity log historyOfMethod: self entity ] + during: [ history := self repositoryModel entity log historyOfMethod: self entity ]. + ^ history ] From 5cd52c73693e07930336e7cba26173972d118e3f Mon Sep 17 00:00:00 2001 From: Guille Polito Date: Thu, 28 Dec 2023 22:24:33 +0100 Subject: [PATCH 77/83] Extend API to remove gofer dependencies --- Iceberg/IceMetacelloRepositoryAdapter.class.st | 14 ++++++++++++++ Iceberg/IceWorkingCopy.class.st | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/Iceberg/IceMetacelloRepositoryAdapter.class.st b/Iceberg/IceMetacelloRepositoryAdapter.class.st index 43f6b91a27..04f3b964ec 100644 --- a/Iceberg/IceMetacelloRepositoryAdapter.class.st +++ b/Iceberg/IceMetacelloRepositoryAdapter.class.st @@ -138,6 +138,20 @@ Do you want to open the Iceberg Browser instead?' format: { IceTipRepositoriesBrowser new open ] +{ #category : 'accessing' } +IceMetacelloRepositoryAdapter >> packageNamed: aName ifAbsent: aBlock [ + + | package | + self repository head description = projectVersion ifFalse: [ + (self repository commitishNamed: projectVersion) + checkoutWithStrategy: IceCheckoutDoNotLoadPackages new ]. + + package := self repository workingCopy + packageNamed: aName + ifAbsent: [ ^ aBlock value ]. + ^ package latestVersion mcVersion +] + { #category : 'accessing' } IceMetacelloRepositoryAdapter >> projectPath [ ^ self repository origin projectPath diff --git a/Iceberg/IceWorkingCopy.class.st b/Iceberg/IceWorkingCopy.class.st index 0d6ffe7727..b10130ac48 100644 --- a/Iceberg/IceWorkingCopy.class.st +++ b/Iceberg/IceWorkingCopy.class.st @@ -560,6 +560,12 @@ IceWorkingCopy >> packageNamed: aString [ ^ self packagesDictionary at: aString ] +{ #category : 'API - packages' } +IceWorkingCopy >> packageNamed: aString ifAbsent: aBlock [ + + ^ self packagesDictionary at: aString ifAbsent: aBlock +] + { #category : 'API - packages' } IceWorkingCopy >> packageNames [ From 20f4fb72fb3c4ba629ac0738532ca63c783b8f02 Mon Sep 17 00:00:00 2001 From: Guille Polito Date: Fri, 29 Dec 2023 22:48:38 +0100 Subject: [PATCH 78/83] Better metacello adapter API --- .../IceGithubRepositoryType.class.st | 21 --------- .../IceProviderRepositoryType.class.st | 22 +++++---- .../IceMetacelloRepositoryAdapter.class.st | 47 +++++++++++++++++-- Iceberg/IceWorkingCopy.class.st | 18 ++++--- 4 files changed, 66 insertions(+), 42 deletions(-) diff --git a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st index 00b3bf513c..846c3b946e 100644 --- a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st @@ -13,24 +13,3 @@ Class { IceGithubRepositoryType class >> type [ ^ 'github' ] - -{ #category : 'accessing' } -IceGithubRepositoryType >> mcRepository [ - | baseRepo | - - self guessRegisteredRepository - ifNotNil: [ :repo | - repo isValid ifTrue: [ ^ repo metacelloAdapter: self projectVersion ]. - "If the repo is not valid, we forget it and reget a new one. Because Metacello want to use it" - repo forget ]. - - baseRepo := self mcRepositoryClass location: self location. - ^ (Iceberg icebergRepositoriesURLs includes: baseRepo scpUrl) - ifTrue: [ - "Do not use Iceberg to load iceberg code, - see https://github.com/pharo-vcs/iceberg/issues/168" - baseRepo ] - ifFalse: [ - baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion ] - -] diff --git a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st index 4036cf4c81..7b4951ff54 100644 --- a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st @@ -45,16 +45,22 @@ IceProviderRepositoryType >> guessRegisteredRepository [ { #category : 'accessing' } IceProviderRepositoryType >> mcRepository [ + | baseRepo | - - self guessRegisteredRepository - ifNotNil: [ :repo | - repo isValid ifTrue: [ ^ repo metacelloAdapter: self projectVersion ]. - "If the repo is not valid, we forget it and reget a new one. - Because Metacello want to use it" - repo forget ]. + self guessRegisteredRepository ifNotNil: [ :repo | + repo isValid ifTrue: [ ^ repo metacelloAdapter: self projectVersion ]. + "If the repo is not valid, we forget it and reget a new one. + Because Metacello want to use it" + repo forget ]. + baseRepo := self mcRepositoryClass location: self location. - ^ baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion + ^ (Iceberg icebergRepositoriesURLs includes: baseRepo scpUrl) + ifTrue: [ "Do not use Iceberg to load iceberg code, + see https://github.com/pharo-vcs/iceberg/issues/168" + baseRepo ] + ifFalse: [ + baseRepo getOrCreateIcebergRepository metacelloAdapter: + self projectVersion ] ] { #category : 'accessing' } diff --git a/Iceberg/IceMetacelloRepositoryAdapter.class.st b/Iceberg/IceMetacelloRepositoryAdapter.class.st index 04f3b964ec..0ba29a57fe 100644 --- a/Iceberg/IceMetacelloRepositoryAdapter.class.st +++ b/Iceberg/IceMetacelloRepositoryAdapter.class.st @@ -59,6 +59,15 @@ IceMetacelloRepositoryAdapter >> description [ ^ self repository origin url, '[', projectVersion, ']' ] +{ #category : 'fetching' } +IceMetacelloRepositoryAdapter >> fetchPackageNamed: aString [ + "The fetch operation just makes sure we have the correct version in disk" + + self repository head description = projectVersion ifFalse: [ + (self repository commitishNamed: projectVersion) + checkoutWithStrategy: IceCheckoutDoNotLoadPackages new ] +] + { #category : 'initialization' } IceMetacelloRepositoryAdapter >> flushForScriptGet [ "do nothing" @@ -120,6 +129,14 @@ IceMetacelloRepositoryAdapter >> isValid [ ^ true ] +{ #category : 'accessing' } +IceMetacelloRepositoryAdapter >> loadPackageNamed: aName intoLoader: aLoader [ + + | package | + package := self repository workingCopy packageNamed: aName. + ^ aLoader addVersion: package latestVersion mcVersion +] + { #category : 'MonticelloGUI' } IceMetacelloRepositoryAdapter >> morphicOpen: workingCopy [ @@ -138,18 +155,42 @@ Do you want to open the Iceberg Browser instead?' format: { IceTipRepositoriesBrowser new open ] +{ #category : 'accessing' } +IceMetacelloRepositoryAdapter >> packageNamed: aName [ + + ^ self packageNamed: aName ifAbsent: [ NotFound signal: aName ] +] + { #category : 'accessing' } IceMetacelloRepositoryAdapter >> packageNamed: aName ifAbsent: aBlock [ + ^ self + packageNamed: aName + ifPresent: [ :found | found ] + ifAbsent: aBlock +] + +{ #category : 'accessing' } +IceMetacelloRepositoryAdapter >> packageNamed: aName ifPresent: aBlock [ + + ^ self + packageNamed: aName + ifPresent: aBlock + ifAbsent: [ NotFound signal: aName ] +] + +{ #category : 'accessing' } +IceMetacelloRepositoryAdapter >> packageNamed: aName ifPresent: presentBlock ifAbsent: absentBlock [ + | package | self repository head description = projectVersion ifFalse: [ (self repository commitishNamed: projectVersion) checkoutWithStrategy: IceCheckoutDoNotLoadPackages new ]. package := self repository workingCopy - packageNamed: aName - ifAbsent: [ ^ aBlock value ]. - ^ package latestVersion mcVersion + packageNamed: aName + ifAbsent: [ ^ absentBlock value ]. + ^ presentBlock value: package latestVersion mcVersion ] { #category : 'accessing' } diff --git a/Iceberg/IceWorkingCopy.class.st b/Iceberg/IceWorkingCopy.class.st index b10130ac48..782f0cd47b 100644 --- a/Iceberg/IceWorkingCopy.class.st +++ b/Iceberg/IceWorkingCopy.class.st @@ -462,20 +462,18 @@ IceWorkingCopy >> loadPackagesNamed: aCollection [ { #category : 'private - monticello' } IceWorkingCopy >> loadPackagesNamed: aCollection fromCommit: aCommit [ - + aCollection ifEmpty: [ ^ self ]. - - self ignoreNotificationsDuring: [ | loader | + + self ignoreNotificationsDuring: [ + | loader | loader := MCVersionLoader new. - aCollection do: [ :name | | package packageVersion | + aCollection do: [ :name | + | package packageVersion | package := self packageNamed: name. - packageVersion := (IceSavedPackageVersion - fromCommit: aCommit - package: package) - mcVersion. + packageVersion := (aCommit versionFor: package) mcVersion. loader addVersion: packageVersion. - package beClean. - ]. + package beClean ]. loader load ] ] From 1614f8ac4fb31d0e81f6c4b98d7ff7d5d1867fc4 Mon Sep 17 00:00:00 2001 From: Guille Polito Date: Tue, 2 Jan 2024 15:33:54 +0100 Subject: [PATCH 79/83] Re-add backwards compatible later with old baselines needed for bootstrapping --- Iceberg/IceMetacelloRepositoryAdapter.class.st | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Iceberg/IceMetacelloRepositoryAdapter.class.st b/Iceberg/IceMetacelloRepositoryAdapter.class.st index 0ba29a57fe..d41a0fd3cf 100644 --- a/Iceberg/IceMetacelloRepositoryAdapter.class.st +++ b/Iceberg/IceMetacelloRepositoryAdapter.class.st @@ -132,9 +132,13 @@ IceMetacelloRepositoryAdapter >> isValid [ { #category : 'accessing' } IceMetacelloRepositoryAdapter >> loadPackageNamed: aName intoLoader: aLoader [ - | package | + | package found | package := self repository workingCopy packageNamed: aName. - ^ aLoader addVersion: package latestVersion mcVersion + found := package latestVersion mcVersion. + aLoader addVersion: found. + ^ { + found. + self } ] { #category : 'MonticelloGUI' } From 3c4942af12b9a6f1993ad54d70ecaa087bae15f6 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Wed, 3 Jan 2024 11:49:36 +0100 Subject: [PATCH 80/83] restore system tag --- .project | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.project b/.project index ac2d93a83c..078c63e532 100644 --- a/.project +++ b/.project @@ -1,3 +1,4 @@ { - 'srcDirectory' : '' + 'srcDirectory' : '', + 'tags' : [ #system ] } From 8357b43d7bdb09442fe0199f5f18c7edf775f2f6 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Sun, 7 Jan 2024 10:58:44 +0100 Subject: [PATCH 81/83] add correct reload action --- Iceberg-TipUI/IceTipPackageModel.class.st | 19 ++++++++++--------- .../IceTipReloadPackageCommand.class.st | 5 ++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index 080c19e5b6..1e827f2e25 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -77,23 +77,24 @@ IceTipPackageModel >> newLoadAction [ yourself ] -{ #category : 'accessing' } -IceTipPackageModel >> packageName [ - ^ self entity packageName -] - { #category : 'actions' } -IceTipPackageModel >> reload [ +IceTipPackageModel >> newReloadAction [ - IceTipStandardAction new + ^ IceTipStandardAction new repository: self entity repository; message: ('Reloading package {1}' format: { self entity name }) ; onSuccessRepositoryModified; - execute: [ + action: [ Iceberg announcer suspendAllForRepository: self entity repository - while: [ self entity reload ] ] + while: [ self entity reload ] ]; + yourself +] + +{ #category : 'accessing' } +IceTipPackageModel >> packageName [ + ^ self entity packageName ] { #category : 'actions' } diff --git a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st index e09b6bdb88..3f52f73c88 100644 --- a/Iceberg-TipUI/IceTipReloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipReloadPackageCommand.class.st @@ -30,9 +30,8 @@ IceTipReloadPackageCommand >> canBeExecuted [ { #category : 'executing' } IceTipReloadPackageCommand >> execute [ - self packageModel reload. - Iceberg announcer announce: - (IceRepositoryModified for: self repository) + self packageModel newReloadAction executeWithContext: self context. + Iceberg announcer announce: (IceRepositoryModified for: self repository) ] { #category : 'accessing' } From 71af7260a8e9cd325acbf27542f227d70c7b21c3 Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Sun, 7 Jan 2024 11:01:33 +0100 Subject: [PATCH 82/83] use newRemoveAction --- Iceberg-TipUI/IceTipPackageModel.class.st | 19 ++++++++++--------- ...emoveFromRepositoryPackageCommand.class.st | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index 1e827f2e25..5ba36f451c 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -92,23 +92,24 @@ IceTipPackageModel >> newReloadAction [ yourself ] -{ #category : 'accessing' } -IceTipPackageModel >> packageName [ - ^ self entity packageName -] - { #category : 'actions' } -IceTipPackageModel >> remove [ +IceTipPackageModel >> newRemoveAction [ - IceTipStandardAction new + ^ IceTipStandardAction new repository: self entity repository; message: ('Removing package {1}' format: { self entity name }); onSuccessRepositoryModified; - execute: [ + action: [ Iceberg announcer suspendAllForRepository: self entity repository - while: [ self entity remove ] ] + while: [ self entity remove ] ]; + yourself +] + +{ #category : 'accessing' } +IceTipPackageModel >> packageName [ + ^ self entity packageName ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st index 371f2f2475..3d03972616 100644 --- a/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipRemoveFromRepositoryPackageCommand.class.st @@ -24,7 +24,7 @@ IceTipRemoveFromRepositoryPackageCommand class >> defaultName [ { #category : 'executing' } IceTipRemoveFromRepositoryPackageCommand >> execute [ - self packageModel remove + self packageModel newRemoveAction executeWithContext: self context ] { #category : 'accessing' } From 7e80198d64536026e737bdd7d80d601cd3e7f3ea Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Sun, 7 Jan 2024 11:03:39 +0100 Subject: [PATCH 83/83] use newUnloadAction --- Iceberg-TipUI/IceTipPackageModel.class.st | 29 ++++++++++--------- .../IceTipUnloadPackageCommand.class.st | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index 5ba36f451c..47a8da0ae4 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -107,6 +107,21 @@ IceTipPackageModel >> newRemoveAction [ yourself ] +{ #category : 'actions' } +IceTipPackageModel >> newUnloadAction [ + + + ^ IceTipStandardAction new + repository: self entity repository; + message: ('Unloading package {1}' format: { self entity name }); + onSuccessRepositoryModified; + action: [ + Iceberg announcer + suspendAllForRepository: self entity repository + while: [ self entity unload ] ]; + yourself +] + { #category : 'accessing' } IceTipPackageModel >> packageName [ ^ self entity packageName @@ -131,17 +146,3 @@ IceTipPackageModel >> statusDecorator [ ifFalse: [ IceTipDescriptionDecorator notLoaded ]. ^ super statusDecorator ] - -{ #category : 'actions' } -IceTipPackageModel >> unload [ - - - IceTipStandardAction new - repository: self entity repository; - message: ('Unloading package {1}' format: { self entity name }); - onSuccessRepositoryModified; - execute: [ - Iceberg announcer - suspendAllForRepository: self entity repository - while: [ self entity unload ] ] -] diff --git a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st index ba89f54d03..654cc37a0e 100644 --- a/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st +++ b/Iceberg-TipUI/IceTipUnloadPackageCommand.class.st @@ -30,7 +30,7 @@ IceTipUnloadPackageCommand >> canBeExecuted [ { #category : 'executing' } IceTipUnloadPackageCommand >> execute [ - self packageModel unload + self packageModel newUnloadAction executeWithContext: self context ] { #category : 'accessing' }