From 5e2d900b2bea74204ddaec3d64184a92add4bb18 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Fri, 23 Jul 2010 17:09:16 +0400
Subject: [PATCH] @Nullable/@NotNull

---
 .../refactoring/memberPullUp/PullUpConflictsUtil.java | 11 ++++++-----
 .../com/intellij/refactoring/PullUpMultifileTest.java |  9 ++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
index dc86c0c8a88a..79f624db5293 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
@@ -40,6 +40,7 @@ import com.intellij.refactoring.util.classMembers.MemberInfo;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.VisibilityUtil;
 import com.intellij.util.containers.MultiMap;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -53,17 +54,17 @@ public class PullUpConflictsUtil {
   public static MultiMap<PsiElement, String> checkConflicts(final MemberInfo[] infos,
                                         PsiClass subclass,
                                         @Nullable PsiClass superClass,
-                                        PsiPackage targetPackage,
-                                        PsiDirectory targetDirectory,
+                                        @NotNull PsiPackage targetPackage,
+                                        @NotNull PsiDirectory targetDirectory,
                                         final InterfaceContainmentVerifier interfaceContainmentVerifier) {
     return checkConflicts(infos, subclass, superClass, targetPackage, targetDirectory, interfaceContainmentVerifier, true);
   }
 
   public static MultiMap<PsiElement, String> checkConflicts(final MemberInfo[] infos,
-                                                            final PsiClass subclass,
+                                                            @NotNull final PsiClass subclass,
                                                             @Nullable PsiClass superClass,
-                                                            final PsiPackage targetPackage,
-                                                            PsiDirectory targetDirectory,
+                                                            @NotNull final PsiPackage targetPackage,
+                                                            @NotNull PsiDirectory targetDirectory,
                                                             final InterfaceContainmentVerifier interfaceContainmentVerifier,
                                                             boolean movedMembers2Super) {
     final Set<PsiMember> movedMembers = new HashSet<PsiMember>();
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java
index fcfbec4fa1bd..adc2a9256c9b 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java
@@ -24,10 +24,7 @@ import com.intellij.JavaTestUtil;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiField;
-import com.intellij.psi.PsiMethod;
+import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.refactoring.memberPullUp.PullUpConflictsUtil;
 import com.intellij.refactoring.memberPullUp.PullUpHelper;
@@ -75,8 +72,10 @@ public class PullUpMultifileTest extends MultiFileTestCase {
         memberInfo.setChecked(true);
         membersToMove[0] = memberInfo;
 
+        final PsiDirectory targetDirectory = targetClass.getContainingFile().getContainingDirectory();
+        final PsiPackage targetPackage = targetDirectory != null ? JavaDirectoryService.getInstance().getPackage(targetDirectory) : null;
         conflictsMap.putAllValues(
-          PullUpConflictsUtil.checkConflicts(membersToMove, srcClass, targetClass, null, null, new InterfaceContainmentVerifier() {
+          PullUpConflictsUtil.checkConflicts(membersToMove, srcClass, targetClass, targetPackage, targetDirectory, new InterfaceContainmentVerifier() {
             public boolean checkedInterfacesContain(PsiMethod psiMethod) {
               return PullUpHelper.checkedInterfacesContain(Arrays.asList(membersToMove), psiMethod);
             }