java.util.Mapcom.intellij.util.containers.MultiMap



Project JetBrains/intellij-community in file ...ng.introduceVariable.IntroduceVariableHandler.java (2009-10-05)
@@ -17,9 +17,9 @@ import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.ui.ConflictsDialog;
 import com.intellij.refactoring.ui.TypeSelectorManagerImpl;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
+import com.intellij.util.containers.MultiMap;
 
 import java.util.ArrayList;
-import java.util.Map;
 
 public class IntroduceVariableHandler extends IntroduceVariableBase {
 
@@ -72,7 +72,7 @@ public class IntroduceVariableHandler extends IntroduceVariableBase {
     WindowManager.getInstance().getStatusBar(project).setInfo(RefactoringBundle.message("press.escape.to.remove.the.highlighting"));
   }
 
-  protected boolean reportConflicts(final Map<PsiElement, String> conflicts, final Project project, IntroduceVariableSettings dialog) {
+  protected boolean reportConflicts(final MultiMap<PsiElement,String> conflicts, final Project project, IntroduceVariableSettings dialog) {
     ConflictsDialog conflictsDialog = new ConflictsDialog(project, conflicts);
     conflictsDialog.show();
     final boolean ok = conflictsDialog.isOK();
Project JetBrains/intellij-community in file ...s.AutocreatingSingleSourceRootMoveDestination.java (2009-10-05)
@@ -9,11 +9,11 @@ import com.intellij.refactoring.PackageWrapper;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
-import java.util.Map;
 
 /**
  *  @author dsl
@@ -60,7 +60,7 @@ public class AutocreatingSingleSourceRootMoveDestination extends AutocreatingMov
   }
 
   public void analyzeModuleConflicts(final Collection<PsiElement> elements,
-                                     Map<PsiElement,String> conflicts, final UsageInfo[] usages) {
+                                     MultiMap<PsiElement,String> conflicts, final UsageInfo[] usages) {
     RefactoringUtil.analyzeModuleConflicts(getTargetPackage().getManager().getProject(), elements, usages, mySourceRoot, conflicts);
   }
 
Project JetBrains/intellij-community in file ...lassesOrPackages.MultipleRootsMoveDestination.java (2009-10-05)
@@ -7,10 +7,10 @@ import com.intellij.refactoring.PackageWrapper;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
-import java.util.Map;
 
 /**
  *  @author dsl
@@ -77,7 +77,7 @@ public class MultipleRootsMoveDestination extends AutocreatingMoveDestination {
   }
 
   public void analyzeModuleConflicts(final Collection<PsiElement> elements,
-                                     Map<PsiElement,String> conflicts, final UsageInfo[] usages) {
+                                     MultiMap<PsiElement,String> conflicts, final UsageInfo[] usages) {
   }
 
   public PsiDirectory getTargetIfExists(PsiDirectory source) {
Project JetBrains/intellij-community in file ...sesOrPackages.SingleSourceRootMoveDestination.java (2009-10-05)
@@ -6,9 +6,9 @@ import com.intellij.refactoring.MoveDestination;
 import com.intellij.refactoring.PackageWrapper;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.util.containers.MultiMap;
 
 import java.util.Collection;
-import java.util.Map;
 
 /**
  *  @author dsl
@@ -54,7 +54,7 @@ public class SingleSourceRootMoveDestination implements MoveDestination {
   }
 
   public void analyzeModuleConflicts(final Collection<PsiElement> elements,
-                                     Map<PsiElement,String> conflicts, final UsageInfo[] usages) {
+                                     MultiMap<PsiElement,String> conflicts, final UsageInfo[] usages) {
     RefactoringUtil.analyzeModuleConflicts(myPackage.getManager().getProject(), elements, usages, myTargetDirectory, conflicts);
   }
 
Project JetBrains/intellij-community in file ...com.intellij.refactoring.MoveClassToInnerTest.java (2009-10-05)
@@ -15,9 +15,9 @@ import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProce
 import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.util.containers.MultiMap;
 
 import java.io.File;
-import java.util.Map;
 
 /**
  * @author yole
@@ -114,7 +114,7 @@ public class MoveClassToInnerTest extends CodeInsightTestCase {
     PsiClass targetClass = myJavaFacade.findClass(targetClassName, ProjectScope.getAllScope(myProject));
     MoveClassToInnerProcessor processor = new MoveClassToInnerProcessor(myProject, classToMove, targetClass, true, true, null);
     UsageInfo[] usages = processor.findUsages();
-    Map<PsiElement,String> conflicts = processor.getConflicts(usages);
+    MultiMap<PsiElement,String> conflicts = processor.getConflicts(usages);
     assertSameElements(conflicts.values() , expectedConflicts);
   }