Merge branch 'Pharo14' into Refactoring/newdriver

Author: AlexisCnockaert

src/BeautifulComments/ClyRichTextClassCommentEditorToolMorph.class.st

@@ -94,6 +94,12 @@ ClyRichTextClassCommentEditorToolMorph >> printContext [
 	^super printContext , ' / ', editingClass name
 ]
 
+{ #category : 'event handling' }
+ClyRichTextClassCommentEditorToolMorph >> reactToRubTextAreaDoubleClick: anEvent [
+
+	self toggleMode
+]
+
 { #category : 'initialization' }
 ClyRichTextClassCommentEditorToolMorph >> setBackgroundColor: aColor [
 

src/Morphic-Core/BorderedMorph.class.st

@@ -220,6 +220,10 @@ BorderedMorph >> isTranslucentButNotTransparent [
 	^ false
 ]
 
+{ #category : 'event handling' }
+BorderedMorph >> reactToRubTextAreaDoubleClick: anEvent [
+]
+
 { #category : 'accessing' }
 BorderedMorph >> useSquareCorners [
 	self cornerStyle: #square

src/Refactoring-UI/ReGenerateAccessorsDriver.class.st

@@ -7,6 +7,9 @@ It uses the `RBGenerateEqualHashTransformation`.
 Class {
 	#name : 'ReGenerateAccessorsDriver',
 	#superclass : 'ReGenerateMethodDriver',
+	#instVars : [
+		'scopeInstanceSide'
+	],
 	#category : 'Refactoring-UI-Drivers',
 	#package : 'Refactoring-UI',
 	#tag : 'Drivers'
@@ -19,16 +22,20 @@ ReGenerateAccessorsDriver class >> refactoringClass [
 ]
 
 { #category : 'configuration' }
-ReGenerateAccessorsDriver >> instantiateRefactoring [
-		
-	^ ReUpFrontPreconditionCheckingCompositeRefactoring new
-		model: model; 
-		refactorings: (selectedVariables collect: [:each | 
-			self refactoringClass 
-				model: model 
-				instanceVariable: each 
-				class: self targetClass name ]);
-		yourself.
+ReGenerateAccessorsDriver >> configureRefactoring [
+
+	refactoring := ReUpFrontPreconditionCheckingCompositeRefactoring new
+		               model: model;
+		               refactorings: (selectedVariables collect: [ :eachSlot | self refactoringForSlot: eachSlot ]);
+		               yourself
+]
+
+{ #category : 'initialization' }
+ReGenerateAccessorsDriver >> refactoringForSlot: aSlot [
+
+	^ scopeInstanceSide
+		  ifFalse: [ self refactoringClass model: model classVariable: aSlot class: self targetClass name ]
+		  ifTrue: [ self refactoringClass model: model instanceVariable: aSlot class: self targetClass name ]
 ]
 
 { #category : 'configuration' }
@@ -38,6 +45,12 @@ ReGenerateAccessorsDriver >> runRefactoring [
 	self applyChanges
 ]
 
+{ #category : 'accessing' }
+ReGenerateAccessorsDriver >> scopeInstanceSide: aBoolean [
+
+	scopeInstanceSide := aBoolean
+]
+
 { #category : 'configuration' }
 ReGenerateAccessorsDriver >> selectedVariables: aCollection [
 

src/Rubric/RubAbstractTextArea.class.st

@@ -746,6 +746,8 @@ RubAbstractTextArea >> deselect [
 
 { #category : 'event handling' }
 RubAbstractTextArea >> doubleClick: anEvent [
+
+	model interactionModel reactToRubTextAreaDoubleClick: anEvent. 
 	^ self handleEdit: [ self editor doubleClick: anEvent ]
 ]
 

src/SystemCommands-VariableCommands/SycGenerateVariableAccessorCommand.class.st

@@ -22,13 +22,12 @@ SycGenerateVariableAccessorCommand >> defaultMenuItemName [
 
 { #category : 'execution' }
 SycGenerateVariableAccessorCommand >> execute [
-	
-	(ReGenerateAccessorsDriver new 
-		targetClass: variables first definingClass;
-		scopes: toolContext refactoringScopes;
-		selectedVariables: (variables collect: [:each | each name ]) ) runRefactoring
-	
 
+	(ReGenerateAccessorsDriver new
+		 targetClass: variables first definingClass;
+		 scopes: toolContext refactoringScopes;
+		 scopeInstanceSide: variables first definingClass isInstanceSide;
+		 selectedVariables: (variables collect: [ :each | each name ])) runRefactoring
 ]
 
 { #category : 'factory method' }