From dfa1ddbf14c3e8e89b3233fbd495149901cf0f80 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@jetbrains.com>
Date: Mon, 22 Dec 2008 18:45:15 +0300
Subject: [PATCH] cleanup

---
 .../safeDelete/SafeDeleteProcessor.java            |  8 ++------
 .../safeDelete/SafeDeleteUsageViewDescriptor.java  |  5 +----
 .../tree/java/PsiAssignmentExpressionImpl.java     | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java b/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java
index 271a0a5b2a..6b2e1d7e39 100644
--- a/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java
+++ b/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java
@@ -77,9 +77,7 @@ public class SafeDeleteProcessor extends BaseRefactoringProcessor {
       }
     }
 
-    if (PsiTreeUtil.isAncestor(ancestor, place, false)) return true;
-
-    return false;
+    return PsiTreeUtil.isAncestor(ancestor, place, false);
   }
 
   @NotNull
@@ -275,9 +273,7 @@ public class SafeDeleteProcessor extends BaseRefactoringProcessor {
 
   protected void refreshElements(PsiElement[] elements) {
     LOG.assertTrue(elements.length == myElements.length);
-    for (int i = 0; i < elements.length; i++) {
-      myElements[i] = elements[i];
-    }
+    System.arraycopy(elements, 0, myElements, 0, elements.length);
   }
 
   protected boolean isPreviewUsages(UsageInfo[] usages) {
diff --git a/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteUsageViewDescriptor.java b/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteUsageViewDescriptor.java
index 85abacd56e..3b85f2ec81 100644
--- a/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteUsageViewDescriptor.java
+++ b/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteUsageViewDescriptor.java
@@ -12,10 +12,7 @@ import org.jetbrains.annotations.NotNull;
 public class SafeDeleteUsageViewDescriptor extends UsageViewDescriptorAdapter {
   private final PsiElement[] myElementsToDelete;
 
-  public SafeDeleteUsageViewDescriptor(
-    PsiElement[] elementsToDelete
-  ) {
-    super();
+  public SafeDeleteUsageViewDescriptor(PsiElement[] elementsToDelete) {
     myElementsToDelete = elementsToDelete;
   }
 
diff --git a/source/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java b/source/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java
index 3a4b50a06e..f171410221 100644
--- a/source/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java
+++ b/source/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java
@@ -3,19 +3,20 @@ package com.intellij.psi.impl.source.tree.java;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.Constants;
 import com.intellij.psi.impl.source.tree.ChildRole;
+import com.intellij.psi.impl.source.tree.ElementType;
+import com.intellij.psi.impl.source.tree.JavaElementType;
 import com.intellij.psi.impl.source.tree.TreeUtil;
+import com.intellij.psi.tree.ChildRoleBase;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.tree.ChildRoleBase;
 import org.jetbrains.annotations.NotNull;
 
-public class PsiAssignmentExpressionImpl extends ExpressionPsiElement implements PsiAssignmentExpression, Constants {
+public class PsiAssignmentExpressionImpl extends ExpressionPsiElement implements PsiAssignmentExpression {
   private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiAssignmentExpressionImpl");
 
   public PsiAssignmentExpressionImpl() {
-    super(ASSIGNMENT_EXPRESSION);
+    super(JavaElementType.ASSIGNMENT_EXPRESSION);
   }
 
   @NotNull
@@ -51,7 +52,7 @@ public class PsiAssignmentExpressionImpl extends ExpressionPsiElement implements
         return getFirstChildNode();
 
       case ChildRole.ROPERAND:
-        return EXPRESSION_BIT_SET.contains(getLastChildNode().getElementType()) ? getLastChildNode() : null;
+        return ElementType.EXPRESSION_BIT_SET.contains(getLastChildNode().getElementType()) ? getLastChildNode() : null;
 
       case ChildRole.OPERATION_SIGN:
         return TreeUtil.findChild(this, OUR_OPERATIONS_BIT_SET);
@@ -60,7 +61,7 @@ public class PsiAssignmentExpressionImpl extends ExpressionPsiElement implements
 
   public int getChildRole(ASTNode child) {
     LOG.assertTrue(child.getTreeParent() == this);
-    if (EXPRESSION_BIT_SET.contains(child.getElementType())) {
+    if (ElementType.EXPRESSION_BIT_SET.contains(child.getElementType())) {
       if (child == getFirstChildNode()) return ChildRole.LOPERAND;
       if (child == getLastChildNode()) return ChildRole.ROPERAND;
       return ChildRoleBase.NONE;
@@ -73,11 +74,10 @@ public class PsiAssignmentExpressionImpl extends ExpressionPsiElement implements
     }
   }
 
-  private static final TokenSet OUR_OPERATIONS_BIT_SET = TokenSet.create(new IElementType[]{
-    EQ, ASTERISKEQ, DIVEQ, PERCEQ,
-    PLUSEQ, MINUSEQ, LTLTEQ, GTGTEQ,
-    GTGTGTEQ, ANDEQ, OREQ, XOREQ
-  });
+  private static final TokenSet OUR_OPERATIONS_BIT_SET = TokenSet.create(JavaTokenType.EQ, JavaTokenType.ASTERISKEQ, JavaTokenType.DIVEQ,
+                                                                         JavaTokenType.PERCEQ, JavaTokenType.PLUSEQ, JavaTokenType.MINUSEQ,
+                                                                         JavaTokenType.LTLTEQ, JavaTokenType.GTGTEQ, JavaTokenType.GTGTGTEQ,
+                                                                         JavaTokenType.ANDEQ, JavaTokenType.OREQ, JavaTokenType.XOREQ);
 
   public void accept(@NotNull PsiElementVisitor visitor) {
     if (visitor instanceof JavaElementVisitor) {
-- 
2.11.4.GIT