From 16295b875b097c22805872ba6025c7edde8a92ca Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 26 Mar 2015 14:34:32 +0300
Subject: [PATCH] Removed methods not need anymore

---
 j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt    | 2 +-
 j2k/src/org/jetbrains/kotlin/j2k/SwitchConverter.kt | 2 +-
 j2k/src/org/jetbrains/kotlin/j2k/Utils.kt           | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt
index 5b95b266c04..2bad11a63ee 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt
@@ -123,7 +123,7 @@ class ForConverter(
 
     private fun convertToForeach(): ForeachStatement? {
         if (initialization is PsiDeclarationStatement) {
-            val loopVar = initialization.getDeclaredElements().singleOrNull2() as? PsiLocalVariable
+            val loopVar = initialization.getDeclaredElements().singleOrNull() as? PsiLocalVariable
             if (loopVar != null
                     && !loopVar.hasWriteAccesses(referenceSearcher, body)
                     && !loopVar.hasWriteAccesses(referenceSearcher, condition)
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/SwitchConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/SwitchConverter.kt
index c642f343554..382f71fd0bf 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/SwitchConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/SwitchConverter.kt
@@ -93,7 +93,7 @@ class SwitchConverter(private val codeConverter: CodeConverter) {
             false
         }
         else {
-            val block = case.statements.singleOrNull2() as? PsiBlockStatement
+            val block = case.statements.singleOrNull() as? PsiBlockStatement
             val statements = if (block != null) block.getCodeBlock().getStatements().toList() else case.statements
             !statements.any { it is PsiBreakStatement || it is PsiContinueStatement || it is PsiReturnStatement || it is PsiThrowStatement }
         }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt
index d8c80b8338b..750f6a7874a 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt
@@ -120,9 +120,6 @@ fun PsiModifierListOwner.accessModifier(): String = when {
 
 fun PsiMethod.isMainMethod(): Boolean = PsiMethodUtil.isMainMethod(this)
 
-fun <T: Any> List<T>.singleOrNull2(): T? = if (size() == 1) this[0] else null
-fun <T: Any> Array<T>.singleOrNull2(): T? = if (size() == 1) this[0] else null
-
 fun PsiMember.isImported(file: PsiJavaFile): Boolean {
     if (this is PsiClass) {
         val fqName = getQualifiedName()