From 274ea6ebf6c82ecf6a844549cd2f5a7cc72ed75f Mon Sep 17 00:00:00 2001 From: AlexisCnockaert Date: Mon, 6 Jan 2025 15:58:36 +0100 Subject: [PATCH 1/3] renamed all ice git hub classes from model to presenter ( not model anymore) --- ...GitHubAcceptPullRequestPresenter.class.st} | 36 +++---- ...GitHubCreatePullRequestPresenter.class.st} | 98 +++++++++---------- .../IceGitHubNewPullRequestAction.class.st | 2 +- ...GitHubPullRequestDetailPresenter.class.st} | 60 ++++++------ ...GitHubRejectPullRequestPresenter.class.st} | 30 +++--- .../IceGitHubRemoveBranchesAction.class.st | 2 +- ...IceGitHubRemoveBranchesPresenter.class.st} | 32 +++--- .../IceGitHubTipPullRequestBrowser.class.st | 4 +- ...ceTipGitHubPullRequestListBrowser.class.st | 2 +- 9 files changed, 133 insertions(+), 133 deletions(-) rename Iceberg-Plugin-GitHub/{IceGitHubAcceptPullRequestModel.class.st => IceGitHubAcceptPullRequestPresenter.class.st} (66%) rename Iceberg-Plugin-GitHub/{IceGitHubCreatePullRequestModel.class.st => IceGitHubCreatePullRequestPresenter.class.st} (73%) rename Iceberg-Plugin-GitHub/{IceGitHubPullRequestDetailModel.class.st => IceGitHubPullRequestDetailPresenter.class.st} (78%) rename Iceberg-Plugin-GitHub/{IceGitHubRejectPullRequestModel.class.st => IceGitHubRejectPullRequestPresenter.class.st} (66%) rename Iceberg-Plugin-GitHub/{IceGitHubRemoveBranchesModel.class.st => IceGitHubRemoveBranchesPresenter.class.st} (70%) diff --git a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st similarity index 66% rename from Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st rename to Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st index 7934afd4cd..27f7c718ab 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st @@ -2,7 +2,7 @@ I'm a dialog for collecting data to accept a pull request. " Class { - #name : 'IceGitHubAcceptPullRequestModel', + #name : 'IceGitHubAcceptPullRequestPresenter', #superclass : 'IceTipPresenter', #instVars : [ 'messageLabel', @@ -17,7 +17,7 @@ Class { } { #category : 'actions' } -IceGitHubAcceptPullRequestModel >> accept [ +IceGitHubAcceptPullRequestPresenter >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ]. @@ -25,13 +25,13 @@ IceGitHubAcceptPullRequestModel >> accept [ ] { #category : 'accessing' } -IceGitHubAcceptPullRequestModel >> availableTypes [ +IceGitHubAcceptPullRequestPresenter >> availableTypes [ ^ #( 'merge' 'squash' 'rebase' ) ] { #category : 'initialization' } -IceGitHubAcceptPullRequestModel >> connectPresenters [ +IceGitHubAcceptPullRequestPresenter >> connectPresenters [ self typeList items: self availableTypes; @@ -39,7 +39,7 @@ IceGitHubAcceptPullRequestModel >> connectPresenters [ ] { #category : 'layout' } -IceGitHubAcceptPullRequestModel >> defaultLayout [ +IceGitHubAcceptPullRequestPresenter >> defaultLayout [ ^ SpGridLayout new beColumnNotHomogeneous; @@ -51,19 +51,19 @@ IceGitHubAcceptPullRequestModel >> defaultLayout [ ] { #category : 'accessing' } -IceGitHubAcceptPullRequestModel >> defaultType [ +IceGitHubAcceptPullRequestPresenter >> defaultType [ ^ 'merge' ] { #category : 'api' } -IceGitHubAcceptPullRequestModel >> initialExtentForWindow [ +IceGitHubAcceptPullRequestPresenter >> initialExtentForWindow [ ^ (600 @ 300) scaledByDisplayScaleFactor ] { #category : 'initialization' } -IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ +IceGitHubAcceptPullRequestPresenter >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter addButton: 'Cancel' do: [ :presenter | @@ -74,7 +74,7 @@ IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresente ] { #category : 'initialization' } -IceGitHubAcceptPullRequestModel >> initializePresenters [ +IceGitHubAcceptPullRequestPresenter >> initializePresenters [ messageLabel := self newLabel. messageText := self newText. @@ -88,13 +88,13 @@ IceGitHubAcceptPullRequestModel >> initializePresenters [ ] { #category : 'accessing' } -IceGitHubAcceptPullRequestModel >> message [ +IceGitHubAcceptPullRequestPresenter >> message [ ^ self messageText text asString ] { #category : 'accessing' } -IceGitHubAcceptPullRequestModel >> messageGhostText [ +IceGitHubAcceptPullRequestPresenter >> messageGhostText [ ^ 'Commit title @@ -102,42 +102,42 @@ Add an optional extented description' ] { #category : 'accessing - ui' } -IceGitHubAcceptPullRequestModel >> messageLabel [ +IceGitHubAcceptPullRequestPresenter >> messageLabel [ ^ messageLabel ] { #category : 'accessing - ui' } -IceGitHubAcceptPullRequestModel >> messageText [ +IceGitHubAcceptPullRequestPresenter >> messageText [ ^ messageText ] { #category : 'events' } -IceGitHubAcceptPullRequestModel >> onAccept: aBlock [ +IceGitHubAcceptPullRequestPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] { #category : 'specs' } -IceGitHubAcceptPullRequestModel >> titleForWindow [ +IceGitHubAcceptPullRequestPresenter >> titleForWindow [ ^ 'Accept pull request' ] { #category : 'accessing' } -IceGitHubAcceptPullRequestModel >> type [ +IceGitHubAcceptPullRequestPresenter >> type [ ^ self typeList selectedItem ] { #category : 'accessing - ui' } -IceGitHubAcceptPullRequestModel >> typeLabel [ +IceGitHubAcceptPullRequestPresenter >> typeLabel [ ^ typeLabel ] { #category : 'accessing - ui' } -IceGitHubAcceptPullRequestModel >> typeList [ +IceGitHubAcceptPullRequestPresenter >> typeList [ ^ typeList ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st similarity index 73% rename from Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st rename to Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st index 5d0be11000..81e644192e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st @@ -2,7 +2,7 @@ I'm a dialog to ask for data relevant to create a pull request. " Class { - #name : 'IceGitHubCreatePullRequestModel', + #name : 'IceGitHubCreatePullRequestPresenter', #superclass : 'IceTipPresenter', #instVars : [ 'repository', @@ -32,12 +32,12 @@ Class { } { #category : 'instance creation' } -IceGitHubCreatePullRequestModel class >> new [ +IceGitHubCreatePullRequestPresenter class >> new [ self error: 'Use #repository:credentials:headRemote:' ] { #category : 'instance creation' } -IceGitHubCreatePullRequestModel class >> newApplication: anApplication +IceGitHubCreatePullRequestPresenter class >> newApplication: anApplication repository: aRepository credentials: aCredentials headRemote: aRemote [ @@ -51,13 +51,13 @@ IceGitHubCreatePullRequestModel class >> newApplication: anApplication ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel class >> titleSize [ +IceGitHubCreatePullRequestPresenter class >> titleSize [ ^ 80 ] { #category : 'actions' } -IceGitHubCreatePullRequestModel >> accept [ +IceGitHubCreatePullRequestPresenter >> accept [ | title | title := self titlePanel text trim. @@ -75,14 +75,14 @@ IceGitHubCreatePullRequestModel >> accept [ ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> availableBranchNames [ +IceGitHubCreatePullRequestPresenter >> availableBranchNames [ ^ availableBranchNames ifNil: [ availableBranchNames := self obtainAvailableBranchNames ] ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> availableRemotes [ +IceGitHubCreatePullRequestPresenter >> availableRemotes [ "Retrieves available remotes to perform the PR" ^ availableRemotes ifNil: [ @@ -90,40 +90,40 @@ IceGitHubCreatePullRequestModel >> availableRemotes [ ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> baseBranchList [ +IceGitHubCreatePullRequestPresenter >> baseBranchList [ ^ baseBranchList ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> baseBranchNames [ +IceGitHubCreatePullRequestPresenter >> baseBranchNames [ ^ self baseBranches collect: [ :each | each at: #name ] ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> baseBranches [ +IceGitHubCreatePullRequestPresenter >> baseBranches [ ^ baseBranches ifNil: [ baseBranches := self requestBaseBranches ] ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> baseDefaultBranchName [ +IceGitHubCreatePullRequestPresenter >> baseDefaultBranchName [ ^ self gitBase at: #default_branch ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> baseForkList [ +IceGitHubCreatePullRequestPresenter >> baseForkList [ ^ baseForkList ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> baseLabel [ +IceGitHubCreatePullRequestPresenter >> baseLabel [ ^ baseLabel ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> baseRemote [ +IceGitHubCreatePullRequestPresenter >> baseRemote [ "This is the 'base' remote (the place where the repository is forked). This is used to suggest fork PR destination (base)" @@ -131,23 +131,23 @@ IceGitHubCreatePullRequestModel >> baseRemote [ ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> bodyLabel [ +IceGitHubCreatePullRequestPresenter >> bodyLabel [ ^ bodyLabel ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> bodyPanel [ +IceGitHubCreatePullRequestPresenter >> bodyPanel [ ^ bodyText ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> branch [ +IceGitHubCreatePullRequestPresenter >> branch [ ^ self repository branch ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> createPullRequest [ +IceGitHubCreatePullRequestPresenter >> createPullRequest [ ^ IceGitHubPullRequestDefinition new credentials: self credentials; @@ -161,19 +161,19 @@ IceGitHubCreatePullRequestModel >> createPullRequest [ ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> credentials [ +IceGitHubCreatePullRequestPresenter >> credentials [ ^ credentials ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> credentials: aCredentials [ +IceGitHubCreatePullRequestPresenter >> credentials: aCredentials [ credentials := aCredentials ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> defaultBaseBranchName [ +IceGitHubCreatePullRequestPresenter >> defaultBaseBranchName [ self hasParent ifFalse: [ ^ self baseDefaultBranchName ]. ^ self baseBranchNames @@ -182,13 +182,13 @@ IceGitHubCreatePullRequestModel >> defaultBaseBranchName [ ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> defaultHeadBranchName [ +IceGitHubCreatePullRequestPresenter >> defaultHeadBranchName [ ^ self branch shortname ] { #category : 'layout' } -IceGitHubCreatePullRequestModel >> defaultLayout [ +IceGitHubCreatePullRequestPresenter >> defaultLayout [ ^ SpGridLayout new beColumnNotHomogeneous; @@ -203,7 +203,7 @@ IceGitHubCreatePullRequestModel >> defaultLayout [ ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> gitBase [ +IceGitHubCreatePullRequestPresenter >> gitBase [ | json | json := self gitRepositoryInfo. @@ -211,47 +211,47 @@ IceGitHubCreatePullRequestModel >> gitBase [ ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> gitRepositoryInfo [ +IceGitHubCreatePullRequestPresenter >> gitRepositoryInfo [ ^ gitRepositoryInfo ifNil: [ gitRepositoryInfo := self requestGitRepositoryInfo ] ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> hasParent [ +IceGitHubCreatePullRequestPresenter >> hasParent [ ^ self gitRepositoryInfo includesKey: #parent ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> headBranchList [ +IceGitHubCreatePullRequestPresenter >> headBranchList [ ^ headBranchList ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> headForkList [ +IceGitHubCreatePullRequestPresenter >> headForkList [ ^ headForkList ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> headLabel [ +IceGitHubCreatePullRequestPresenter >> headLabel [ ^ headLabel ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> headRemote [ +IceGitHubCreatePullRequestPresenter >> headRemote [ ^ headRemote ifNil: [ self repository head upstream remote ] ] { #category : 'initialization' } -IceGitHubCreatePullRequestModel >> initialExtentForWindow [ +IceGitHubCreatePullRequestPresenter >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] { #category : 'initialization' } -IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ +IceGitHubCreatePullRequestPresenter >> initializeDialogWindow: aWindow [ aWindow addButton: 'Cancel' do: [ :presenter | @@ -263,7 +263,7 @@ IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ ] { #category : 'initialization' } -IceGitHubCreatePullRequestModel >> initializePresenters [ +IceGitHubCreatePullRequestPresenter >> initializePresenters [ titleLabel := self newLabel label: 'Title'. headLabel := self newLabel label: 'From (Head)'. @@ -284,7 +284,7 @@ IceGitHubCreatePullRequestModel >> initializePresenters [ ] { #category : 'initialization' } -IceGitHubCreatePullRequestModel >> initializeRepository: aRepository credentials: aCredentials headRemote: aRemote [ +IceGitHubCreatePullRequestPresenter >> initializeRepository: aRepository credentials: aCredentials headRemote: aRemote [ repository := aRepository. credentials := aCredentials. @@ -293,13 +293,13 @@ IceGitHubCreatePullRequestModel >> initializeRepository: aRepository credentials ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> lastCommitMessage [ +IceGitHubCreatePullRequestPresenter >> lastCommitMessage [ ^ lastCommitMessage ifNil: [ lastCommitMessage := self obtainLastCommitMessage ] ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> obtainAvailableBranchNames [ +IceGitHubCreatePullRequestPresenter >> obtainAvailableBranchNames [ ^ ((self repository allBranches collect: #shortname as: Set) addAll: self baseBranchNames; @@ -309,7 +309,7 @@ IceGitHubCreatePullRequestModel >> obtainAvailableBranchNames [ ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> obtainAvailableRemotes [ +IceGitHubCreatePullRequestPresenter >> obtainAvailableRemotes [ | remotes | remotes := self repository remotes. @@ -320,7 +320,7 @@ IceGitHubCreatePullRequestModel >> obtainAvailableRemotes [ ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> obtainBaseRemote [ +IceGitHubCreatePullRequestPresenter >> obtainBaseRemote [ | base sshUrl httpUrl | base := self gitBase. @@ -335,19 +335,19 @@ IceGitHubCreatePullRequestModel >> obtainBaseRemote [ ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> obtainLastCommitMessage [ +IceGitHubCreatePullRequestPresenter >> obtainLastCommitMessage [ ^ self branch commit comment ] { #category : 'events' } -IceGitHubCreatePullRequestModel >> onAccept: aBlock [ +IceGitHubCreatePullRequestPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> proposedComment [ +IceGitHubCreatePullRequestPresenter >> proposedComment [ | lines firstLine remainingLines | lines := self lastCommitMessage lines. @@ -366,7 +366,7 @@ IceGitHubCreatePullRequestModel >> proposedComment [ ] { #category : 'private' } -IceGitHubCreatePullRequestModel >> proposedTitle [ +IceGitHubCreatePullRequestPresenter >> proposedTitle [ self lastCommitMessage linesDo: [ :eachLine | ^ eachLine size > self class titleSize @@ -377,13 +377,13 @@ IceGitHubCreatePullRequestModel >> proposedTitle [ ] { #category : 'accessing' } -IceGitHubCreatePullRequestModel >> repository [ +IceGitHubCreatePullRequestPresenter >> repository [ ^ repository ] { #category : 'private - request' } -IceGitHubCreatePullRequestModel >> requestBaseBranches [ +IceGitHubCreatePullRequestPresenter >> requestBaseBranches [ ^ IceGitHubAPI new credentials: self credentials; @@ -392,7 +392,7 @@ IceGitHubCreatePullRequestModel >> requestBaseBranches [ ] { #category : 'private - request' } -IceGitHubCreatePullRequestModel >> requestGitRepositoryInfo [ +IceGitHubCreatePullRequestPresenter >> requestGitRepositoryInfo [ | remote | remote := self headRemote. @@ -402,25 +402,25 @@ IceGitHubCreatePullRequestModel >> requestGitRepositoryInfo [ ] { #category : 'specs' } -IceGitHubCreatePullRequestModel >> titleForWindow [ +IceGitHubCreatePullRequestPresenter >> titleForWindow [ ^ 'New pull request' ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> titleLabel [ +IceGitHubCreatePullRequestPresenter >> titleLabel [ ^ titleLabel ] { #category : 'accessing - ui' } -IceGitHubCreatePullRequestModel >> titlePanel [ +IceGitHubCreatePullRequestPresenter >> titlePanel [ ^ titleTextInput ] { #category : 'initialization' } -IceGitHubCreatePullRequestModel >> updatePresenter [ +IceGitHubCreatePullRequestPresenter >> updatePresenter [ baseForkList items: self availableRemotes; diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st index 3c1cfd866c..64587cbc7a 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st @@ -28,7 +28,7 @@ IceGitHubNewPullRequestAction >> basicExecute [ (self validateMakePullRequestOn: self repository) ifFalse: [ ^ #() ]. - ((IceGitHubCreatePullRequestModel + ((IceGitHubCreatePullRequestPresenter newApplication: context application repository: self repository credentials: self credentials diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailPresenter.class.st similarity index 78% rename from Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st rename to Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailPresenter.class.st index 8be5c78867..5dff6cadf9 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailPresenter.class.st @@ -2,7 +2,7 @@ I'm a spec model to present a detailed view of a Pull Request. " Class { - #name : 'IceGitHubPullRequestDetailModel', + #name : 'IceGitHubPullRequestDetailPresenter', #superclass : 'SpPresenter', #instVars : [ 'urlLabel', @@ -30,7 +30,7 @@ Class { } { #category : 'commands' } -IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntance forRoot: rootCommandGroup [ +IceGitHubPullRequestDetailPresenter class >> buildCommandsGroupWith: presenterIntance forRoot: rootCommandGroup [ rootCommandGroup register: ((CmCommandGroup named: 'checks commands') asSpecGroup @@ -38,27 +38,27 @@ IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntanc ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> authorLabel [ +IceGitHubPullRequestDetailPresenter >> authorLabel [ ^ authorLabel ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> authorText [ +IceGitHubPullRequestDetailPresenter >> authorText [ ^ authorText ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> bodyText [ +IceGitHubPullRequestDetailPresenter >> bodyText [ ^ bodyText ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> checksTable [ +IceGitHubPullRequestDetailPresenter >> checksTable [ ^ checksTable ] { #category : 'layout' } -IceGitHubPullRequestDetailModel >> defaultLayout [ +IceGitHubPullRequestDetailPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom borderWidth: 5; @@ -91,23 +91,23 @@ IceGitHubPullRequestDetailModel >> defaultLayout [ ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> fromLabel [ +IceGitHubPullRequestDetailPresenter >> fromLabel [ ^ fromLabel ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> fromText [ +IceGitHubPullRequestDetailPresenter >> fromText [ ^ fromText ] { #category : 'private' } -IceGitHubPullRequestDetailModel >> iconForMergeable: mergeable [ +IceGitHubPullRequestDetailPresenter >> iconForMergeable: mergeable [ mergeable = true ifTrue: [ ^ self iconNamed: #smallOk ]. ^ self iconNamed: #smallCancel ] { #category : 'private' } -IceGitHubPullRequestDetailModel >> iconForStatus: status [ +IceGitHubPullRequestDetailPresenter >> iconForStatus: status [ status = 'success' ifTrue: [ ^ self iconNamed: #testGreen ]. status = 'failure' ifTrue: [ ^ self iconNamed: #testRed ]. status = 'pending' ifTrue: [ ^ self iconNamed: #testYellow ]. @@ -116,7 +116,7 @@ IceGitHubPullRequestDetailModel >> iconForStatus: status [ ] { #category : 'initialization' } -IceGitHubPullRequestDetailModel >> initializePresenters [ +IceGitHubPullRequestDetailPresenter >> initializePresenters [ urlLabel := self newLabel label: 'Url'. authorLabel := self newLabel label: 'Author'. @@ -142,17 +142,17 @@ IceGitHubPullRequestDetailModel >> initializePresenters [ ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> mergeableLabel [ +IceGitHubPullRequestDetailPresenter >> mergeableLabel [ ^ mergeableLabel ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> mergeableMessage [ +IceGitHubPullRequestDetailPresenter >> mergeableMessage [ ^ mergeableMessage ] { #category : 'private - factory' } -IceGitHubPullRequestDetailModel >> newChecksTable [ +IceGitHubPullRequestDetailPresenter >> newChecksTable [ ^ self newTable addColumn: (SpCompositeTableColumn new @@ -176,19 +176,19 @@ IceGitHubPullRequestDetailModel >> newChecksTable [ ] { #category : 'accessing' } -IceGitHubPullRequestDetailModel >> pullRequest [ +IceGitHubPullRequestDetailPresenter >> pullRequest [ ^ pullRequest ] { #category : 'accessing' } -IceGitHubPullRequestDetailModel >> pullRequest: aPullRequest [ +IceGitHubPullRequestDetailPresenter >> pullRequest: aPullRequest [ pullRequest := aPullRequest. self updatePresenter ] { #category : 'private' } -IceGitHubPullRequestDetailModel >> retrieveDetail [ +IceGitHubPullRequestDetailPresenter >> retrieveDetail [ self mergeableMessage text: (self mergeableMessage text , ' Loading...' ). self schedule: [ @@ -205,7 +205,7 @@ IceGitHubPullRequestDetailModel >> retrieveDetail [ ] { #category : 'private' } -IceGitHubPullRequestDetailModel >> retrieveStatuses [ +IceGitHubPullRequestDetailPresenter >> retrieveStatuses [ " self statusPanel widget addMorphBack: 'Loading...' asMorph." self statusMessage text: (statusMessage text , ' Loading...'). self schedule: [ @@ -225,13 +225,13 @@ IceGitHubPullRequestDetailModel >> retrieveStatuses [ ] { #category : 'private' } -IceGitHubPullRequestDetailModel >> schedule: aBlock [ +IceGitHubPullRequestDetailPresenter >> schedule: aBlock [ self scheduler schedule: aBlock ] { #category : 'private' } -IceGitHubPullRequestDetailModel >> scheduler [ +IceGitHubPullRequestDetailPresenter >> scheduler [ ^ scheduler ifNil: [ scheduler := TKTWorkerPool new @@ -241,22 +241,22 @@ IceGitHubPullRequestDetailModel >> scheduler [ ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> statusIcon [ +IceGitHubPullRequestDetailPresenter >> statusIcon [ ^ statusIcon ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> statusLabel [ +IceGitHubPullRequestDetailPresenter >> statusLabel [ ^ statusLabel ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> statusMessage [ +IceGitHubPullRequestDetailPresenter >> statusMessage [ ^ statusMessage ] { #category : 'private' } -IceGitHubPullRequestDetailModel >> textForMergeable: mergeable [ +IceGitHubPullRequestDetailPresenter >> textForMergeable: mergeable [ mergeable = true ifTrue: [ ^ 'Yes' ]. mergeable = false ifTrue: [ ^ 'There are conflicts' ]. @@ -266,17 +266,17 @@ IceGitHubPullRequestDetailModel >> textForMergeable: mergeable [ ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> toLabel [ +IceGitHubPullRequestDetailPresenter >> toLabel [ ^ toLabel ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> toText [ +IceGitHubPullRequestDetailPresenter >> toText [ ^ toText ] { #category : 'initialization' } -IceGitHubPullRequestDetailModel >> updatePresenter [ +IceGitHubPullRequestDetailPresenter >> updatePresenter [ self pullRequest ifNil: [ ^ self ]. @@ -290,11 +290,11 @@ IceGitHubPullRequestDetailModel >> updatePresenter [ ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> urlLabel [ +IceGitHubPullRequestDetailPresenter >> urlLabel [ ^ urlLabel ] { #category : 'accessing - ui' } -IceGitHubPullRequestDetailModel >> urlText [ +IceGitHubPullRequestDetailPresenter >> urlText [ ^ urlText ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st similarity index 66% rename from Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st rename to Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st index 2ff980871a..1ce09264f3 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st @@ -2,7 +2,7 @@ I'm a dialog to collect data about a pull request rejection. " Class { - #name : 'IceGitHubRejectPullRequestModel', + #name : 'IceGitHubRejectPullRequestPresenter', #superclass : 'IceTipPresenter', #instVars : [ 'messageLabel', @@ -16,7 +16,7 @@ Class { } { #category : 'actions' } -IceGitHubRejectPullRequestModel >> accept [ +IceGitHubRejectPullRequestPresenter >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ]. @@ -24,19 +24,19 @@ IceGitHubRejectPullRequestModel >> accept [ ] { #category : 'accessing - ui' } -IceGitHubRejectPullRequestModel >> acceptButton [ +IceGitHubRejectPullRequestPresenter >> acceptButton [ ^ acceptButton ] { #category : 'accessing' } -IceGitHubRejectPullRequestModel >> availableTypes [ +IceGitHubRejectPullRequestPresenter >> availableTypes [ ^ #( 'merge' 'squash' 'rebase' ) ] { #category : 'layout' } -IceGitHubRejectPullRequestModel >> defaultLayout [ +IceGitHubRejectPullRequestPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom borderWidth: 5; @@ -47,19 +47,19 @@ IceGitHubRejectPullRequestModel >> defaultLayout [ ] { #category : 'accessing' } -IceGitHubRejectPullRequestModel >> defaultType [ +IceGitHubRejectPullRequestPresenter >> defaultType [ ^ 'merge' ] { #category : 'api' } -IceGitHubRejectPullRequestModel >> initialExtentForWindow [ +IceGitHubRejectPullRequestPresenter >> initialExtentForWindow [ ^ (500 @ 250) scaledByDisplayScaleFactor ] { #category : 'initialization' } -IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ +IceGitHubRejectPullRequestPresenter >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter addButton: 'Cancel' do: [ :presenter | @@ -71,7 +71,7 @@ IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresente ] { #category : 'initialization' } -IceGitHubRejectPullRequestModel >> initializePresenters [ +IceGitHubRejectPullRequestPresenter >> initializePresenters [ super initializePresenters. messageLabel := self newLabel. @@ -87,13 +87,13 @@ IceGitHubRejectPullRequestModel >> initializePresenters [ ] { #category : 'accessing' } -IceGitHubRejectPullRequestModel >> message [ +IceGitHubRejectPullRequestPresenter >> message [ ^ self messageText text asString ] { #category : 'accessing' } -IceGitHubRejectPullRequestModel >> messageGhostText [ +IceGitHubRejectPullRequestPresenter >> messageGhostText [ ^ 'Commit title @@ -101,25 +101,25 @@ Add an optional extented description' ] { #category : 'accessing - ui' } -IceGitHubRejectPullRequestModel >> messageLabel [ +IceGitHubRejectPullRequestPresenter >> messageLabel [ ^ messageLabel ] { #category : 'accessing - ui' } -IceGitHubRejectPullRequestModel >> messageText [ +IceGitHubRejectPullRequestPresenter >> messageText [ ^ messageText ] { #category : 'events' } -IceGitHubRejectPullRequestModel >> onAccept: aBlock [ +IceGitHubRejectPullRequestPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] { #category : 'specs' } -IceGitHubRejectPullRequestModel >> titleForWindow [ +IceGitHubRejectPullRequestPresenter >> titleForWindow [ ^ 'Reject pull request' ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st index a0d4d7c504..9e05350662 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st @@ -20,7 +20,7 @@ IceGitHubRemoveBranchesAction >> basicExecute [ informUser: ('Retrieving branch information from {1}' format: {self remote url}) during: [ self cacheAllBranches ]. - ((IceGitHubRemoveBranchesModel newApplication: context application) + ((IceGitHubRemoveBranchesPresenter newApplication: context application) remote: remote; items: branchesByName values ; onAccept: [ :selection | self removeBranches: selection ]; diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st similarity index 70% rename from Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st rename to Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st index 79841ebbb5..b7f499ae39 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st @@ -2,7 +2,7 @@ I'm a dialog to select a list of anything (used by branches now). " Class { - #name : 'IceGitHubRemoveBranchesModel', + #name : 'IceGitHubRemoveBranchesPresenter', #superclass : 'IceTipPresenter', #instVars : [ 'selectedItems', @@ -17,14 +17,14 @@ Class { } { #category : 'actions' } -IceGitHubRemoveBranchesModel >> confirmSelection [ +IceGitHubRemoveBranchesPresenter >> confirmSelection [ acceptBlock ifNotNil: [ acceptBlock value: selectedItems ]. self closeWindow ] { #category : 'layout' } -IceGitHubRemoveBranchesModel >> defaultLayout [ +IceGitHubRemoveBranchesPresenter >> defaultLayout [ ^ SpBoxLayout newTopToBottom add: listPanel;" @@ -33,26 +33,26 @@ IceGitHubRemoveBranchesModel >> defaultLayout [ ] { #category : 'api' } -IceGitHubRemoveBranchesModel >> displayBlock: aBlock [ +IceGitHubRemoveBranchesPresenter >> displayBlock: aBlock [ displayBlock := aBlock ] { #category : 'initialization' } -IceGitHubRemoveBranchesModel >> initialExtentForWindow [ +IceGitHubRemoveBranchesPresenter >> initialExtentForWindow [ ^ 550 @ 500 ] { #category : 'initialization' } -IceGitHubRemoveBranchesModel >> initialize [ +IceGitHubRemoveBranchesPresenter >> initialize [ selectedItems := Set new. super initialize ] { #category : 'initialization' } -IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ +IceGitHubRemoveBranchesPresenter >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter addButton: 'Cancel' do: [ :presenter | @@ -64,7 +64,7 @@ IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ ] { #category : 'initialization' } -IceGitHubRemoveBranchesModel >> initializePresenters [ +IceGitHubRemoveBranchesPresenter >> initializePresenters [ listPanel := self newTable. listPanel @@ -79,37 +79,37 @@ IceGitHubRemoveBranchesModel >> initializePresenters [ ] { #category : 'api' } -IceGitHubRemoveBranchesModel >> items: aCollection [ +IceGitHubRemoveBranchesPresenter >> items: aCollection [ self listPanel items: aCollection ] { #category : 'accessing - ui' } -IceGitHubRemoveBranchesModel >> listPanel [ +IceGitHubRemoveBranchesPresenter >> listPanel [ ^ listPanel ] { #category : 'events' } -IceGitHubRemoveBranchesModel >> onAccept: aBlock [ +IceGitHubRemoveBranchesPresenter >> onAccept: aBlock [ acceptBlock := aBlock ] { #category : 'accessing' } -IceGitHubRemoveBranchesModel >> remote [ +IceGitHubRemoveBranchesPresenter >> remote [ ^ remote ] { #category : 'accessing' } -IceGitHubRemoveBranchesModel >> remote: anObject [ +IceGitHubRemoveBranchesPresenter >> remote: anObject [ remote := anObject ] { #category : 'accessing' } -IceGitHubRemoveBranchesModel >> timeSinceLastCommit: branch [ +IceGitHubRemoveBranchesPresenter >> timeSinceLastCommit: branch [ | lastCommitDate | lastCommitDate := ((((branch at: 'commit') at: 'commit') @@ -118,14 +118,14 @@ IceGitHubRemoveBranchesModel >> timeSinceLastCommit: branch [ ] { #category : 'initialization' } -IceGitHubRemoveBranchesModel >> titleForWindow [ +IceGitHubRemoveBranchesPresenter >> titleForWindow [ ^ 'Select branches to remove on remote {1}' format: { self remote name } ] { #category : 'private' } -IceGitHubRemoveBranchesModel >> triggerAcceptAction [ +IceGitHubRemoveBranchesPresenter >> triggerAcceptAction [ acceptBlock ifNil: [ ^ self ]. acceptBlock value: selectedItems diff --git a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st index 48525b2273..9a0eb4bc29 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st @@ -63,7 +63,7 @@ IceGitHubTipPullRequestBrowser >> acceptButton [ { #category : 'actions' } IceGitHubTipPullRequestBrowser >> acceptPullRequest [ - IceGitHubAcceptPullRequestModel new + IceGitHubAcceptPullRequestPresenter new onAccept: [ :aModel | IceGitHubAPI ensureCredentials. self pullRequest acceptMessage: aModel message type: aModel type. @@ -260,7 +260,7 @@ IceGitHubTipPullRequestBrowser >> rejectButton [ { #category : 'actions' } IceGitHubTipPullRequestBrowser >> rejectPullRequest [ - ((IceGitHubRejectPullRequestModel newApplication: self application) + ((IceGitHubRejectPullRequestPresenter newApplication: self application) onAccept: [ :aModel | IceGitHubAPI ensureCredentials. self pullRequest rejectMessage: aModel message. diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st index d47f721a0e..ccd135bc0b 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st @@ -106,7 +106,7 @@ IceTipGitHubPullRequestListBrowser >> initializePresenters [ super initializePresenters. pullRequests := self newTable. - details := self instantiate: IceGitHubPullRequestDetailModel. + details := self instantiate: IceGitHubPullRequestDetailPresenter. self initializePullRequestsTable. From b21379abecca1a980a60d94994fad1ca2e2324dd Mon Sep 17 00:00:00 2001 From: AlexisCnockaert Date: Thu, 9 Jan 2025 10:40:13 +0100 Subject: [PATCH 2/3] Branch: renameStColorPicker, Fixes # 1874 --- .../IceGitHubAcceptPullRequestPresenter.class.st | 6 ++++++ .../IceGitHubCreatePullRequestPresenter.class.st | 6 ++++++ .../IceGitHubPullRequestDetailPresenter.class.st | 6 ++++++ .../IceGitHubRejectPullRequestPresenter.class.st | 6 ++++++ .../IceGitHubRemoveBranchesPresenter.class.st | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st index 27f7c718ab..b15f76f86b 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestPresenter.class.st @@ -16,6 +16,12 @@ Class { #tag : 'View' } +{ #category : 'class initialization' } +IceGitHubAcceptPullRequestPresenter class >> initialize [ + + self deprecatedAliases: { #IceGitHubAcceptPullRequestModel } +] + { #category : 'actions' } IceGitHubAcceptPullRequestPresenter >> accept [ diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st index 81e644192e..976dc04aed 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestPresenter.class.st @@ -31,6 +31,12 @@ Class { #tag : 'View' } +{ #category : 'class initialization' } +IceGitHubCreatePullRequestPresenter class >> initialize [ + + self deprecatedAliases: { #IceGitHubCreatePullReqsuestModel } +] + { #category : 'instance creation' } IceGitHubCreatePullRequestPresenter class >> new [ self error: 'Use #repository:credentials:headRemote:' diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailPresenter.class.st index 5dff6cadf9..aff039d0f7 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailPresenter.class.st @@ -37,6 +37,12 @@ IceGitHubPullRequestDetailPresenter class >> buildCommandsGroupWith: presenterIn register: (IceTipOpenCheckUrlCommand forSpecContext: presenterIntance)) ] +{ #category : 'class initialization' } +IceGitHubPullRequestDetailPresenter class >> initialize [ + + self deprecatedAliases: { #IceGitHubPullRequestDetailModel } +] + { #category : 'accessing - ui' } IceGitHubPullRequestDetailPresenter >> authorLabel [ ^ authorLabel diff --git a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st index 1ce09264f3..3b19ec2798 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestPresenter.class.st @@ -15,6 +15,12 @@ Class { #tag : 'View' } +{ #category : 'class initialization' } +IceGitHubRejectPullRequestPresenter class >> initialize [ + + self deprecatedAliases: { #IceGitHubRejectPullRequestModel } +] + { #category : 'actions' } IceGitHubRejectPullRequestPresenter >> accept [ diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st index b7f499ae39..440841baf3 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesPresenter.class.st @@ -16,6 +16,12 @@ Class { #tag : 'View' } +{ #category : 'class initialization' } +IceGitHubRemoveBranchesPresenter class >> initialize [ + + self deprecatedAliases: { #IceGitHubRemoveBranchesModel } +] + { #category : 'actions' } IceGitHubRemoveBranchesPresenter >> confirmSelection [ From ec721d88aeebe23df5847f484f851063ee347f1c Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 9 Jan 2025 18:01:49 +0100 Subject: [PATCH 3/3] Remove duplicated methods Those methods have an equivalent in their superclass --- Iceberg-TipUI/IceTipDiffPanel.class.st | 19 ------------------- Iceberg/MCGitlabRepository.extension.st | 15 --------------- 2 files changed, 34 deletions(-) delete mode 100644 Iceberg/MCGitlabRepository.extension.st diff --git a/Iceberg-TipUI/IceTipDiffPanel.class.st b/Iceberg-TipUI/IceTipDiffPanel.class.st index 3a72a20929..ae2f986e43 100644 --- a/Iceberg-TipUI/IceTipDiffPanel.class.st +++ b/Iceberg-TipUI/IceTipDiffPanel.class.st @@ -188,13 +188,6 @@ IceTipDiffPanel >> iceNodesTree [ ^ iceNodesTree ] -{ #category : 'initialization' } -IceTipDiffPanel >> initialize [ - - super initialize. - self subscribeToAnnouncements -] - { #category : 'initialization' } IceTipDiffPanel >> initializeDiffPanel [ @@ -234,12 +227,6 @@ IceTipDiffPanel >> mainList [ ^iceNodesTree ] -{ #category : 'accessing' } -IceTipDiffPanel >> model [ - - ^ model -] - { #category : 'accessing' } IceTipDiffPanel >> refresh [ @@ -277,12 +264,6 @@ IceTipDiffPanel >> selectionChanged [ right: itemValue leftContents ] ] -{ #category : 'initialization' } -IceTipDiffPanel >> setModelBeforeInitialization: anObject [ - - model := anObject -] - { #category : 'initialization' } IceTipDiffPanel >> subscribeToAnnouncements [ diff --git a/Iceberg/MCGitlabRepository.extension.st b/Iceberg/MCGitlabRepository.extension.st deleted file mode 100644 index 85d4ffcfc2..0000000000 --- a/Iceberg/MCGitlabRepository.extension.st +++ /dev/null @@ -1,15 +0,0 @@ -Extension { #name : 'MCGitlabRepository' } - -{ #category : '*Iceberg' } -MCGitlabRepository >> httpsUrl [ - ^ 'https://<1s>/<2s>.git' expandMacrosWith: self hostname with: projectPath -] - -{ #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" - - ^ self sshPort - ifNil: [ 'git@<1s>:<2s>.git' expandMacrosWith: self hostname with: projectPath ] - ifNotNil: [ :port | 'ssh://git@<1s>:<2s>/<3s>.git' expandMacrosWith: self hostname with: port with: projectPath ] -]