From 151b5c6c2202071357f697fe5e0510827f111d30 Mon Sep 17 00:00:00 2001 From: Eric Winger Date: Tue, 14 Aug 2018 17:30:36 -0700 Subject: [PATCH] method source update Method updates should not update the browser if the proper method isn't selected --- sources/JadeiteProjectsBrowserPresenter.cls | 2 +- sources/Rowan UI Base.pax | 6 +++--- sources/RowanMethodService.cls | 14 ++++++++------ sources/RowanService.cls | 5 +++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/sources/JadeiteProjectsBrowserPresenter.cls b/sources/JadeiteProjectsBrowserPresenter.cls index 12c9d9a4..4c2487c0 100644 --- a/sources/JadeiteProjectsBrowserPresenter.cls +++ b/sources/JadeiteProjectsBrowserPresenter.cls @@ -916,7 +916,7 @@ registerPresentersForUpdates selector: #classMethodsUpdate:browser: browser: self. BrowserUpdate current register: methodListPresenter selector: #methodsRemoved:. - BrowserUpdate current register: methodSourcePresenter selector: #methodSourceUpdate:! + BrowserUpdate current register: methodSourcePresenter selector: #methodSourceUpdate:browser: browser: self. ! releasedReferencedServices: selectionChangingEvent selectionChangingEvent window presenter selectionOrNil diff --git a/sources/Rowan UI Base.pax b/sources/Rowan UI Base.pax index 7e13677c..672c512b 100644 --- a/sources/Rowan UI Base.pax +++ b/sources/Rowan UI Base.pax @@ -171,7 +171,7 @@ package methodNames add: #RowanCommandResult -> #filterUpdate:browser:; add: #RowanCommandResult -> #globalsUpdate:; add: #RowanCommandResult -> #methodFilterUpdate:; - add: #RowanCommandResult -> #methodSourceUpdate:; + add: #RowanCommandResult -> #methodSourceUpdate:browser:; add: #RowanCommandResult -> #methodsRemoved:; add: #RowanCommandResult -> #methodsUpdate:; add: #RowanCommandResult -> #packagesUpdate:; @@ -2203,7 +2203,7 @@ globalsUpdate: presenter! methodFilterUpdate: presenter ! -methodSourceUpdate: presenter +methodSourceUpdate: presenter browser: anObject ! methodsRemoved: presenter @@ -2263,7 +2263,7 @@ updateType !RowanCommandResult categoriesFor: #filterUpdate:browser:!public!updating! ! !RowanCommandResult categoriesFor: #globalsUpdate:!public!updating! ! !RowanCommandResult categoriesFor: #methodFilterUpdate:!public!updating! ! -!RowanCommandResult categoriesFor: #methodSourceUpdate:!public!updating! ! +!RowanCommandResult categoriesFor: #methodSourceUpdate:browser:!public!updating! ! !RowanCommandResult categoriesFor: #methodsRemoved:!public!updating! ! !RowanCommandResult categoriesFor: #methodsUpdate:!public!updating! ! !RowanCommandResult categoriesFor: #packagesUpdate:!public!updating! ! diff --git a/sources/RowanMethodService.cls b/sources/RowanMethodService.cls index 05d91d22..5ae25894 100644 --- a/sources/RowanMethodService.cls +++ b/sources/RowanMethodService.cls @@ -152,11 +152,13 @@ methodDefinitions: anObject methodDefinitions := anObject. self trigger: #changed! -methodSourceUpdate: presenter - presenter value: source. - presenter view - backcolor: JadeTextStyles default colorForNoEdits; - isModified: false! +methodSourceUpdate: presenter browser: browser + browser methodListPresenter selection = self + ifTrue: + [presenter value: source. + presenter view + backcolor: JadeTextStyles default colorForNoEdits; + isModified: false]! oop @@ -351,7 +353,7 @@ user: anObject !RowanMethodService categoriesFor: #meta:!accessing!private! ! !RowanMethodService categoriesFor: #methodDefinitions!accessing!private! ! !RowanMethodService categoriesFor: #methodDefinitions:!accessing!private! ! -!RowanMethodService categoriesFor: #methodSourceUpdate:!public!updating! ! +!RowanMethodService categoriesFor: #methodSourceUpdate:browser:!public!updating! ! !RowanMethodService categoriesFor: #oop!public! ! !RowanMethodService categoriesFor: #oopType!public! ! !RowanMethodService categoriesFor: #packageName!accessing!private! ! diff --git a/sources/RowanService.cls b/sources/RowanService.cls index de9edd22..7451326a 100644 --- a/sources/RowanService.cls +++ b/sources/RowanService.cls @@ -134,7 +134,8 @@ isTestCase methodFilterUpdate: presenter ! -methodSourceUpdate: presenter! +methodSourceUpdate: presenter browser: anObject + ! methodsRemoved: presenter ! @@ -293,7 +294,7 @@ variableListUpdate: aPresenter! ! !RowanService categoriesFor: #isProjectService!public!testing! ! !RowanService categoriesFor: #isTestCase!public!testing! ! !RowanService categoriesFor: #methodFilterUpdate:!public!updating! ! -!RowanService categoriesFor: #methodSourceUpdate:!public!updating! ! +!RowanService categoriesFor: #methodSourceUpdate:browser:!public!updating! ! !RowanService categoriesFor: #methodsRemoved:!public!updating! ! !RowanService categoriesFor: #methodsUpdate:!public!updating! ! !RowanService categoriesFor: #name!accessing!public! !