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] 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') ) ]