tree model: cleanup interface

joaomoreno · joaomoreno · commit b557d59b9e93 · 2018-12-14T12:22:03.000+01:00
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -321,11 +321,11 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 	}
 
 	expandAll(): void {
-		this.model.expandAll();
+		this.model.setCollapsed(this.model.rootRef, false, true);
 	}
 
 	collapseAll(): void {
-		this.model.collapseAll();
+		this.model.setCollapsed(this.model.rootRef, true, true);
 	}
 
 	isCollapsible(location: TRef): boolean {
diff --git a/src/vs/base/browser/ui/tree/indexTreeModel.ts b/src/vs/base/browser/ui/tree/indexTreeModel.ts
@@ -45,6 +45,8 @@ export interface IIndexTreeModelOptions<T, TFilterData> {
 
 export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = void> implements ITreeModel<T, TFilterData, number[]> {
 
+	readonly rootRef = [];
+
 	private root: IMutableTreeNode<T, TFilterData>;
 	private eventBufferer = new EventBufferer(); // TODO@joao is this really necessary
 
@@ -123,6 +125,14 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 		return this.getTreeNodeWithListIndex(location).listIndex;
 	}
 
+	isCollapsible(location: number[]): boolean {
+		return this.getTreeNode(location).collapsible;
+	}
+
+	isCollapsed(location: number[]): boolean {
+		return this.getTreeNode(location).collapsed;
+	}
+
 	setCollapsed(location: number[], collapsed?: boolean, recursive = false): boolean {
 		const { node, listIndex, revealed } = this.getTreeNodeWithListIndex(location);
 
@@ -167,22 +177,6 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
 		return result;
 	}
 
-	expandAll(): void {
-		this.setCollapsed([], false, true);
-	}
-
-	collapseAll(): void {
-		this.setCollapsed([], true, true);
-	}
-
-	isCollapsible(location: number[]): boolean {
-		return this.getTreeNode(location).collapsible;
-	}
-
-	isCollapsed(location: number[]): boolean {
-		return this.getTreeNode(location).collapsed;
-	}
-
 	refilter(): void {
 		const previousRenderNodeCount = this.root.renderNodeCount;
 		const toInsert = this.updateNodeAfterFilterChange(this.root);
diff --git a/src/vs/base/browser/ui/tree/objectTreeModel.ts b/src/vs/base/browser/ui/tree/objectTreeModel.ts
@@ -13,6 +13,8 @@ export interface IObjectTreeModelOptions<T, TFilterData> extends IIndexTreeModel
 
 export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends NonNullable<any> = void> implements ITreeModel<T | null, TFilterData, T | null> {
 
+	readonly rootRef = null;
+
 	private model: IndexTreeModel<T | null, TFilterData>;
 	private nodes = new Map<T | null, ITreeNode<T, TFilterData>>();
 
@@ -106,19 +108,6 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		return this.model.getListIndex(location);
 	}
 
-	setCollapsed(element: T, collapsed: boolean): boolean {
-		const location = this.getElementLocation(element);
-		return this.model.setCollapsed(location, collapsed);
-	}
-
-	expandAll(): void {
-		this.model.expandAll();
-	}
-
-	collapseAll(): void {
-		this.model.collapseAll();
-	}
-
 	isCollapsible(element: T): boolean {
 		const location = this.getElementLocation(element);
 		return this.model.isCollapsible(location);
@@ -129,6 +118,11 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		return this.model.isCollapsed(location);
 	}
 
+	setCollapsed(element: T, collapsed: boolean): boolean {
+		const location = this.getElementLocation(element);
+		return this.model.setCollapsed(location, collapsed);
+	}
+
 	refilter(): void {
 		this.model.refilter();
 	}
diff --git a/src/vs/base/browser/ui/tree/tree.ts b/src/vs/base/browser/ui/tree/tree.ts
@@ -86,6 +86,7 @@ export interface ITreeNode<T, TFilterData = void> {
 }
 
 export interface ITreeModel<T, TFilterData, TRef> {
+	readonly rootRef: TRef;
 	readonly onDidChangeCollapseState: Event<ITreeNode<T, TFilterData>>;
 	readonly onDidChangeRenderNodeCount: Event<ITreeNode<T, TFilterData>>;
 
@@ -101,8 +102,6 @@ export interface ITreeModel<T, TFilterData, TRef> {
 	isCollapsible(location: TRef): boolean;
 	isCollapsed(location: TRef): boolean;
 	setCollapsed(location: TRef, collapsed?: boolean, recursive?: boolean): boolean;
-	expandAll(): void;
-	collapseAll(): void;
 
 	refilter(): void;
 }

Original file line number	Diff line number	Diff line change
`@@ -321,11 +321,11 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`expandAll(): void {`
`324`		`- this.model.expandAll();`
	`324`	`+ this.model.setCollapsed(this.model.rootRef, false, true);`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`collapseAll(): void {`
`328`		`- this.model.collapseAll();`
	`328`	`+ this.model.setCollapsed(this.model.rootRef, true, true);`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`isCollapsible(location: TRef): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ export interface ITreeNode<T, TFilterData = void> {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`export interface ITreeModel<T, TFilterData, TRef> {`
	`89`	`+ readonly rootRef: TRef;`
`89`	`90`	`readonly onDidChangeCollapseState: Event<ITreeNode<T, TFilterData>>;`
`90`	`91`	`readonly onDidChangeRenderNodeCount: Event<ITreeNode<T, TFilterData>>;`
`91`	`92`
`@@ -101,8 +102,6 @@ export interface ITreeModel<T, TFilterData, TRef> {`
`101`	`102`	`isCollapsible(location: TRef): boolean;`
`102`	`103`	`isCollapsed(location: TRef): boolean;`
`103`	`104`	`setCollapsed(location: TRef, collapsed?: boolean, recursive?: boolean): boolean;`
`104`		`- expandAll(): void;`
`105`		`- collapseAll(): void;`
`106`	`105`
`107`	`106`	`refilter(): void;`
`108`	`107`	`}`