From d6f0a591bbde2f0107bd1fb359e00f5858f8f1f0 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 23 Feb 2018 18:43:58 +0100 Subject: [PATCH] panel and viewlet enablement rename --- .../browser/parts/activitybar/activitybarPart.ts | 2 +- src/vs/workbench/browser/parts/panel/panelPart.ts | 2 +- src/vs/workbench/parts/search/browser/replaceService.ts | 8 ++++---- src/vs/workbench/services/panel/common/panelService.ts | 2 +- .../services/progress/test/progressService.test.ts | 6 +++--- src/vs/workbench/services/viewlet/browser/viewlet.ts | 4 ++-- .../workbench/services/viewlet/browser/viewletService.ts | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index 3a006681555..fb0abcaebbd 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -86,7 +86,7 @@ export class ActivitybarPart extends Part { // Deactivate viewlet action on close this.toUnbind.push(this.viewletService.onDidViewletClose(viewlet => this.compositeBar.deactivateComposite(viewlet.getId()))); this.toUnbind.push(this.compositeBar.onDidContextMenu(e => this.showContextMenu(e))); - this.toUnbind.push(this.viewletService.onDidViewletEnable(({ id, enabled }) => { + this.toUnbind.push(this.viewletService.onDidViewletEnablementChange(({ id, enabled }) => { if (enabled) { this.compositeBar.addComposite(this.viewletService.getViewlet(id)); } else { diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts index bd7143f497b..bb74e114f9c 100644 --- a/src/vs/workbench/browser/parts/panel/panelPart.ts +++ b/src/vs/workbench/browser/parts/panel/panelPart.ts @@ -175,7 +175,7 @@ export class PanelPart extends CompositePart implements IPanelService { .sort((v1, v2) => v1.order - v2.order); } - public enablePanel(id: string, enabled: boolean): void { + public setPanelEnablement(id: string, enabled: boolean): void { const descriptor = Registry.as(PanelExtensions.Panels).getPanels().filter(p => p.id === id).pop(); if (descriptor && descriptor.enabled !== enabled) { descriptor.enabled = enabled; diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts index c120cb59ab6..2ba4b4d6cb2 100644 --- a/src/vs/workbench/parts/search/browser/replaceService.ts +++ b/src/vs/workbench/parts/search/browser/replaceService.ts @@ -109,12 +109,12 @@ export class ReplaceService implements IReplaceService { const updateSearchViewLocation = () => { const config = configurationService.getValue(); if (config.search.location === 'panel') { - viewletService.enableViewlet(VIEW_ID, false); - panelService.enablePanel(VIEW_ID, true); + viewletService.setViewletEnablement(VIEW_ID, false); + panelService.setPanelEnablement(VIEW_ID, true); } if (config.search.location === 'sidebar') { - panelService.enablePanel(VIEW_ID, false); - viewletService.enableViewlet(VIEW_ID, true); + panelService.setPanelEnablement(VIEW_ID, false); + viewletService.setViewletEnablement(VIEW_ID, true); } }; configurationService.onDidChangeConfiguration(e => { diff --git a/src/vs/workbench/services/panel/common/panelService.ts b/src/vs/workbench/services/panel/common/panelService.ts index ab9a41d2f10..5df76a3f635 100644 --- a/src/vs/workbench/services/panel/common/panelService.ts +++ b/src/vs/workbench/services/panel/common/panelService.ts @@ -42,5 +42,5 @@ export interface IPanelService { * Enables or disables a panel. Disabled panels are completly hidden from UI. * By default all panels are enabled. */ - enablePanel(id: string, enabled: boolean): void; + setPanelEnablement(id: string, enabled: boolean): void; } diff --git a/src/vs/workbench/services/progress/test/progressService.test.ts b/src/vs/workbench/services/progress/test/progressService.test.ts index 11dc5122571..b47aad236ff 100644 --- a/src/vs/workbench/services/progress/test/progressService.test.ts +++ b/src/vs/workbench/services/progress/test/progressService.test.ts @@ -28,7 +28,7 @@ class TestViewletService implements IViewletService { onDidViewletOpen = this.onDidViewletOpenEmitter.event; onDidViewletClose = this.onDidViewletCloseEmitter.event; - onDidViewletEnable = this.onDidViewletEnableEmitter.event; + onDidViewletEnablementChange = this.onDidViewletEnableEmitter.event; public openViewlet(id: string, focus?: boolean): TPromise { return TPromise.as(null); @@ -41,7 +41,7 @@ class TestViewletService implements IViewletService { public getActiveViewlet(): IViewlet { return activeViewlet; } - public enableViewlet(id: string, enabled: boolean): void { } + public setViewletEnablement(id: string, enabled: boolean): void { } public dispose() { } @@ -77,7 +77,7 @@ class TestPanelService implements IPanelService { return activeViewlet; } - public enablePanel(id: string, enabled: boolean): void { } + public setPanelEnablement(id: string, enabled: boolean): void { } public dispose() { } diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts index 75e3e4708e6..d416809eb39 100644 --- a/src/vs/workbench/services/viewlet/browser/viewlet.ts +++ b/src/vs/workbench/services/viewlet/browser/viewlet.ts @@ -18,7 +18,7 @@ export interface IViewletService { onDidViewletOpen: Event; onDidViewletClose: Event; - onDidViewletEnable: Event<{ id: string, enabled: boolean }>; + onDidViewletEnablementChange: Event<{ id: string, enabled: boolean }>; /** * Opens a viewlet with the given identifier and pass keyboard focus to it if specified. @@ -49,7 +49,7 @@ export interface IViewletService { * Enables or disables a viewlet. Disabled viewlets are completly hidden from UI. * By default all viewlets are enabled. */ - enableViewlet(id: string, enabled: boolean): void; + setViewletEnablement(id: string, enabled: boolean): void; /** * diff --git a/src/vs/workbench/services/viewlet/browser/viewletService.ts b/src/vs/workbench/services/viewlet/browser/viewletService.ts index 6f5d71b1412..3708327ee53 100644 --- a/src/vs/workbench/services/viewlet/browser/viewletService.ts +++ b/src/vs/workbench/services/viewlet/browser/viewletService.ts @@ -35,7 +35,7 @@ export class ViewletService implements IViewletService { public get onDidViewletOpen(): Event { return this.sidebarPart.onDidViewletOpen; } public get onDidViewletClose(): Event { return this.sidebarPart.onDidViewletClose; } - public get onDidViewletEnable(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; } + public get onDidViewletEnablementChange(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; } constructor( sidebarPart: SidebarPart, @@ -84,7 +84,7 @@ export class ViewletService implements IViewletService { }); } - public enableViewlet(id: string, enabled: boolean): void { + public setViewletEnablement(id: string, enabled: boolean): void { const descriptor = this.getBuiltInViewlets().filter(desc => desc.id === id).pop(); if (descriptor && descriptor.enabled !== enabled) { descriptor.enabled = enabled; -- GitLab