From 4ee59e351bc6e5c0201caf16897e9cf7aa7b77cc Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 30 Apr 2013 16:08:30 +0400
Subject: [PATCH] Move "else" extractor to JetWhenExpression

---
 .../src/org/jetbrains/jet/lang/psi/JetPsiUtil.java     |  9 ---------
 .../org/jetbrains/jet/lang/psi/JetWhenExpression.java  | 10 ++++++++++
 .../branchedTransformations/WhenUtils.java             |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
index 5d5612fa35e..2d130fa4faa 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -703,15 +703,6 @@ public class JetPsiUtil {
         return (elseCount == 1);
     }
 
-    public static JetExpression getWhenElseBranch(@NotNull JetWhenExpression whenExpression) {
-        for (JetWhenEntry entry : whenExpression.getEntries()) {
-            if (entry.isElse()) {
-                return entry.getExpression();
-            }
-        }
-        return null;
-    }
-
     public static PsiElement skipTrailingWhitespacesAndComments(PsiElement element)  {
         return PsiTreeUtil.skipSiblingsForward(element, PsiWhiteSpace.class, PsiComment.class);
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java
index 1a313791735..7ff507478bf 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java
@@ -60,4 +60,14 @@ public class JetWhenExpression extends JetExpressionImpl {
         ASTNode openBraceNode = getNode().findChildByType(JetTokens.RBRACE);
         return openBraceNode != null ? openBraceNode.getPsi() : null;
     }
+
+    @Nullable
+    public JetExpression getElseExpression() {
+        for (JetWhenEntry entry : getEntries()) {
+            if (entry.isElse()) {
+                return entry.getExpression();
+            }
+        }
+        return null;
+    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java
index b17bd974abc..fde43685005 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/WhenUtils.java
@@ -69,7 +69,7 @@ public class WhenUtils {
 
         if (!JetPsiUtil.checkWhenExpressionHasSingleElse(whenExpression)) return false;
 
-        JetExpression elseBranch = JetPsiUtil.getWhenElseBranch(whenExpression);
+        JetExpression elseBranch = whenExpression.getElseExpression();
         if (!(elseBranch instanceof JetWhenExpression)) return false;
 
         JetWhenExpression nestedWhenExpression = (JetWhenExpression) elseBranch;
@@ -89,7 +89,7 @@ public class WhenUtils {
     public static void flattenWhen(@NotNull JetWhenExpression whenExpression) {
         JetExpression subjectExpression = whenExpression.getSubjectExpression();
 
-        JetExpression elseBranch = JetPsiUtil.getWhenElseBranch(whenExpression);
+        JetExpression elseBranch = whenExpression.getElseExpression();
         assert elseBranch instanceof JetWhenExpression : TRANSFORM_WITHOUT_CHECK;
 
         JetWhenExpression nestedWhenExpression = (JetWhenExpression) elseBranch;