Move "else" extractor to JetWhenExpression

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);
     }

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;
+    }
 }

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;