From 586cb12980ee6a8c1950c1a497d128f0b68eefcd Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 31 Aug 2010 13:58:02 +0400
Subject: [PATCH] oror is associative operation as well

---
 .../psi/impl/source/tree/java/ReplaceExpressionUtil.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
index 86bd01fc7b54..a5b9be29cbd8 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
@@ -50,7 +50,8 @@ public class ReplaceExpressionUtil {
       return ((CompositeElement)oldParent).getChildRole(oldExpr) != ChildRole.LOPERAND &&
              opType != JavaTokenType.PLUS &&
              opType != JavaTokenType.ASTERISK &&
-             opType != JavaTokenType.ANDAND;
+             opType != JavaTokenType.ANDAND &&
+             opType != JavaTokenType.OROR;
     }
     else if (i == JavaElementType.INSTANCE_OF_EXPRESSION) {
       return priority < parentPriority;