From d9318fdc5791eb758d698b7d0a87ad4ae8130548 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 23 Sep 2014 16:27:49 +0400
Subject: [PATCH] Create Function From Usage: Make
 ClassCandidateListCellRenderer nested class

---
 .../ClassCandidateListCellRenderer.kt         | 25 -------------------
 .../CreateFunctionFromUsageFix.kt             | 20 +++++++++++++++
 2 files changed, 20 insertions(+), 25 deletions(-)
 delete mode 100644 idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.kt
deleted file mode 100644
index b95fb3ef42b..00000000000
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/ClassCandidateListCellRenderer.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction
-
-import com.intellij.ide.util.PsiElementListCellRenderer
-import org.jetbrains.jet.lang.psi.JetClass
-import org.jetbrains.jet.plugin.presentation.JetClassPresenter
-
-import javax.swing.*
-import java.awt.*
-
-class ClassCandidateListCellRenderer : PsiElementListCellRenderer<JetClass>() {
-    private val presenter = JetClassPresenter()
-
-    override fun getElementText(element: JetClass): String? =
-            presenter.getPresentation(element)?.getPresentableText()
-
-    protected override fun getContainerText(element: JetClass?, name: String?): String? =
-            element?.let { presenter.getPresentation(it) }?.getLocationString()
-
-    override fun getIconFlags(): Int = 0
-
-    public override fun getListCellRendererComponent(
-            list: JList<out Any?>, value: Any?, index: Int, isSelected: Boolean, cellHasFocus: Boolean
-    ): Component? =
-            super.getListCellRendererComponent(list, (value as ClassCandidate).jetClass, index, isSelected, cellHasFocus)
-}
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt
index b968bc022d2..4930333616b 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt
@@ -68,6 +68,9 @@ import org.jetbrains.jet.plugin.quickfix.QuickFixUtil
 import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase
 import org.jetbrains.jet.plugin.refactoring.EmptyValidator
 import org.jetbrains.jet.plugin.refactoring.CollectingValidator
+import com.intellij.ide.util.PsiElementListCellRenderer
+import org.jetbrains.jet.plugin.presentation.JetClassPresenter
+import java.awt.Component
 
 private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList"
 private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt"
@@ -325,6 +328,23 @@ public class CreateFunctionFromUsageFix internal (
         private val returnType: TypeOrExpressionThereof,
         private val parameters: List<Parameter> = Collections.emptyList()
 ) : CreateFromUsageFixBase(element) {
+    private class ClassCandidateListCellRenderer : PsiElementListCellRenderer<JetClass>() {
+        private val presenter = JetClassPresenter()
+
+        override fun getElementText(element: JetClass): String? =
+                presenter.getPresentation(element)?.getPresentableText()
+
+        protected override fun getContainerText(element: JetClass?, name: String?): String? =
+                element?.let { presenter.getPresentation(it) }?.getLocationString()
+
+        override fun getIconFlags(): Int = 0
+
+        public override fun getListCellRendererComponent(
+                list: JList<out Any?>, value: Any?, index: Int, isSelected: Boolean, cellHasFocus: Boolean
+        ): Component? =
+                super.getListCellRendererComponent(list, (value as ClassCandidate).jetClass, index, isSelected, cellHasFocus)
+    }
+
     private var isUnit: Boolean = false
     private var isExtension: Boolean = false
     private var currentFile: JetFile by Delegates.notNull()