Fix push down to allow moving fields/methods to inner/local classes (#…

…1693)

- add logic to
  PushDownRefactoringProcessor.checkReferencesToPushedDownMembers()
  to ignore members in the declaring CU that will end up being
  targets of the move (i.e. they extend the declaring class)
- add new test to PushDownTests
- fixes #1691

org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PushDownRefactoringProcessor.java

@@ -629,6 +629,19 @@ private RefactoringStatus checkReferencesToPushedDownMembers(IProgressMonitor mo
 					continue;
 				if (!(element instanceof IMember))
 					continue;
+				IType[] destinationTypes= getAbstractDestinations(new NullProgressMonitor());
+				IMember elementMember= (IMember)element;
+				IType elementMemberType= elementMember.getDeclaringType();
+				boolean isMoveDestination= false;
+				for (IType destinationType : destinationTypes) {
+					if (destinationType.getFullyQualifiedName().equals(elementMemberType.getFullyQualifiedName())) {
+						isMoveDestination= true;
+						break;
+					}
+				}
+				if (isMoveDestination) {
+					continue;
+				}
 				IMember referencingMember= (IMember) element;
 				Object[] keys= { label, createLabel(referencingMember) };
 				String msg= Messages.format(RefactoringCoreMessages.PushDownRefactoring_referenced, keys);

org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test40/in/A.java

@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	int f;
+
+	void mA() {
+		class B extends A {
+			public void mB() {
+				f = 0;
+			}
+		}
+	}
+}

org.eclipse.jdt.ui.tests.refactoring/resources/PushDown/test40/out/A.java

@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	void mA() {
+		class B extends A {
+			int f;
+
+			public void mB() {
+				f = 0;
+			}
+		}
+	}
+}

org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PushDownTests.java

@@ -963,6 +963,24 @@ public void test39() throws Exception { //https://github.com/eclipse-jdt/eclipse
 				namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
 	}
 
+	@Test
+	public void test40() throws Exception { //https://github.com/eclipse-jdt/eclipse.jdt.ui/issues/1679
+		String[] selectedMethodNames= { };
+		String[][] selectedMethodSignatures= { new String[0] };
+		String[] selectedFieldNames= { "f" };
+		String[] namesOfMethodsToPushDown= selectedMethodNames;
+		String[][] signaturesOfMethodsToPushDown= selectedMethodSignatures;
+		String[] namesOfFieldsToPushDown= {};
+		String[] namesOfMethodsToDeclareAbstract= {};
+		String[][] signaturesOfMethodsToDeclareAbstract= {};
+
+		helper(selectedMethodNames, selectedMethodSignatures,
+				selectedFieldNames,
+				namesOfMethodsToPushDown, signaturesOfMethodsToPushDown,
+				namesOfFieldsToPushDown,
+				namesOfMethodsToDeclareAbstract, signaturesOfMethodsToDeclareAbstract, null, null);
+	}
+
 	@Test
 	public void testFail0() throws Exception {
 		String[] selectedMethodNames= {"f"};