kill find replace service signleton

pharo-project · May 24, 2019 · dcf8ffe · dcf8ffe
1 parent c48d7a7
commit dcf8ffe
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 32 deletions.
diff --git a/src/Rubric/RubAbstractTextArea.class.st b/src/Rubric/RubAbstractTextArea.class.st
@@ -94,7 +94,8 @@ Class {
 		'getMenuPolicy',
 		'mouseDownPoint',
 		'completionEngine',
-		'maxLength'
+		'maxLength',
+		'findReplaceService'
 	],
 	#classVars : [
 		'BackgroundColor',
@@ -810,6 +811,12 @@ RubAbstractTextArea >> findRegex [
 	^ self editor findRegex
 ]
 
+{ #category : #'event handling' }
+RubAbstractTextArea >> findReplaceService [
+	^ findReplaceService ifNil: [
+		findReplaceService := RubFindReplaceService new ].
+]
+
 { #category : #'find-replace' }
 RubAbstractTextArea >> findText [
 	^ self editor findText
@@ -1022,7 +1029,7 @@ RubAbstractTextArea >> hasDecoratorNamed: aKey [
 
 { #category : #'find-replace' }
 RubAbstractTextArea >> hasFindReplaceFocus [
-	^ RubFindReplaceService default dialogIsActiveFor: self
+	^ self findReplaceService dialogIsActiveFor: self
 ]
 
 { #category : #'accessing editing state' }
@@ -1440,9 +1447,9 @@ RubAbstractTextArea >> paragraphWasComposedFrom: startIndex to: stopIndex [
 { #category : #initialization }
 RubAbstractTextArea >> plugFindReplace [
 	self announcer 
-		when:  MorphGotFocus send: #whenTextAreaGotFocus: to: RubFindReplaceService default;
-	 	when:  MorphLostFocus send: #whenTextAreaLostFocus: to: RubFindReplaceService default;	
-		when:  RubSelectionChanged send: #whenTextAreaSelectionChanged: to: RubFindReplaceService default
+		when:  MorphGotFocus send: #whenTextAreaGotFocus: to: self findReplaceService;
+	 	when:  MorphLostFocus send: #whenTextAreaLostFocus: to: self findReplaceService;	
+		when:  RubSelectionChanged send: #whenTextAreaSelectionChanged: to: self findReplaceService
 ]
 
 { #category : #'accessing selection' }
@@ -1915,7 +1922,7 @@ RubAbstractTextArea >> unplug [
 
 { #category : #initialization }
 RubAbstractTextArea >> unplugFindReplace [
-	self announcer unsubscribe: RubFindReplaceService default
+	self announcer unsubscribe: self findReplaceService
 
 ]
 

diff --git a/src/Rubric/RubFindReplaceDialogWindow.class.st b/src/Rubric/RubFindReplaceDialogWindow.class.st
@@ -9,51 +9,31 @@ Class {
 	],
 	#classVars : [
 		'Finds',
-		'Replacements',
-		'Singleton'
+		'Replacements'
 	],
 	#category : #'Rubric-Editing-FindReplaceService'
 }
 
-{ #category : #cleanup }
-RubFindReplaceDialogWindow class >> cleanUp [
-	Singleton ifNotNil: [ 
-			Singleton close.
-			Singleton := nil ]
-]
-
 { #category : #accessing }
 RubFindReplaceDialogWindow class >> finds [
 	^ Finds ifNil: [Finds := OrderedCollection new]
 ]
 
-{ #category : #accessing }
-RubFindReplaceDialogWindow class >> initialize [
-	"EditorFindReplaceDialogWindow initialize"
-	Singleton := nil.
-]
-
 { #category : #accessing }
 RubFindReplaceDialogWindow class >> maxPreviousListSize [
 	^ 15
 ]
 
 { #category : #accessing }
 RubFindReplaceDialogWindow class >> on: aTextView [
-	^ self singleton on: aTextView
+	^ self new on: aTextView
 ]
 
 { #category : #accessing }
 RubFindReplaceDialogWindow class >> replacements [
 	^ Replacements ifNil: [Replacements := OrderedCollection new]
 ]
 
-{ #category : #accessing }
-RubFindReplaceDialogWindow class >> singleton [ 
-	^ Singleton ifNil: [Singleton := self new].
-
-]
-
 { #category : #'user-interface' }
 RubFindReplaceDialogWindow >> buildWindowMenu [
 	"Build and answer the window menu."

diff --git a/src/Rubric/RubFindReplaceService.class.st b/src/Rubric/RubFindReplaceService.class.st
@@ -176,7 +176,7 @@ RubFindReplaceService >> findText [
 RubFindReplaceService >> findText: aStringOrText [
 	findText := aStringOrText asText.
 	self findPolicyChanged.
-	self textArea whenFindTextChanged: RubFindTextChanged new.
+	"self textArea whenFindTextChanged: RubFindTextChanged new."
 	^ true
 ]
 

diff --git a/src/Rubric/RubMethodEditingExample.class.st b/src/Rubric/RubMethodEditingExample.class.st
@@ -205,7 +205,7 @@ RubMethodEditingExample >> textModel [
 ]
 
 { #category : #accessing }
-RubMethodEditingExample >> updateCodeWith: someText. [
+RubMethodEditingExample >> updateCodeWith: someText [.
 	self textModel setText: someText.
 
 ]
diff --git a/src/Rubric/RubTextEditor.class.st b/src/Rubric/RubTextEditor.class.st
@@ -6,7 +6,8 @@ Class {
 	#superclass : #Object,
 	#instVars : [
 		'defaultKeymappingIndex',
-		'textArea'
+		'textArea',
+		'findReplaceService'
 	],
 	#category : #'Rubric-Editing-Core'
 }
@@ -1213,7 +1214,7 @@ RubTextEditor >> findRegex [
 
 { #category : #'find-select' }
 RubTextEditor >> findReplaceService [
-	^ RubFindReplaceService default
+	^ self textArea findReplaceService
 ]
 
 { #category : #'find-select' }