diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index 8e22161b5bb725ab4a4aab912fd57b1373df8e18..7eeccc9be5b3e6434a1ccaf6a357fde8bea9ec50 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -129,19 +129,6 @@ export abstract class TreeViewsViewletPanel extends ViewsViewletPanel { } } - protected renderHeader(container: HTMLElement): void { - super.renderHeader(container); - - // Expand on drag over - this.dragHandler = new DelayedDragHandler(container, () => this.setExpanded(true)); - } - - protected renderViewTree(container: HTMLElement): HTMLElement { - const treeContainer = document.createElement('div'); - container.appendChild(treeContainer); - return treeContainer; - } - getViewer(): WorkbenchTree { return this.tree; } @@ -160,14 +147,6 @@ export abstract class TreeViewsViewletPanel extends ViewsViewletPanel { this.focusTree(); } - protected reveal(element: any, relativeTop?: number): TPromise { - if (!this.tree) { - return TPromise.as(null); // return early if viewlet has not yet been created - } - - return this.tree.reveal(element, relativeTop); - } - layoutBody(size: number): void { if (this.tree) { this.treeContainer.style.height = size + 'px'; @@ -175,47 +154,25 @@ export abstract class TreeViewsViewletPanel extends ViewsViewletPanel { } } - getActions(): IAction[] { - return []; - } - - getSecondaryActions(): IAction[] { - return []; - } - - getActionItem(action: IAction): IActionItem { - return null; - } - - getActionsContext(): any { - return undefined; - } - - getOptimalWidth(): number { - return 0; - } + protected renderHeader(container: HTMLElement): void { + super.renderHeader(container); - create(): TPromise { - return TPromise.as(null); + // Expand on drag over + this.dragHandler = new DelayedDragHandler(container, () => this.setExpanded(true)); } - shutdown(): void { - // Subclass to implement + protected renderViewTree(container: HTMLElement): HTMLElement { + const treeContainer = document.createElement('div'); + container.appendChild(treeContainer); + return treeContainer; } - dispose(): void { - this.isDisposed = true; - this.treeContainer = null; - - if (this.tree) { - this.tree.dispose(); - } - - if (this.dragHandler) { - this.dragHandler.dispose(); + protected reveal(element: any, relativeTop?: number): TPromise { + if (!this.tree) { + return TPromise.as(null); // return early if viewlet has not yet been created } - super.dispose(); + return this.tree.reveal(element, relativeTop); } protected updateTreeVisibility(tree: WorkbenchTree, isVisible: boolean): void { @@ -250,6 +207,21 @@ export abstract class TreeViewsViewletPanel extends ViewsViewletPanel { // Pass Focus to Viewer this.tree.DOMFocus(); } + + dispose(): void { + this.isDisposed = true; + this.treeContainer = null; + + if (this.tree) { + this.tree.dispose(); + } + + if (this.dragHandler) { + this.dragHandler.dispose(); + } + + super.dispose(); + } } export interface IViewletViewOptions extends IViewOptions {