From 4b591bf41f1bdc101a74a96f6b73d265c81ebbd8 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 18 Nov 2016 12:30:02 +0100
Subject: [PATCH] KotlinStructureViewModel: J2K

---
 .../structureView/KotlinStructureViewModel.kt | 46 +++++++++----------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt
index b392cdff32a..726107dea3e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.kt
@@ -14,38 +14,34 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.structureView;
+package org.jetbrains.kotlin.idea.structureView
 
-import com.intellij.ide.structureView.StructureViewModelBase;
-import com.intellij.ide.util.treeView.smartTree.NodeProvider;
-import com.intellij.ide.util.treeView.smartTree.Sorter;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.psi.KtDeclaration;
-import org.jetbrains.kotlin.psi.KtFile;
+import com.intellij.ide.structureView.StructureViewModelBase
+import com.intellij.ide.util.treeView.smartTree.NodeProvider
+import com.intellij.ide.util.treeView.smartTree.Sorter
+import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.psi.KtFile
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.Arrays
 
-public class KotlinStructureViewModel extends StructureViewModelBase {
-    private static final Collection<NodeProvider> NODE_PROVIDERS = Arrays.<NodeProvider>asList(
-            new KotlinInheritedMembersNodeProvider());
+class KotlinStructureViewModel(jetFile: KtFile) : StructureViewModelBase(jetFile, KotlinStructureViewElement(jetFile, false)) {
 
-    private static final Sorter[] sorters = new Sorter[] {Sorter.ALPHA_SORTER};
-
-    public KotlinStructureViewModel(@NotNull KtFile jetFile) {
-        super(jetFile, new KotlinStructureViewElement(jetFile, false));
-        withSuitableClasses(KtDeclaration.class);
+    init {
+        withSuitableClasses(KtDeclaration::class.java)
     }
 
-    @NotNull
-    @Override
-    public Collection<NodeProvider> getNodeProviders() {
-        return NODE_PROVIDERS;
+    override fun getNodeProviders(): Collection<NodeProvider<*>> {
+        return NODE_PROVIDERS
     }
 
-    @NotNull
-    @Override
-    public Sorter[] getSorters() {
-        return sorters;
+    override fun getSorters(): Array<Sorter> {
+        return Companion.sorters
+    }
+
+    companion object {
+        private val NODE_PROVIDERS = Arrays.asList<NodeProvider<*>>(
+                KotlinInheritedMembersNodeProvider())
+
+        private val sorters = arrayOf(Sorter.ALPHA_SORTER)
     }
 }