From b425bf9a1bc1a3e5e0f23d23faeb7ff16d6fd00e Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 3 Feb 2020 03:48:10 +0300 Subject: [PATCH] 201: TreeStructureProvider api changed: AbstractTreeNode *> --- .../org/jetbrains/kotlin/idea/projectView/compat.kt | 11 +++++++++++ .../jetbrains/kotlin/idea/projectView/compat.kt.201 | 11 +++++++++++ .../kotlin/idea/projectView/projectViewProviders.kt | 12 ++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt create mode 100644 idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.201 diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt b/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt new file mode 100644 index 00000000000..d8037be2158 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt @@ -0,0 +1,11 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.projectView + +import com.intellij.ide.util.treeView.AbstractTreeNode + +// BUNCH: 193 +typealias AbstractTreeNodeAny = AbstractTreeNode \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.201 b/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.201 new file mode 100644 index 00000000000..323879b2b88 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/compat.kt.201 @@ -0,0 +1,11 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.projectView + +import com.intellij.ide.util.treeView.AbstractTreeNode + +// BUNCH: 193 +typealias AbstractTreeNodeAny = AbstractTreeNode<*> \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt b/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt index adf303d8a68..99f3c4a895c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/projectViewProviders.kt @@ -28,8 +28,8 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware { // should be called after ClassesTreeStructureProvider override fun modify( - parent: AbstractTreeNode, - children: Collection>, + parent: AbstractTreeNodeAny, + children: Collection, settings: ViewSettings ): Collection> { val result = ArrayList>() @@ -60,16 +60,16 @@ class KotlinExpandNodeProjectViewProvider : TreeStructureProvider, DumbAware { else -> null } - override fun getData(selected: Collection>, dataName: String): Any? = null + override fun getData(selected: Collection, dataName: String): Any? = null } class KotlinSelectInProjectViewProvider(private val project: Project) : SelectableTreeStructureProvider, DumbAware { - override fun getData(selected: Collection>, dataName: String): Any? = null + override fun getData(selected: Collection, dataName: String): Any? = null override fun modify( - parent: AbstractTreeNode, - children: Collection>, + parent: AbstractTreeNodeAny, + children: Collection, settings: ViewSettings ): Collection> { return ArrayList(children)