move as enum: strip enum qualifiers in case statements

java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveJavaMemberHandler.java

@@ -84,7 +84,7 @@ public class MoveJavaMemberHandler implements MoveMemberHandler {
       PsiReferenceExpression refExpr = (PsiReferenceExpression)usage.reference;
       PsiExpression qualifier = refExpr.getQualifierExpression();
       if (qualifier != null) {
-        if (usage.qualifierClass != null) {
+        if (usage.qualifierClass != null && PsiTreeUtil.getParentOfType(refExpr, PsiSwitchLabelStatement.class) == null) {
           changeQualifier(refExpr, usage.qualifierClass, usage.member);
         }
         else {
@@ -92,7 +92,7 @@ public class MoveJavaMemberHandler implements MoveMemberHandler {
         }
       }
       else { // no qualifier
-        if (usage.qualifierClass != null) {
+        if (usage.qualifierClass != null && PsiTreeUtil.getParentOfType(refExpr, PsiSwitchLabelStatement.class) == null) {
           changeQualifier(refExpr, usage.qualifierClass, usage.member);
         }
       }

java/java-tests/testData/refactoring/moveMembers/enumConstantFromCaseStatement/after/A.java

@@ -0,0 +1,4 @@
+public enum A {
+    ONE(1);
+  A(int i){}
+}

java/java-tests/testData/refactoring/moveMembers/enumConstantFromCaseStatement/after/B.java

@@ -0,0 +1,17 @@
+public class B {
+    void foo(A i) {
+        switch (i) {
+            case ONE :
+              break;
+        }
+    }
+}
+
+class Usage {
+    void foo(A i) {
+        switch (i) {
+            case ONE :
+              break;
+        }
+    }
+}

java/java-tests/testData/refactoring/moveMembers/enumConstantFromCaseStatement/before/A.java

@@ -0,0 +1,4 @@
+public enum A {
+  ;
+  A(int i){}
+}

java/java-tests/testData/refactoring/moveMembers/enumConstantFromCaseStatement/before/B.java

@@ -0,0 +1,18 @@
+public class B {
+    public static final int ONE = 1;
+    void foo(A i) {
+        switch (i) {
+            case ONE :
+              break;
+        }
+    }
+}
+
+class Usage {
+    void foo(A i) {
+        switch (i) {
+            case B.ONE :
+              break;
+        }
+    }
+}

java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java

@@ -84,6 +84,10 @@ public class MoveMembersTest extends MultiFileTestCase {
     doTest("B", "A", 0);
   }
 
+  public void testEnumConstantFromCaseStatement() throws Exception {
+    doTest("B", "A", 0);
+  }
+
   public void testDependantFields() throws Exception {
     doTest("B", "A", 0);
   }