From 9dd290fd56220c75ade34dd7c5adca1c4175123e Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 26 May 2015 18:40:40 +0200 Subject: [PATCH] reformat --- .../ipp/trivialif/MergeIfAndIntention.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndIntention.java index 707a2a9b6663..e47a2cc8b120 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/MergeIfAndIntention.java @@ -32,25 +32,20 @@ public class MergeIfAndIntention extends Intention { return new MergeIfAndPredicate(); } - public void processIntention(PsiElement element) - throws IncorrectOperationException { - final PsiJavaToken token = - (PsiJavaToken)element; - final PsiIfStatement parentStatement = - (PsiIfStatement)token.getParent(); + public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + final PsiJavaToken token = (PsiJavaToken)element; + final PsiIfStatement parentStatement = (PsiIfStatement)token.getParent(); if (parentStatement == null) { return; } final PsiStatement parentThenBranch = parentStatement.getThenBranch(); - final PsiIfStatement childStatement = - (PsiIfStatement)ControlFlowUtils.stripBraces(parentThenBranch); + final PsiIfStatement childStatement = (PsiIfStatement)ControlFlowUtils.stripBraces(parentThenBranch); final PsiExpression childCondition = childStatement.getCondition(); if (childCondition == null) { return; } final String childConditionText; - if (ParenthesesUtils.getPrecedence(childCondition) - > ParenthesesUtils.AND_PRECEDENCE) { + if (ParenthesesUtils.getPrecedence(childCondition) > ParenthesesUtils.AND_PRECEDENCE) { childConditionText = '(' + childCondition.getText() + ')'; } else { @@ -62,8 +57,7 @@ public class MergeIfAndIntention extends Intention { return; } final String parentConditionText; - if (ParenthesesUtils.getPrecedence(parentCondition) - > ParenthesesUtils.AND_PRECEDENCE) { + if (ParenthesesUtils.getPrecedence(parentCondition) > ParenthesesUtils.AND_PRECEDENCE) { parentConditionText = '(' + parentCondition.getText() + ')'; } else { @@ -73,8 +67,7 @@ public class MergeIfAndIntention extends Intention { if (childThenBranch == null) { return; } - @NonNls final String statement = "if(" + parentConditionText + "&&" + - childConditionText + ')' + childThenBranch.getText(); + @NonNls final String statement = "if(" + parentConditionText + "&&" + childConditionText + ')' + childThenBranch.getText(); PsiReplacementUtil.replaceStatement(parentStatement, statement); } } \ No newline at end of file