Merge pull request #1290 from Julesboul/fix/protocolChoice

Fix bug when choosing a protocol name

Author: jecisc

src/NewTools-Core-Tests/StProtocolNameChooserPresenterTest.class.st

@@ -18,16 +18,6 @@ StProtocolNameChooserPresenterTest >> setUp [
 	presenter := StProtocolNameChooserPresenter new
 ]
 
-{ #category : 'running' }
-StProtocolNameChooserPresenterTest >> testAddButtonIsDiabledWhenTextFieldIsEmpty [
-
-	self assertEmpty: presenter protocolName.
-	self deny: presenter newProtocolButton isEnabled.
-
-	presenter protocolName: 'ANewProtocol'.
-	self assert: presenter newProtocolButton isEnabled
-]
-
 { #category : 'tests' }
 StProtocolNameChooserPresenterTest >> testCreatingProtocolThatDoesntExists [
 "When creating a protocol that doesn't exist beforehand, it should create it correctly with the same name as written."
@@ -44,16 +34,15 @@ StProtocolNameChooserPresenterTest >> testCreatingProtocolThatDoesntExists [
 
 { #category : 'tests' }
 StProtocolNameChooserPresenterTest >> testCreatingProtocolThatExists [
-"When creating a protocol that does exist beforehand, it should create the name of the suggested protocol instead of the name written."
-	| protocolName |
+	"When creating a new protocol, it should create the name written."
 
-	protocolName := 'acc' .
+	| protocolName |
+	protocolName := 'acc'.
 	presenter concernedClass: self class.
-	
+
 	presenter protocolName: protocolName.
 	presenter doAcceptFromTextInput.
-	self assert: presenter selectedProtocolName equals: 'accessing' 
-
+	self assert: presenter selectedProtocolName equals: 'acc'
 ]
 
 { #category : 'tests' }

src/NewTools-Core/StProtocolNameChooserPresenter.class.st

@@ -18,7 +18,6 @@ Class {
 		'suggestionList',
 		'protocolNameField',
 		'concernedClass',
-		'newProtocolButton',
 		'selectedProtocolName'
 	],
 	#category : 'NewTools-Core-Calypso',
@@ -76,9 +75,7 @@ StProtocolNameChooserPresenter >> connectPresenters [
 	protocolNameField whenTextChangedDo: [ self updatePresenter ].
 	protocolNameField whenSubmitDo: [ :aString | self doAcceptFromTextInput  ].
 
-	suggestionList whenActivatedDo: [ self doAcceptFromList ].
-	
-	newProtocolButton action: [ self doAcceptFromTextInput ]
+	suggestionList whenActivatedDo: [ self doAcceptFromList ]
 ]
 
 { #category : 'layout' }
@@ -90,7 +87,6 @@ StProtocolNameChooserPresenter >> defaultLayout [
 		add: (SpBoxLayout newLeftToRight
 				spacing: 3;
 				add: protocolNameField expand: true;
-				add: newProtocolButton expand: false;
 				yourself)
 			expand: false;
 		yourself
@@ -106,8 +102,7 @@ StProtocolNameChooserPresenter >> doAcceptFromList [
 { #category : 'private - actions' }
 StProtocolNameChooserPresenter >> doAcceptFromTextInput [
 
-	selectedProtocolName := suggestionList selectedItem 
-		ifNil: [  protocolNameField text. ].
+	selectedProtocolName := protocolNameField text.
 	self withWindowDo: [ :w | w beOk; close ]
 ]
 
@@ -128,12 +123,6 @@ StProtocolNameChooserPresenter >> initializePresenters [
 	protocolNameField := self newTextInput.
 	protocolNameField placeholder: 'Protocol name (e.g. accessing)'.
 
-	newProtocolButton := self newButton.
-	newProtocolButton
-		addStyle: 'small';
-		icon: (self iconNamed: #add);
-		help: 'Create a new protocol with the content of the input field if this protocol is not in the list'.
-
 	self initializeProtocolNameField
 ]
 
@@ -166,12 +155,6 @@ StProtocolNameChooserPresenter >> initializeWindow: aWindowPresenter [
 	aWindowPresenter whenOpenedDo: [ protocolNameField takeKeyboardFocus ]
 ]
 
-{ #category : 'private - accessing' }
-StProtocolNameChooserPresenter >> newProtocolButton [
-
-	^ newProtocolButton
-]
-
 { #category : 'private - accessing' }
 StProtocolNameChooserPresenter >> protocolName [
 	^ protocolNameField text asSymbol
@@ -249,9 +232,6 @@ StProtocolNameChooserPresenter >> selectedProtocolName [
 { #category : 'initialization' }
 StProtocolNameChooserPresenter >> updatePresenter [
 
-	newProtocolButton enabled: self protocolName isNotEmpty.
-
 	suggestionList
-		items: self protocolsToSuggest;
-		selectFirst
+		items: self protocolsToSuggest
 ]