From 3b3f9f70226992039d3bfd3dee8ae59d82c9adde Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 5 Feb 2014 17:22:06 +0400 Subject: [PATCH] Rewrite KotlinImportListRenderer to Java to make it compilable with both JDK 1.6 and JDK 1.7 In JDK 1.7 JList has generic parameter --- ...derer.kt => KotlinImportListRenderer.java} | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) rename idea/src/org/jetbrains/jet/plugin/codeInsight/{KotlinImportListRenderer.kt => KotlinImportListRenderer.java} (51%) diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinImportListRenderer.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinImportListRenderer.java similarity index 51% rename from idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinImportListRenderer.kt rename to idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinImportListRenderer.java index 809701e4d3c..a125b6a29ce 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinImportListRenderer.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinImportListRenderer.java @@ -14,16 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.codeInsight +package org.jetbrains.jet.plugin.codeInsight; -import com.intellij.ide.util.FQNameCellRenderer -import javax.swing.JList -import java.awt.Component +import com.intellij.ide.util.FQNameCellRenderer; +import org.jetbrains.annotations.NotNull; -class KotlinImportListRenderer: FQNameCellRenderer() { - override fun getListCellRendererComponent(list: JList?, value: Any?, index: Int, isSelected: Boolean, cellHasFocus: Boolean): Component? { - val component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus) - setIcon(null) - return component +import javax.swing.*; +import java.awt.*; + +/* package */ final class KotlinImportListRenderer extends FQNameCellRenderer { + @NotNull + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + setIcon(null); + return component; } -} \ No newline at end of file +}