From 54fa6662e06980f199a5022e3efaf7236ecc848d Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <no_reply@jetbrains.com>
Date: Wed, 26 Jan 2005 19:58:12 +0300
Subject: [PATCH] (no message)

---
 .../refactoring/move/moveInner/MoveInnerProcessor.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java b/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
index 51518f784e2a..77e20ca2df31 100644
--- a/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
+++ b/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
@@ -32,6 +32,7 @@ import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewDescriptor;
 import com.intellij.usageView.UsageViewUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.HashMap;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -272,7 +273,7 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor {
     final ArrayList<String> conflicts = new ArrayList<String>();
 
     class Visitor extends PsiRecursiveElementVisitor {
-      private final com.intellij.util.containers.HashMap reported = new com.intellij.util.containers.HashMap();
+      private final HashMap<PsiElement,HashSet<PsiElement>> reported = new HashMap<PsiElement, HashSet<PsiElement>>();
 
       public void visitReferenceExpression(PsiReferenceExpression expression) {
         visitReferenceElement(expression);
@@ -294,11 +295,11 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor {
         }
 
         if (isInInnerClass &&
-            resolved instanceof PsiModifierListOwner && becomesInaccessible(((PsiModifierListOwner)resolved))) {
+            becomesInaccessible(((PsiModifierListOwner)resolved))) {
           final PsiElement container = ConflictsUtil.getContainer(reference);
-          HashSet containerSet = (HashSet)reported.get(resolved);
+          HashSet<PsiElement> containerSet = reported.get(resolved);
           if (containerSet == null) {
-            containerSet = new HashSet();
+            containerSet = new HashSet<PsiElement>();
             reported.put(resolved, containerSet);
           }
           if (!containerSet.contains(container)) {