From 83593d51a519678a318d5d950e3c4b0a42ccd3fc Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 21 Dec 2018 10:14:45 +0700 Subject: [PATCH] UnrollLoopAction: deprecated method calls replaced --- .../intellij/codeInsight/intention/impl/UnrollLoopAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnrollLoopAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnrollLoopAction.java index f62dc9dda4b0..34c4b740a6dd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnrollLoopAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/UnrollLoopAction.java @@ -69,7 +69,7 @@ public class UnrollLoopAction extends PsiElementBaseIntentionAction { for (PsiStatement statement : statements) { if (isLoopBreak(statement)) continue; boolean acceptable = PsiTreeUtil.processElements(statement, e -> { - if (e instanceof PsiBreakStatement && ((PsiBreakStatement)e).findExitedStatement() == loop) return false; + if (e instanceof PsiBreakStatement && ((PsiBreakStatement)e).findExitedElement() == loop) return false; if (e instanceof PsiContinueStatement && ((PsiContinueStatement)e).findContinuedStatement() == loop) return false; return true; }); @@ -225,6 +225,6 @@ public class UnrollLoopAction extends PsiElementBaseIntentionAction { PsiIfStatement ifStatement = (PsiIfStatement)statement; if (ifStatement.getElseBranch() != null || ifStatement.getCondition() == null) return false; PsiStatement thenBranch = ControlFlowUtils.stripBraces(ifStatement.getThenBranch()); - return thenBranch instanceof PsiBreakStatement && ((PsiBreakStatement)thenBranch).getLabelIdentifier() == null; + return thenBranch instanceof PsiBreakStatement && ((PsiBreakStatement)thenBranch).getLabelExpression() == null; } }