Move JSL3 workJDK_1_5

5 files changed, 28 insertions, 15 deletions

diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/A.java
index ce7e368faf..0b322c41c8 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/A.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/in/A.java
@@ -1,4 +1,4 @@
 package p;
 public interface A{
-	public /*static final*/ int i= 0;
+	public int i= 0;
 }
diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/B.java
index 3aaf599f8c..a500360659 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/B.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/resources/MoveMembers/test35/out/B.java
@@ -1,5 +1,5 @@
 package p;
 public class B{
 
-	public /*static final*/ static final int i= 0;
+	public static final int i= 0;
 }
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToTopLevelTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToTopLevelTests.java
index db95f36f8a..4f16c2d636 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToTopLevelTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInnerToTopLevelTests.java
@@ -50,6 +50,10 @@ public class MoveInnerToTopLevelTests extends RefactoringTest {
 		return new MySetup(new TestSuite(clazz));
 	}
 	
+	public static Test setUpTest(Test someTest) {
+	    return new MySetup(someTest);
+	}
+	
 	protected String getRefactoringPath() {
 		return REFACTORING_PATH;
 	}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MoveTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MoveTest.java
index 0a5053a290..cef4fae4c6 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MoveTest.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/reorg/MoveTest.java
@@ -1182,9 +1182,10 @@ public class MoveTest extends RefactoringTest {
 					new MoveArguments(project.getProject(), ref.getUpdateReferences()),
 					new MoveArguments(project.getProject(), ref.getUpdateReferences()),
 					new MoveArguments(project.getResource(), ref.getUpdateReferences())});
-		}finally{
+		} finally {
 			performDummySearch();
-			newFile.delete(true, false, null);
+			if (newFile != null)
+				newFile.delete(true, false, null);
 		}
 	}
 
@@ -1307,9 +1308,10 @@ public class MoveTest extends RefactoringTest {
 					new MoveArguments(destination, ref.getUpdateReferences()),
 					new MoveArguments(destination, ref.getUpdateReferences()),
 					new MoveArguments(folder, ref.getUpdateReferences())});
-		}finally{
+		} finally {
 			performDummySearch();
-			newFile.delete(true, false, null);
+			if (newFile != null)
+				newFile.delete(true, false, null);
 			folder.delete(true, false, null);
 		}
 	}
@@ -1385,9 +1387,10 @@ public class MoveTest extends RefactoringTest {
 				handles,
 				new MoveArguments[] {
 					new MoveArguments(getPackageP().getResource(), ref.getUpdateReferences())});
-		}finally{
+		} finally {
 			performDummySearch();
-			newFile.delete(true, new NullProgressMonitor());
+			if (newFile != null)
+				newFile.delete(true, new NullProgressMonitor());
 			cu1.delete(true, new NullProgressMonitor());
 		}
 	}		
@@ -1422,9 +1425,10 @@ public class MoveTest extends RefactoringTest {
 				handles,
 				new MoveArguments[] {
 					new MoveArguments(getPackageP().getResource(), ref.getUpdateReferences())});
-		}finally{
+		} finally {
 			performDummySearch();
-			newFile.delete(true, new NullProgressMonitor());
+			if (newFile != null)
+				newFile.delete(true, new NullProgressMonitor());
 		}
 	}
 
@@ -1459,7 +1463,7 @@ public class MoveTest extends RefactoringTest {
 				handles,
 				new MoveArguments[] {
 					new MoveArguments(getPackageP().getResource(), ref.getUpdateReferences())});
-		} finally{
+		} finally {
 			performDummySearch();
 			file.delete(true, false, null);
 			cu.delete(true, null);
@@ -1497,7 +1501,8 @@ public class MoveTest extends RefactoringTest {
 					new MoveArguments(getRoot().getResource(), ref.getUpdateReferences())});
 		}finally{
 			performDummySearch();
-			newFile.delete(true, new NullProgressMonitor());
+			if (newFile != null)
+				newFile.delete(true, new NullProgressMonitor());
 		}
 	}		
 
@@ -1550,7 +1555,8 @@ public class MoveTest extends RefactoringTest {
 					new MoveArguments(destination, ref.getUpdateReferences())});
 		} finally{
 			performDummySearch();
-			newFolder.delete(true, new NullProgressMonitor());			
+			if (newFolder != null)
+				newFolder.delete(true, new NullProgressMonitor());			
 			otherFolder.delete(true, new NullProgressMonitor());			
 		}
 	}
@@ -1601,7 +1607,8 @@ public class MoveTest extends RefactoringTest {
 					new MoveArguments(getRoot().getResource(), ref.getUpdateReferences())});
 		} finally{
 			performDummySearch();
-			newPackage.delete(true, new NullProgressMonitor());
+			if (newPackage != null)
+				newPackage.delete(true, new NullProgressMonitor());
 		}
 	}
 
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/InstanceMethodMover.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/InstanceMethodMover.java
index 0dcf97d15a..a36f249c51 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/InstanceMethodMover.java
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/InstanceMethodMover.java
@@ -76,6 +76,7 @@ import org.eclipse.jdt.internal.corext.Assert;
 import org.eclipse.jdt.internal.corext.Corext;
 import org.eclipse.jdt.internal.corext.codemanipulation.CodeGenerationSettings;
 import org.eclipse.jdt.internal.corext.codemanipulation.ImportRewrite;
+import org.eclipse.jdt.internal.corext.dom.ASTNodes;
 import org.eclipse.jdt.internal.corext.dom.OldASTRewrite;
 import org.eclipse.jdt.internal.corext.dom.Bindings;
 import org.eclipse.jdt.internal.corext.dom.HierarchicalASTVisitor;
@@ -736,7 +737,8 @@ class InstanceMethodMover {
 			}
 	
 			private boolean isNonInstanceMemberReference(SimpleName name) {
-				if (name.getParent() instanceof ClassInstanceCreation)
+				ASTNode normalized= ASTNodes.getNormalizedNode(name);
+				if (normalized.getLocationInParent() == ClassInstanceCreation.TYPE_PROPERTY)
 					return false;
 				
 				IBinding binding= name.resolveBinding();