initial commit in accordance with CQ 3784

2251 files changed, 28442 insertions, 0 deletions

diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_in.java
new file mode 100644
index 000000000..34e6051cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_in.java
@@ -0,0 +1,7 @@
+//5, 16 -> 5, 17   AllowLoadtime == false
+package p;
+class A {
+	void f() {
+		int i= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_out.java
new file mode 100644
index 000000000..d327be867
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test0_out.java
@@ -0,0 +1,9 @@
+//5, 16 -> 5, 17   AllowLoadtime == false
+package p;
+class A {
+	private static final int CONSTANT= 0;
+
+	void f() {
+		int i= CONSTANT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_in.java
new file mode 100644
index 000000000..bb771919c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_in.java
@@ -0,0 +1,10 @@
+// 8, 17 -> 8, 22
+package p;
+
+class A {
+	void foob() {
+		int c= 2 + 2 * 4 + (28 + 2 + 2) + 1;
+
+		int e= (2 + 2) * 3 * 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_out.java
new file mode 100644
index 000000000..47867c321
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test10_out.java
@@ -0,0 +1,12 @@
+// 8, 17 -> 8, 22
+package p;
+
+class A {
+	private static final int CONSTANT= 2 + 2;
+
+	void foob() {
+		int c= 2 + 2 * 4 + (28 + CONSTANT) + 1;
+
+		int e= CONSTANT * 3 * 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_in.java
new file mode 100644
index 000000000..751b6aa25
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_in.java
@@ -0,0 +1,12 @@
+// 10, 37 -> 10, 43
+package p;
+
+class A {
+	void foob() {
+
+		int c= 3 * (2 + 1) + 2 + 2 * 4 + 28;
+
+
+		int e= (2 + 2) * (27 + 2 * (2+2* 4+1*2));
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_out.java
new file mode 100644
index 000000000..2e4ef704c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test11_out.java
@@ -0,0 +1,14 @@
+// 10, 37 -> 10, 43
+package p;
+
+class A {
+	private static final int CONSTANT= 2+2* 4;
+
+	void foob() {
+
+		int c= 3 * (2 + 1) + CONSTANT + 28;
+
+
+		int e= (2 + 2) * (27 + 2 * (CONSTANT + 1*2));
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_in.java
new file mode 100644
index 000000000..7481e130c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_in.java
@@ -0,0 +1,11 @@
+// 9, 19 -> 9, 24
+package p;
+
+class A {
+	void foob() {
+		
+		int e= (2 + 2) * 3 * 1;
+		
+		int f= 5 *3*  1 *(1 + 1);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_out.java
new file mode 100644
index 000000000..4a6e2cd48
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test12_out.java
@@ -0,0 +1,13 @@
+// 9, 19 -> 9, 24
+package p;
+
+class A {
+	private static final int CONSTANT= 3*  1;
+
+	void foob() {
+		
+		int e= (2 + 2) * CONSTANT;
+		
+		int f= 5 * CONSTANT * (1 + 1);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_in.java
new file mode 100644
index 000000000..08cf97c61
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_in.java
@@ -0,0 +1,12 @@
+//9, 16 -> 9, 28   AllowLoadtime == true
+package p;
+
+class S {
+	public static S instance= new S();
+	
+	int f(){
+
+		int v= instance.f();
+		return 0;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_out.java
new file mode 100644
index 000000000..a0574916d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test13_out.java
@@ -0,0 +1,13 @@
+//9, 16 -> 9, 28   AllowLoadtime == true
+package p;
+
+class S {
+	public static S instance= new S();
+	private static final int CONSTANT= instance.f();
+	
+	int f(){
+
+		int v= CONSTANT;
+		return 0;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_in.java
new file mode 100644
index 000000000..5ac843bf0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_in.java
@@ -0,0 +1,13 @@
+//10, 28 -> 10, 44   AllowLoadtime == true
+package p;
+
+class S {
+	public static S instance= new S();
+
+	int s;
+
+	int f() {
+		System.out.println(S.instance.s + 1);
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_out.java
new file mode 100644
index 000000000..20dc190cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test14_out.java
@@ -0,0 +1,15 @@
+//10, 28 -> 10, 44   AllowLoadtime == true
+package p;
+
+class S {
+	public static S instance= new S();
+
+	private static final int CONSTANT= S.instance.s + 1;
+
+	int s;
+
+	int f() {
+		System.out.println(CONSTANT);
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_in.java
new file mode 100644
index 000000000..71a125d08
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_in.java
@@ -0,0 +1,10 @@
+//5, 16 -> 5, 25   AllowLoadtime == false
+package p;
+class A {
+	void f() {
+		int i= getFred();
+	}
+	static int getFred(){
+		return 5;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_out.java
new file mode 100644
index 000000000..e42902fe9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test15_out.java
@@ -0,0 +1,11 @@
+//5, 16 -> 5, 25   AllowLoadtime == false
+package p;
+class A {
+	private static final int CONSTANT= getFred();
+	void f() {
+		int i= CONSTANT;
+	}
+	static int getFred(){
+		return 5;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_in.java
new file mode 100644
index 000000000..2df41b7ec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_in.java
@@ -0,0 +1,10 @@
+//5, 20 -> 5, 27   AllowLoadtime == false
+package p;
+class A {
+	void f() {
+		boolean i= isRed();
+	}
+	static boolean isRed(){
+		return 5==1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_out.java
new file mode 100644
index 000000000..1f2d55769
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test16_out.java
@@ -0,0 +1,11 @@
+//5, 20 -> 5, 27   AllowLoadtime == false
+package p;
+class A {
+	private static final boolean CONSTANT= isRed();
+	void f() {
+		boolean i= CONSTANT;
+	}
+	static boolean isRed(){
+		return 5==1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_in.java
new file mode 100644
index 000000000..4c847906d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_in.java
@@ -0,0 +1,10 @@
+//5, 16 -> 5, 35   AllowLoadtime == false
+package p;
+class A {
+	void f() {
+		int i= getYetAnotherFred();
+	}
+	static int getYetAnotherFred(){
+		return 5;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_out.java
new file mode 100644
index 000000000..5aa99590e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test17_out.java
@@ -0,0 +1,11 @@
+//5, 16 -> 5, 35   AllowLoadtime == false
+package p;
+class A {
+	private static final int CONSTANT= getYetAnotherFred();
+	void f() {
+		int i= CONSTANT;
+	}
+	static int getYetAnotherFred(){
+		return 5;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_in.java
new file mode 100644
index 000000000..d8b8815f4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_in.java
@@ -0,0 +1,17 @@
+//5, 16 -> 5, 17   AllowLoadtime == false,  qualifyReferencesWithClassName= true
+package p;
+class ClassName {
+	int f() {
+		return 0;
+	}
+	
+	class Nested {
+		{
+			System.out.println(0);	
+		}
+		
+		void f() {
+			int i= 0;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_out.java
new file mode 100644
index 000000000..df2f89aa5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test18_out.java
@@ -0,0 +1,19 @@
+//5, 16 -> 5, 17   AllowLoadtime == false,  qualifyReferencesWithClassName= true
+package p;
+class ClassName {
+	private static final int CONSTANT= 0;
+
+	int f() {
+		return ClassName.CONSTANT;
+	}
+	
+	class Nested {
+		{
+			System.out.println(ClassName.CONSTANT);	
+		}
+		
+		void f() {
+			int i= ClassName.CONSTANT;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_in.java
new file mode 100644
index 000000000..77f3a8c65
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_in.java
@@ -0,0 +1,7 @@
+// 5, 23 -> 5, 38
+class Foo {
+	public final static String BASE = "base."; //$NON-NLS-1$
+	public void m1() {
+		String name = BASE + "suffix";
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_out.java
new file mode 100644
index 000000000..023ec6984
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test19_out.java
@@ -0,0 +1,8 @@
+// 5, 23 -> 5, 38
+class Foo {
+	public final static String BASE = "base."; //$NON-NLS-1$
+	private static final String CONSTANT= BASE + "suffix";
+	public void m1() {
+		String name = CONSTANT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_in.java
new file mode 100644
index 000000000..a9eea9658
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_in.java
@@ -0,0 +1,7 @@
+//5, 16 -> 5, 21   AllowLoadtime == false
+package p;
+class A {
+	void f() {
+		int i= 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_out.java
new file mode 100644
index 000000000..50b9e6c4c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test1_out.java
@@ -0,0 +1,9 @@
+//5, 16 -> 5, 21   AllowLoadtime == false
+package p;
+class A {
+	private static final int CONSTANT= 1 + 2;
+
+	void f() {
+		int i= CONSTANT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_in.java
new file mode 100644
index 000000000..102d0a974
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_in.java
@@ -0,0 +1,9 @@
+// 7, 19 -> 7, 28
+class BodyDeclOnSameLine {
+	private final static String BAR= "c";
+	private final static String FOO=  "a";  /* ambiguous */ String strange= "b"; //$NON-NLS-1$ //$NON-NLS-2$
+
+	void m() {
+		String s= FOO + BAR;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_out.java
new file mode 100644
index 000000000..3b4656797
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test20_out.java
@@ -0,0 +1,10 @@
+// 7, 19 -> 7, 28
+class BodyDeclOnSameLine {
+	private final static String BAR= "c";
+	private final static String FOO=  "a";  /* ambiguous */
+	private static final String CONSTANT= FOO + BAR; String strange= "b"; //$NON-NLS-1$ //$NON-NLS-2$
+
+	void m() {
+		String s= CONSTANT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_in.java
new file mode 100644
index 000000000..c2834b6b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_in.java
@@ -0,0 +1,7 @@
+//  4, 28 -> 4, 37
+class EndsOnSameLine {
+	void m() {
+		System.out.println(FOO + FOO);
+	}
+
+	static final String FOO= "foo";} // $NON-NLS-1$
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_out.java
new file mode 100644
index 000000000..1492022ac
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test21_out.java
@@ -0,0 +1,8 @@
+//  4, 28 -> 4, 37
+class EndsOnSameLine {
+	void m() {
+		System.out.println(CONSTANT);
+	}
+
+	static final String FOO= "foo";
+	private static final String CONSTANT= FOO + FOO;} // $NON-NLS-1$
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test22_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test22_in.java
new file mode 100644
index 000000000..74d54a5ff
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test22_in.java
@@ -0,0 +1,11 @@
+//9, 35, 9, 59
+package p;
+
+import java.util.List;
+import java.util.ArrayList;
+
+class A {
+	void m(){
+		List<? extends Number> l= new ArrayList<Integer>();
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test22_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test22_out.java
new file mode 100644
index 000000000..0f13ea7d7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test22_out.java
@@ -0,0 +1,13 @@
+//9, 35, 9, 59
+package p;
+
+import java.util.List;
+import java.util.ArrayList;
+
+class A {
+	private static final ArrayList<Integer> ITEMS= new ArrayList<Integer>();
+
+	void m(){
+		List<? extends Number> l= ITEMS;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test23_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test23_in.java
new file mode 100644
index 000000000..b98fdc1ba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test23_in.java
@@ -0,0 +1,22 @@
+//14, 12, 14, 15
+package p;
+
+import static p.Color.RED;
+
+enum Color {
+	RED, BLUE(), YELLOW() {};
+	public static final Color fColor= RED;
+}
+
+class ColorUser {
+	void use() {
+		Color c= Color.fColor;
+		c= RED;
+		switch (c) {
+			case RED : //extract constant "RED"
+				break;
+			default :
+				break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test23_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test23_out.java
new file mode 100644
index 000000000..293ba095e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test23_out.java
@@ -0,0 +1,24 @@
+//14, 12, 14, 15
+package p;
+
+import static p.Color.RED;
+
+enum Color {
+	RED, BLUE(), YELLOW() {};
+	public static final Color fColor= RED;
+}
+
+class ColorUser {
+	private static final Color COLOR= RED;
+
+	void use() {
+		Color c= Color.fColor;
+		c= COLOR;
+		switch (c) {
+			case RED : //extract constant "RED"
+				break;
+			default :
+				break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test24_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test24_in.java
new file mode 100644
index 000000000..c6f8d369b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test24_in.java
@@ -0,0 +1,11 @@
+//9, 28, 9, 36
+package p;
+
+class A {
+	enum Enum {
+		ONE, TWO();
+	}
+	public void run() {
+		System.out.println(Enum.ONE.name());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test24_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test24_out.java
new file mode 100644
index 000000000..74a95379f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test24_out.java
@@ -0,0 +1,12 @@
+//9, 28, 9, 36
+package p;
+
+class A {
+	private static final Enum NUM= Enum.ONE;
+	enum Enum {
+		ONE, TWO();
+	}
+	public void run() {
+		System.out.println(NUM.name());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test25_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test25_in.java
new file mode 100644
index 000000000..25955b658
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test25_in.java
@@ -0,0 +1,6 @@
+//5, 27, 5, 40
+package p;
+
+@interface A {
+	String name() default "Jean-Pierre";
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test25_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test25_out.java
new file mode 100644
index 000000000..0bf021719
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test25_out.java
@@ -0,0 +1,8 @@
+//5, 27, 5, 40
+package p;
+
+@interface A {
+	public static final String DEFAULT_NAME= "Jean-Pierre";
+
+	String name() default DEFAULT_NAME;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test26_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test26_in.java
new file mode 100644
index 000000000..69306252b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test26_in.java
@@ -0,0 +1,8 @@
+//6, 16, 6, 32
+package p;
+
+class A<E> {
+	static A<Integer> getInt() {
+		return new A<Integer>();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test26_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test26_out.java
new file mode 100644
index 000000000..833382799
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test26_out.java
@@ -0,0 +1,10 @@
+//6, 16, 6, 32
+package p;
+
+class A<E> {
+	private static final A<Integer> INT= new A<Integer>();
+
+	static A<Integer> getInt() {
+		return A.INT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test27_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test27_in.java
new file mode 100644
index 000000000..a5b79b82d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test27_in.java
@@ -0,0 +1,15 @@
+//13, 14, 13, 19
+package p;
+
+import java.util.List;
+
+class A {
+    public static List<?>[] foo() {
+        return null;
+    }
+    void take(List<?>[] a) {
+    }
+    void bar() {
+        take(foo());
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test27_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test27_out.java
new file mode 100644
index 000000000..e5b76d26e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test27_out.java
@@ -0,0 +1,16 @@
+//13, 14, 13, 19
+package p;
+
+import java.util.List;
+
+class A {
+    private static final List<?>[] FOO= foo();
+	public static List<?>[] foo() {
+        return null;
+    }
+    void take(List<?>[] a) {
+    }
+    void bar() {
+        take(FOO);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test28_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test28_in.java
new file mode 100644
index 000000000..0286b302c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test28_in.java
@@ -0,0 +1,15 @@
+//13, 14, 13, 19
+package p;
+
+import java.util.List;
+
+class A {
+    public static List<?> foo() {
+        return null;
+    }
+    void take(List<?> a) {
+    }
+    void bar() {
+        take(foo());
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test28_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test28_out.java
new file mode 100644
index 000000000..df84e1fd5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test28_out.java
@@ -0,0 +1,16 @@
+//13, 14, 13, 19
+package p;
+
+import java.util.List;
+
+class A {
+    private static final List<?> FOO= foo();
+	public static List<?> foo() {
+        return null;
+    }
+    void take(List<?> a) {
+    }
+    void bar() {
+        take(FOO);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test29_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test29_in.java
new file mode 100644
index 000000000..3782813f3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test29_in.java
@@ -0,0 +1,14 @@
+//12, 19, 12, 28
+package p;
+
+import java.util.ArrayList;
+
+class A_29_Super {
+	static final ArrayList<? extends Number> NL= new ArrayList<Integer>();
+}
+
+class A extends A_29_Super {
+	void foo() {
+		Number n= NL.get(0);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test29_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test29_out.java
new file mode 100644
index 000000000..b64e1acf6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test29_out.java
@@ -0,0 +1,16 @@
+//12, 19, 12, 28
+package p;
+
+import java.util.ArrayList;
+
+class A_29_Super {
+	static final ArrayList<? extends Number> NL= new ArrayList<Integer>();
+}
+
+class A extends A_29_Super {
+	private static final Number NUMBER= NL.get(0);
+
+	void foo() {
+		Number n= NUMBER;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_in.java
new file mode 100644
index 000000000..66ad43aa6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_in.java
@@ -0,0 +1,10 @@
+//8, 16 -> 8, 27   AllowLoadtime == false
+package p;
+class A {
+	static final int foo= 1;
+	static final int bar= 2;
+	static final int baz= 3;
+	void f() {
+		int i= 1 + 3 * bar;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_out.java
new file mode 100644
index 000000000..87cffcf18
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test2_out.java
@@ -0,0 +1,11 @@
+//8, 16 -> 8, 27   AllowLoadtime == false
+package p;
+class A {
+	static final int foo= 1;
+	static final int bar= 2;
+	private static final int CONSTANT= 1 + 3 * bar;
+	static final int baz= 3;
+	void f() {
+		int i= CONSTANT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test30_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test30_in.java
new file mode 100644
index 000000000..3e8f0bcc4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test30_in.java
@@ -0,0 +1,14 @@
+//12, 19, 12, 28
+package p;
+
+import java.util.ArrayList;
+
+class A_30_Super {
+	static final ArrayList<? super Integer> NL= new ArrayList<Integer>();
+}
+
+class A extends A_30_Super {
+	void foo() {
+		Object o= NL.get(0);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test30_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test30_out.java
new file mode 100644
index 000000000..75d16ef11
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test30_out.java
@@ -0,0 +1,16 @@
+//12, 19, 12, 28
+package p;
+
+import java.util.ArrayList;
+
+class A_30_Super {
+	static final ArrayList<? super Integer> NL= new ArrayList<Integer>();
+}
+
+class A extends A_30_Super {
+	private static final Object INTEGER= NL.get(0);
+
+	void foo() {
+		Object o= INTEGER;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test31_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test31_in.java
new file mode 100644
index 000000000..01429dfb6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test31_in.java
@@ -0,0 +1,14 @@
+package p;
+
+import static java.util.Arrays.*;
+
+class Bug {
+	final static String[] side = new String[0];
+	{
+		if (true) {
+			System.out.println(asList(side));
+		} else {
+			System.out.println(asList(side));
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test31_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test31_out.java
new file mode 100644
index 000000000..1844cc10f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test31_out.java
@@ -0,0 +1,17 @@
+package p;
+
+import static java.util.Arrays.*;
+
+import java.util.List;
+
+class Bug {
+	final static String[] side = new String[0];
+	private static final List<String> AS_LIST= asList(side);
+	{
+		if (true) {
+			System.out.println(AS_LIST);
+		} else {
+			System.out.println(AS_LIST);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test32_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test32_in.java
new file mode 100644
index 000000000..efdd84d92
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test32_in.java
@@ -0,0 +1,9 @@
+// 7, 20, 7, 35
+package p;
+import java.util.List;
+class A {
+	{
+		Object o= new String("Bla");
+		Object o2= new String(XXX);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test32_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test32_out.java
new file mode 100644
index 000000000..54dc80a95
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test32_out.java
@@ -0,0 +1,11 @@
+// 7, 20, 7, 35
+package p;
+import java.util.List;
+class A {
+	private static final String STRING= new String(XXX);
+
+	{
+		Object o= new String("Bla");
+		Object o2= STRING;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test33_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test33_in.java
new file mode 100644
index 000000000..5bf3bec72
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test33_in.java
@@ -0,0 +1,9 @@
+// 7, 20, 7, 35
+package p;
+import java.util.List;
+class A {
+	{
+		Object o= new String(XXX);
+		Object o2= new String(XXX);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test33_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test33_out.java
new file mode 100644
index 000000000..31fcd850a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test33_out.java
@@ -0,0 +1,11 @@
+// 7, 20, 7, 35
+package p;
+import java.util.List;
+class A {
+	private static final String STRING= new String(XXX);
+
+	{
+		Object o= STRING;
+		Object o2= STRING;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test34_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test34_in.java
new file mode 100644
index 000000000..6ec92f2aa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test34_in.java
@@ -0,0 +1,9 @@
+// 7, 20, 7, 35
+package p;
+import java.util.List;
+class A {
+	{
+		Object o= new String(XXX);
+		Object o2= new String(XXX)
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test34_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test34_out.java
new file mode 100644
index 000000000..2603293ca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test34_out.java
@@ -0,0 +1,11 @@
+// 7, 20, 7, 35
+package p;
+import java.util.List;
+class A {
+	private static final String STRING= new String(XXX);
+
+	{
+		Object o= STRING;
+		Object o2= STRING
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test35_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test35_in.java
new file mode 100644
index 000000000..464ba2cf7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test35_in.java
@@ -0,0 +1,11 @@
+// 7, 20, 7, 25
+package p;
+enum Bug {
+	Z {
+		@Override
+		String method() {
+			return "bug";
+		}
+	};
+	abstract String method();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test35_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test35_out.java
new file mode 100644
index 000000000..ac65a0d09
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test35_out.java
@@ -0,0 +1,13 @@
+// 7, 20, 7, 25
+package p;
+enum Bug {
+	Z {
+		@Override
+		String method() {
+			return BUG;
+		}
+	};
+	private static final String BUG= "bug";
+
+	abstract String method();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test36_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test36_in.java
new file mode 100644
index 000000000..378ee2845
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test36_in.java
@@ -0,0 +1,10 @@
+// 7, 20, 7, 25
+package p;
+enum Bug {
+	Z {
+		@Override
+		String method() {
+			return "bug";
+		}
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test36_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test36_out.java
new file mode 100644
index 000000000..1c662b3a5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test36_out.java
@@ -0,0 +1,12 @@
+// 7, 20, 7, 25
+package p;
+enum Bug {
+	Z {
+		@Override
+		String method() {
+			return BUG;
+		}
+	};
+
+	private static final String BUG= "bug";
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_in.java
new file mode 100644
index 000000000..d049fb1cd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_in.java
@@ -0,0 +1,10 @@
+//8, 16 -> 8, 27   AllowLoadtime == false
+package p;
+class A {
+	static final int foo= 1;
+	static final int bar= 2;
+	static final int baz= foo * (1+3*bar);
+	void f() {
+		int i= 1 + 3 * bar;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_out.java
new file mode 100644
index 000000000..f5de92607
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test3_out.java
@@ -0,0 +1,11 @@
+//8, 16 -> 8, 27   AllowLoadtime == false
+package p;
+class A {
+	static final int foo= 1;
+	static final int bar= 2;
+	private static final int CONSTANT= 1 + 3 * bar;
+	static final int baz= foo * CONSTANT;
+	void f() {
+		int i= CONSTANT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_in.java
new file mode 100644
index 000000000..9eb22442b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_in.java
@@ -0,0 +1,12 @@
+//5, 23 -> 5, 34   AllowLoadtime == false
+package p;
+class A {
+	static void f() {
+		int i= 2*(1 + 2 * b() * 5);
+		System.out.println(i);
+		System.out.println(2*b     ()*5  +1);
+	}
+	static int b() {
+		return 4;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_out.java
new file mode 100644
index 000000000..bf3031ad1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test4_out.java
@@ -0,0 +1,13 @@
+//5, 23 -> 5, 34   AllowLoadtime == false
+package p;
+class A {
+	private static final int CONSTANT= 2 * b() * 5;
+	static void f() {
+		int i= 2*(1 + CONSTANT);
+		System.out.println(i);
+		System.out.println(CONSTANT  +1);
+	}
+	static int b() {
+		return 4;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_in.java
new file mode 100644
index 000000000..b871560a8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_in.java
@@ -0,0 +1,15 @@
+//11, 20 -> 11, 26   AllowLoadtime == true
+package p;
+
+class R {
+	static int rG() {
+		return 2;
+	}
+
+	static class S extends R {
+		int f(){
+			int d= R.rG();
+			return d;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_out.java
new file mode 100644
index 000000000..6b53b7b3f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test5_out.java
@@ -0,0 +1,17 @@
+//11, 20 -> 11, 26   AllowLoadtime == true
+package p;
+
+class R {
+	static int rG() {
+		return 2;
+	}
+
+	static class S extends R {
+		private static final int CONSTANT= R.rG();
+
+		int f(){
+			int d= CONSTANT;
+			return d;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_in.java
new file mode 100644
index 000000000..4d28bf747
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_in.java
@@ -0,0 +1,17 @@
+//13, 20 -> 13, 35   AllowLoadtime == true
+package p;
+
+class R {
+	public static R instance= new R();
+	
+	int rF() {
+		return 1;
+	}
+	
+	static class S extends R {
+		int f(){
+			int d= R.instance.rF();		
+			return 0;	
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_out.java
new file mode 100644
index 000000000..0b1f49c1b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test6_out.java
@@ -0,0 +1,19 @@
+//13, 20 -> 13, 35   AllowLoadtime == true
+package p;
+
+class R {
+	public static R instance= new R();
+	
+	int rF() {
+		return 1;
+	}
+	
+	static class S extends R {
+		private static final int CONSTANT= R.instance.rF();
+
+		int f(){
+			int d= CONSTANT;		
+			return 0;	
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_in.java
new file mode 100644
index 000000000..001007d8e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_in.java
@@ -0,0 +1,15 @@
+//12, 20 -> 12, 28   AllowLoadtime == true
+package p;
+
+
+class R {
+	static int rG() {
+		return 2;	
+	}
+	
+	static class S extends R {
+		void f(){
+			int d= p.R.rG();	
+		}
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_out.java
new file mode 100644
index 000000000..8b7dc148e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test7_out.java
@@ -0,0 +1,17 @@
+//12, 20 -> 12, 28   AllowLoadtime == true
+package p;
+
+
+class R {
+	static int rG() {
+		return 2;	
+	}
+	
+	static class S extends R {
+		private static final int CONSTANT= p.R.rG();
+
+		void f(){
+			int d= CONSTANT;	
+		}
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_in.java
new file mode 100644
index 000000000..59610d63a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_in.java
@@ -0,0 +1,10 @@
+//8, 16 -> 8, 22   AllowLoadtime == true
+package p;
+
+class S {
+	static int s;
+
+	int f() {
+		return 23 * s;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_out.java
new file mode 100644
index 000000000..186eeb7af
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test8_out.java
@@ -0,0 +1,11 @@
+//8, 16 -> 8, 22   AllowLoadtime == true
+package p;
+
+class S {
+	static int s;
+	private static final int CONSTANT= 23 * s;
+
+	int f() {
+		return CONSTANT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_in.java
new file mode 100644
index 000000000..87db857f0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_in.java
@@ -0,0 +1,10 @@
+// 6, 24 -> 6, 29
+package p;
+
+class A {
+	void foob() {
+		int a= 2 * 3 + 3 + 1;
+
+		int b= (3 + 1) + 1*1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_out.java
new file mode 100644
index 000000000..c46402610
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_test9_out.java
@@ -0,0 +1,12 @@
+// 6, 24 -> 6, 29
+package p;
+
+class A {
+	private static final int CONSTANT= 3 + 1;
+
+	void foob() {
+		int a= 2 * 3 + CONSTANT;
+
+		int b= CONSTANT + 1*1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_in.java
new file mode 100644
index 000000000..b2d2c717a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_in.java
@@ -0,0 +1,7 @@
+//5, 18 -> 5, 18   AllowLoadtime == false
+package p;
+class A {
+	void f() {
+		int i= 100;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_out.java
new file mode 100644
index 000000000..1104d31f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/canExtract/A_testZeroLengthSelection0_out.java
@@ -0,0 +1,9 @@
+//5, 18 -> 5, 18   AllowLoadtime == false
+package p;
+class A {
+	private static final int CONSTANT= 100;
+
+	void f() {
+		int i= CONSTANT;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail0.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail0.java
new file mode 100644
index 000000000..5ebd21070
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail0.java
@@ -0,0 +1,10 @@
+//8, 16 -> 8, 21   AllowLoadtime == true
+package p;
+
+class S {
+	int s;
+	
+	void f(){
+		int l= s + 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail1.java
new file mode 100644
index 000000000..bc91ca43b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail1.java
@@ -0,0 +1,10 @@
+//8, 16 -> 8, 26   AllowLoadtime == true
+package p;
+
+class S {
+	int s;
+		
+	int f() {
+		return 23 *this.s;	
+	}
+}	
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail10.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail10.java
new file mode 100644
index 000000000..ae366f701
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail10.java
@@ -0,0 +1,19 @@
+//15, 20 -> 15, 37   AllowLoadtime == false
+package p;
+
+class R {
+	static R instance() {
+		return null;
+	}
+	
+	int rF() {
+		return 1;	
+	}
+	
+	static class S extends R {
+		int f(){
+			int d= R.instance().rF();		
+			return 0;	
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail11.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail11.java
new file mode 100644
index 000000000..77096bda8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail11.java
@@ -0,0 +1,10 @@
+//8, 16 -> 8, 22   AllowLoadtime == false
+package p;
+
+class S {
+	static int s;
+		
+	int f() {
+		return 23 * s;	
+	}
+}	
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail12.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail12.java
new file mode 100644
index 000000000..1ffe9d8d8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail12.java
@@ -0,0 +1,5 @@
+//4, 7 -> 4, 8   AllowLoadtime == true
+package p;
+
+class S {
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail13.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail13.java
new file mode 100644
index 000000000..af9a24693
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail13.java
@@ -0,0 +1,5 @@
+//2, 9 -> 2, 10   AllowLoadtime == true
+package p;
+
+class S {
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail14.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail14.java
new file mode 100644
index 000000000..2d28a7a0c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail14.java
@@ -0,0 +1,6 @@
+//5, 9 -> 5, 11   AllowLoadtime == true
+package p;
+
+class S {
+	int i= 1;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail15.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail15.java
new file mode 100644
index 000000000..062140a6c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail15.java
@@ -0,0 +1,6 @@
+//5, 10 -> 5, 13   AllowLoadtime == true
+package p;
+
+class S {
+	int i= 1;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail16.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail16.java
new file mode 100644
index 000000000..4d52c2999
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail16.java
@@ -0,0 +1,11 @@
+//9, 20, 9, 38
+package p;
+
+import java.util.List;
+import java.util.ArrayList;
+
+class A<E> {
+	void m(){
+		List<E> l= new ArrayList<E>();
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail17.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail17.java
new file mode 100644
index 000000000..44c0081b8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail17.java
@@ -0,0 +1,22 @@
+//16, 18, 16, 21
+package p;
+
+import static p.Color.RED;
+
+enum Color {
+	RED, BLUE(), YELLOW() {};
+	public static final Color fColor= RED;
+}
+
+class ColorUser {
+	void use() {
+		Color c= Color.fColor;
+		c= RED;
+		switch (c) {
+			case RED : //extract constant "RED"
+				break;
+			default :
+				break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail2.java
new file mode 100644
index 000000000..01cc4e14b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail2.java
@@ -0,0 +1,12 @@
+//9, 20 -> 9, 21   AllowLoadtime == true
+package p;
+
+class R {
+	int r;
+	
+	static class S extends R {
+		void f(){
+			int n= r;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail3.java
new file mode 100644
index 000000000..778b26d03
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail3.java
@@ -0,0 +1,15 @@
+//9, 18 -> 9, 25   AllowLoadtime == true
+package p;
+
+class R {
+	int r;
+
+	static class S extends R {
+		String f() {
+			fish(super.r);
+			return null;	
+		}
+		static void fish(int parm) {
+		}
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail4.java
new file mode 100644
index 000000000..08045d7c6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail4.java
@@ -0,0 +1,11 @@
+//6, 16 -> 6, 20   AllowLoadtime == true
+package p;
+
+class S {
+	int f(){
+		return f2();	
+	}
+	int f2() {
+		return 0;
+	}
+}	
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail5.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail5.java
new file mode 100644
index 000000000..d55f27eb0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail5.java
@@ -0,0 +1,11 @@
+//9, 16 -> 9, 25   AllowLoadtime == true
+package p;
+
+class S {
+	public int f2() {
+		return 1;	
+	}
+	void f(){
+		int i= this.f2();	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail6.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail6.java
new file mode 100644
index 000000000..0e12a9c99
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail6.java
@@ -0,0 +1,15 @@
+//11, 20 -> 11, 24   AllowLoadtime == true
+package p;
+class R {
+	int rF() {
+		return 1;
+	}
+	
+	
+	static class S extends R {
+		int f(){
+			int t= rF();
+			return t * t;
+		}	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail7.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail7.java
new file mode 100644
index 000000000..836f07d49
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/cannotExtract/A_testFail7.java
@@ -0,0 +1,14 @@
+//11, 20 -> 11, 34   AllowLoadtime == true
+package p;
+
+class R {
+	int rF() {
+		return 1;
+	}
+	
+	static class S extends R {
+		void foo() {
+			int u= super.rF() + 1;	
+		}
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName0.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName0.java
new file mode 100644
index 000000000..34aa9cd55
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName0.java
@@ -0,0 +1,9 @@
+package p;
+class A {
+	void foo() {
+		String s= getFooBar();//expected FOO_BAR
+	}
+	static String getFooBar() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName1.java
new file mode 100644
index 000000000..e4fadd824
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessFromGetterName1.java
@@ -0,0 +1,9 @@
+package p;
+class A {
+	void foo() {
+		boolean isfb= isFooBar();//expected FOO_BAR
+	}
+	static boolean isFooBar() {
+		return false;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral0.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral0.java
new file mode 100644
index 000000000..421fc6e82
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral0.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void foo() {
+		String s= "Foo.HashMap";//expected FOO_HASHMAP
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral1.java
new file mode 100644
index 000000000..03eb77595
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral1.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void foo() {
+		String s= "Foo/Hash+Map";//expected FOO_HASH_MAP
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral2.java
new file mode 100644
index 000000000..a82adeae8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral2.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void foo() {
+		String s= "/** HansImGlueck123*34//Bla//bla...";//expected HANS_IM_GLUECK123_34_BLA_BLA
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral3.java
new file mode 100644
index 000000000..89f12ca74
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractConstant/nameGuessing/testGuessStringLiteral3.java
@@ -0,0 +1,6 @@
+//5, 16, 5, 16
+package p;
+
+class A {
+	String s= "assumeCamelCase";
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/in/A.java
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/in/A.java
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/out/A.java
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test/out/A.java
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/in/A.java
new file mode 100644
index 000000000..6291b8090
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/in/A.java
@@ -0,0 +1,3 @@
+package p;
+class A{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/A.java
new file mode 100644
index 000000000..e773ba660
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/A.java
@@ -0,0 +1,3 @@
+package p;
+class A implements I{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test0/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/in/A.java
new file mode 100644
index 000000000..dd87960c0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/in/A.java
@@ -0,0 +1,4 @@
+package p;
+class A{
+	public void m(){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/A.java
new file mode 100644
index 000000000..ebd1a3180
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/A.java
@@ -0,0 +1,7 @@
+package p;
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test1/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/in/A.java
new file mode 100644
index 000000000..664199286
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/in/A.java
@@ -0,0 +1,4 @@
+package p;
+class A{
+	public final void m(){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/A.java
new file mode 100644
index 000000000..2cf178d57
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/A.java
@@ -0,0 +1,7 @@
+package p;
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public final void m(){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test10/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/in/A.java
new file mode 100644
index 000000000..9f7c410d7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/in/A.java
@@ -0,0 +1,28 @@
+package p;
+
+public abstract class A {
+	public abstract void x()   ;
+	//	 TestRunListener implementation
+	public abstract void y() /* nasty */;
+	public abstract void z() // xx
+	;
+
+	/** Javadoc*/abstract public void a () /**post-Javadoc*/;
+
+	/**JD*/
+	
+	//abstract
+	
+	public abstract void b();
+	
+	//destruct
+	public
+	abstract
+	void c
+	()
+	/* Comments*/
+	/** en */
+	// gros!
+	; //post
+	public abstract void d();
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/A.java
new file mode 100644
index 000000000..7d969e886
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/A.java
@@ -0,0 +1,47 @@
+package p;
+
+public abstract class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#x()
+	 */
+	public abstract void x()   ;
+	//	 TestRunListener implementation
+	/* (non-Javadoc)
+	 * @see p.I#y()
+	 */
+	public abstract void y() /* nasty */;
+	/* (non-Javadoc)
+	 * @see p.I#z()
+	 */
+	public abstract void z() // xx
+	;
+
+	/* (non-Javadoc)
+	 * @see p.I#a()
+	 */abstract public void a () /**post-Javadoc*/;
+
+	/* (non-Javadoc)
+	 * @see p.I#b()
+	 */
+	
+	//abstract
+	
+	public abstract void b();
+	
+	//destruct
+	/* (non-Javadoc)
+	 * @see p.I#c()
+	 */
+	public
+	abstract
+	void c
+	()
+	/* Comments*/
+	/** en */
+	// gros!
+	; //post
+	/* (non-Javadoc)
+	 * @see p.I#d()
+	 */
+	public abstract void d();
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java
new file mode 100644
index 000000000..14b71abc7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test100/out/I.java
@@ -0,0 +1,33 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void x();
+
+	//	 TestRunListener implementation
+	public abstract void y() /* nasty */;
+
+	public abstract void z() // xx
+	;
+
+	/** Javadoc*/
+	abstract public void a() /**post-Javadoc*/
+	;
+
+	/**JD*/
+
+	//abstract
+
+	public abstract void b();
+
+	//destruct
+	public abstract void c()
+	/* Comments*/
+	/** en */
+	// gros!
+	; //post
+
+	public abstract void d();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/A.java
new file mode 100644
index 000000000..7c137448d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/A.java
@@ -0,0 +1,14 @@
+package p;
+
+public enum A {
+	TEST;
+	void bar() {
+		B site = null;
+		baz(site.f, site.f);
+	}
+
+	void baz(C filters, C fs) {
+		filters.foo();
+	}
+	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/B.java
new file mode 100644
index 000000000..1ca780b5e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B  {
+
+	C f = null;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/C.java
new file mode 100644
index 000000000..9b9ebeaed
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/in/C.java
@@ -0,0 +1,8 @@
+
+package p;
+
+      
+public enum C {
+	PROBE;
+	public void foo () {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/A.java
new file mode 100644
index 000000000..dc25cc7c2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+public enum A {
+	TEST;
+	void bar() {
+		B site = null;
+		baz(site.f, site.f);
+	}
+
+	void baz(C filters, I fs) {
+		filters.foo();
+	}
+	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/B.java
new file mode 100644
index 000000000..1ca780b5e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B  {
+
+	C f = null;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/C.java
new file mode 100644
index 000000000..570b235dc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/C.java
@@ -0,0 +1,8 @@
+
+package p;
+
+      
+public enum C implements I {
+	PROBE;
+	public void foo () {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/I.java
new file mode 100644
index 000000000..fd202032a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test101/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/A.java
new file mode 100644
index 000000000..5f73d05d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+public class A<T> {
+	
+	void bar() {
+		B site = null;
+		baz(site.f, site.f);
+	}
+
+	void baz(C filters, C fs) {
+		filters.foo();
+	}
+
+	T wassup() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/B.java
new file mode 100644
index 000000000..1ca780b5e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B  {
+
+	C f = null;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/C.java
new file mode 100644
index 000000000..d4a94220f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/in/C.java
@@ -0,0 +1,7 @@
+
+package p;
+
+      
+public class C<S, T extends String> {
+	public void foo () {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/A.java
new file mode 100644
index 000000000..45ecb01c2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+public class A<T> {
+	
+	void bar() {
+		B site = null;
+		baz(site.f, site.f);
+	}
+
+	void baz(C filters, I fs) {
+		filters.foo();
+	}
+
+	T wassup() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/B.java
new file mode 100644
index 000000000..1ca780b5e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B  {
+
+	C f = null;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/C.java
new file mode 100644
index 000000000..5e8f646ed
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/C.java
@@ -0,0 +1,7 @@
+
+package p;
+
+      
+public class C<S, T extends String> implements I<S, T> {
+	public void foo () {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/I.java
new file mode 100644
index 000000000..2705ad64b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test102/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+public interface I<S, T extends String> {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/A.java
new file mode 100644
index 000000000..b2f050e1e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/A.java
@@ -0,0 +1,14 @@
+package p;
+
+public class A<S> {
+	
+	void bar() {
+		B<S> site = null;
+		baz(site.f, site.f);
+	}
+
+	void baz(C filters, C fs) {
+		filters.foo();
+	}
+	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/B.java
new file mode 100644
index 000000000..f97064f92
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B<T>  {
+
+	C f = null;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/C.java
new file mode 100644
index 000000000..f67d9fbbc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/in/C.java
@@ -0,0 +1,8 @@
+
+package p;
+
+      
+public enum C {
+	TEST;
+	public void foo () {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/A.java
new file mode 100644
index 000000000..96d0b9a84
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+public class A<S> {
+	
+	void bar() {
+		B<S> site = null;
+		baz(site.f, site.f);
+	}
+
+	void baz(C filters, I fs) {
+		filters.foo();
+	}
+	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/B.java
new file mode 100644
index 000000000..f97064f92
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B<T>  {
+
+	C f = null;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/C.java
new file mode 100644
index 000000000..2b2914be2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/C.java
@@ -0,0 +1,8 @@
+
+package p;
+
+      
+public enum C implements I {
+	TEST;
+	public void foo () {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/I.java
new file mode 100644
index 000000000..fd202032a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test103/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/in/A.java
new file mode 100644
index 000000000..f2ac1adc9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A {
+	public void m1() {
+	}
+	public void m2() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/in/B.java
new file mode 100644
index 000000000..b57d3c8f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/in/B.java
@@ -0,0 +1,10 @@
+package p;
+
+public class B {
+	public static void main(String[] args) {
+		A[] arr = new A[5];
+		for(A mytest : arr) {
+			mytest.m1();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/A.java
new file mode 100644
index 000000000..5737ea78c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m1()
+	 */
+	public void m1() {
+	}
+	public void m2() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/B.java
new file mode 100644
index 000000000..0e1da7932
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/B.java
@@ -0,0 +1,10 @@
+package p;
+
+public class B {
+	public static void main(String[] args) {
+		I[] arr = new I[5];
+		for(I mytest : arr) {
+			mytest.m1();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/I.java
new file mode 100644
index 000000000..8c8e81389
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test104/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m1();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/in/A.java
new file mode 100644
index 000000000..f2ac1adc9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A {
+	public void m1() {
+	}
+	public void m2() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/in/B.java
new file mode 100644
index 000000000..b57d3c8f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/in/B.java
@@ -0,0 +1,10 @@
+package p;
+
+public class B {
+	public static void main(String[] args) {
+		A[] arr = new A[5];
+		for(A mytest : arr) {
+			mytest.m1();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/A.java
new file mode 100644
index 000000000..a515c7f15
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+public class A implements I {
+	public void m1() {
+	}
+	/* (non-Javadoc)
+	 * @see p.I#m2()
+	 */
+	public void m2() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/B.java
new file mode 100644
index 000000000..b57d3c8f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/B.java
@@ -0,0 +1,10 @@
+package p;
+
+public class B {
+	public static void main(String[] args) {
+		A[] arr = new A[5];
+		for(A mytest : arr) {
+			mytest.m1();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/I.java
new file mode 100644
index 000000000..218e40ad9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test105/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m2();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/in/A.java
new file mode 100644
index 000000000..f2ac1adc9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A {
+	public void m1() {
+	}
+	public void m2() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/in/B.java
new file mode 100644
index 000000000..e332a9799
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/in/B.java
@@ -0,0 +1,10 @@
+package p;
+import java.util.ArrayList;
+public class B {
+	public static void main(String[] args) {
+		ArrayList<A> col = new ArrayList<A>();
+		for(A mytest : col) {
+			mytest.m1();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/A.java
new file mode 100644
index 000000000..5737ea78c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m1()
+	 */
+	public void m1() {
+	}
+	public void m2() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/B.java
new file mode 100644
index 000000000..c55491ca6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/B.java
@@ -0,0 +1,10 @@
+package p;
+import java.util.ArrayList;
+public class B {
+	public static void main(String[] args) {
+		ArrayList<A> col = new ArrayList<A>();
+		for(I mytest : col) {
+			mytest.m1();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/I.java
new file mode 100644
index 000000000..8c8e81389
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test106/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m1();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/in/A.java
new file mode 100644
index 000000000..f2ac1adc9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A {
+	public void m1() {
+	}
+	public void m2() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/in/B.java
new file mode 100644
index 000000000..e332a9799
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/in/B.java
@@ -0,0 +1,10 @@
+package p;
+import java.util.ArrayList;
+public class B {
+	public static void main(String[] args) {
+		ArrayList<A> col = new ArrayList<A>();
+		for(A mytest : col) {
+			mytest.m1();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/A.java
new file mode 100644
index 000000000..a515c7f15
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+public class A implements I {
+	public void m1() {
+	}
+	/* (non-Javadoc)
+	 * @see p.I#m2()
+	 */
+	public void m2() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/B.java
new file mode 100644
index 000000000..e332a9799
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/B.java
@@ -0,0 +1,10 @@
+package p;
+import java.util.ArrayList;
+public class B {
+	public static void main(String[] args) {
+		ArrayList<A> col = new ArrayList<A>();
+		for(A mytest : col) {
+			mytest.m1();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/I.java
new file mode 100644
index 000000000..218e40ad9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test107/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m2();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/in/A.java
new file mode 100644
index 000000000..8e99b8007
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/in/A.java
@@ -0,0 +1,15 @@
+package p;
+
+public class A {
+	public void m() {
+		for (A a : getCollection()) {
+			a.abc();
+		}
+		for (A a : getCollection()) {
+
+		}
+	}
+
+	private void abc() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/A.java
new file mode 100644
index 000000000..0aee7a239
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/A.java
@@ -0,0 +1,18 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {
+		for (A a : getCollection()) {
+			a.abc();
+		}
+		for (I a : getCollection()) {
+
+		}
+	}
+
+	private void abc() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/I.java
new file mode 100644
index 000000000..d35d188e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test108/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/in/A.java
new file mode 100644
index 000000000..85aa8408f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+public class A {
+	public void m() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/A.java
new file mode 100644
index 000000000..e5f397f30
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	@Override
+	public void m() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/I.java
new file mode 100644
index 000000000..d35d188e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test109/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/in/A.java
new file mode 100644
index 000000000..2b34eb578
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/in/A.java
@@ -0,0 +1,4 @@
+package p;
+abstract class A{
+	abstract public void m();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/A.java
new file mode 100644
index 000000000..ce5f6a6e6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/A.java
@@ -0,0 +1,7 @@
+package p;
+abstract class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	abstract public void m();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java
new file mode 100644
index 000000000..c5fc68052
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test11/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	abstract public void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/in/A.java
new file mode 100644
index 000000000..5e21e43d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/in/A.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	public void m(){}
+	private void f(){
+		A a= new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/A.java
new file mode 100644
index 000000000..507037d20
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/A.java
@@ -0,0 +1,10 @@
+package p;
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	private void f(){
+		I a= new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test12/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/in/A.java
new file mode 100644
index 000000000..12e1ef30f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/in/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A extends Object implements Cloneable{
+	public void m(){
+	}
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/A.java
new file mode 100644
index 000000000..c3e0061cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A extends Object implements Cloneable, I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){
+	}
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test13/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/in/A.java
new file mode 100644
index 000000000..5a5dfceab
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/in/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	public void m(){}
+	void f(){
+		A a= new A();
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/A.java
new file mode 100644
index 000000000..26ae8c2e7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	void f(){
+		I a= new A();
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test14/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/in/A.java
new file mode 100644
index 000000000..5a5e8899a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m(){}
+	public void m1(){}
+	void f(){
+		A a= new A();
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/A.java
new file mode 100644
index 000000000..a0c786975
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	/* (non-Javadoc)
+	 * @see p.I#m1()
+	 */
+	public void m1(){}
+	void f(){
+		I a= new A();
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java
new file mode 100644
index 000000000..1f5efbe9f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test15/out/I.java
@@ -0,0 +1,10 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+	public abstract void m1();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/in/A.java
new file mode 100644
index 000000000..25c649216
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/in/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	public void m(){}
+	public void m1(){}
+	void f(){
+		A a= new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/A.java
new file mode 100644
index 000000000..eb4608229
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	public void m1(){}
+	void f(){
+		I a= new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test16/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/in/A.java
new file mode 100644
index 000000000..f8b6018fb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m(){}
+	public void m1(){}
+	void f(){
+		A a= new A();
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/A.java
new file mode 100644
index 000000000..ba6249eb6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	public void m1(){}
+	void f(){
+		A a= new A();
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test17/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/in/A.java
new file mode 100644
index 000000000..ef848e152
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m(){}
+	public void m1(){}
+	void f(){
+		A a= new A();
+		a.m();
+
+		A a1= new A();
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/A.java
new file mode 100644
index 000000000..8f5c2e146
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	public void m1(){}
+	void f(){
+		I a= new A();
+		a.m();
+
+		A a1= new A();
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test18/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/in/A.java
new file mode 100644
index 000000000..465ce7d07
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	public void m(){}
+	public void m1(){}
+	void f(){
+		A a= new A(), a1 = new A();
+		a.m();
+
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/A.java
new file mode 100644
index 000000000..1304eaa72
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	public void m1(){}
+	void f(){
+		A a= new A(), a1 = new A();
+		a.m();
+
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test19/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/in/A.java
new file mode 100644
index 000000000..8cde1c8d5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/in/A.java
@@ -0,0 +1,7 @@
+package p;
+
+import java.util.List;
+
+class A{
+	public List m(){return null;}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/A.java
new file mode 100644
index 000000000..ca1ab22e9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.List;
+
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public List m(){return null;}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java
new file mode 100644
index 000000000..a1364c5c6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test2/out/I.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.List;
+
+/** typecomment template*/
+interface I {
+
+	public abstract List m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/in/A.java
new file mode 100644
index 000000000..465ce7d07
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	public void m(){}
+	public void m1(){}
+	void f(){
+		A a= new A(), a1 = new A();
+		a.m();
+
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/A.java
new file mode 100644
index 000000000..08c2542de
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/A.java
@@ -0,0 +1,18 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	/* (non-Javadoc)
+	 * @see p.I#m1()
+	 */
+	public void m1(){}
+	void f(){
+		I a= new A(), a1 = new A();
+		a.m();
+
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java
new file mode 100644
index 000000000..1f5efbe9f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test20/out/I.java
@@ -0,0 +1,10 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+	public abstract void m1();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/in/A.java
new file mode 100644
index 000000000..097d16258
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A extends Exception {
+	public void m() {}
+	void e() throws A{}
+	void g() {
+		try{
+			e();
+		} catch (A a){
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/A.java
new file mode 100644
index 000000000..d36f352c9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+class A extends Exception implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	void e() throws A{}
+	void g() {
+		try{
+			e();
+		} catch (A a){
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test21/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/in/A.java
new file mode 100644
index 000000000..ccfb484a3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	public void m() {}
+	Class g() {
+		return A.class;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/A.java
new file mode 100644
index 000000000..4321d3765
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	Class g() {
+		return A.class;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test22/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/in/A.java
new file mode 100644
index 000000000..6a11d584b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	public void m() {}
+	void g() {
+		A a= (A)new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/A.java
new file mode 100644
index 000000000..d19f01a46
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	void g() {
+		I a= (I)new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test23/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/in/A.java
new file mode 100644
index 000000000..b62808f89
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void g() {
+		A a= (A)new A();
+		((A)this).m1();
+		((A)this).m();
+		(((A)this)).m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/A.java
new file mode 100644
index 000000000..a7e2f7859
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void g() {
+		I a= (I)new A();
+		((A)this).m1();
+		((I)this).m();
+		(((I)this)).m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test24/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/in/A.java
new file mode 100644
index 000000000..e68557f1b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	public void m() {}
+	protected A g() {
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/A.java
new file mode 100644
index 000000000..ca3ea86ff
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	protected I g() {
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test25/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/in/A.java
new file mode 100644
index 000000000..b1a453c5b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	protected A g() {
+		g().m();
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/A.java
new file mode 100644
index 000000000..82b4bc95d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected I g() {
+		g().m();
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test26/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/in/A.java
new file mode 100644
index 000000000..5b3c42a32
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	protected A g() {
+		g().m1();
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/A.java
new file mode 100644
index 000000000..c03a0a70a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected A g() {
+		g().m1();
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test27/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/in/A.java
new file mode 100644
index 000000000..034048d2a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/in/A.java
@@ -0,0 +1,14 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	protected A g() {
+		return this;	
+	}
+}
+class A1 extends A{
+	protected A g() {
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/A.java
new file mode 100644
index 000000000..e82649bd2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected I g() {
+		return this;	
+	}
+}
+class A1 extends A{
+	protected I g() {
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test28/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/in/A.java
new file mode 100644
index 000000000..e35e76962
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/in/A.java
@@ -0,0 +1,15 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	protected A g() {
+		return this;	
+	}
+}
+class A1 extends A{
+	protected A g() {
+		g().m1();
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/A.java
new file mode 100644
index 000000000..26be95e56
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/A.java
@@ -0,0 +1,18 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected I g() {
+		return this;	
+	}
+}
+class A1 extends A{
+	protected A g() {
+		g().m1();
+		return this;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test29/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/in/A.java
new file mode 100644
index 000000000..8dc82243c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A{
+	public void m(){
+		List list= new ArrayList();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/A.java
new file mode 100644
index 000000000..3ac9ecac3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){
+		List list= new ArrayList();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test3/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/in/A.java
new file mode 100644
index 000000000..bd95d6d68
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void g() {
+		f((A)this);
+	}
+	A f(A a){
+		f(a).m1();
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/A.java
new file mode 100644
index 000000000..fa601c8b1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void g() {
+		f((A)this);
+	}
+	A f(A a){
+		f(a).m1();
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test30/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/in/A.java
new file mode 100644
index 000000000..ac7516b10
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void g() {
+		f((A)this);
+	}
+	A f(A a){
+		f(a).m();
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/A.java
new file mode 100644
index 000000000..7f5c5e792
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void g() {
+		f((I)this);
+	}
+	I f(I a){
+		f(a).m();
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test31/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/in/A.java
new file mode 100644
index 000000000..73697dca6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1= a0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/A.java
new file mode 100644
index 000000000..4489e8fb1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		I a0= new A();
+		I a1= a0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test32/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/in/A.java
new file mode 100644
index 000000000..dafae2d73
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1= a0;
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/A.java
new file mode 100644
index 000000000..be9ece2f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1= a0;
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test33/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/in/A.java
new file mode 100644
index 000000000..77c79e4cf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1= a0;
+		a1.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/A.java
new file mode 100644
index 000000000..95cf37111
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		I a0= new A();
+		I a1= a0;
+		a1.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test34/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/in/A.java
new file mode 100644
index 000000000..a37464681
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/A.java
new file mode 100644
index 000000000..6eff4e846
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test35/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/in/A.java
new file mode 100644
index 000000000..c8eae545a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		f(a0);
+	}
+	void f(A a){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/A.java
new file mode 100644
index 000000000..a6acc55cb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		f(a0);
+	}
+	void f(A a){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test36/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/in/A.java
new file mode 100644
index 000000000..7b8503c99
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		f(a0);
+	}
+	void f(A a){
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/A.java
new file mode 100644
index 000000000..497cd738f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		I a0= new A();
+		f(a0);
+	}
+	void f(I a){
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test37/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/in/A.java
new file mode 100644
index 000000000..057736699
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1;
+		a1= a0;
+		a1.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/A.java
new file mode 100644
index 000000000..f67267dfb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		I a0= new A();
+		I a1;
+		a1= a0;
+		a1.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test38/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/in/A.java
new file mode 100644
index 000000000..c59c6b676
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1;
+		a1= a0;
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/A.java
new file mode 100644
index 000000000..2bf783953
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1;
+		a1= a0;
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test39/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/in/A.java
new file mode 100644
index 000000000..8ba196554
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/in/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A implements Cloneable{
+	public void m(){
+	}
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/A.java
new file mode 100644
index 000000000..3b7ce0999
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A implements Cloneable, I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){
+	}
+	protected Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test4/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/in/A.java
new file mode 100644
index 000000000..5af74a304
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a1;
+		a1= null;
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/A.java
new file mode 100644
index 000000000..9e8e56bb6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a1;
+		a1= null;
+		a1.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test40/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/in/A.java
new file mode 100644
index 000000000..d51ccac22
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1= a0;
+		A a2= a1;
+		a2.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/A.java
new file mode 100644
index 000000000..67449cefd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1= a0;
+		A a2= a1;
+		a2.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test41/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/in/A.java
new file mode 100644
index 000000000..640bb019e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/in/A.java
@@ -0,0 +1,14 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1;
+		a1= a0;
+		A a2;
+		a2= a1;
+		a2.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/A.java
new file mode 100644
index 000000000..1de9a3345
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		A a1;
+		a1= a0;
+		A a2;
+		a2= a1;
+		a2.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test42/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/in/A.java
new file mode 100644
index 000000000..bd58ab206
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		((A)a0).m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/A.java
new file mode 100644
index 000000000..a7cf0cedd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		I a0= new A();
+		((I)a0).m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test43/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/in/A.java
new file mode 100644
index 000000000..6e991abc3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void test(){
+		A a0= new A();
+		((A)a0).m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/A.java
new file mode 100644
index 000000000..367f75166
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void test(){
+		I a0= new A();
+		((A)a0).m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test44/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/in/A.java
new file mode 100644
index 000000000..563853729
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/in/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void f(A a){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/A.java
new file mode 100644
index 000000000..7b8098ae5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(A a){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test45/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/in/A.java
new file mode 100644
index 000000000..4a13bcfda
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/in/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void f(A a){
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/A.java
new file mode 100644
index 000000000..6f14847ae
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(I a){
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test46/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/in/A.java
new file mode 100644
index 000000000..2795284d6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	A g() {
+		A a= new A();
+		g().m1();
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/A.java
new file mode 100644
index 000000000..8af821002
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	A g() {
+		A a= new A();
+		g().m1();
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test47/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/in/A.java
new file mode 100644
index 000000000..4691f697f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	A f(A a){
+		f(a).m1();
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/A.java
new file mode 100644
index 000000000..8a1bdfc0a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	A f(A a){
+		f(a).m1();
+		return a;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test48/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/in/A.java
new file mode 100644
index 000000000..a11f57956
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void g() {
+		f((A)this);
+	}
+	void f(A a){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/A.java
new file mode 100644
index 000000000..00fab3b41
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void g() {
+		f((A)this);
+	}
+	void f(A a){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test49/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/in/A.java
new file mode 100644
index 000000000..d5feb017e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+class A{
+	public void m() throws IOException{
+		List list= new ArrayList();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/A.java
new file mode 100644
index 000000000..d3467d063
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() throws IOException{
+		List list= new ArrayList();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java
new file mode 100644
index 000000000..d33a7aac0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test5/out/I.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.io.IOException;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m() throws IOException;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/in/A.java
new file mode 100644
index 000000000..1393e6a13
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	A a;
+	public void m() {}
+	public void m1() {}
+	void f(){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/A.java
new file mode 100644
index 000000000..68486e18f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	A a;
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test50/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/in/A.java
new file mode 100644
index 000000000..b8d3883ef
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	A a;
+	public void m() {}
+	public void m1() {}
+	void f(){
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/A.java
new file mode 100644
index 000000000..8ffda9e64
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	I a;
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(){
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test51/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/in/A.java
new file mode 100644
index 000000000..07f76efcc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	A fA;
+	public void m() {}
+	public void m1() {}
+	void f(){
+		A a= fA;
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/A.java
new file mode 100644
index 000000000..198d60b43
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+class A implements I {
+	A fA;
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(){
+		A a= fA;
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test52/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/in/A.java
new file mode 100644
index 000000000..0c285d8ee
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	A fA;
+	public void m() {}
+	public void m1() {}
+	void f(){
+		A a= fA;
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/A.java
new file mode 100644
index 000000000..1d91ebd6f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+class A implements I {
+	I fA;
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(){
+		I a= fA;
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test53/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A.java
new file mode 100644
index 000000000..edba837b7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A {
+	public void m() {}
+	public void m1() {}
+	protected void f(A a){
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A1.java
new file mode 100644
index 000000000..2d54186f8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/in/A1.java
@@ -0,0 +1,7 @@
+package p;
+
+public class A1 extends A{
+	protected void f(A a){
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A.java
new file mode 100644
index 000000000..417b32f0a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected void f(I a){
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A1.java
new file mode 100644
index 000000000..3eccac64d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/A1.java
@@ -0,0 +1,7 @@
+package p;
+
+public class A1 extends A{
+	protected void f(I a){
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java
new file mode 100644
index 000000000..d35d188e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test54/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A.java
new file mode 100644
index 000000000..edba837b7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A {
+	public void m() {}
+	public void m1() {}
+	protected void f(A a){
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A1.java
new file mode 100644
index 000000000..a4285b33c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/in/A1.java
@@ -0,0 +1,7 @@
+package p;
+
+public class A1 extends A{
+	protected void f(A a){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A.java
new file mode 100644
index 000000000..03730eb7e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected void f(A a){
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A1.java
new file mode 100644
index 000000000..a4285b33c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/A1.java
@@ -0,0 +1,7 @@
+package p;
+
+public class A1 extends A{
+	protected void f(A a){
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java
new file mode 100644
index 000000000..d35d188e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test55/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A.java
new file mode 100644
index 000000000..8074a12b1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+public class A {
+	public void m() {}
+	public void m1() {}
+	protected A f(){
+		return this;
+	}
+	void test(){
+		f().m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A1.java
new file mode 100644
index 000000000..c6b716d12
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/in/A1.java
@@ -0,0 +1,10 @@
+package p;
+
+public class A1 extends A{
+	protected A f(){
+		return this;
+	}
+	void test(){
+		f().m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A.java
new file mode 100644
index 000000000..e65e8c0ba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected A f(){
+		return this;
+	}
+	void test(){
+		f().m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A1.java
new file mode 100644
index 000000000..c6b716d12
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/A1.java
@@ -0,0 +1,10 @@
+package p;
+
+public class A1 extends A{
+	protected A f(){
+		return this;
+	}
+	void test(){
+		f().m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java
new file mode 100644
index 000000000..d35d188e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test56/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A.java
new file mode 100644
index 000000000..68860d5ca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+public class A {
+	public void m() {}
+	public void m1() {}
+	protected A f(){
+		return this;
+	}
+	void test(){
+		f().m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A1.java
new file mode 100644
index 000000000..d29e8f0e2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/in/A1.java
@@ -0,0 +1,10 @@
+package p;
+
+public class A1 extends A{
+	protected A f(){
+		return this;
+	}
+	void test(){
+		f().m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A.java
new file mode 100644
index 000000000..bcbd7df3e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected I f(){
+		return this;
+	}
+	void test(){
+		f().m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A1.java
new file mode 100644
index 000000000..2de0edc84
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/A1.java
@@ -0,0 +1,10 @@
+package p;
+
+public class A1 extends A{
+	protected I f(){
+		return this;
+	}
+	void test(){
+		f().m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java
new file mode 100644
index 000000000..d35d188e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test57/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/in/A.java
new file mode 100644
index 000000000..652974461
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	int f;
+	public void m() {}
+	public void m1() {}
+	protected A f(){
+		return this;
+	}
+	void test(){
+		f().f=0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/A.java
new file mode 100644
index 000000000..ac894caca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	int f;
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	protected A f(){
+		return this;
+	}
+	void test(){
+		f().f=0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test58/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/in/A.java
new file mode 100644
index 000000000..71717be34
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/in/A.java
@@ -0,0 +1,7 @@
+package p;
+
+import p.A;
+class A {
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/A.java
new file mode 100644
index 000000000..8b4f980fc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+import p.A;
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test59/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/in/A.java
new file mode 100644
index 000000000..075d6ae4e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+class A{
+	public List m(Set set) throws IOException{
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/A.java
new file mode 100644
index 000000000..1d9937877
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m(java.util.Set)
+	 */
+	public List m(Set set) throws IOException{
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java
new file mode 100644
index 000000000..b2d1c306b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test6/out/I.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+/** typecomment template*/
+interface I {
+
+	public abstract List m(Set set) throws IOException;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/in/A.java
new file mode 100644
index 000000000..a45dd6cf7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	public static void s() {}
+	void t(){
+		A.s();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/A.java
new file mode 100644
index 000000000..98d5f9e91
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	public static void s() {}
+	void t(){
+		A.s();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test60/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/in/A.java
new file mode 100644
index 000000000..373a7eedd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	public static int s= 0;
+	void t(){
+		A.s= 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/A.java
new file mode 100644
index 000000000..d63b057bd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	public static int s= 0;
+	void t(){
+		A.s= 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test61/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/in/A.java
new file mode 100644
index 000000000..1b847e999
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void t(){
+		new A(){
+			void g(){
+				A.this.m1();
+			}
+		};	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/A.java
new file mode 100644
index 000000000..d67e6b409
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void t(){
+		new A(){
+			void g(){
+				A.this.m1();
+			}
+		};	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test62/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/in/A.java
new file mode 100644
index 000000000..a2b831a1e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void t(){
+		new A(){
+			void g() throws InterruptedException{
+				A.super.wait();
+			}
+		};	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/A.java
new file mode 100644
index 000000000..f2e0959fa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void t(){
+		new A(){
+			void g() throws InterruptedException{
+				A.super.wait();
+			}
+		};	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test63/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/A.java
new file mode 100644
index 000000000..227d1d517
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void f(Inter i){
+		A a= new A();
+		i.work(a);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/Inter.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/Inter.java
new file mode 100644
index 000000000..06fa9e7ff
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/in/Inter.java
@@ -0,0 +1,5 @@
+package p;
+
+public interface Inter {
+	void work(A a);
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/A.java
new file mode 100644
index 000000000..2a46b9590
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(Inter i){
+		I a= new A();
+		i.work(a);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/Inter.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/Inter.java
new file mode 100644
index 000000000..505676f1a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test64/out/Inter.java
@@ -0,0 +1,5 @@
+package p;
+
+public interface Inter {
+	void work(I a);
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/in/A.java
new file mode 100644
index 000000000..ef34364e6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void f(){
+		A a= create();
+		a.m1();
+	}
+	A create(){
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/A.java
new file mode 100644
index 000000000..f2d164143
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(){
+		A a= create();
+		a.m1();
+	}
+	A create(){
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test65/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/in/A.java
new file mode 100644
index 000000000..5be310309
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+	void f(){
+		A a= create();
+		a.m();
+	}
+	A create(){
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/A.java
new file mode 100644
index 000000000..cab8614fb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+	void f(){
+		I a= create();
+		a.m();
+	}
+	I create(){
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test66/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/A.java
new file mode 100644
index 000000000..a37464681
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+class A {
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Inter.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Inter.java
new file mode 100644
index 000000000..147dd9a3f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Inter.java
@@ -0,0 +1,4 @@
+package p;
+public interface Inter {
+	void work(A a);
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Outer.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Outer.java
new file mode 100644
index 000000000..e09d286b5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/in/Outer.java
@@ -0,0 +1,11 @@
+package p;
+public class Outer{
+	public static class Implementor implements Inter{	
+		public void work(A a) {}
+	}
+	Implementor implementor;
+	void f(){
+		A a= new A();
+		implementor.work(a);
+	}
+}	
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/A.java
new file mode 100644
index 000000000..6eff4e846
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Inter.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Inter.java
new file mode 100644
index 000000000..a6b6364b2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Inter.java
@@ -0,0 +1,4 @@
+package p;
+public interface Inter {
+	void work(I a);
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Outer.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Outer.java
new file mode 100644
index 000000000..3c1a5eff9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test67/out/Outer.java
@@ -0,0 +1,11 @@
+package p;
+public class Outer{
+	public static class Implementor implements Inter{	
+		public void work(I a) {}
+	}
+	Implementor implementor;
+	void f(){
+		I a= new A();
+		implementor.work(a);
+	}
+}	
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/A.java
new file mode 100644
index 000000000..4f1f8c471
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/A.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	static A getA(){
+		return null;
+	}
+	public void m(){}
+	public void m1(){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/As.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/As.java
new file mode 100644
index 000000000..5aa68d81b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/in/As.java
@@ -0,0 +1,8 @@
+package p;
+/** typecomment template*/
+public class As {
+	void f(){
+		A a= A.getA();
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/A.java
new file mode 100644
index 000000000..abf6616c1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/A.java
@@ -0,0 +1,11 @@
+package p;
+class A implements I {
+	static A getA(){
+		return null;
+	}
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	public void m1(){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/As.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/As.java
new file mode 100644
index 000000000..5aa68d81b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/As.java
@@ -0,0 +1,8 @@
+package p;
+/** typecomment template*/
+public class As {
+	void f(){
+		A a= A.getA();
+		a.m1();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test68/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/A.java
new file mode 100644
index 000000000..4f1f8c471
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/A.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	static A getA(){
+		return null;
+	}
+	public void m(){}
+	public void m1(){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/As.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/As.java
new file mode 100644
index 000000000..156c19573
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/in/As.java
@@ -0,0 +1,8 @@
+package p;
+/** typecomment template*/
+public class As {
+	void f(){
+		A a= A.getA();
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/A.java
new file mode 100644
index 000000000..78dffdcf9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/A.java
@@ -0,0 +1,11 @@
+package p;
+class A implements I {
+	static I getA(){
+		return null;
+	}
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m(){}
+	public void m1(){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/As.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/As.java
new file mode 100644
index 000000000..5dfb4a260
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/As.java
@@ -0,0 +1,8 @@
+package p;
+/** typecomment template*/
+public class As {
+	void f(){
+		I a= A.getA();
+		a.m();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test69/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/in/A.java
new file mode 100644
index 000000000..4120bb73b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+class A{
+	public List m(Set set, Set set1) throws IOException{
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/A.java
new file mode 100644
index 000000000..b9e8f8f1e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m(java.util.Set, java.util.Set)
+	 */
+	public List m(Set set, Set set1) throws IOException{
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java
new file mode 100644
index 000000000..73e123437
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test7/out/I.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+/** typecomment template*/
+interface I {
+
+	public abstract List m(Set set, Set set1) throws IOException;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/in/A.java
new file mode 100644
index 000000000..8dc037d6d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+public class A {
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/A.java
new file mode 100644
index 000000000..e02fbe9ea
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/A.java
@@ -0,0 +1,9 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java
new file mode 100644
index 000000000..d35d188e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test70/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/A.java
new file mode 100644
index 000000000..8dc037d6d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+public class A {
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/As.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/As.java
new file mode 100644
index 000000000..e0c24ef68
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/in/As.java
@@ -0,0 +1,10 @@
+package p;
+/** typecomment template*/
+public class As {
+	void f(){
+		A a= new A();
+		if (a instanceof A){
+		} else {
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/A.java
new file mode 100644
index 000000000..e02fbe9ea
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/A.java
@@ -0,0 +1,9 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#m()
+	 */
+	public void m() {}
+	public void m1() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/As.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/As.java
new file mode 100644
index 000000000..a24cf3dad
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/As.java
@@ -0,0 +1,10 @@
+package p;
+/** typecomment template*/
+public class As {
+	void f(){
+		I a= new A();
+		if (a instanceof A){
+		} else {
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java
new file mode 100644
index 000000000..d35d188e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test71/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/A.java
new file mode 100644
index 000000000..90fe4bf85
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/A.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+    public void m(A foo) {
+        foo.m(foo);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/As.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/As.java
new file mode 100644
index 000000000..b19dc18f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/in/As.java
@@ -0,0 +1,7 @@
+package p;
+public class As {
+    void r(A foo) {
+        A local= null;
+        foo.m(local);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/A.java
new file mode 100644
index 000000000..ebc780b91
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/A.java
@@ -0,0 +1,9 @@
+package p;
+class A implements I {
+    /* (non-Javadoc)
+	 * @see p.I#m(p.I)
+	 */
+    public void m(I foo) {
+        foo.m(foo);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/As.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/As.java
new file mode 100644
index 000000000..a18bf9a19
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/As.java
@@ -0,0 +1,7 @@
+package p;
+public class As {
+    void r(I foo) {
+        I local= null;
+        foo.m(local);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java
new file mode 100644
index 000000000..12b236f98
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test72/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m(I foo);
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/A.java
new file mode 100644
index 000000000..6d767e0db
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/A.java
@@ -0,0 +1,5 @@
+package p;
+
+public class A implements OldInterface{
+	public int amount(){ return 1;}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/B.java
new file mode 100644
index 000000000..a04ba1d50
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/B.java
@@ -0,0 +1,10 @@
+package p;
+
+public class B implements OldInterface{
+	private void s(){
+		OldInterface i= find();
+	}
+	private A find(){
+		return new A();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/OldInterface.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/OldInterface.java
new file mode 100644
index 000000000..f140f1b16
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/in/OldInterface.java
@@ -0,0 +1,3 @@
+package p;
+public interface OldInterface {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/A.java
new file mode 100644
index 000000000..8ca42eed8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A implements OldInterface, I{
+	/* (non-Javadoc)
+	 * @see p.I#amount()
+	 */
+	public int amount(){ return 1;}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/B.java
new file mode 100644
index 000000000..a04ba1d50
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/B.java
@@ -0,0 +1,10 @@
+package p;
+
+public class B implements OldInterface{
+	private void s(){
+		OldInterface i= find();
+	}
+	private A find(){
+		return new A();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java
new file mode 100644
index 000000000..1b927d77b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract int amount();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/OldInterface.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/OldInterface.java
new file mode 100644
index 000000000..f140f1b16
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test73/out/OldInterface.java
@@ -0,0 +1,3 @@
+package p;
+public interface OldInterface {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/A.java
new file mode 100644
index 000000000..6d767e0db
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/A.java
@@ -0,0 +1,5 @@
+package p;
+
+public class A implements OldInterface{
+	public int amount(){ return 1;}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/B.java
new file mode 100644
index 000000000..bdacf80d7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/B.java
@@ -0,0 +1,11 @@
+package p;
+
+public class B implements OldInterface{
+	private void s(){
+		OldInterface i;
+		i= find();
+	}
+	private A find(){
+		return new A();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/OldInterface.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/OldInterface.java
new file mode 100644
index 000000000..f140f1b16
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/in/OldInterface.java
@@ -0,0 +1,3 @@
+package p;
+public interface OldInterface {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/A.java
new file mode 100644
index 000000000..8ca42eed8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A implements OldInterface, I{
+	/* (non-Javadoc)
+	 * @see p.I#amount()
+	 */
+	public int amount(){ return 1;}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/B.java
new file mode 100644
index 000000000..bdacf80d7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/B.java
@@ -0,0 +1,11 @@
+package p;
+
+public class B implements OldInterface{
+	private void s(){
+		OldInterface i;
+		i= find();
+	}
+	private A find(){
+		return new A();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java
new file mode 100644
index 000000000..1b927d77b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract int amount();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/OldInterface.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/OldInterface.java
new file mode 100644
index 000000000..f140f1b16
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test74/out/OldInterface.java
@@ -0,0 +1,3 @@
+package p;
+public interface OldInterface {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/A.java
new file mode 100644
index 000000000..996b609cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+public class A {
+	public int amount(){ return 1;}
+	public void add(){}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/B.java
new file mode 100644
index 000000000..cdad7771b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B {
+	B(int t, A a){
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/C.java
new file mode 100644
index 000000000..399856f22
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/in/C.java
@@ -0,0 +1,8 @@
+package p;
+
+public class C {
+	A fA;
+	void f(){
+		B b= new B(2, fA);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/A.java
new file mode 100644
index 000000000..340a3ed03
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/A.java
@@ -0,0 +1,9 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#amount()
+	 */
+	public int amount(){ return 1;}
+	public void add(){}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/B.java
new file mode 100644
index 000000000..53bece195
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B {
+	B(int t, I a){
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/C.java
new file mode 100644
index 000000000..623defa96
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/C.java
@@ -0,0 +1,8 @@
+package p;
+
+public class C {
+	I fA;
+	void f(){
+		B b= new B(2, fA);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java
new file mode 100644
index 000000000..1b927d77b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test75/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract int amount();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/A.java
new file mode 100644
index 000000000..996b609cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+public class A {
+	public int amount(){ return 1;}
+	public void add(){}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/B.java
new file mode 100644
index 000000000..d07a15db6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/B.java
@@ -0,0 +1,7 @@
+package p;
+
+public class B {
+	B(int t, A a){
+		a.add();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/C.java
new file mode 100644
index 000000000..399856f22
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/in/C.java
@@ -0,0 +1,8 @@
+package p;
+
+public class C {
+	A fA;
+	void f(){
+		B b= new B(2, fA);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/A.java
new file mode 100644
index 000000000..340a3ed03
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/A.java
@@ -0,0 +1,9 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#amount()
+	 */
+	public int amount(){ return 1;}
+	public void add(){}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/B.java
new file mode 100644
index 000000000..d07a15db6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/B.java
@@ -0,0 +1,7 @@
+package p;
+
+public class B {
+	B(int t, A a){
+		a.add();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/C.java
new file mode 100644
index 000000000..399856f22
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/C.java
@@ -0,0 +1,8 @@
+package p;
+
+public class C {
+	A fA;
+	void f(){
+		B b= new B(2, fA);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java
new file mode 100644
index 000000000..1b927d77b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test76/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract int amount();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/A.java
new file mode 100644
index 000000000..bd54b4586
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/A.java
@@ -0,0 +1,7 @@
+package p;
+
+public class A {
+	class Inner {
+		public int amount(){ return 1;}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/B.java
new file mode 100644
index 000000000..831a28b3e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/in/B.java
@@ -0,0 +1,7 @@
+package p;
+
+public class B {
+	B(int t, A.Inner a){
+		a.amount();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/A.java
new file mode 100644
index 000000000..6bf30ff89
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+public class A {
+	class Inner implements I {
+		/* (non-Javadoc)
+		 * @see p.I#amount()
+		 */
+		public int amount(){ return 1;}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/B.java
new file mode 100644
index 000000000..7c02a2475
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/B.java
@@ -0,0 +1,7 @@
+package p;
+
+public class B {
+	B(int t, I a){
+		a.amount();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java
new file mode 100644
index 000000000..09e25e008
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test77/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract int amount();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/in/A.java
new file mode 100644
index 000000000..249d15eb3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/in/A.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+    public A m(A foo) {
+        foo.m(foo);
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/A.java
new file mode 100644
index 000000000..f09e78796
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/A.java
@@ -0,0 +1,10 @@
+package p;
+class A implements I {
+    /* (non-Javadoc)
+	 * @see p.I#m(p.I)
+	 */
+    public I m(I foo) {
+        foo.m(foo);
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java
new file mode 100644
index 000000000..a907fc378
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test78/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract I m(I foo);
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/in/A.java
new file mode 100644
index 000000000..48e129cad
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/in/A.java
@@ -0,0 +1,9 @@
+package p;
+class A {
+	public A getFoo() {
+		return null;
+	}
+	public void foo(A foo) {
+
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/A.java
new file mode 100644
index 000000000..77d9486b3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/A.java
@@ -0,0 +1,15 @@
+package p;
+class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#getFoo()
+	 */
+	public I getFoo() {
+		return null;
+	}
+	/* (non-Javadoc)
+	 * @see p.I#foo(p.I)
+	 */
+	public void foo(I foo) {
+
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java
new file mode 100644
index 000000000..426865327
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test79/out/I.java
@@ -0,0 +1,10 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract I getFoo();
+
+	public abstract void foo(I foo);
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/in/A.java
new file mode 100644
index 000000000..391f87d30
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+class A{
+	public List m(Set set, String string) throws IOException{
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/A.java
new file mode 100644
index 000000000..3a144986a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m(java.util.Set, java.lang.String)
+	 */
+	public List m(Set set, String string) throws IOException{
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java
new file mode 100644
index 000000000..65c216bca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test8/out/I.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+/** typecomment template*/
+interface I {
+
+	public abstract List m(Set set, String string) throws IOException;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/in/A.java
new file mode 100644
index 000000000..78a5c2958
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/in/A.java
@@ -0,0 +1,51 @@
+package p;
+
+public class A {
+	/**
+	 * comment f
+	 */
+	public void f(){
+	} 
+
+	/** comment fz*/
+	public void fz(){
+	} 
+
+	/**
+	 * comment f1
+	 */
+	public void f1(){
+	} 
+
+	/** comment f1z*/
+	public void f1z(){
+	} 
+
+	//comment f11
+	public void f11(){
+	}
+
+	public void f2(){
+	}
+	
+	/** 
+	 * jdoc I1
+	 */
+	public static final int I1= 0;
+
+	/** jdoc I1z*/
+	public static final int I1z= 0;
+
+	/** 
+	 * comI2
+	 */
+	public static final int I2= 0;
+
+	/** com I2z*/
+	public static final int I2z= 0;
+
+	//comment I3
+	public static final int I3= 0;
+
+	public static final int I4= 0;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/A.java
new file mode 100644
index 000000000..d86b73938
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/A.java
@@ -0,0 +1,40 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#f()
+	 */
+	public void f(){
+	} 
+
+	/* (non-Javadoc)
+	 * @see p.I#fz()
+	 */
+	public void fz(){
+	} 
+
+	/* (non-Javadoc)
+	 * @see p.I#f1()
+	 */
+	public void f1(){
+	} 
+
+	/* (non-Javadoc)
+	 * @see p.I#f1z()
+	 */
+	public void f1z(){
+	} 
+
+	//comment f11
+	/* (non-Javadoc)
+	 * @see p.I#f11()
+	 */
+	public void f11(){
+	}
+
+	/* (non-Javadoc)
+	 * @see p.I#f2()
+	 */
+	public void f2(){
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java
new file mode 100644
index 000000000..41edaba7e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test80/out/I.java
@@ -0,0 +1,43 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	/**
+	 * comment f
+	 */
+	public abstract void f();
+
+	/** comment fz*/
+	public abstract void fz();
+
+	/**
+	 * comment f1
+	 */
+	public abstract void f1();
+
+	/** comment f1z*/
+	public abstract void f1z();
+
+	//comment f11
+	public abstract void f11();
+
+	public abstract void f2();
+
+	/** 
+	 * jdoc I1
+	 */
+	public static final int I1= 0;
+	/** jdoc I1z*/
+	public static final int I1z= 0;
+	/** 
+	 * comI2
+	 */
+	public static final int I2= 0;
+	/** com I2z*/
+	public static final int I2z= 0;
+	//comment I3
+	public static final int I3= 0;
+	public static final int I4= 0;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/in/A.java
new file mode 100644
index 000000000..e2cb58af8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/in/A.java
@@ -0,0 +1,12 @@
+package p;
+class A {
+	private int x;
+	private A[] v2= null; 
+	void f(A[] v){
+		A[] a= v;
+		a[0].x= 0;
+		A[] v1= null;
+		a= v1;
+		a= v2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/A.java
new file mode 100644
index 000000000..50afd048a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/A.java
@@ -0,0 +1,12 @@
+package p;
+class A implements I {
+	private int x;
+	private A[] v2= null; 
+	void f(A[] v){
+		A[] a= v;
+		a[0].x= 0;
+		A[] v1= null;
+		a= v1;
+		a= v2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test81/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/in/A.java
new file mode 100644
index 000000000..9998396bf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/in/A.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	private int x;
+	void f(A[] v){
+		A[] a= v;
+		a[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/A.java
new file mode 100644
index 000000000..28e3dc303
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/A.java
@@ -0,0 +1,8 @@
+package p;
+class A implements I {
+	private int x;
+	void f(A[] v){
+		A[] a= v;
+		a[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test82/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/in/A.java
new file mode 100644
index 000000000..5a3af0b8f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/in/A.java
@@ -0,0 +1,11 @@
+package p;
+class A {
+	private int x;
+	void f(A[] v){
+		A[] a= v;
+		g(a);
+	}
+	void g(A[] x){
+		x[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/A.java
new file mode 100644
index 000000000..f470b9fa6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/A.java
@@ -0,0 +1,11 @@
+package p;
+class A implements I {
+	private int x;
+	void f(A[] v){
+		A[] a= v;
+		g(a);
+	}
+	void g(A[] x){
+		x[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test83/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/in/A.java
new file mode 100644
index 000000000..c198bd9d1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/in/A.java
@@ -0,0 +1,13 @@
+package p;
+class A{
+	int x;
+}
+class B {
+	A f(){
+		A a= null;
+		return (a);	
+	}
+	void x(){
+		f().x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/A.java
new file mode 100644
index 000000000..8dea002ba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/A.java
@@ -0,0 +1,13 @@
+package p;
+class A implements I{
+	int x;
+}
+class B {
+	A f(){
+		A a= null;
+		return (a);	
+	}
+	void x(){
+		f().x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test84/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/in/A.java
new file mode 100644
index 000000000..c55a5d0b5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/in/A.java
@@ -0,0 +1,13 @@
+package p;
+class A {
+	int x;
+}
+class T{
+	A[] cs;
+	void add(A c){
+		cs[0]= c;
+	}
+	void f(){
+		cs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/A.java
new file mode 100644
index 000000000..a76fdcd69
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/A.java
@@ -0,0 +1,13 @@
+package p;
+class A implements I {
+	int x;
+}
+class T{
+	A[] cs;
+	void add(A c){
+		cs[0]= c;
+	}
+	void f(){
+		cs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test85/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/in/A.java
new file mode 100644
index 000000000..c38d60a1f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/in/A.java
@@ -0,0 +1,17 @@
+package p;
+class A {
+	int x;
+}
+class Y{
+	A[] cs;
+	void add(A c){
+		cs[0]= c;
+	}
+	void f(){
+		cs[0].x= 0;
+	}
+	void foo(){
+		A[] tab= null;
+		add(tab[0]);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/A.java
new file mode 100644
index 000000000..d288692f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/A.java
@@ -0,0 +1,17 @@
+package p;
+class A implements I {
+	int x;
+}
+class Y{
+	A[] cs;
+	void add(A c){
+		cs[0]= c;
+	}
+	void f(){
+		cs[0].x= 0;
+	}
+	void foo(){
+		A[] tab= null;
+		add(tab[0]);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test86/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/in/A.java
new file mode 100644
index 000000000..58ba48d38
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/in/A.java
@@ -0,0 +1,11 @@
+package p;
+class A {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	void add(A c){
+		new A[]{null}[0]= c;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/A.java
new file mode 100644
index 000000000..be6652321
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/A.java
@@ -0,0 +1,11 @@
+package p;
+class A implements I {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	void add(I c){
+		new I[]{null}[0]= c;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test87/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/in/A.java
new file mode 100644
index 000000000..30f535631
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/in/A.java
@@ -0,0 +1,13 @@
+package p;
+class A {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	A[] cs;
+	void add(A c){
+		(cs= cs)[0]= c;
+		cs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/A.java
new file mode 100644
index 000000000..ea147377c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/A.java
@@ -0,0 +1,13 @@
+package p;
+class A implements I {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	A[] cs;
+	void add(A c){
+		(cs= cs)[0]= c;
+		cs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test88/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/in/A.java
new file mode 100644
index 000000000..befe09bba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/in/A.java
@@ -0,0 +1,13 @@
+package p;
+class A {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	A[] cs;
+	void add(A c){
+		((3 > 4) ? cs: cs)[0]= c;
+		cs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/A.java
new file mode 100644
index 000000000..7887c322a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/A.java
@@ -0,0 +1,13 @@
+package p;
+class A implements I {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	A[] cs;
+	void add(A c){
+		((3 > 4) ? cs: cs)[0]= c;
+		cs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test89/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/in/A.java
new file mode 100644
index 000000000..8dd87343d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/in/A.java
@@ -0,0 +1,4 @@
+package p;
+class A{
+	public void m(int i, boolean b, short s, char c, long l, double d){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/A.java
new file mode 100644
index 000000000..26bf7351d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/A.java
@@ -0,0 +1,7 @@
+package p;
+class A implements I{
+	/* (non-Javadoc)
+	 * @see p.I#m(int, boolean, short, char, long, double)
+	 */
+	public void m(int i, boolean b, short s, char c, long l, double d){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java
new file mode 100644
index 000000000..32a22414f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test9/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m(int i, boolean b, short s, char c, long l, double d);
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/in/A.java
new file mode 100644
index 000000000..082c5c417
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/in/A.java
@@ -0,0 +1,21 @@
+package p;
+class A {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	void add(A c){
+		gm()[0]= c;
+		
+		gm1()[0]= c;
+		gm1()[0].x= 0;
+	}
+	A[] gm() {
+		return null;
+	}
+	A[] gm1() {
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/A.java
new file mode 100644
index 000000000..a5ecb0339
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/A.java
@@ -0,0 +1,21 @@
+package p;
+class A implements I {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	void add(A c){
+		gm()[0]= c;
+		
+		gm1()[0]= c;
+		gm1()[0].x= 0;
+	}
+	I[] gm() {
+		return null;
+	}
+	A[] gm1() {
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test90/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/in/A.java
new file mode 100644
index 000000000..e30a0efcc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/in/A.java
@@ -0,0 +1,13 @@
+package p;
+class A {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	static A[] scs;
+	void add(A c){
+		p.T.scs[0]= c;
+		p.T.scs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/A.java
new file mode 100644
index 000000000..5c9a871a8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/A.java
@@ -0,0 +1,13 @@
+package p;
+class A implements I {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	static A[] scs;
+	void add(A c){
+		p.T.scs[0]= c;
+		p.T.scs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test91/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/in/A.java
new file mode 100644
index 000000000..8140b37d5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/in/A.java
@@ -0,0 +1,13 @@
+package p;
+class A {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	A[] cs;
+	void add(A c){
+		(cs)[0]= c;
+		cs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/A.java
new file mode 100644
index 000000000..9b94fae80
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/A.java
@@ -0,0 +1,13 @@
+package p;
+class A implements I {
+	int x;
+}
+class ST{
+}
+class T extends ST{
+	A[] cs;
+	void add(A c){
+		(cs)[0]= c;
+		cs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test92/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/in/A.java
new file mode 100644
index 000000000..b9361189f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/in/A.java
@@ -0,0 +1,13 @@
+package p;
+class A {
+	int x;
+}
+class ST{
+	A[] supercs;
+}
+class T extends ST{
+	void add(A c){
+		super.supercs[0]= c;
+		super.supercs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/A.java
new file mode 100644
index 000000000..4bcd521a0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/A.java
@@ -0,0 +1,13 @@
+package p;
+class A implements I {
+	int x;
+}
+class ST{
+	A[] supercs;
+}
+class T extends ST{
+	void add(A c){
+		super.supercs[0]= c;
+		super.supercs[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test93/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/in/A.java
new file mode 100644
index 000000000..919c0d5f7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/in/A.java
@@ -0,0 +1,15 @@
+package p;
+class A {
+	int x;
+}
+class ST{
+	 A[] gm() {
+		return null;
+	}
+}
+class T extends ST{
+	void add(A c){
+		super.gm()[0]= c;
+		super.gm()[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/A.java
new file mode 100644
index 000000000..52e4ed8b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/A.java
@@ -0,0 +1,15 @@
+package p;
+class A implements I {
+	int x;
+}
+class ST{
+	 A[] gm() {
+		return null;
+	}
+}
+class T extends ST{
+	void add(A c){
+		super.gm()[0]= c;
+		super.gm()[0].x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test94/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/in/A.java
new file mode 100644
index 000000000..d12f48e5f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/in/A.java
@@ -0,0 +1,5 @@
+package p;
+class A {
+	String x[]= {""};
+	A a;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/A.java
new file mode 100644
index 000000000..2fe5c1166
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/A.java
@@ -0,0 +1,5 @@
+package p;
+class A implements I {
+	String x[]= {""};
+	I a;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test95/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/in/A.java
new file mode 100644
index 000000000..8e3ee8d02
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/in/A.java
@@ -0,0 +1,5 @@
+package p;
+class A {
+	String[] x[]= {{""}, {}};
+	A a;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/A.java
new file mode 100644
index 000000000..649191834
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/A.java
@@ -0,0 +1,5 @@
+package p;
+class A implements I {
+	String[] x[]= {{""}, {}};
+	I a;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/I.java
new file mode 100644
index 000000000..085463411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test96/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/in/A.java
new file mode 100644
index 000000000..2f1240202
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/in/A.java
@@ -0,0 +1,15 @@
+package p;
+
+public class A {
+	public int foo() {
+		return 0;
+	}
+}
+
+class Tester {
+	void bar() {
+		A t= null;
+		int i= t.foo();
+		t.hashCode();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/A.java
new file mode 100644
index 000000000..e693ef51f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/A.java
@@ -0,0 +1,18 @@
+package p;
+
+public class A implements I {
+	/* (non-Javadoc)
+	 * @see p.I#foo()
+	 */
+	public int foo() {
+		return 0;
+	}
+}
+
+class Tester {
+	void bar() {
+		I t= null;
+		int i= t.foo();
+		t.hashCode();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java
new file mode 100644
index 000000000..d52e8ee1f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test97/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract int foo();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Bar.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Bar.java
new file mode 100644
index 000000000..fc032f19e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Bar.java
@@ -0,0 +1,17 @@
+package p;
+public class Bar {
+
+  private Foo foo;
+  
+  public Foo getFoo() {
+	return foo;
+  }
+
+  public void setFoo(Foo foo) {
+	this.foo = foo;
+  }
+
+  public void useFoo() {
+	foo.foo();
+  }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Foo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Foo.java
new file mode 100644
index 000000000..34c5c8461
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/in/Foo.java
@@ -0,0 +1,6 @@
+package p;
+public class Foo {
+	public void foo() {
+
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Bar.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Bar.java
new file mode 100644
index 000000000..0add8fab8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Bar.java
@@ -0,0 +1,17 @@
+package p;
+public class Bar {
+
+  private IFoo foo;
+  
+  public IFoo getFoo() {
+	return foo;
+  }
+
+  public void setFoo(IFoo foo) {
+	this.foo = foo;
+  }
+
+  public void useFoo() {
+	foo.foo();
+  }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Foo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Foo.java
new file mode 100644
index 000000000..e3a65d8e3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/Foo.java
@@ -0,0 +1,9 @@
+package p;
+public class Foo implements IFoo {
+	/* (non-Javadoc)
+	 * @see p.IFoo#foo()
+	 */
+	public void foo() {
+
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java
new file mode 100644
index 000000000..a2eebffc4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test98/out/IFoo.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface IFoo {
+
+	public abstract void foo();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/A.java
new file mode 100644
index 000000000..846d1b81c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/A.java
@@ -0,0 +1,14 @@
+package p;
+
+public class A {
+	
+	void bar() {
+		B site = null;
+		baz(site.f, site.f);
+	}
+
+	void baz(C filters, C fs) {
+		filters.foo();
+	}
+	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/B.java
new file mode 100644
index 000000000..1ca780b5e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B  {
+
+	C f = null;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/C.java
new file mode 100644
index 000000000..4dd423fe9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/in/C.java
@@ -0,0 +1,7 @@
+
+package p;
+
+      
+public class C {
+	public void foo () {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/A.java
new file mode 100644
index 000000000..c1693ed1d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+public class A {
+	
+	void bar() {
+		B site = null;
+		baz(site.f, site.f);
+	}
+
+	void baz(C filters, I fs) {
+		filters.foo();
+	}
+	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/B.java
new file mode 100644
index 000000000..1ca780b5e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/B.java
@@ -0,0 +1,6 @@
+package p;
+
+public class B  {
+
+	C f = null;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/C.java
new file mode 100644
index 000000000..12dfe0fed
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/C.java
@@ -0,0 +1,7 @@
+
+package p;
+
+      
+public class C implements I {
+	public void foo () {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/I.java
new file mode 100644
index 000000000..fd202032a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/test99/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/A.java
new file mode 100644
index 000000000..547553e29
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+public class A {
+	private void foo() {
+		X idealEndPos[][] = null;
+		X ideal[] = null;
+		ideal[2] = (false
+				? idealEndPos[3][2]
+								 : idealEndPos[2][1]);
+		int j = ideal.length;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/X.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/X.java
new file mode 100644
index 000000000..63ebf4d35
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/in/X.java
@@ -0,0 +1,3 @@
+package p;
+
+public class X { }
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/A.java
new file mode 100644
index 000000000..ad5c1c905
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+public class A {
+	private void foo() {
+		I idealEndPos[][] = null;
+		I ideal[] = null;
+		ideal[2] = (false
+				? idealEndPos[3][2]
+								 : idealEndPos[2][1]);
+		int j = ideal.length;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/I.java
new file mode 100644
index 000000000..fd202032a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/I.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/X.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/X.java
new file mode 100644
index 000000000..a5cd1ff95
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional1/out/X.java
@@ -0,0 +1,3 @@
+package p;
+
+public class X implements I { }
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/A.java
new file mode 100644
index 000000000..dc1caca74
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+public class A {
+	void foo() {
+		X v1[] = null;
+		X v2[] = null;
+		v2[1] = (true ? null : v1[1]); // BUG
+		v1[1].dot(v2[1]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/X.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/X.java
new file mode 100644
index 000000000..3a148435e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/in/X.java
@@ -0,0 +1,8 @@
+package p;
+
+public class X {
+	public double x;
+	public final double dot(X v) {
+		return v.x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/A.java
new file mode 100644
index 000000000..dc1caca74
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+public class A {
+	void foo() {
+		X v1[] = null;
+		X v2[] = null;
+		v2[1] = (true ? null : v1[1]); // BUG
+		v1[1].dot(v2[1]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java
new file mode 100644
index 000000000..fbe645ae3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+public interface I {
+
+	public abstract double dot(X v);
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/X.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/X.java
new file mode 100644
index 000000000..e4442a00b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConditional2/out/X.java
@@ -0,0 +1,11 @@
+package p;
+
+public class X implements I {
+	public double x;
+	/* (non-Javadoc)
+	 * @see p.I#dot(p.X)
+	 */
+	public final double dot(X v) {
+		return v.x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/in/A.java
new file mode 100644
index 000000000..2e0193a36
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/in/A.java
@@ -0,0 +1,9 @@
+package p;
+class A {
+	public static final int X= 0;
+}
+class Test{
+	void f(A a){
+		int i= a.X;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/A.java
new file mode 100644
index 000000000..cebf70cb8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/A.java
@@ -0,0 +1,8 @@
+package p;
+class A implements I {
+}
+class Test{
+	void f(I a){
+		int i= a.X;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java
new file mode 100644
index 000000000..9fe19efec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant80/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/in/A.java
new file mode 100644
index 000000000..ccd75f756
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/in/A.java
@@ -0,0 +1,9 @@
+package p;
+class A {
+	public static final int X= 0;
+}
+class Test{
+	void f(){
+		int i= A.X;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/A.java
new file mode 100644
index 000000000..8d0c9cd89
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/A.java
@@ -0,0 +1,8 @@
+package p;
+class A implements I {
+}
+class Test{
+	void f(){
+		int i= I.X;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java
new file mode 100644
index 000000000..9fe19efec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant81/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/in/A.java
new file mode 100644
index 000000000..1fa8e13ce
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/in/A.java
@@ -0,0 +1,11 @@
+package p;
+class A {
+	public static final int X= 0;
+	public static final int Y= 0;
+}
+class Test{
+	void f(){
+		int i= A.X;
+		i= A.Y;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/A.java
new file mode 100644
index 000000000..4db9eddfd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/A.java
@@ -0,0 +1,10 @@
+package p;
+class A implements I {
+	public static final int Y= 0;
+}
+class Test{
+	void f(){
+		int i= I.X;
+		i= A.Y;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java
new file mode 100644
index 000000000..9fe19efec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant82/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/in/A.java
new file mode 100644
index 000000000..35145b813
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/in/A.java
@@ -0,0 +1,11 @@
+package p;
+class A {
+	public static final int X= 0;
+	public static final int Y= 0;
+}
+class Test{
+	void f(A a){
+		int i= a.X;
+		i= a.Y;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/A.java
new file mode 100644
index 000000000..b6ef13db2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/A.java
@@ -0,0 +1,10 @@
+package p;
+class A implements I {
+	public static final int Y= 0;
+}
+class Test{
+	void f(A a){
+		int i= a.X;
+		i= a.Y;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java
new file mode 100644
index 000000000..9fe19efec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant83/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/in/A.java
new file mode 100644
index 000000000..82caf1c0e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/in/A.java
@@ -0,0 +1,22 @@
+package p;
+class A {
+	public static final int Y= 0;
+	public static final int X= 0;
+}
+class Test{
+	void f(){
+		A a= null;
+		int i= a.X;
+		u(a);
+
+		A a1= null;
+		int i1= a.X;
+		u1(a1);
+	}
+	void u(A a){
+		int u= a.X;
+	}
+	void u1(A a){
+		int u= a.Y;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/A.java
new file mode 100644
index 000000000..74633bac3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/A.java
@@ -0,0 +1,21 @@
+package p;
+class A implements I {
+	public static final int Y= 0;
+}
+class Test{
+	void f(){
+		I a= null;
+		int i= a.X;
+		u(a);
+
+		A a1= null;
+		int i1= a.X;
+		u1(a1);
+	}
+	void u(I a){
+		int u= a.X;
+	}
+	void u1(A a){
+		int u= a.Y;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java
new file mode 100644
index 000000000..9fe19efec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant84/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/in/A.java
new file mode 100644
index 000000000..6a6d112da
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+import java.util.ArrayList;
+
+class A extends ArrayList{
+	public static final int X= 0;
+}
+class Test{
+	void f(A a){
+		x(a);
+	}
+	void x(ArrayList o){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/A.java
new file mode 100644
index 000000000..db15ce31c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.util.ArrayList;
+
+class A extends ArrayList implements I{
+}
+class Test{
+	void f(A a){
+		x(a);
+	}
+	void x(ArrayList o){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java
new file mode 100644
index 000000000..9fe19efec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant85/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/in/A.java
new file mode 100644
index 000000000..12c805254
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/in/A.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	public static final int X= 0; /*constant comment*/
+
+	public static final int Y= 0; //constant line comment
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/A.java
new file mode 100644
index 000000000..707deb532
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/A.java
@@ -0,0 +1,3 @@
+package p;
+class A implements I {
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java
new file mode 100644
index 000000000..c5752c9be
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant86/out/I.java
@@ -0,0 +1,9 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0; /*constant comment*/
+	public static final int Y= 0; //constant line comment
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/in/A.java
new file mode 100644
index 000000000..12c805254
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/in/A.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	public static final int X= 0; /*constant comment*/
+
+	public static final int Y= 0; //constant line comment
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/A.java
new file mode 100644
index 000000000..707deb532
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/A.java
@@ -0,0 +1,3 @@
+package p;
+class A implements I {
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java
new file mode 100644
index 000000000..c5752c9be
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant87/out/I.java
@@ -0,0 +1,9 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0; /*constant comment*/
+	public static final int Y= 0; //constant line comment
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/in/A.java
new file mode 100644
index 000000000..c0b0f5301
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/in/A.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	public static final int X= 0;
+
+	public static final int Y= A.X + A.X;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/A.java
new file mode 100644
index 000000000..707deb532
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/A.java
@@ -0,0 +1,3 @@
+package p;
+class A implements I {
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java
new file mode 100644
index 000000000..061be5067
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testConstant88/out/I.java
@@ -0,0 +1,9 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int X= 0;
+	public static final int Y= I.X + I.X;
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail/in/A.java
new file mode 100644
index 000000000..6b249e3d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail/in/A.java
@@ -0,0 +1,2 @@
+package p;
+interface A{}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail0/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail0/in/A.java
new file mode 100644
index 000000000..6b249e3d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail0/in/A.java
@@ -0,0 +1,2 @@
+package p;
+interface A{}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail1/in/A.java
new file mode 100644
index 000000000..af50958dc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testFail1/in/A.java
@@ -0,0 +1,3 @@
+package p;
+class A{}
+interface I{}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/in/A.java
new file mode 100644
index 000000000..11361e57f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/in/A.java
@@ -0,0 +1,4 @@
+package p;
+interface A{
+	void m();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/A.java
new file mode 100644
index 000000000..2e796c10b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/A.java
@@ -0,0 +1,3 @@
+package p;
+interface A extends I{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface0/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/in/A.java
new file mode 100644
index 000000000..83e7e98e7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/in/A.java
@@ -0,0 +1,4 @@
+package p;
+interface A extends Cloneable{
+	void m();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/A.java
new file mode 100644
index 000000000..56853cef2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/A.java
@@ -0,0 +1,3 @@
+package p;
+interface A extends Cloneable, I{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java
new file mode 100644
index 000000000..4a018ad60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface1/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/in/A.java
new file mode 100644
index 000000000..1adef634f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/in/A.java
@@ -0,0 +1,6 @@
+package p;
+interface A{
+	public static final int i= 0;
+	int j= 1;
+	void m();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/A.java
new file mode 100644
index 000000000..2e796c10b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/A.java
@@ -0,0 +1,3 @@
+package p;
+interface A extends I{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java
new file mode 100644
index 000000000..ee2febd37
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface2/out/I.java
@@ -0,0 +1,11 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public static final int i= 0;
+	int j= 1;
+
+	public abstract void m();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/in/A.java
new file mode 100644
index 000000000..d9a06e7da
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/in/A.java
@@ -0,0 +1,28 @@
+package p;
+interface A{
+	/** method m javadoc comment */
+	void m();
+
+	/** field I javadoc comment */
+	int I= 9;
+
+	/* method m1 regular comment */
+	void m1();
+
+	/* field i1 regular comment */
+	int I1= 9;
+
+	// method m2 line comment
+	void m2();
+
+	// field i2 line comment
+	int I2= 9;
+
+	void m4(); /* method m4 regular comment */
+
+	int I4= 9; /* field i4 regular comment */
+
+	void m5(); // method m5 line comment
+
+	int I5= 9; // field i5 line comment
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/A.java
new file mode 100644
index 000000000..2e796c10b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/A.java
@@ -0,0 +1,3 @@
+package p;
+interface A extends I{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java
new file mode 100644
index 000000000..5265bf76f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface3/out/I.java
@@ -0,0 +1,32 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	/** method m javadoc comment */
+	public abstract void m();
+
+	/** field I javadoc comment */
+	int I= 9;
+
+	/* method m1 regular comment */
+	public abstract void m1();
+
+	/* field i1 regular comment */
+	int I1= 9;
+
+	// method m2 line comment
+	public abstract void m2();
+
+	// field i2 line comment
+	int I2= 9;
+
+	public abstract void m4(); /* method m4 regular comment */
+
+	int I4= 9; /* field i4 regular comment */
+
+	public abstract void m5(); // method m5 line comment
+
+	int I5= 9; // field i5 line comment
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/in/A.java
new file mode 100644
index 000000000..dc11ee7fb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/in/A.java
@@ -0,0 +1,4 @@
+package p;
+interface A{
+	A a(A a1, A a2);
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/A.java
new file mode 100644
index 000000000..2e796c10b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/A.java
@@ -0,0 +1,3 @@
+package p;
+interface A extends I{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java
new file mode 100644
index 000000000..1853490dd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface4/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract I a(I a1, I a2);
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/in/A.java
new file mode 100644
index 000000000..d01e51760
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/in/A.java
@@ -0,0 +1,4 @@
+package p;
+interface A{
+	A a();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/A.java
new file mode 100644
index 000000000..2e796c10b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/A.java
@@ -0,0 +1,3 @@
+package p;
+interface A extends I{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java
new file mode 100644
index 000000000..cc239b7e9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface5/out/I.java
@@ -0,0 +1,8 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract I a();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/in/A.java
new file mode 100644
index 000000000..0aac8d96c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/in/A.java
@@ -0,0 +1,10 @@
+package p;
+interface A{
+	public abstract void foo0();
+	
+	abstract void foo1();
+	
+	public void foo2();	
+	
+	void foo3();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/A.java
new file mode 100644
index 000000000..2e796c10b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/A.java
@@ -0,0 +1,3 @@
+package p;
+interface A extends I{
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java
new file mode 100644
index 000000000..502337f53
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testInterface6/out/I.java
@@ -0,0 +1,14 @@
+package p;
+
+/** typecomment template*/
+interface I {
+
+	public abstract void foo0();
+
+	public abstract void foo1();
+
+	public abstract void foo2();
+
+	public abstract void foo3();
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/in/A.java
new file mode 100644
index 000000000..f8f8d5752
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/in/A.java
@@ -0,0 +1,76 @@
+package p;
+
+class A {
+	int size = 0;
+	Comparable[] elems = new Comparable[10];
+	public java.util.Iterator iterator() {
+		return new Iterator(this);
+	}
+	public A add(Comparable e) {
+		if (this.size + 1 == this.elems.length) {
+			Comparable[] newElems = new Comparable[2 * this.size];
+			System.arraycopy(this.elems, 0, newElems, 0, this.size);
+			this.elems = newElems;
+		}
+		this.elems[this.size++] = e;
+		return this;
+	}
+	public A addAll(A v1) {
+		java.util.Iterator i = v1.iterator();
+		for (; i.hasNext(); this.add((Comparable) i.next()));
+		return this;
+	}
+	public void sort() { /* insertion sort */
+		for (int i = 1; i < this.size; i++) {
+			Comparable e1 = this.elems[i];
+			int j = i;
+			while ((j > 0) && (this.elems[j - 1].compareTo(e1) > 0)) {
+				this.elems[j] = this.elems[j - 1];
+				j--;
+			}
+			this.elems[j] = e1;
+		}
+	}
+}
+class Iterator implements java.util.Iterator {
+	private int count = 0;
+	private A v2;
+	Iterator(A v3) {
+		this.v2 = v3;
+	}
+	public boolean hasNext() {
+		return this.count < this.v2.size;
+	}
+	public Object next() {
+		return this.v2.elems[this.count++];
+	}
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+}
+class Client {
+	public static void main(String[] args) {
+		A v4 = createList();
+		populate(v4);
+		update(v4);
+		sortList(v4);
+		print(v4);
+	}
+	static A createList() {
+		return new A();
+	}
+	static void populate(A v5) {
+		v5.add("foo").add("bar");
+	}
+	static void update(A v6) {
+		A v7 = new A().add("zap").add("baz");
+		v6.addAll(v7);
+	}
+	static void sortList(A v8) {
+		v8.sort();
+	}
+	static void print(A v9) {
+		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
+			System.out.println("Object: " + iter.next());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/A.java
new file mode 100644
index 000000000..2da2aeece
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/A.java
@@ -0,0 +1,85 @@
+package p;
+
+class A implements Bag {
+	int size = 0;
+	Comparable[] elems = new Comparable[10];
+	/* (non-Javadoc)
+	 * @see p.Bag#iterator()
+	 */
+	public java.util.Iterator iterator() {
+		return new Iterator(this);
+	}
+	/* (non-Javadoc)
+	 * @see p.Bag#add(java.lang.Comparable)
+	 */
+	public Bag add(Comparable e) {
+		if (this.size + 1 == this.elems.length) {
+			Comparable[] newElems = new Comparable[2 * this.size];
+			System.arraycopy(this.elems, 0, newElems, 0, this.size);
+			this.elems = newElems;
+		}
+		this.elems[this.size++] = e;
+		return this;
+	}
+	/* (non-Javadoc)
+	 * @see p.Bag#addAll(p.Bag)
+	 */
+	public Bag addAll(Bag v1) {
+		java.util.Iterator i = v1.iterator();
+		for (; i.hasNext(); this.add((Comparable) i.next()));
+		return this;
+	}
+	public void sort() { /* insertion sort */
+		for (int i = 1; i < this.size; i++) {
+			Comparable e1 = this.elems[i];
+			int j = i;
+			while ((j > 0) && (this.elems[j - 1].compareTo(e1) > 0)) {
+				this.elems[j] = this.elems[j - 1];
+				j--;
+			}
+			this.elems[j] = e1;
+		}
+	}
+}
+class Iterator implements java.util.Iterator {
+	private int count = 0;
+	private A v2;
+	Iterator(A v3) {
+		this.v2 = v3;
+	}
+	public boolean hasNext() {
+		return this.count < this.v2.size;
+	}
+	public Object next() {
+		return this.v2.elems[this.count++];
+	}
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+}
+class Client {
+	public static void main(String[] args) {
+		A v4 = createList();
+		populate(v4);
+		update(v4);
+		sortList(v4);
+		print(v4);
+	}
+	static A createList() {
+		return new A();
+	}
+	static void populate(Bag v5) {
+		v5.add("foo").add("bar");
+	}
+	static void update(Bag v6) {
+		Bag v7 = new A().add("zap").add("baz");
+		v6.addAll(v7);
+	}
+	static void sortList(A v8) {
+		v8.sort();
+	}
+	static void print(Bag v9) {
+		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
+			System.out.println("Object: " + iter.next());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java
new file mode 100644
index 000000000..e29b6462b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample0/out/Bag.java
@@ -0,0 +1,12 @@
+package p;
+
+/** typecomment template*/
+interface Bag {
+
+	public abstract java.util.Iterator iterator();
+
+	public abstract Bag add(Comparable e);
+
+	public abstract Bag addAll(Bag v1);
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/in/A.java
new file mode 100644
index 000000000..02d5d0692
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/in/A.java
@@ -0,0 +1,76 @@
+package p;
+
+class A {
+	int size = 0;
+	Comparable[] elems = new Comparable[10];
+	public java.util.Iterator iterator() {
+		return new Iterator(this);
+	}
+	public A add(Comparable e) {
+		if (size + 1 == elems.length) {
+			Comparable[] newElems = new Comparable[2 * size];
+			System.arraycopy(elems, 0, newElems, 0, size);
+			elems = newElems;
+		}
+		elems[size++] = e;
+		return this;
+	}
+	public A addAll(A v1) {
+		java.util.Iterator i = v1.iterator();
+		for (; i.hasNext(); add((Comparable) i.next()));
+		return this;
+	}
+	public void sort() { /* insertion sort */
+		for (int i = 1; i < size; i++) {
+			Comparable e1 = elems[i];
+			int j = i;
+			while ((j > 0) && (elems[j - 1].compareTo(e1) > 0)) {
+				elems[j] = elems[j - 1];
+				j--;
+			}
+			elems[j] = e1;
+		}
+	}
+}
+class Iterator implements java.util.Iterator {
+	private int count = 0;
+	private A v2;
+	Iterator(A v3) {
+		v2 = v3;
+	}
+	public boolean hasNext() {
+		return count < v2.size;
+	}
+	public Object next() {
+		return v2.elems[count++];
+	}
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+}
+class Client {
+	public static void main(String[] args) {
+		A v4 = createList();
+		populate(v4);
+		update(v4);
+		sortList(v4);
+		print(v4);
+	}
+	static A createList() {
+		return new A();
+	}
+	static void populate(A v5) {
+		v5.add("foo").add("bar");
+	}
+	static void update(A v6) {
+		A v7 = new A().add("zap").add("baz");
+		v6.addAll(v7);
+	}
+	static void sortList(A v8) {
+		v8.sort();
+	}
+	static void print(A v9) {
+		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
+			System.out.println("Object: " + iter.next());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/A.java
new file mode 100644
index 000000000..63180c61b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/A.java
@@ -0,0 +1,85 @@
+package p;
+
+class A implements Bag {
+	int size = 0;
+	Comparable[] elems = new Comparable[10];
+	/* (non-Javadoc)
+	 * @see p.Bag#iterator()
+	 */
+	public java.util.Iterator iterator() {
+		return new Iterator(this);
+	}
+	/* (non-Javadoc)
+	 * @see p.Bag#add(java.lang.Comparable)
+	 */
+	public Bag add(Comparable e) {
+		if (size + 1 == elems.length) {
+			Comparable[] newElems = new Comparable[2 * size];
+			System.arraycopy(elems, 0, newElems, 0, size);
+			elems = newElems;
+		}
+		elems[size++] = e;
+		return this;
+	}
+	/* (non-Javadoc)
+	 * @see p.Bag#addAll(p.Bag)
+	 */
+	public Bag addAll(Bag v1) {
+		java.util.Iterator i = v1.iterator();
+		for (; i.hasNext(); add((Comparable) i.next()));
+		return this;
+	}
+	public void sort() { /* insertion sort */
+		for (int i = 1; i < size; i++) {
+			Comparable e1 = elems[i];
+			int j = i;
+			while ((j > 0) && (elems[j - 1].compareTo(e1) > 0)) {
+				elems[j] = elems[j - 1];
+				j--;
+			}
+			elems[j] = e1;
+		}
+	}
+}
+class Iterator implements java.util.Iterator {
+	private int count = 0;
+	private A v2;
+	Iterator(A v3) {
+		v2 = v3;
+	}
+	public boolean hasNext() {
+		return count < v2.size;
+	}
+	public Object next() {
+		return v2.elems[count++];
+	}
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+}
+class Client {
+	public static void main(String[] args) {
+		A v4 = createList();
+		populate(v4);
+		update(v4);
+		sortList(v4);
+		print(v4);
+	}
+	static A createList() {
+		return new A();
+	}
+	static void populate(Bag v5) {
+		v5.add("foo").add("bar");
+	}
+	static void update(Bag v6) {
+		Bag v7 = new A().add("zap").add("baz");
+		v6.addAll(v7);
+	}
+	static void sortList(A v8) {
+		v8.sort();
+	}
+	static void print(Bag v9) {
+		for (java.util.Iterator iter = v9.iterator(); iter.hasNext();)
+			System.out.println("Object: " + iter.next());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java
new file mode 100644
index 000000000..e29b6462b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExample1/out/Bag.java
@@ -0,0 +1,12 @@
+package p;
+
+/** typecomment template*/
+interface Bag {
+
+	public abstract java.util.Iterator iterator();
+
+	public abstract Bag add(Comparable e);
+
+	public abstract Bag addAll(Bag v1);
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/in/A.java
new file mode 100644
index 000000000..5a77a0205
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	int notExtracted= 0;
+	private A v2;
+	void f(A v3){
+		this.v2= v3;
+		this.v2.notExtracted= 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/A.java
new file mode 100644
index 000000000..0f93cdc32
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A implements Bag {
+	int notExtracted= 0;
+	private A v2;
+	void f(A v3){
+		this.v2= v3;
+		this.v2.notExtracted= 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/Bag.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/Bag.java
new file mode 100644
index 000000000..0ee48e871
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractInterface/testPaperExampleSimplified0/out/Bag.java
@@ -0,0 +1,6 @@
+package p;
+
+/** typecomment template*/
+interface Bag {
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/.cvsignore b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/.cvsignore
new file mode 100644
index 000000000..9caf6f297
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/.cvsignore
@@ -0,0 +1,3 @@
+.metadata

+bin

+*.class
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.classpath b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.classpath
new file mode 100644
index 000000000..3baf1bd75
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path=""/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.cvsignore b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.cvsignore
new file mode 100644
index 000000000..4fdcfd74f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.cvsignore
@@ -0,0 +1,3 @@
+bin

+.classpath

+*.class
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.project b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.project
new file mode 100644
index 000000000..c1e1775e7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>ExtractMethodTests</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.settings/org.eclipse.jdt.core.prefs b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..a70de1908
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,70 @@
+#Fri Nov 19 13:46:34 CET 2004

+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

+org.eclipse.jdt.core.compiler.debug.lineNumber=generate

+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

+org.eclipse.jdt.core.compiler.problem.unusedImport=warning

+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

+org.eclipse.jdt.core.builder.invalidClasspath=abort

+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore

+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

+org.eclipse.jdt.core.compiler.debug.localVariable=generate

+org.eclipse.jdt.core.compiler.problem.deprecation=warning

+org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

+org.eclipse.jdt.core.builder.cleanOutputFolder=clean

+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore

+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore

+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore

+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags

+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

+org.eclipse.jdt.core.incompatibleJDKLevel=ignore

+eclipse.preferences.version=1

+org.eclipse.jdt.core.circularClasspath=error

+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

+org.eclipse.jdt.core.compiler.debug.sourceFile=generate

+org.eclipse.jdt.core.compiler.doc.comment.support=enabled

+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

+org.eclipse.jdt.core.incompleteClasspath=error

+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore

+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

+org.eclipse.jdt.core.builder.duplicateResourceTask=warning

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A.java
new file mode 100644
index 000000000..80a4d26e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A.java
@@ -0,0 +1,8 @@
+public class A{
+	public void foo() {
+		// comment
+		foo();
+		// comment
+		foo();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A_test450.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A_test450.java
new file mode 100644
index 000000000..3e31e3a29
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/A_test450.java
@@ -0,0 +1,10 @@
+public class A_test450 {
+	public void foo() {
+		try {
+			/*]*/g();/*[*/
+		} catch (java.io.IOException e) {
+		}
+	}
+	public void g() throws java.io.IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/BBB.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/BBB.java
new file mode 100644
index 000000000..60e421a12
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/BBB.java
@@ -0,0 +1,46 @@
+public class BBB {
+	public void foo() {
+		int i= 0;
+		BBB b= new BBB();
+		BBB[] bb= new BBB[10];
+		if (i == 0 && i == 10 && b instanceof BBB)
+			foo();
+		while(i++ == 10) {
+			foo();
+		}
+		i--;
+		
+		while(i++ == 10)
+			foo();
+		i--;
+		
+		do {
+		} while (i < 10);	
+		
+		for (int x= 0, o= 0; x < 10; x++, o++);
+		 {
+			foo();
+			int z;//= x;
+		}
+		
+		try {
+			foo();
+		} catch (Exception e) {
+		} finally {
+		}
+		
+		switch (i) {
+			case 10:
+				foo();
+			case 20:
+				foo();
+			default:
+				foo();
+		}
+	}
+	public int g() {
+		g();
+		return 1;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_5690.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_5690.java
new file mode 100644
index 000000000..559cf1ba9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_5690.java
@@ -0,0 +1,13 @@
+public class Bug_5690 {
+	public void foo() {
+		Object runnable= null;
+		Object[] disposeList= null;
+		for (int i=0; i < disposeList.length; i++) {
+			if (disposeList [i] == null) {
+				disposeList [i] = runnable;
+				return;
+			}
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_71575.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_71575.java
new file mode 100644
index 000000000..147aaaf42
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Bug_71575.java
@@ -0,0 +1,41 @@
+
+
+import java.util.BitSet;
+
+public class Bug_71575 {
+	private int[] getIntArray() {
+		return new int[0];
+	}
+	
+	public void f1() {
+		int[] intArray = getIntArray();
+		
+		BitSet bitSet1 = new BitSet();
+		for (int i = 0 ; i < intArray.length ; i++) {
+			bitSet1.set(intArray[i]);
+		}
+		
+		BitSet bitSet2 = new BitSet();
+		for (int i = 0 ; i < intArray.length ; i++) {
+			bitSet2.set(intArray[i] + 1);
+		}
+		
+		bitSet1.and(bitSet2);
+	}
+
+	public void f2() {
+		int[] intArray = getIntArray();
+		
+		BitSet bitSet1 = new BitSet();
+		for (int i = 0 ; i < intArray.length ; i++) {
+			bitSet1.set(intArray[i]);
+		}
+		
+		BitSet bitSet2 = new BitSet();
+		for (int i = 0 ; i < intArray.length ; i++) {
+			bitSet2.set(intArray[i] + 1);
+		}
+
+		bitSet1.and(bitSet2);	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/C.java
new file mode 100644
index 000000000..5dbee96bb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/C.java
@@ -0,0 +1,5 @@
+public class C {
+	void f(){
+		C i= new /*[*/C/*]*/();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java
new file mode 100644
index 000000000..35673b24b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java
@@ -0,0 +1,29 @@
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+public class D {
+	public static class MyException extends Exception {
+	}
+	
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 10;
+		try {
+			try {
+				if (flag)
+					throw new IOException();
+				if (!flag)
+					throw new MyException();
+			} catch (IOException e) {
+			}
+			i= 10;
+		} catch (MyException e) {
+		}
+		read(i);
+	}
+
+	private void read(int i) {
+	}	
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/E.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/E.java
new file mode 100644
index 000000000..ad6960fa4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/E.java
@@ -0,0 +1,12 @@
+public class E {
+	boolean flag;
+	public void foo() {
+		int i= 0;
+		if (flag) {
+			i= 1;
+		} else {
+			i= 2;
+		}
+		System.out.println(i);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/L.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/L.java
new file mode 100644
index 000000000..91d302cc4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/L.java
@@ -0,0 +1,20 @@
+public class L {
+
+	public void foo() {
+		int x= 0;
+		
+		x++;
+		
+		// x= 10;
+		int y= x;
+	}
+	
+	public void g(int x) {
+	}
+	
+	public int bar() {
+		bar();
+		return 10;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/MyTest.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/MyTest.java
new file mode 100644
index 000000000..949aaa97f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/MyTest.java
@@ -0,0 +1,8 @@
+public class MyTest {
+  public void test() {
+    Object object = new Object() {
+      public void name() {
+      }
+    };
+  }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Philippe.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Philippe.java
new file mode 100644
index 000000000..f7df8955d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Philippe.java
@@ -0,0 +1,13 @@
+public class Philippe {
+	void foo(final int out){
+		String tab[] = /*START*/{"hello", "world" } /*END*/;       
+	}
+	
+	public void foo2(int i) {
+		String /*START*/str = "ggg"/*END*/;
+	}
+	
+	public void foo3() {
+		int i= 10, j= 30;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10031.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10031.java
new file mode 100644
index 000000000..5a65aedb4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10031.java
@@ -0,0 +1,15 @@
+public class T10031 {
+	private static Object fValue;
+	
+	public static void foo() {
+		setValue(null);
+	}
+
+	public static void setValue(Object value) {
+		fValue= value;
+	}
+
+	public static Object getValue() {
+		return fValue;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10245.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10245.java
new file mode 100644
index 000000000..9bd2ef601
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T10245.java
@@ -0,0 +1,12 @@
+public class T10245 {
+	T10245 f;
+	public T10245 a() {
+		a().f= a();
+		
+		/*[*/
+		int y= 0;
+		a().f= a(); /*[*/
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337.java
new file mode 100644
index 000000000..8bbc7821f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337.java
@@ -0,0 +1,6 @@
+public class T11337 {
+	void f(byte bytes) {
+		String s= "k";
+		/*[*/System.out.println(s + " " + bytes); /*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337_1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337_1.java
new file mode 100644
index 000000000..2b17b7f18
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T11337_1.java
@@ -0,0 +1,5 @@
+public class T11337_1 {
+	void f(byte bytes) {
+		/*[*/System.out.println(bytes); /*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T4165.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T4165.java
new file mode 100644
index 000000000..c53aee0bb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T4165.java
@@ -0,0 +1,13 @@
+public class T4165 {
+	void m(int i) {
+		for (;;) {
+			//---
+			if (i == 0)
+				continue;	
+			if (i != 5)	
+				continue;	
+			//---	
+		}
+	}
+
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T7368.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T7368.java
new file mode 100644
index 000000000..a506c7719
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T7368.java
@@ -0,0 +1,6 @@
+public class T7368 {
+	public void foo() {
+		int f= (/*[*/2/*]*/);
+		// int u= new T7368[/*[*/1+ 3/*[*/].length;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T9815.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T9815.java
new file mode 100644
index 000000000..c7e194e44
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/T9815.java
@@ -0,0 +1,10 @@
+public class T9815 {
+	void f1() {
+		String j= ex();
+	}
+
+	String ex() {
+		return /*[*/"text"/*]*/;
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Test.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Test.java
new file mode 100644
index 000000000..01c117962
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Test.java
@@ -0,0 +1,9 @@
+public class Test {
+	public void foo() {
+		foo();
+		/* comment */int i= 0;/*[*/
+		// comment
+		/** comment */
+		foo();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Wcf.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Wcf.java
new file mode 100644
index 000000000..651c238ee
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Wcf.java
@@ -0,0 +1,13 @@
+public class Wcf {
+	void hg(){
+		class A extends B {
+			void m(){
+				f();   //<<<<<<<<
+			}
+		}
+	}  
+}  
+
+class B {
+	void f(){}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/X.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/X.java
new file mode 100644
index 000000000..c57bf9feb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/X.java
@@ -0,0 +1,22 @@
+public class X {
+	class Inner extends Exception {
+	}
+}
+class DD extends X.Inner {
+	DD() {
+		new X().super();
+	}
+	public final static boolean DEBUG= true;
+	public void foo0() {
+		try {
+			d();
+		} catch (X.Inner e) {
+		}
+	}
+
+	protected void d() throws X.Inner {
+		if (DEBUG)
+			throw new X().new Inner();//<<SELECT AND EXTRACT
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Z.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Z.java
new file mode 100644
index 000000000..afaa4d1d9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/Z.java
@@ -0,0 +1,8 @@
+
+public abstract class Z {
+	void foo() {
+		int i = 0;
+		i= 10;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test750.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test750.java
new file mode 100644
index 000000000..4c696e9fc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test750.java
@@ -0,0 +1,13 @@
+package branch_in;
+
+public class A_test750 {
+	public volatile boolean flag;
+
+	public void foo() {
+		/*[*/for (int i= 0; i < 10; i++) {
+			if (flag)
+				continue;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test751.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test751.java
new file mode 100644
index 000000000..eefb9da50
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test751.java
@@ -0,0 +1,13 @@
+package branch_in;
+
+public class A_test751 {
+	public volatile boolean flag;
+
+	public void foo() {
+		/*[*/for (int i= 0; i < 10; i++) {
+			if (flag)
+				break;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test752.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test752.java
new file mode 100644
index 000000000..f34959167
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test752.java
@@ -0,0 +1,13 @@
+package branch_in;
+
+public class A_test752 {
+	public volatile boolean flag;
+
+	public void foo() {
+		/*[*/while (flag) {
+			if (flag)
+				continue;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test753.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test753.java
new file mode 100644
index 000000000..f02950556
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test753.java
@@ -0,0 +1,13 @@
+package branch_in;
+
+public class A_test753 {
+	public volatile boolean flag;
+
+	public void foo() {
+		/*[*/while (flag) {
+			if (flag)
+				break;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test754.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test754.java
new file mode 100644
index 000000000..7673402d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test754.java
@@ -0,0 +1,13 @@
+package branch_in;
+
+public class A_test754 {
+	public volatile boolean flag;
+
+	public void foo() {
+		/*[*/do {
+			if (flag)
+				continue;
+		} while (flag);/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test755.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test755.java
new file mode 100644
index 000000000..3de0c89a8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test755.java
@@ -0,0 +1,13 @@
+package branch_in;
+
+public class A_test755 {
+	public volatile boolean flag;
+
+	public void foo() {
+		/*[*/do {
+			if (flag)
+				break;
+		} while (flag);/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test756.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test756.java
new file mode 100644
index 000000000..abe4655eb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test756.java
@@ -0,0 +1,16 @@
+package branch_in;
+
+public class A_test756 {
+
+	public void foo() {
+		for (int i= 0; i < 3; i++) {
+			/*[*/
+			if(i == 2) {
+				continue;
+			}
+			System.out.println();
+			/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test757.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test757.java
new file mode 100644
index 000000000..8d2793109
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test757.java
@@ -0,0 +1,16 @@
+package branch_in;
+
+public class A_test757 {
+
+	public void foo() {
+		/*[*/
+		for (int i= 0; i < 3; i++) {
+			if(i == 2) {
+				continue;
+			}
+			System.out.println();
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test758.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test758.java
new file mode 100644
index 000000000..1d6b2d9de
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test758.java
@@ -0,0 +1,18 @@
+package branch_in;
+
+import java.util.List;
+
+public class A_test758 {
+
+	public void foo(List a) {
+		/*[*/
+		for (Object x : a) {
+			if(x == null) {
+				continue;
+			}
+			System.out.println();
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test759.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test759.java
new file mode 100644
index 000000000..b5f716042
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test759.java
@@ -0,0 +1,16 @@
+package branch_in;
+
+public class A_test759 {
+
+	public void foo(int a) {
+		/*[*/
+		while (a > 0) {
+			if(a == 3) {
+				continue;
+			}
+			System.out.println();
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test760.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test760.java
new file mode 100644
index 000000000..2bbcc1b3e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test760.java
@@ -0,0 +1,16 @@
+package branch_in;
+
+public class A_test760 {
+
+	public void foo(int a) {
+		/*[*/
+		do {
+			if(a == 3) {
+				continue;
+			}
+			System.out.println();
+		} while (a > 0);
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test761.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test761.java
new file mode 100644
index 000000000..e2900887e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test761.java
@@ -0,0 +1,18 @@
+package branch_in;
+
+public class A_test761 {
+
+	public void foo() {
+		outer: for (int i= 0; i < 3; i++) {
+			/*[*/
+			for (int j= 0; j < 3; j++) {
+				if(j == 3) {
+					continue outer;
+				}
+				System.out.println();
+			}
+			/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test762.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test762.java
new file mode 100644
index 000000000..616a0f0be
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test762.java
@@ -0,0 +1,20 @@
+package branch_in;
+
+public class A_test762 {
+
+	public void foo() {
+		outer: for (int i= 0; i < 3; i++) {
+			/*[*/
+			for (int j= 0; j < 3; j++) {
+				for (int k= 0; k < 3; k++) {
+					if(j == 3) {
+						continue outer;
+					}
+					System.out.println();
+				}
+			}
+			/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test763.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test763.java
new file mode 100644
index 000000000..f4173ea1b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test763.java
@@ -0,0 +1,16 @@
+package branch_in;
+
+public class A_test763 {
+
+	public void foo() {
+		inner: for (int i= 0; i < 3; i++) {
+			/*[*/
+			if(i == 2) {
+				continue inner;
+			}
+			System.out.println();
+			/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test764.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test764.java
new file mode 100644
index 000000000..65fe5a11d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test764.java
@@ -0,0 +1,19 @@
+package branch_in;
+
+public class A_test764 {
+
+	public void foo() {
+		int x = 0;
+		for (int i= 0; i < 3; i++) {
+			/*[*/
+			if(i == 2) {
+				x = 2;
+				continue;
+			}
+			System.out.println();
+			/*]*/
+		}
+		System.out.println(x);
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test765.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test765.java
new file mode 100644
index 000000000..472fee072
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test765.java
@@ -0,0 +1,19 @@
+package branch_in;
+
+public class A_test765 {
+
+	public void foo() {
+		int x = 0;
+		for (int i= 0; i < 3; i++) {
+			/*[*/
+			if(i == 2) {
+				x = (i*3);
+				continue;
+			}
+			System.out.println();
+			/*]*/
+		}
+		System.out.println(x);
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test766.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test766.java
new file mode 100644
index 000000000..8a2049e16
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test766.java
@@ -0,0 +1,19 @@
+package branch_in;
+
+public class A_test766 {
+
+	public void foo() {
+		int x = 0;
+		foo: for (int i= 0; i < 3; i++) {
+			/*[*/
+			if(i == 2) {
+				x = (i*3);
+				continue;
+			}
+			System.out.println();
+			/*]*/
+		}
+		System.out.println(x);
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test767.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test767.java
new file mode 100644
index 000000000..1bc5b494e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test767.java
@@ -0,0 +1,18 @@
+package branch_in;
+
+public class A_test767 {
+
+	public void foo() {
+		for (int i = 0; i < 3; i++) {
+			/*[*/
+			inner: for (int j = 0; j < 10; j++) {
+				if (j == 2) {
+					System.out.println();
+					continue inner;
+				}
+			}
+			/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test768.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test768.java
new file mode 100644
index 000000000..aa928a435
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test768.java
@@ -0,0 +1,17 @@
+package branch_in;
+
+public class A_test768 {
+
+	public void foo() {
+		int i = 0;
+		do {
+			/*[*/
+			if( i == 3 ) {
+				continue;
+			}
+			System.out.println();
+			/*]*/
+		} while ( i < 10 );
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test769.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test769.java
new file mode 100644
index 000000000..401c607bf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test769.java
@@ -0,0 +1,16 @@
+package branch_in;
+
+public class A_test769 {
+
+	public void foo(int[] a) {
+		for(int i : a) {
+			/*[*/
+			if( i == 3 ) {
+				continue;
+			}
+			System.out.println();
+			/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test750.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test750.java
new file mode 100644
index 000000000..c3b9ca33d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test750.java
@@ -0,0 +1,17 @@
+package branch_out;
+
+public class A_test750 {
+	public volatile boolean flag;
+
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/for (int i= 0; i < 10; i++) {
+			if (flag)
+				continue;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test751.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test751.java
new file mode 100644
index 000000000..b28abf6ab
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test751.java
@@ -0,0 +1,17 @@
+package branch_out;
+
+public class A_test751 {
+	public volatile boolean flag;
+
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/for (int i= 0; i < 10; i++) {
+			if (flag)
+				break;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test752.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test752.java
new file mode 100644
index 000000000..b2ec75481
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test752.java
@@ -0,0 +1,17 @@
+package branch_out;
+
+public class A_test752 {
+	public volatile boolean flag;
+
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/while (flag) {
+			if (flag)
+				continue;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test753.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test753.java
new file mode 100644
index 000000000..13597d85c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test753.java
@@ -0,0 +1,17 @@
+package branch_out;
+
+public class A_test753 {
+	public volatile boolean flag;
+
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/while (flag) {
+			if (flag)
+				break;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test754.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test754.java
new file mode 100644
index 000000000..416e15e2c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test754.java
@@ -0,0 +1,17 @@
+package branch_out;
+
+public class A_test754 {
+	public volatile boolean flag;
+
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/do {
+			if (flag)
+				continue;
+		} while (flag);/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test755.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test755.java
new file mode 100644
index 000000000..0cd686707
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test755.java
@@ -0,0 +1,17 @@
+package branch_out;
+
+public class A_test755 {
+	public volatile boolean flag;
+
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/do {
+			if (flag)
+				break;
+		} while (flag);/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test756.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test756.java
new file mode 100644
index 000000000..7e5c29887
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test756.java
@@ -0,0 +1,20 @@
+package branch_out;
+
+public class A_test756 {
+
+	public void foo() {
+		for (int i= 0; i < 3; i++) {
+			extracted(i);
+		}
+	}
+
+	protected void extracted(int i) {
+		/*[*/
+		if(i == 2) {
+			return;
+		}
+		System.out.println();
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test757.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test757.java
new file mode 100644
index 000000000..89bd156d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test757.java
@@ -0,0 +1,20 @@
+package branch_out;
+
+public class A_test757 {
+
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/
+		for (int i= 0; i < 3; i++) {
+			if(i == 2) {
+				continue;
+			}
+			System.out.println();
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test758.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test758.java
new file mode 100644
index 000000000..601265218
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test758.java
@@ -0,0 +1,22 @@
+package branch_out;
+
+import java.util.List;
+
+public class A_test758 {
+
+	public void foo(List a) {
+		extracted(a);
+	}
+
+	protected void extracted(List a) {
+		/*[*/
+		for (Object x : a) {
+			if(x == null) {
+				continue;
+			}
+			System.out.println();
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test759.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test759.java
new file mode 100644
index 000000000..c7624592b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test759.java
@@ -0,0 +1,20 @@
+package branch_out;
+
+public class A_test759 {
+
+	public void foo(int a) {
+		extracted(a);
+	}
+
+	protected void extracted(int a) {
+		/*[*/
+		while (a > 0) {
+			if(a == 3) {
+				continue;
+			}
+			System.out.println();
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test760.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test760.java
new file mode 100644
index 000000000..08290faa7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test760.java
@@ -0,0 +1,20 @@
+package branch_out;
+
+public class A_test760 {
+
+	public void foo(int a) {
+		extracted(a);
+	}
+
+	protected void extracted(int a) {
+		/*[*/
+		do {
+			if(a == 3) {
+				continue;
+			}
+			System.out.println();
+		} while (a > 0);
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test761.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test761.java
new file mode 100644
index 000000000..08818d017
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test761.java
@@ -0,0 +1,22 @@
+package branch_out;
+
+public class A_test761 {
+
+	public void foo() {
+		outer: for (int i= 0; i < 3; i++) {
+			extracted();
+		}
+	}
+
+	protected void extracted() {
+		/*[*/
+		for (int j= 0; j < 3; j++) {
+			if(j == 3) {
+				return;
+			}
+			System.out.println();
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test762.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test762.java
new file mode 100644
index 000000000..6218704c4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test762.java
@@ -0,0 +1,24 @@
+package branch_out;
+
+public class A_test762 {
+
+	public void foo() {
+		outer: for (int i= 0; i < 3; i++) {
+			extracted();
+		}
+	}
+
+	protected void extracted() {
+		/*[*/
+		for (int j= 0; j < 3; j++) {
+			for (int k= 0; k < 3; k++) {
+				if(j == 3) {
+					return;
+				}
+				System.out.println();
+			}
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test763.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test763.java
new file mode 100644
index 000000000..2de5a47f3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test763.java
@@ -0,0 +1,20 @@
+package branch_out;
+
+public class A_test763 {
+
+	public void foo() {
+		inner: for (int i= 0; i < 3; i++) {
+			extracted(i);
+		}
+	}
+
+	protected void extracted(int i) {
+		/*[*/
+		if(i == 2) {
+			return;
+		}
+		System.out.println();
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test764.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test764.java
new file mode 100644
index 000000000..d48ebf7d6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test764.java
@@ -0,0 +1,24 @@
+package branch_out;
+
+public class A_test764 {
+
+	public void foo() {
+		int x = 0;
+		for (int i= 0; i < 3; i++) {
+			x = extracted(x, i);
+		}
+		System.out.println(x);
+	}
+
+	protected int extracted(int x, int i) {
+		/*[*/
+		if(i == 2) {
+			x = 2;
+			return x;
+		}
+		System.out.println();
+		/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test765.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test765.java
new file mode 100644
index 000000000..c98d410db
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test765.java
@@ -0,0 +1,24 @@
+package branch_out;
+
+public class A_test765 {
+
+	public void foo() {
+		int x = 0;
+		for (int i= 0; i < 3; i++) {
+			x = extracted(x, i);
+		}
+		System.out.println(x);
+	}
+
+	protected int extracted(int x, int i) {
+		/*[*/
+		if(i == 2) {
+			x = (i*3);
+			return x;
+		}
+		System.out.println();
+		/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test766.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test766.java
new file mode 100644
index 000000000..027aa6328
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test766.java
@@ -0,0 +1,24 @@
+package branch_out;
+
+public class A_test766 {
+
+	public void foo() {
+		int x = 0;
+		foo: for (int i= 0; i < 3; i++) {
+			x = extracted(x, i);
+		}
+		System.out.println(x);
+	}
+
+	protected int extracted(int x, int i) {
+		/*[*/
+		if(i == 2) {
+			x = (i*3);
+			return x;
+		}
+		System.out.println();
+		/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test767.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test767.java
new file mode 100644
index 000000000..696611257
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test767.java
@@ -0,0 +1,22 @@
+package branch_out;
+
+public class A_test767 {
+
+	public void foo() {
+		for (int i = 0; i < 3; i++) {
+			extracted();
+		}
+	}
+
+	protected void extracted() {
+		/*[*/
+		inner: for (int j = 0; j < 10; j++) {
+			if (j == 2) {
+				System.out.println();
+				continue inner;
+			}
+		}
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test768.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test768.java
new file mode 100644
index 000000000..3386fa2ca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test768.java
@@ -0,0 +1,21 @@
+package branch_out;
+
+public class A_test768 {
+
+	public void foo() {
+		int i = 0;
+		do {
+			extracted(i);
+		} while ( i < 10 );
+	}
+
+	protected void extracted(int i) {
+		/*[*/
+		if( i == 3 ) {
+			return;
+		}
+		System.out.println();
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test769.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test769.java
new file mode 100644
index 000000000..d6f2bd0a2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test769.java
@@ -0,0 +1,20 @@
+package branch_out;
+
+public class A_test769 {
+
+	public void foo(int[] a) {
+		for(int i : a) {
+			extracted(i);
+		}
+	}
+
+	protected void extracted(int i) {
+		/*[*/
+		if( i == 3 ) {
+			return;
+		}
+		System.out.println();
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1050.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1050.java
new file mode 100644
index 000000000..3b0339186
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1050.java
@@ -0,0 +1,11 @@
+package destination_in;
+
+public class A_test1050 {
+	public class Inner {
+		public void foo() {
+			/*[*/bar();/*]*/
+		}
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1051.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1051.java
new file mode 100644
index 000000000..3415bcda1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1051.java
@@ -0,0 +1,13 @@
+package destination_in;
+
+public class A_test1051 {
+	public void foo() {
+		Runnable r= new Runnable() {
+			public void run() {
+				/*[*/bar();/*]*/
+			}
+		};
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1052.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1052.java
new file mode 100644
index 000000000..976c34ecb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1052.java
@@ -0,0 +1,11 @@
+package destination_in;
+
+public class A_test1052 {
+	public static void foo() {
+		Runnable r= new Runnable() {
+			public void run() {
+				/*[*/System.out.println();/*]*/
+			}
+		};
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1053.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1053.java
new file mode 100644
index 000000000..670bfaff6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_in/A_test1053.java
@@ -0,0 +1,13 @@
+package destination_in;
+
+public class A_test1053 {
+	public static class Inner {
+		public void foo() {
+			/*[*/bar();/*]*/
+		}
+	}
+
+	public static void bar() {
+		System.out.println();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1050.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1050.java
new file mode 100644
index 000000000..b18f35a49
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1050.java
@@ -0,0 +1,14 @@
+package destination_out;
+
+public class A_test1050 {
+	public class Inner {
+		public void foo() {
+			extracted();
+		}
+	}
+	public void bar() {
+	}
+	protected void extracted() {
+		/*[*/bar();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1051.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1051.java
new file mode 100644
index 000000000..5b63d61e9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1051.java
@@ -0,0 +1,16 @@
+package destination_out;
+
+public class A_test1051 {
+	public void foo() {
+		Runnable r= new Runnable() {
+			public void run() {
+				extracted();
+			}
+		};
+	}
+	public void bar() {
+	}
+	protected void extracted() {
+		/*[*/bar();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1052.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1052.java
new file mode 100644
index 000000000..9d2e556c4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1052.java
@@ -0,0 +1,15 @@
+package destination_out;
+
+public class A_test1052 {
+	public static void foo() {
+		Runnable r= new Runnable() {
+			public void run() {
+				extracted();
+			}
+		};
+	}
+
+	protected static void extracted() {
+		/*[*/System.out.println();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1053.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1053.java
new file mode 100644
index 000000000..3794fb423
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1053.java
@@ -0,0 +1,17 @@
+package destination_out;
+
+public class A_test1053 {
+	public static class Inner {
+		public void foo() {
+			extracted();
+		}
+	}
+
+	public static void bar() {
+		System.out.println();
+	}
+
+	protected static void extracted() {
+		/*[*/bar();/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test950.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test950.java
new file mode 100644
index 000000000..131e7fade
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test950.java
@@ -0,0 +1,13 @@
+package duplicates_in;
+
+public class A_test950 {
+	void f(){
+		int i= 0;
+		int j= 1;
+		int k= /*[*/i+j/*]*/;
+
+		int i1= 0;
+		int j1= 1;
+		int k1= i+j;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test951.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test951.java
new file mode 100644
index 000000000..663aae44c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test951.java
@@ -0,0 +1,8 @@
+package duplicates_in;
+
+public class A_test951 {
+	void foo() {
+		/*[*/System.out.println("Eclipse");/*]*/
+		System.out.println("Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test952.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test952.java
new file mode 100644
index 000000000..4cdd48e02
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test952.java
@@ -0,0 +1,11 @@
+package duplicates_in;
+
+public class A_test952 {
+	void foo() {
+		/*[*/bar();/*]*/
+		bar();
+	}
+
+	void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test953.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test953.java
new file mode 100644
index 000000000..77109faf1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test953.java
@@ -0,0 +1,14 @@
+package duplicates_in;
+
+public class A_test953 {
+	void foo() {
+		int i =10;
+		/*[*/bar(i);/*]*/
+		
+		int j= 10;
+		bar(j);
+	}
+
+	void bar(int x) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test954.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test954.java
new file mode 100644
index 000000000..5c2b645e7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test954.java
@@ -0,0 +1,9 @@
+package duplicates_in;
+
+public class A_test954 {
+	void foo() {
+		/*[*/System.out.println("Eclipse");/*]*/
+		if (true)
+			System.out.println("Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test955.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test955.java
new file mode 100644
index 000000000..5c1abb3e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test955.java
@@ -0,0 +1,12 @@
+package duplicates_in;
+
+public class A_test955 {
+	void foo() {
+		/*[*/bar();
+		bar();/*]*/
+		bar();
+		bar();
+	}
+	void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test956.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test956.java
new file mode 100644
index 000000000..732a78ae9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test956.java
@@ -0,0 +1,14 @@
+package duplicates_in;
+
+// don't extract second occurence of
+// 2 since it is in a inner class
+public class A_test956 {
+	void foo() {
+		int y= /*[*/2/*]*/;
+	}
+	class Inner {
+		void foo() {
+			int y1= 2;
+		}
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test957.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test957.java
new file mode 100644
index 000000000..19019e9c4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test957.java
@@ -0,0 +1,14 @@
+package duplicates_in;
+
+public class A_test957 {
+	public void f() {
+		int i = 17;
+		int k = 1;
+
+		/*[*/i++;/*]*/
+		k++;
+
+		System.out.println(i);
+		System.out.println(k);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test958.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test958.java
new file mode 100644
index 000000000..796f4fa02
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test958.java
@@ -0,0 +1,15 @@
+package duplicates_in;
+
+public class A_test958 {
+	private Object fO;
+
+	public void method0() {
+		/*[*/Object o2= fO;/*]*/
+		fO= o2;
+	}
+
+	public void method1() {
+		Object o= fO;
+		fO= o;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test959.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test959.java
new file mode 100644
index 000000000..683fda274
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test959.java
@@ -0,0 +1,9 @@
+package duplicates_in;
+
+public class A_test959 {
+	public void foo() {
+		int x= 10;
+		int y= /*[*/x/*]*/;
+		x= 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test960.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test960.java
new file mode 100644
index 000000000..39390e3d8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test960.java
@@ -0,0 +1,13 @@
+package duplicates_in;
+
+public class A_test960 {
+	private Object fO;
+
+	public void foo() {
+		/*[*/fO= new Object();/*]*/
+	}
+	public void bar() {
+		foo();
+		fO= new Object();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test961.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test961.java
new file mode 100644
index 000000000..a009a7f28
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test961.java
@@ -0,0 +1,13 @@
+package duplicates_in;
+
+public class A_test961 {
+	private Object fO;
+
+	public void foo(Object o) {
+		/*[*/fO= o;/*]*/
+	}
+	public void bar(Object x) {
+		foo(x);
+		fO= x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test962.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test962.java
new file mode 100644
index 000000000..739c90f03
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test962.java
@@ -0,0 +1,9 @@
+package duplicates_in;
+
+public class A_test962 {
+	private Object object;
+	public A_test962() {
+	  this.object = new Object();
+	  System.out.println(/*[*/this.object/*]*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test963.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test963.java
new file mode 100644
index 000000000..6566f9e23
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test963.java
@@ -0,0 +1,12 @@
+package duplicates_in;
+
+public class A_test963 {
+	void test() {
+		new Object() {
+			public void yes() {
+				/*[*/System.out.println("hello world");/*]*/
+			}
+		};
+		System.out.println("hello world");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test964.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test964.java
new file mode 100644
index 000000000..502542ff9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test964.java
@@ -0,0 +1,13 @@
+package duplicates_in;
+
+public class A_test964 {
+	void test() {
+		new Object() {
+			public void yes() {
+				yes();
+				System.out.println("hello world");
+			}
+		};
+		/*[*/System.out.println("hello world");/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test965.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test965.java
new file mode 100644
index 000000000..d694e674b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test965.java
@@ -0,0 +1,18 @@
+package duplicates_in;
+
+public class A_test964 {
+	boolean test() {
+		Object x= null;
+		if (true) {
+			/*[*/if (x instanceof Integer)
+				return false;
+			return true;/*]*/
+		} else {
+			{
+				if (x instanceof Integer)
+					return false;
+			}
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test966.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test966.java
new file mode 100644
index 000000000..11396fb04
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test966.java
@@ -0,0 +1,21 @@
+package duplicates_in;
+
+import java.util.List;
+
+public class A_test964 {
+	boolean test() {
+		Object x= null;
+		List l= null;
+		if (true) {
+			/*[*/if (x instanceof Integer)
+				l.add(null);
+			l.add(new Object());/*]*/
+		} else {
+			if (true)
+				if (x instanceof Integer)
+					l.add(null);
+			l.add(new Object());
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test967.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test967.java
new file mode 100644
index 000000000..8a51bb11e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test967.java
@@ -0,0 +1,17 @@
+package duplicates_in;
+
+import java.util.List;
+
+public class A_test964 {
+	public void test() {
+		/*[*/foo();
+		foo();/*]*/
+		
+		if (true)
+			foo();
+		else
+			foo();
+	}
+	public void foo() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test968.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test968.java
new file mode 100644
index 000000000..b5c89e5fb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test968.java
@@ -0,0 +1,19 @@
+package duplicates_in;
+
+import java.util.List;
+
+public class A_test964 {
+	public void test() {
+		/*[*/foo();
+		foo();/*]*/
+
+		switch(10) {
+			case 1:
+				foo();
+			case 2:
+				foo();
+		}
+	}
+	public void foo() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test969.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test969.java
new file mode 100644
index 000000000..eabaa25c7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test969.java
@@ -0,0 +1,18 @@
+package duplicates_in;
+
+import java.util.List;
+
+public class A_test964 {
+	public void test() {
+		/*[*/foo();
+		foo();/*]*/
+
+		switch(10) {
+			case 1:
+				foo();
+				foo();
+		}
+	}
+	public void foo() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test970.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test970.java
new file mode 100644
index 000000000..dfb1367d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test970.java
@@ -0,0 +1,49 @@
+package duplicates_in;
+
+public class A_test970 {
+	static class Transaction {
+		public void start(String string) {}
+		public void run(Action action) {}
+		public void run(String string) {}
+		public void end() {}
+	}
+	static class Action {
+		public Action(String string) {}
+	}
+
+	public void a3()
+	{
+		Transaction t = new Transaction();
+		Action action = new Action(" A.a3");
+		String string = "A.a3";
+		/*[*/
+		t.start(string);
+		t.run(action);
+		t.end();
+		/*]*/
+	}
+
+	public void a4()
+	{
+		Transaction t = new Transaction();
+		String t_name = "A.a4";
+
+		Action action = new Action(t_name);
+
+		t.start(t_name);
+		t.run(t_name);
+		t.end();
+	}
+
+	public void a6()
+	{
+		Transaction t = new Transaction();
+		String t_name = "A.a6";
+
+		Action action = new Action(t_name);
+		// DUPLICATE!!!
+		t.start(t_name);
+		t.run(action);
+		t.end();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test971.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test971.java
new file mode 100644
index 000000000..741268f8a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test971.java
@@ -0,0 +1,13 @@
+package duplicates_in;
+
+public class A_test971 {
+	void f(){
+		new Object() {
+			public String toString() {
+				/*[*/System.out.println("hello world");/*]*/
+				return null;
+			}
+		};
+		System.out.println("hello world");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test972.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test972.java
new file mode 100644
index 000000000..fbe441d09
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test972.java
@@ -0,0 +1,14 @@
+package duplicates_in;
+
+public class A_test972 {
+	class X {
+		public String toString() {
+			/*[*/System.out.println("hello world");/*]*/
+			return null;
+		}
+	};
+	
+	void f(){
+		System.out.println("hello world");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test980.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test980.java
new file mode 100644
index 000000000..0a3c98cab
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test980.java
@@ -0,0 +1,11 @@
+package duplicates_in;
+
+public class A_test980 {
+	int x;
+	int f(){
+		return /*[*/x/*]*/;
+	}
+	void g() {
+		x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test981.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test981.java
new file mode 100644
index 000000000..c8544a7ba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test981.java
@@ -0,0 +1,11 @@
+package duplicates_in;
+
+public class A_test981 {
+	int x;
+	int f(){
+		return /*[*/x/*]*/;
+	}
+	void g() {
+		this.x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test982.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test982.java
new file mode 100644
index 000000000..70058411a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test982.java
@@ -0,0 +1,12 @@
+package duplicates_in;
+
+public class A_test982 {
+	A_test982 c;
+	int x;
+	int f(){
+		return /*[*/x/*]*/;
+	}
+	void g() {
+		c.x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test983.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test983.java
new file mode 100644
index 000000000..f2394adaa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test983.java
@@ -0,0 +1,12 @@
+package duplicates_in;
+
+public class A_test983 {
+	int[] x;
+	int i = 1;
+	int[] f(){
+		return /*[*/x/*]*/;
+	}
+	void g() {
+		x[i]= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test984.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test984.java
new file mode 100644
index 000000000..132697520
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test984.java
@@ -0,0 +1,12 @@
+package duplicates_in;
+
+public class A_test984 {
+	int[] x;
+	int i = 1;
+	int f(){
+		return /*[*/i/*]*/;
+	}
+	void g() {
+		x[i]= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test985.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test985.java
new file mode 100644
index 000000000..ec72be38b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test985.java
@@ -0,0 +1,18 @@
+package duplicates_in;
+
+public class A_test985 {
+	class A {
+		int parentFoo;
+	}
+
+	class X extends A {
+		int f() {
+			return /*[*/parentFoo/*]*/;
+		}
+
+		void g() {
+			super.parentFoo= 1;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test986.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test986.java
new file mode 100644
index 000000000..cd737af9b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test986.java
@@ -0,0 +1,19 @@
+package duplicates_in;
+
+public class A_test986 {
+	class A {
+		int parentFoo;
+	}
+
+	class X extends A {
+		int f() {
+			return /*[*/parentFoo/*]*/;
+		}
+
+		void g() {
+			int i;
+			i= parentFoo;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test987.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test987.java
new file mode 100644
index 000000000..5d01b3606
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test987.java
@@ -0,0 +1,13 @@
+package duplicates_in;
+
+public class A_test987 {
+	A_test987 other;
+	int x;
+	protected void f() {
+		Object o= /*[*/other/*]*/;
+		x = 1;
+        other.x= 1;
+        other.other.x= 5;
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test950.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test950.java
new file mode 100644
index 000000000..80deeddb8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test950.java
@@ -0,0 +1,17 @@
+package duplicates_out;
+
+public class A_test950 {
+	void f(){
+		int i= 0;
+		int j= 1;
+		int k= extracted(i, j);
+
+		int i1= 0;
+		int j1= 1;
+		int k1= extracted(i, j);
+	}
+
+	protected int extracted(int i, int j) {
+		return /*[*/i+j/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test951.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test951.java
new file mode 100644
index 000000000..8642d43ca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test951.java
@@ -0,0 +1,12 @@
+package duplicates_out;
+
+public class A_test951 {
+	void foo() {
+		extracted();
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/System.out.println("Eclipse");/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test952.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test952.java
new file mode 100644
index 000000000..c662697f1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test952.java
@@ -0,0 +1,15 @@
+package duplicates_out;
+
+public class A_test952 {
+	void foo() {
+		extracted();
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/bar();/*]*/
+	}
+
+	void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test953.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test953.java
new file mode 100644
index 000000000..ae871b457
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test953.java
@@ -0,0 +1,18 @@
+package duplicates_out;
+
+public class A_test953 {
+	void foo() {
+		int i =10;
+		extracted(i);
+		
+		int j= 10;
+		extracted(j);
+	}
+
+	protected void extracted(int i) {
+		/*[*/bar(i);/*]*/
+	}
+
+	void bar(int x) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test954.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test954.java
new file mode 100644
index 000000000..07a79439e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test954.java
@@ -0,0 +1,13 @@
+package duplicates_out;
+
+public class A_test954 {
+	void foo() {
+		extracted();
+		if (true)
+			extracted();
+	}
+
+	protected void extracted() {
+		/*[*/System.out.println("Eclipse");/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test955.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test955.java
new file mode 100644
index 000000000..8bd14b6e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test955.java
@@ -0,0 +1,14 @@
+package duplicates_out;
+
+public class A_test955 {
+	void foo() {
+		extracted();
+		extracted();
+	}
+	protected void extracted() {
+		/*[*/bar();
+		bar();/*]*/
+	}
+	void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test956.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test956.java
new file mode 100644
index 000000000..7366904b8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test956.java
@@ -0,0 +1,17 @@
+package duplicates_out;
+
+// don't extract second occurence of
+// 2 since it is in a inner class
+public class A_test956 {
+	void foo() {
+		int y= extracted();
+	}
+	protected int extracted() {
+		return /*[*/2/*]*/;
+	}
+	class Inner {
+		void foo() {
+			int y1= 2;
+		}
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test957.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test957.java
new file mode 100644
index 000000000..6c6feb68a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test957.java
@@ -0,0 +1,19 @@
+package duplicates_out;
+
+public class A_test957 {
+	public void f() {
+		int i = 17;
+		int k = 1;
+
+		i = extracted(i);
+		k = extracted(k);
+
+		System.out.println(i);
+		System.out.println(k);
+	}
+
+	protected int extracted(int i) {
+		/*[*/i++;/*]*/
+		return i;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test958.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test958.java
new file mode 100644
index 000000000..4d2fca98e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test958.java
@@ -0,0 +1,20 @@
+package duplicates_out;
+
+public class A_test958 {
+	private Object fO;
+
+	public void method0() {
+		Object o2 = extracted();
+		fO= o2;
+	}
+
+	protected Object extracted() {
+		/*[*/Object o2= fO;/*]*/
+		return o2;
+	}
+
+	public void method1() {
+		Object o = extracted();
+		fO= o;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test959.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test959.java
new file mode 100644
index 000000000..92ae85331
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test959.java
@@ -0,0 +1,13 @@
+package duplicates_out;
+
+public class A_test959 {
+	public void foo() {
+		int x= 10;
+		int y= extracted(x);
+		x= 20;
+	}
+
+	protected int extracted(int x) {
+		return /*[*/x/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test960.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test960.java
new file mode 100644
index 000000000..bded87336
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test960.java
@@ -0,0 +1,16 @@
+package duplicates_out;
+
+public class A_test960 {
+	private Object fO;
+
+	public void foo() {
+		extracted();
+	}
+	protected void extracted() {
+		/*[*/fO= new Object();/*]*/
+	}
+	public void bar() {
+		foo();
+		extracted();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test961.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test961.java
new file mode 100644
index 000000000..1dbc37ab3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test961.java
@@ -0,0 +1,16 @@
+package duplicates_out;
+
+public class A_test961 {
+	private Object fO;
+
+	public void foo(Object o) {
+		extracted(o);
+	}
+	protected void extracted(Object o) {
+		/*[*/fO= o;/*]*/
+	}
+	public void bar(Object x) {
+		foo(x);
+		extracted(x);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test962.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test962.java
new file mode 100644
index 000000000..f19304c3e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test962.java
@@ -0,0 +1,12 @@
+package duplicates_out;
+
+public class A_test962 {
+	private Object object;
+	public A_test962() {
+	  this.object = new Object();
+	  System.out.println(extracted());
+	}
+	protected Object extracted() {
+		return /*[*/this.object/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test963.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test963.java
new file mode 100644
index 000000000..fc592b827
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test963.java
@@ -0,0 +1,16 @@
+package duplicates_out;
+
+public class A_test963 {
+	void test() {
+		new Object() {
+			public void yes() {
+				extracted();
+			}
+
+			protected void extracted() {
+				/*[*/System.out.println("hello world");/*]*/
+			}
+		};
+		System.out.println("hello world");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test964.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test964.java
new file mode 100644
index 000000000..c578e5797
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test964.java
@@ -0,0 +1,17 @@
+package duplicates_out;
+
+public class A_test964 {
+	void test() {
+		new Object() {
+			public void yes() {
+				yes();
+				extracted();
+			}
+		};
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/System.out.println("hello world");/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test965.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test965.java
new file mode 100644
index 000000000..c8bca3df8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test965.java
@@ -0,0 +1,22 @@
+package duplicates_out;
+
+public class A_test964 {
+	boolean test() {
+		Object x= null;
+		if (true) {
+			return extracted(x);
+		} else {
+			{
+				if (x instanceof Integer)
+					return false;
+			}
+			return true;
+		}
+	}
+
+	protected boolean extracted(Object x) {
+		/*[*/if (x instanceof Integer)
+			return false;
+		return true;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test966.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test966.java
new file mode 100644
index 000000000..731cddc2b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test966.java
@@ -0,0 +1,25 @@
+package duplicates_out;
+
+import java.util.List;
+
+public class A_test964 {
+	boolean test() {
+		Object x= null;
+		List l= null;
+		if (true) {
+			extracted(x, l);
+		} else {
+			if (true)
+				if (x instanceof Integer)
+					l.add(null);
+			l.add(new Object());
+		}
+		return true;
+	}
+
+	protected void extracted(Object x, List l) {
+		/*[*/if (x instanceof Integer)
+			l.add(null);
+		l.add(new Object());/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test967.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test967.java
new file mode 100644
index 000000000..1f3ec7cd5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test967.java
@@ -0,0 +1,20 @@
+package duplicates_out;
+
+import java.util.List;
+
+public class A_test964 {
+	public void test() {
+		extracted();
+		
+		if (true)
+			foo();
+		else
+			foo();
+	}
+	protected void extracted() {
+		/*[*/foo();
+		foo();/*]*/
+	}
+	public void foo() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test968.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test968.java
new file mode 100644
index 000000000..8935557f9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test968.java
@@ -0,0 +1,22 @@
+package duplicates_out;
+
+import java.util.List;
+
+public class A_test964 {
+	public void test() {
+		extracted();
+
+		switch(10) {
+			case 1:
+				foo();
+			case 2:
+				foo();
+		}
+	}
+	protected void extracted() {
+		/*[*/foo();
+		foo();/*]*/
+	}
+	public void foo() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test969.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test969.java
new file mode 100644
index 000000000..162d6f64a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test969.java
@@ -0,0 +1,20 @@
+package duplicates_out;
+
+import java.util.List;
+
+public class A_test964 {
+	public void test() {
+		extracted();
+
+		switch(10) {
+			case 1:
+				extracted();
+		}
+	}
+	protected void extracted() {
+		/*[*/foo();
+		foo();/*]*/
+	}
+	public void foo() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test970.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test970.java
new file mode 100644
index 000000000..635586f20
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test970.java
@@ -0,0 +1,50 @@
+package duplicates_out;
+
+public class A_test970 {
+	static class Transaction {
+		public void start(String string) {}
+		public void run(Action action) {}
+		public void run(String string) {}
+		public void end() {}
+	}
+	static class Action {
+		public Action(String string) {}
+	}
+
+	public void a3()
+	{
+		Transaction t = new Transaction();
+		Action action = new Action(" A.a3");
+		String string = "A.a3";
+		extracted(t, action, string);
+	}
+
+	protected void extracted(Transaction t, Action action, String string) {
+		/*[*/
+		t.start(string);
+		t.run(action);
+		t.end();
+		/*]*/
+	}
+
+	public void a4()
+	{
+		Transaction t = new Transaction();
+		String t_name = "A.a4";
+
+		Action action = new Action(t_name);
+
+		t.start(t_name);
+		t.run(t_name);
+		t.end();
+	}
+
+	public void a6()
+	{
+		Transaction t = new Transaction();
+		String t_name = "A.a6";
+
+		Action action = new Action(t_name);
+		extracted(t, action, t_name);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test971.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test971.java
new file mode 100644
index 000000000..a84d45715
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test971.java
@@ -0,0 +1,17 @@
+package duplicates_out;
+
+public class A_test971 {
+	void f(){
+		new Object() {
+			public String toString() {
+				extracted();
+				return null;
+			}
+		};
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/System.out.println("hello world");/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test972.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test972.java
new file mode 100644
index 000000000..228c6b42e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test972.java
@@ -0,0 +1,18 @@
+package duplicates_out;
+
+public class A_test972 {
+	class X {
+		public String toString() {
+			extracted();
+			return null;
+		}
+
+		protected void extracted() {
+			/*[*/System.out.println("hello world");/*]*/
+		}
+	};
+	
+	void f(){
+		System.out.println("hello world");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test980.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test980.java
new file mode 100644
index 000000000..89128ecf4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test980.java
@@ -0,0 +1,14 @@
+package duplicates_out;
+
+public class A_test980 {
+	int x;
+	int f(){
+		return extracted();
+	}
+	protected int extracted() {
+		return /*[*/x/*]*/;
+	}
+	void g() {
+		x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test981.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test981.java
new file mode 100644
index 000000000..96272d10c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test981.java
@@ -0,0 +1,14 @@
+package duplicates_out;
+
+public class A_test981 {
+	int x;
+	int f(){
+		return extracted();
+	}
+	protected int extracted() {
+		return /*[*/x/*]*/;
+	}
+	void g() {
+		this.x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test982.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test982.java
new file mode 100644
index 000000000..465d9d5a5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test982.java
@@ -0,0 +1,15 @@
+package duplicates_out;
+
+public class A_test982 {
+	A_test982 c;
+	int x;
+	int f(){
+		return extracted();
+	}
+	protected int extracted() {
+		return /*[*/x/*]*/;
+	}
+	void g() {
+		c.x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test983.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test983.java
new file mode 100644
index 000000000..afe8b048b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test983.java
@@ -0,0 +1,15 @@
+package duplicates_out;
+
+public class A_test983 {
+	int[] x;
+	int i = 1;
+	int[] f(){
+		return extracted();
+	}
+	protected int[] extracted() {
+		return /*[*/x/*]*/;
+	}
+	void g() {
+		extracted()[i]= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test984.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test984.java
new file mode 100644
index 000000000..9f8793fed
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test984.java
@@ -0,0 +1,15 @@
+package duplicates_out;
+
+public class A_test984 {
+	int[] x;
+	int i = 1;
+	int f(){
+		return extracted();
+	}
+	protected int extracted() {
+		return /*[*/i/*]*/;
+	}
+	void g() {
+		x[extracted()]= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test985.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test985.java
new file mode 100644
index 000000000..3816efb35
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test985.java
@@ -0,0 +1,22 @@
+package duplicates_out;
+
+public class A_test985 {
+	class A {
+		int parentFoo;
+	}
+
+	class X extends A {
+		int f() {
+			return extracted();
+		}
+
+		protected int extracted() {
+			return /*[*/parentFoo/*]*/;
+		}
+
+		void g() {
+			super.parentFoo= 1;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test986.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test986.java
new file mode 100644
index 000000000..ef3b4b472
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test986.java
@@ -0,0 +1,23 @@
+package duplicates_out;
+
+public class A_test986 {
+	class A {
+		int parentFoo;
+	}
+
+	class X extends A {
+		int f() {
+			return extracted();
+		}
+
+		protected int extracted() {
+			return /*[*/parentFoo/*]*/;
+		}
+
+		void g() {
+			int i;
+			i= extracted();
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test987.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test987.java
new file mode 100644
index 000000000..769b44746
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test987.java
@@ -0,0 +1,16 @@
+package duplicates_out;
+
+public class A_test987 {
+	A_test987 other;
+	int x;
+	protected void f() {
+		Object o= extracted();
+		x = 1;
+        extracted().x= 1;
+        extracted().extracted().x= 5;
+	}
+	protected A_test987 extracted() {
+		return /*[*/other/*]*/;
+	}
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1150.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1150.java
new file mode 100644
index 000000000..a6c5033c1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1150.java
@@ -0,0 +1,9 @@
+package enums_in;
+
+public enum A_test1150 {
+	A;
+	
+	public void foo() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1151.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1151.java
new file mode 100644
index 000000000..e5619ad90
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1151.java
@@ -0,0 +1,12 @@
+package enums_in;
+
+public enum A_test1151 {
+	A;
+	
+	static {
+		/*[*/foo();/*]*/
+	}
+	
+	private static void foo() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1152.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1152.java
new file mode 100644
index 000000000..785a73316
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_in/A_test1152.java
@@ -0,0 +1,9 @@
+package enums_in;
+
+public enum A_test1152 {
+	A {
+		public void foo() {
+			/*[*/foo();/*]*/
+		}
+	};
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1150.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1150.java
new file mode 100644
index 000000000..e3b7f5d2c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1150.java
@@ -0,0 +1,13 @@
+package enums_out;
+
+public enum A_test1150 {
+	A;
+	
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1151.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1151.java
new file mode 100644
index 000000000..82694d169
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1151.java
@@ -0,0 +1,16 @@
+package enums_out;
+
+public enum A_test1151 {
+	A;
+	
+	static {
+		extracted();
+	}
+
+	protected static void extracted() {
+		/*[*/foo();/*]*/
+	}
+	
+	private static void foo() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1152.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1152.java
new file mode 100644
index 000000000..edc155ee8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/enums_out/A_test1152.java
@@ -0,0 +1,13 @@
+package enums_out;
+
+public enum A_test1152 {
+	A {
+		public void foo() {
+			extracted();
+		}
+
+		protected void extracted() {
+			/*[*/foo();/*]*/
+		}
+	};
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test800.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test800.java
new file mode 100644
index 000000000..e647199e8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test800.java
@@ -0,0 +1,10 @@
+package error_in;
+
+public class A_test800 {
+	public void fails() {
+		foo()
+	}
+	public void foo() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test801.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test801.java
new file mode 100644
index 000000000..ac121d871
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test801.java
@@ -0,0 +1,11 @@
+package error_in;
+
+public class A_test801 {
+	public void foo() {
+		List l;
+		/*[*/g(l);/*]*/
+	}
+
+	public void g(List l) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test802.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test802.java
new file mode 100644
index 000000000..0583ea814
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test802.java
@@ -0,0 +1,10 @@
+package error_in;
+
+public class A_test802 {
+	public List g() {
+		return null;
+	}
+	public void foo() {
+		/*]*/g()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test803.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test803.java
new file mode 100644
index 000000000..736d45f66
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_in/A_test803.java
@@ -0,0 +1,12 @@
+package error_in;
+
+public class A_test803 {
+	void m(String[] names) {
+		/*[*/
+		for (String string : names) {
+			System.out.println(string.);
+		}
+		/*]*/
+	}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test800.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test800.java
new file mode 100644
index 000000000..d59faa001
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test800.java
@@ -0,0 +1,13 @@
+package error_out;
+
+public class A_test800 {
+	public void fails() {
+		foo()
+	}
+	public void foo() {
+		extracted();
+	}
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test801.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test801.java
new file mode 100644
index 000000000..7a4d01ca0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test801.java
@@ -0,0 +1,15 @@
+package error_out;
+
+public class A_test801 {
+	public void foo() {
+		List l;
+		extracted(l);
+	}
+
+	protected void extracted(List l) {
+		/*[*/g(l);/*]*/
+	}
+
+	public void g(List l) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test802.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test802.java
new file mode 100644
index 000000000..3eeca6180
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test802.java
@@ -0,0 +1,13 @@
+package error_out;
+
+public class A_test802 {
+	public List g() {
+		return null;
+	}
+	public void foo() {
+		/*]*/extracted();
+	}
+	protected List extracted() {
+		return g()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test803.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test803.java
new file mode 100644
index 000000000..9fc35cc41
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/error_out/A_test803.java
@@ -0,0 +1,16 @@
+package error_out;
+
+public class A_test803 {
+	void m(String[] names) {
+		extracted(names);
+	}
+
+	protected void extracted(String[] names) {
+		/*[*/
+		for (String string : names) {
+			System.out.println(string.);
+		}
+		/*]*/
+	}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A.java
new file mode 100644
index 000000000..1f00ac3e6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A.java
@@ -0,0 +1,12 @@
+package expression_in;
+
+import java.io.File;
+
+class A {
+	public File getFile() {
+		return null;
+	}
+	public void useFile(File file) {
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test600.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test600.java
new file mode 100644
index 000000000..94db9365a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test600.java
@@ -0,0 +1,10 @@
+package expression_in;
+
+public class A_test600 {
+
+	public void foo() {
+		int i= 10;
+		if (/*[*/i < 10/*]*/)
+			foo();
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test601.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test601.java
new file mode 100644
index 000000000..193f07ac3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test601.java
@@ -0,0 +1,10 @@
+package expression_in;
+
+public class A_test601 {
+
+	public void foo() {
+		int i= 10;
+		if (/*[*/i < 10 && i < 20/*]*/)
+			foo();
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test602.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test602.java
new file mode 100644
index 000000000..0c46ee7d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test602.java
@@ -0,0 +1,10 @@
+package expression_in;
+
+public class A_test602 {
+
+	public void foo() {
+		int i= 10;
+		if (/*[*/i < 10 || i < 20/*]*/)
+			foo();
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test603.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test603.java
new file mode 100644
index 000000000..21f20ecec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test603.java
@@ -0,0 +1,10 @@
+package expression_in;
+
+public class A_test603 {
+
+	public void foo() {
+		int i= 10;
+		if (/*[*/i == 10/*]*/)
+			foo();
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test604.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test604.java
new file mode 100644
index 000000000..58e04ec01
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test604.java
@@ -0,0 +1,10 @@
+package expression_in;
+
+public class A_test604 {
+
+	public void foo() {
+		Object o= null;
+		if (/*[*/o == o/*]*/)
+			foo();
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test605.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test605.java
new file mode 100644
index 000000000..96abbb649
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test605.java
@@ -0,0 +1,11 @@
+package expression_in;
+
+public class A_test605 {
+
+	public void foo() {
+		int i= 0;
+		while (/*[*/i <= 10/*]*/)
+			foo();
+		foo();	
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test606.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test606.java
new file mode 100644
index 000000000..e719d7260
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test606.java
@@ -0,0 +1,12 @@
+package expression_in;
+
+public class A_test606 {
+
+	public void foo() {
+		int i= 0;
+		foo();
+		do {
+			foo();
+		} while (/*[*/i <= 10/*]*/);
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test607.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test607.java
new file mode 100644
index 000000000..16bdd6c8a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test607.java
@@ -0,0 +1,9 @@
+package expression_in;
+
+public class A_test607 {
+
+	public void foo() {
+		for (int i= 0;/*[*/ i < 10/*]*/; i++)
+			foo();
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test608.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test608.java
new file mode 100644
index 000000000..8e07b6cdc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test608.java
@@ -0,0 +1,24 @@
+package expression_in;
+
+public class A_test608 {
+
+	public static class Scanner {
+		public int x;
+		public int y;
+	}
+	public static class Selection {
+		public int start;
+		public int end;
+	}
+
+	public void foo(Selection selection) {
+		Scanner scanner= new Scanner();
+		
+		if (/*[*/scanner.x < selection.start && selection.start < scanner.y/*]*/) {
+			g();
+		}
+	}
+
+	public void g() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test609.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test609.java
new file mode 100644
index 000000000..0bbcf8bb1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test609.java
@@ -0,0 +1,8 @@
+package expression_in;
+
+public class A_test609 {
+	public void foo() {
+		boolean b;
+		b= 1 < 10 && /*[*/2 < 20/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test610.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test610.java
new file mode 100644
index 000000000..c30d04da2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test610.java
@@ -0,0 +1,7 @@
+package expression_in;
+
+public class A_test610 {
+	public void foo() {
+		int i= /*[*/0/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test611.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test611.java
new file mode 100644
index 000000000..5b94a3023
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test611.java
@@ -0,0 +1,9 @@
+package expression_in;
+
+public class A_test611 {
+	class Inner {
+	}
+	public void foo() {
+		Inner inner= /*[*/new Inner()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test612.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test612.java
new file mode 100644
index 000000000..ce7e0d872
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test612.java
@@ -0,0 +1,9 @@
+package expression_in;
+
+public class A_test612 {
+	class Inner {
+	}
+	public void foo() {
+		Inner[] inner= /*[*/new Inner[10]/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test613.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test613.java
new file mode 100644
index 000000000..8009c6d3e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test613.java
@@ -0,0 +1,8 @@
+package expression_in;
+
+public class A_test613 {
+	public void foo() {
+		A a= null;
+		a.useFile(/*[*/a.getFile()/*]*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java
new file mode 100644
index 000000000..523806db2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java
@@ -0,0 +1,10 @@
+package expression_in;
+
+import java.io.File;
+
+public class A_test614 {
+	public void foo() {
+		A a= null;
+		a.useFile(/*[*/a.getFile()/*]*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test615.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test615.java
new file mode 100644
index 000000000..b81a13c7f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test615.java
@@ -0,0 +1,11 @@
+package expression_in;
+
+public class A_test615 {
+	class Inner {
+	}
+	public void foo() {
+		Inner inner= null;
+		boolean b;
+		b= /*[*/inner instanceof Inner/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test616.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test616.java
new file mode 100644
index 000000000..837988770
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test616.java
@@ -0,0 +1,8 @@
+package expression_in;
+
+public class A_test616 {
+	public void foo() {
+		A a= null;
+		/*]*/a.getFile()/*]*/.getName();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test617.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test617.java
new file mode 100644
index 000000000..2e13e44e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test617.java
@@ -0,0 +1,8 @@
+package expression_in;
+
+public class A_test617 {
+	public int foo() {
+		return 10 + /*[*/20 * 30/*]*/ + 10;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test618.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test618.java
new file mode 100644
index 000000000..48db0c4c3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test618.java
@@ -0,0 +1,8 @@
+package expression_in;
+
+public class A_test618 {
+	public void foo() {
+		int i= 20 + /*[*/10 * 30/*]*/ + 10;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test619.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test619.java
new file mode 100644
index 000000000..54b01133d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test619.java
@@ -0,0 +1,7 @@
+package expression_in;
+
+public class A_test619 {
+	public void foo() {
+		int f= new A[/*[*/1 + 2/*]*/].length;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test620.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test620.java
new file mode 100644
index 000000000..304d772a2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test620.java
@@ -0,0 +1,8 @@
+package expression_in;
+
+public class A_test620 {
+	public void foo() {
+		B b= new B();
+		Object o= /*[*/b.foo()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test621.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test621.java
new file mode 100644
index 000000000..5001b8fa0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test621.java
@@ -0,0 +1,9 @@
+package expression_in;
+
+public class A_test621 {
+	public A_test621() {
+		this(/*[*/5 + 6/*]*/);
+	}
+	public A_test621(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test622.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test622.java
new file mode 100644
index 000000000..c9c9b8390
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test622.java
@@ -0,0 +1,11 @@
+package expression_in;
+
+public class A_test622 {
+	public A_test622(int i) {
+	}
+	static class Inner extends A_test622 {
+		public Inner() {
+			super(/*[*/5 + 6/*]*/);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/B.java
new file mode 100644
index 000000000..368e3d36b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/B.java
@@ -0,0 +1,9 @@
+package expression_in;
+
+import java.util.List;
+
+public class B {
+	public List[] foo() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A.java
new file mode 100644
index 000000000..22a411387
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A.java
@@ -0,0 +1,12 @@
+package expression_out;
+
+import java.io.File;
+
+class A {
+	public File getFile() {
+		return null;
+	}
+	public void useFile(File file) {
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test600.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test600.java
new file mode 100644
index 000000000..ea11d99ad
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test600.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+public class A_test600 {
+
+	public void foo() {
+		int i= 10;
+		if (extracted(i))
+			foo();
+	}
+
+	protected boolean extracted(int i) {
+		return /*[*/i < 10/*]*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test601.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test601.java
new file mode 100644
index 000000000..d45a539be
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test601.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+public class A_test601 {
+
+	public void foo() {
+		int i= 10;
+		if (extracted(i))
+			foo();
+	}
+
+	protected boolean extracted(int i) {
+		return /*[*/i < 10 && i < 20/*]*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test602.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test602.java
new file mode 100644
index 000000000..f3e2cf739
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test602.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+public class A_test602 {
+
+	public void foo() {
+		int i= 10;
+		if (extracted(i))
+			foo();
+	}
+
+	protected boolean extracted(int i) {
+		return /*[*/i < 10 || i < 20/*]*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test603.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test603.java
new file mode 100644
index 000000000..dbd021332
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test603.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+public class A_test603 {
+
+	public void foo() {
+		int i= 10;
+		if (extracted(i))
+			foo();
+	}
+
+	protected boolean extracted(int i) {
+		return /*[*/i == 10/*]*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test604.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test604.java
new file mode 100644
index 000000000..17154313b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test604.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+public class A_test604 {
+
+	public void foo() {
+		Object o= null;
+		if (extracted(o))
+			foo();
+	}
+
+	protected boolean extracted(Object o) {
+		return /*[*/o == o/*]*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test605.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test605.java
new file mode 100644
index 000000000..e6e12f42e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test605.java
@@ -0,0 +1,15 @@
+package expression_out;
+
+public class A_test605 {
+
+	public void foo() {
+		int i= 0;
+		while (extracted(i))
+			foo();
+		foo();	
+	}
+
+	protected boolean extracted(int i) {
+		return /*[*/i <= 10/*]*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test606.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test606.java
new file mode 100644
index 000000000..f1a6c39fc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test606.java
@@ -0,0 +1,16 @@
+package expression_out;
+
+public class A_test606 {
+
+	public void foo() {
+		int i= 0;
+		foo();
+		do {
+			foo();
+		} while (extracted(i));
+	}
+
+	protected boolean extracted(int i) {
+		return /*[*/i <= 10/*]*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test607.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test607.java
new file mode 100644
index 000000000..765271b57
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test607.java
@@ -0,0 +1,13 @@
+package expression_out;
+
+public class A_test607 {
+
+	public void foo() {
+		for (int i= 0;extracted(i); i++)
+			foo();
+	}
+
+	protected boolean extracted(int i) {
+		return /*[*/ i < 10/*]*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test608.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test608.java
new file mode 100644
index 000000000..23a3e43aa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test608.java
@@ -0,0 +1,28 @@
+package expression_out;
+
+public class A_test608 {
+
+	public static class Scanner {
+		public int x;
+		public int y;
+	}
+	public static class Selection {
+		public int start;
+		public int end;
+	}
+
+	public void foo(Selection selection) {
+		Scanner scanner= new Scanner();
+		
+		if (extracted(selection, scanner)) {
+			g();
+		}
+	}
+
+	protected boolean extracted(Selection selection, Scanner scanner) {
+		return /*[*/scanner.x < selection.start && selection.start < scanner.y/*]*/;
+	}
+
+	public void g() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test609.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test609.java
new file mode 100644
index 000000000..859f6418e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test609.java
@@ -0,0 +1,12 @@
+package expression_out;
+
+public class A_test609 {
+	public void foo() {
+		boolean b;
+		b= 1 < 10 && extracted();
+	}
+
+	protected boolean extracted() {
+		return /*[*/2 < 20/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test610.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test610.java
new file mode 100644
index 000000000..89149ac4b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test610.java
@@ -0,0 +1,11 @@
+package expression_out;
+
+public class A_test610 {
+	public void foo() {
+		int i= extracted();
+	}
+
+	protected int extracted() {
+		return /*[*/0/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test611.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test611.java
new file mode 100644
index 000000000..f30f66925
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test611.java
@@ -0,0 +1,12 @@
+package expression_out;
+
+public class A_test611 {
+	class Inner {
+	}
+	public void foo() {
+		Inner inner= extracted();
+	}
+	protected Inner extracted() {
+		return /*[*/new Inner()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test612.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test612.java
new file mode 100644
index 000000000..972f49681
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test612.java
@@ -0,0 +1,12 @@
+package expression_out;
+
+public class A_test612 {
+	class Inner {
+	}
+	public void foo() {
+		Inner[] inner= extracted();
+	}
+	protected Inner[] extracted() {
+		return /*[*/new Inner[10]/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test613.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test613.java
new file mode 100644
index 000000000..842554976
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test613.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+import java.io.File;
+
+public class A_test613 {
+	public void foo() {
+		A a= null;
+		a.useFile(extracted(a));
+	}
+
+	protected File extracted(A a) {
+		return /*[*/a.getFile()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test614.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test614.java
new file mode 100644
index 000000000..8a74345c2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test614.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+import java.io.File;
+
+public class A_test614 {
+	public void foo() {
+		A a= null;
+		a.useFile(extracted(a));
+	}
+
+	protected File extracted(A a) {
+		return /*[*/a.getFile()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test615.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test615.java
new file mode 100644
index 000000000..a5234e2af
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test615.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+public class A_test615 {
+	class Inner {
+	}
+	public void foo() {
+		Inner inner= null;
+		boolean b;
+		b= extracted(inner);
+	}
+	protected boolean extracted(Inner inner) {
+		return /*[*/inner instanceof Inner/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test616.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test616.java
new file mode 100644
index 000000000..327b46076
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test616.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+import java.io.File;
+
+public class A_test616 {
+	public void foo() {
+		A a= null;
+		/*]*/extracted(a).getName();
+	}
+
+	protected File extracted(A a) {
+		return a.getFile()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test617.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test617.java
new file mode 100644
index 000000000..00d92a8b0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test617.java
@@ -0,0 +1,12 @@
+package expression_out;
+
+public class A_test617 {
+	public int foo() {
+		return 10 + extracted() + 10;
+	}
+
+	protected int extracted() {
+		return /*[*/20 * 30/*]*/;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test618.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test618.java
new file mode 100644
index 000000000..304c5b949
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test618.java
@@ -0,0 +1,12 @@
+package expression_out;
+
+public class A_test618 {
+	public void foo() {
+		int i= 20 + extracted() + 10;
+	}
+
+	protected int extracted() {
+		return /*[*/10 * 30/*]*/;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test619.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test619.java
new file mode 100644
index 000000000..0d5654264
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test619.java
@@ -0,0 +1,11 @@
+package expression_out;
+
+public class A_test619 {
+	public void foo() {
+		int f= new A[extracted()].length;
+	}
+
+	protected int extracted() {
+		return /*[*/1 + 2/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test620.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test620.java
new file mode 100644
index 000000000..e676e6b00
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test620.java
@@ -0,0 +1,14 @@
+package expression_out;
+
+import java.util.List;
+
+public class A_test620 {
+	public void foo() {
+		B b= new B();
+		Object o= extracted(b);
+	}
+
+	protected List[] extracted(B b) {
+		return /*[*/b.foo()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test621.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test621.java
new file mode 100644
index 000000000..75966b678
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test621.java
@@ -0,0 +1,12 @@
+package expression_out;
+
+public class A_test621 {
+	public A_test621() {
+		this(extracted());
+	}
+	protected static int extracted() {
+		return /*[*/5 + 6/*]*/;
+	}
+	public A_test621(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test622.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test622.java
new file mode 100644
index 000000000..3e0cb45d9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test622.java
@@ -0,0 +1,15 @@
+package expression_out;
+
+public class A_test622 {
+	public A_test622(int i) {
+	}
+	static class Inner extends A_test622 {
+		public Inner() {
+			super(extracted());
+		}
+
+		protected static int extracted() {
+			return /*[*/5 + 6/*]*/;
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/B.java
new file mode 100644
index 000000000..2583a2a15
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/B.java
@@ -0,0 +1,9 @@
+package expression_out;
+
+import java.util.List;
+
+public class B {
+	public List[] foo() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1250.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1250.java
new file mode 100644
index 000000000..c9fba1ef5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1250.java
@@ -0,0 +1,5 @@
+package fieldInitializer_in;
+
+public class A_test1250 {
+	private double fRand= /*[*/Math.random()/*]*/;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1251.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1251.java
new file mode 100644
index 000000000..06a9b23de
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1251.java
@@ -0,0 +1,6 @@
+package fieldInitializer_in;
+
+public class A_test1251 {
+	public static final String WORLD= "World";
+	public static int fgAnswer= 42 + /*[*/("Hello" + ' ' + WORLD).length()/*]*/;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1252.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1252.java
new file mode 100644
index 000000000..cf630507f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_in/A_test1252.java
@@ -0,0 +1,13 @@
+package fieldInitializer_in;
+
+public class A_test1252 {
+	String fS= "foo";
+	void m() {
+		new Thread() {
+			String fSub= /*]*/fS.substring(1)/*[*/;
+			public void run() {
+				System.out.println(fS.substring(1));
+			};
+		}.start();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1250.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1250.java
new file mode 100644
index 000000000..6f55b858e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1250.java
@@ -0,0 +1,9 @@
+package fieldInitializer_out;
+
+public class A_test1250 {
+	private double fRand= extracted();
+
+	protected double extracted() {
+		return /*[*/Math.random()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1251.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1251.java
new file mode 100644
index 000000000..b0725c2d7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1251.java
@@ -0,0 +1,9 @@
+package fieldInitializer_out;
+
+public class A_test1251 {
+	public static final String WORLD= "World";
+	public static int fgAnswer= 42 + extracted();
+	protected static int extracted() {
+		return /*[*/("Hello" + ' ' + WORLD).length()/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1252.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1252.java
new file mode 100644
index 000000000..d6ca3fde0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/fieldInitializer_out/A_test1252.java
@@ -0,0 +1,16 @@
+package fieldInitializer_out;
+
+public class A_test1252 {
+	String fS= "foo";
+	void m() {
+		new Thread() {
+			String fSub= /*]*/extracted()/*[*/;
+			protected String extracted() {
+				return fS.substring(1);
+			}
+			public void run() {
+				System.out.println(extracted());
+			};
+		}.start();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1100.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1100.java
new file mode 100644
index 000000000..4da633452
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1100.java
@@ -0,0 +1,7 @@
+package generics_in;
+
+public class A_test1100<E> {
+	public void foo() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1101.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1101.java
new file mode 100644
index 000000000..834f1363a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1101.java
@@ -0,0 +1,7 @@
+package generics_in;
+
+public class A_test1101 {
+	public <E> void foo() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1102.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1102.java
new file mode 100644
index 000000000..1fe252496
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1102.java
@@ -0,0 +1,8 @@
+package generics_in;
+
+public class A_test1102 {
+	public <E> void foo() {
+		E local;
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1103.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1103.java
new file mode 100644
index 000000000..e2af8ab8c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1103.java
@@ -0,0 +1,8 @@
+package generics_in;
+
+public class A_test1103 {
+	public <E> void foo() {
+		/*[*/foo();/*]*/
+		E local;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1104.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1104.java
new file mode 100644
index 000000000..1acd73833
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1104.java
@@ -0,0 +1,7 @@
+package generics_in;
+
+public class A_test1104 {
+	public <E> void foo(E param) {
+		/*[*/foo(param);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1105.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1105.java
new file mode 100644
index 000000000..706e2e21b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1105.java
@@ -0,0 +1,8 @@
+package generics_in;
+
+public class A_test1105 {
+	public <E> void foo(E param) {
+		/*[*/E local= param;
+		foo(local);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1106.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1106.java
new file mode 100644
index 000000000..540d7d00e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1106.java
@@ -0,0 +1,8 @@
+package generics_in;
+
+public class A_test1106<E> {
+	public void foo(E param) {
+		/*[*/E local= param;
+		foo(local);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1107.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1107.java
new file mode 100644
index 000000000..fa658007e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1107.java
@@ -0,0 +1,11 @@
+package generics_in;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A_test1107 {
+	public <E> void foo(E param) {
+		/*[*/List<E> list= new ArrayList<E>();
+		foo(param);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1108.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1108.java
new file mode 100644
index 000000000..2e16d97fd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1108.java
@@ -0,0 +1,7 @@
+package generics_in;
+
+public class A_test1108 {
+	public Object foo() {
+		return /*[*/A_test1108.class/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1109.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1109.java
new file mode 100644
index 000000000..84550144b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1109.java
@@ -0,0 +1,16 @@
+package generics_in;
+
+import java.util.List;
+
+// Tests capture bindings
+public class A_test1109 {
+	public void foo() {
+		consume(/*[*/produce()/*]*/);
+	}
+	public List<?> produce() {
+		return null;
+	}
+	public void consume(List<?> param) {
+		
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1110.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1110.java
new file mode 100644
index 000000000..b7e5f28a4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1110.java
@@ -0,0 +1,14 @@
+package generics_in;
+
+import java.util.List;
+
+// Tests capture bindings
+public class A_test1110 {
+	public void foo() {
+		List<?> param= null;
+		/*[*/consume(param);/*]*/
+	}
+	public void consume(List<?> param) {
+		
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1111.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1111.java
new file mode 100644
index 000000000..191226bca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1111.java
@@ -0,0 +1,12 @@
+package generics_in;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A_test1111 {
+	private List<? extends Number> al= new ArrayList<Integer>();
+	
+	void test () {
+		/*]*/al.get(0)/*[*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1112.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1112.java
new file mode 100644
index 000000000..c92a3789f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1112.java
@@ -0,0 +1,12 @@
+package generics_in;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A_test1112 {
+	private List<? super Integer> al= new ArrayList<Integer>();
+	
+	void test () {
+		/*]*/al.get(0)/*[*/;
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1113.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1113.java
new file mode 100644
index 000000000..1a1c29a9e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1113.java
@@ -0,0 +1,9 @@
+package generics_in;
+
+import java.util.List;
+
+public class A_test1113<E> {
+	private int test(List<E> list) {
+		return /*]*/list.size()/*[*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1114.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1114.java
new file mode 100644
index 000000000..f27e7e51c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1114.java
@@ -0,0 +1,9 @@
+package generics_in;
+
+import java.util.List;
+
+public class A_test1114 {
+	private <T> int test(List<T> list) {
+		return /*]*/list.size()/*[*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1115.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1115.java
new file mode 100644
index 000000000..e884b4689
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1115.java
@@ -0,0 +1,10 @@
+package generics_in;
+
+import java.util.List;
+
+public class A_test1115 {
+	private <T> int test(List<T> list) {
+		/*]*/T t= null;
+		return list.size();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1116.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1116.java
new file mode 100644
index 000000000..662a0d104
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1116.java
@@ -0,0 +1,10 @@
+package generics_in;
+
+import java.util.List;
+
+public class A_test1116 {
+	private <T, X> int test(List<T> list) {
+		/*]*/X x= null;
+		return list.size();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1117.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1117.java
new file mode 100644
index 000000000..d93f5896b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1117.java
@@ -0,0 +1,9 @@
+package generics_in;
+
+import java.util.Map;
+
+public class A_test1117 {
+	private <K, V> int test(Map<K, V> map) {
+		return /*]*/map.size()/*[*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1118.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1118.java
new file mode 100644
index 000000000..7f6a2afb8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1118.java
@@ -0,0 +1,10 @@
+package generics_in;
+
+import java.util.List;
+
+public class A_test1118 {
+	private <T> void test(List<T> list1, List<T> list2) {
+		/*]*/list1.get(0);
+		list2.get(0);/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1119.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1119.java
new file mode 100644
index 000000000..7f5bffb9d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1119.java
@@ -0,0 +1,10 @@
+package generics_in;
+
+import java.util.List;
+
+public class A_test1119 {
+	private <T> void test(List<T> list1, List<T> list2) {
+		/*]*/list1= null;
+		list2= null;/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1100.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1100.java
new file mode 100644
index 000000000..604ac8176
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1100.java
@@ -0,0 +1,11 @@
+package generics_out;
+
+public class A_test1100<E> {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1101.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1101.java
new file mode 100644
index 000000000..9d3275da1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1101.java
@@ -0,0 +1,11 @@
+package generics_out;
+
+public class A_test1101 {
+	public <E> void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1102.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1102.java
new file mode 100644
index 000000000..695e1d977
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1102.java
@@ -0,0 +1,12 @@
+package generics_out;
+
+public class A_test1102 {
+	public <E> void foo() {
+		E local;
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1103.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1103.java
new file mode 100644
index 000000000..4a629d9b2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1103.java
@@ -0,0 +1,12 @@
+package generics_out;
+
+public class A_test1103 {
+	public <E> void foo() {
+		extracted();
+		E local;
+	}
+
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1104.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1104.java
new file mode 100644
index 000000000..6ed7d957a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1104.java
@@ -0,0 +1,11 @@
+package generics_out;
+
+public class A_test1104 {
+	public <E> void foo(E param) {
+		extracted(param);
+	}
+
+	protected <E> void extracted(E param) {
+		/*[*/foo(param);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1105.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1105.java
new file mode 100644
index 000000000..b3824e120
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1105.java
@@ -0,0 +1,12 @@
+package generics_out;
+
+public class A_test1105 {
+	public <E> void foo(E param) {
+		extracted(param);
+	}
+
+	protected <E> void extracted(E param) {
+		/*[*/E local= param;
+		foo(local);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1106.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1106.java
new file mode 100644
index 000000000..a9b863e9a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1106.java
@@ -0,0 +1,12 @@
+package generics_out;
+
+public class A_test1106<E> {
+	public void foo(E param) {
+		extracted(param);
+	}
+
+	protected void extracted(E param) {
+		/*[*/E local= param;
+		foo(local);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1107.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1107.java
new file mode 100644
index 000000000..e8fcb6e5a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1107.java
@@ -0,0 +1,15 @@
+package generics_out;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A_test1107 {
+	public <E> void foo(E param) {
+		extracted(param);
+	}
+
+	protected <E> void extracted(E param) {
+		/*[*/List<E> list= new ArrayList<E>();
+		foo(param);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1108.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1108.java
new file mode 100644
index 000000000..4b5370e9f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1108.java
@@ -0,0 +1,11 @@
+package generics_out;
+
+public class A_test1108 {
+	public Object foo() {
+		return extracted();
+	}
+
+	protected Class<A_test1108> extracted() {
+		return /*[*/A_test1108.class/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1109.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1109.java
new file mode 100644
index 000000000..8e0c4052f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1109.java
@@ -0,0 +1,19 @@
+package generics_out;
+
+import java.util.List;
+
+// Tests capture bindings
+public class A_test1109 {
+	public void foo() {
+		consume(extracted());
+	}
+	protected List<?> extracted() {
+		return /*[*/produce()/*]*/;
+	}
+	public List<?> produce() {
+		return null;
+	}
+	public void consume(List<?> param) {
+		
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1110.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1110.java
new file mode 100644
index 000000000..72137d233
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1110.java
@@ -0,0 +1,17 @@
+package generics_out;
+
+import java.util.List;
+
+// Tests capture bindings
+public class A_test1110 {
+	public void foo() {
+		List<?> param= null;
+		extracted(param);
+	}
+	protected void extracted(List<?> param) {
+		/*[*/consume(param);/*]*/
+	}
+	public void consume(List<?> param) {
+		
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1111.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1111.java
new file mode 100644
index 000000000..d5a8b4853
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1111.java
@@ -0,0 +1,16 @@
+package generics_out;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A_test1111 {
+	private List<? extends Number> al= new ArrayList<Integer>();
+	
+	void test () {
+		/*]*/extracted()/*[*/;
+	}
+
+	protected Number extracted() {
+		return al.get(0);
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1112.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1112.java
new file mode 100644
index 000000000..a106e0e5f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1112.java
@@ -0,0 +1,16 @@
+package generics_out;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A_test1112 {
+	private List<? super Integer> al= new ArrayList<Integer>();
+	
+	void test () {
+		/*]*/extracted()/*[*/;
+	}
+
+	protected Object extracted() {
+		return al.get(0);
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1113.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1113.java
new file mode 100644
index 000000000..ade188c37
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1113.java
@@ -0,0 +1,13 @@
+package generics_out;
+
+import java.util.List;
+
+public class A_test1113<E> {
+	private int test(List<E> list) {
+		return /*]*/extracted(list)/*[*/;
+	}
+
+	protected int extracted(List<E> list) {
+		return list.size();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1114.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1114.java
new file mode 100644
index 000000000..b9409b4f9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1114.java
@@ -0,0 +1,13 @@
+package generics_out;
+
+import java.util.List;
+
+public class A_test1114 {
+	private <T> int test(List<T> list) {
+		return /*]*/extracted(list)/*[*/;
+	}
+
+	protected <T> int extracted(List<T> list) {
+		return list.size();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1115.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1115.java
new file mode 100644
index 000000000..f02c2a343
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1115.java
@@ -0,0 +1,14 @@
+package generics_out;
+
+import java.util.List;
+
+public class A_test1115 {
+	private <T> int test(List<T> list) {
+		/*]*/return extracted(list);/*[*/
+	}
+
+	protected <T> int extracted(List<T> list) {
+		T t= null;
+		return list.size();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1116.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1116.java
new file mode 100644
index 000000000..40f3faa50
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1116.java
@@ -0,0 +1,14 @@
+package generics_out;
+
+import java.util.List;
+
+public class A_test1116 {
+	private <T, X> int test(List<T> list) {
+		/*]*/return extracted(list);/*[*/
+	}
+
+	protected <X, T> int extracted(List<T> list) {
+		X x= null;
+		return list.size();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1117.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1117.java
new file mode 100644
index 000000000..bb313e25c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1117.java
@@ -0,0 +1,13 @@
+package generics_out;
+
+import java.util.Map;
+
+public class A_test1117 {
+	private <K, V> int test(Map<K, V> map) {
+		return /*]*/extracted(map)/*[*/;
+	}
+
+	protected <K, V> int extracted(Map<K, V> map) {
+		return map.size();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1118.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1118.java
new file mode 100644
index 000000000..0693c08cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1118.java
@@ -0,0 +1,14 @@
+package generics_out;
+
+import java.util.List;
+
+public class A_test1118 {
+	private <T> void test(List<T> list1, List<T> list2) {
+		/*]*/extracted(list1, list2);/*[*/
+	}
+
+	protected <T> void extracted(List<T> list1, List<T> list2) {
+		list1.get(0);
+		list2.get(0);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1119.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1119.java
new file mode 100644
index 000000000..126ca62ac
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1119.java
@@ -0,0 +1,16 @@
+package generics_out;
+
+import java.util.List;
+
+public class A_test1119 {
+	private <T> void test(List<T> list1, List<T> list2) {
+		/*]*/extracted();/*[*/
+	}
+
+	protected <T> void extracted() {
+		List<T> list1;
+		List<T> list2;
+		list1= null;
+		list2= null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/handTests/Comments.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/handTests/Comments.java
new file mode 100644
index 000000000..8045ae246
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/handTests/Comments.java
@@ -0,0 +1,12 @@
+package handTests;
+public class Comments {
+	/* comment */
+	public void foo() {
+		foo();
+		/* comment */
+		// comment
+		/** comment */
+		foo();
+	}
+	/* comment */
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1000.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1000.java
new file mode 100644
index 000000000..1a07c82aa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1000.java
@@ -0,0 +1,7 @@
+package initializer_in;
+
+public class A_test1000 {
+	{
+		/*[*/System.out.println("Eclipse");/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1001.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1001.java
new file mode 100644
index 000000000..064ea8bb3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1001.java
@@ -0,0 +1,7 @@
+package initializer_in;
+
+public class A_test1001 {
+	static {
+		/*[*/System.out.println("Eclipse");/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1002.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1002.java
new file mode 100644
index 000000000..1257274ae
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1002.java
@@ -0,0 +1,8 @@
+package initializer_in;
+
+public class A_test1002 {
+	{
+		String s= "Eclipse";
+		/*[*/System.out.println(s);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1003.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1003.java
new file mode 100644
index 000000000..a5c2a29b5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_in/A_test1003.java
@@ -0,0 +1,11 @@
+package initializer_in;
+
+public class A_test1003 {
+	static {
+		int i= /*[*/bar()/*]*/;
+	}
+
+	private static int bar() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1000.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1000.java
new file mode 100644
index 000000000..fc95b7cb8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1000.java
@@ -0,0 +1,11 @@
+package initializer_out;
+
+public class A_test1000 {
+	{
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/System.out.println("Eclipse");/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1001.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1001.java
new file mode 100644
index 000000000..8f22a51d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1001.java
@@ -0,0 +1,11 @@
+package initializer_out;
+
+public class A_test1001 {
+	static {
+		extracted();
+	}
+
+	protected static void extracted() {
+		/*[*/System.out.println("Eclipse");/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1002.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1002.java
new file mode 100644
index 000000000..3d52622f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1002.java
@@ -0,0 +1,12 @@
+package initializer_out;
+
+public class A_test1002 {
+	{
+		String s= "Eclipse";
+		extracted(s);
+	}
+
+	protected void extracted(String s) {
+		/*[*/System.out.println(s);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1003.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1003.java
new file mode 100644
index 000000000..bf7dc07c3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/initializer_out/A_test1003.java
@@ -0,0 +1,15 @@
+package initializer_out;
+
+public class A_test1003 {
+	static {
+		int i= extracted();
+	}
+
+	protected static int extracted() {
+		return /*[*/bar()/*]*/;
+	}
+
+	private static int bar() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test010.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test010.java
new file mode 100644
index 000000000..880e1b674
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test010.java
@@ -0,0 +1,7 @@
+package invalidSelection;
+
+public class A_test010 {
+	public void /*]*/foo() {
+		foo();
+	}/*[*/
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test011.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test011.java
new file mode 100644
index 000000000..1adf11592
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test011.java
@@ -0,0 +1,7 @@
+package invalidSelection;
+
+public class A_test011 {
+	public void foo() {
+		/*]*/foo(/*[*/);
+	}
+} 
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test012.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test012.java
new file mode 100644
index 000000000..c89c75f5a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test012.java
@@ -0,0 +1,13 @@
+package invalidSelection;
+
+public class A_test012 {
+	public void foo() {
+		/*]*/f();
+		g(/*[*/);
+	}
+	
+	public void f() {
+	}
+	public void g() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test013.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test013.java
new file mode 100644
index 000000000..b92d74d30
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test013.java
@@ -0,0 +1,13 @@
+package invalidSelection;
+
+public class A_test013 {
+	public void foo() {/*[*/
+		f();
+		g();
+	}/*[*/
+	
+	public void f() {
+	}
+	public void g() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test014.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test014.java
new file mode 100644
index 000000000..de28005db
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test014.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test014 {
+	public void foo() /*]*/{
+		foo();
+	}/*[*/
+	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test015.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test015.java
new file mode 100644
index 000000000..32e0e1380
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test015.java
@@ -0,0 +1,13 @@
+package invalidSelection;
+
+public class A_test015 {
+	public void foo() /*]*/{
+		f();
+		g();
+	/*]*/}
+	
+	public void f() {
+	}
+	public void g() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test016.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test016.java
new file mode 100644
index 000000000..a4dcb2aee
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test016.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test016 {
+    public void foo() {
+        Observer o = new <,>Observer() {
+                public void update(Observable o, Object arg) {
+                        /*]*/System.out.println(o);/*[*/
+                }
+        };              
+}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test020.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test020.java
new file mode 100644
index 000000000..d99ed0ffc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test020.java
@@ -0,0 +1,22 @@
+package invalidSelection;
+
+public class A_test020 {
+	public void foo(int x) {
+		switch(x) {
+			/*]*/case 10:
+				f();
+				break;/*[*/
+			case 11:
+				g();
+				break;
+			default:
+				f();
+				g();		
+		}
+	}
+	
+	public void f() {
+	}
+	public void g() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test021.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test021.java
new file mode 100644
index 000000000..a104c3011
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test021.java
@@ -0,0 +1,22 @@
+package invalidSelection;
+
+public class A_test021 {
+	public void foo(int x) {
+		/*]*/switch(x) {
+			case 10:
+				f();
+				break;/*[*/
+			case 11:
+				g();
+				break;
+			default:
+				f();
+				g();		
+		}
+	}
+	
+	public void f() {
+	}
+	public void g() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test022.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test022.java
new file mode 100644
index 000000000..e256a20c5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test022.java
@@ -0,0 +1,22 @@
+package invalidSelection;
+
+public class A_test022 {
+	public void foo(int x) {
+		switch(x) {
+			/*]*/case 10:
+				f();
+				break;
+			case 11:
+				g();
+				break;
+			default:
+				f();
+				g();		
+		/*]*/}
+	}
+	
+	public void f() {
+	}
+	public void g() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test030.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test030.java
new file mode 100644
index 000000000..79812d728
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test030.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test030 {
+	public void foo(int x) {
+		{/*[*/
+			f();
+		}/*[*/
+	}	
+	public void f() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test031.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test031.java
new file mode 100644
index 000000000..b8fc35b44
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test031.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test031 {
+	public void foo(int x) {
+		/*]*/{
+			f();
+		/*]*/}
+	}	
+	public void f() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test040.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test040.java
new file mode 100644
index 000000000..f7a17c45f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test040.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test040 {
+	public void foo() {
+		for (int i= 0; i /*]*/</*[*/ 10; i++)
+			foo();
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test041.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test041.java
new file mode 100644
index 000000000..e3219e2ec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test041.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test041 {
+	public void foo() {
+		for (/*]*/int i= 0/*[*/; i < 10; i++)
+			foo();
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test042.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test042.java
new file mode 100644
index 000000000..87baa6f59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test042.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test042 {
+	public void foo() {
+		for (int i= 0; i < 10; /*]*/i++/*[*/)
+			foo();
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test043.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test043.java
new file mode 100644
index 000000000..6782f4475
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test043.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test043 {
+	public void foo() {
+		/*]*/for (int i= 0; i < 10; i++)/*[*/
+			foo();
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test044.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test044.java
new file mode 100644
index 000000000..eba8d1922
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test044.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test044 {
+	public void foo() {
+		/*]*/for (int i= 0; i < 10; i++)
+			foo(/*[*/);
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test045.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test045.java
new file mode 100644
index 000000000..855333848
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test045.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test045 {
+	public void foo() {
+		for /*]*/(int i= 0; i < 10; i++)
+			foo();/*[*/
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test046.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test046.java
new file mode 100644
index 000000000..ad867fc05
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test046.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test046 {
+	public void foo() {
+		for (int i= 10; i < 10; i++)
+			for (int z= 10; z < 10; z++)
+				/*]*/foo();
+		foo()/*[*/;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test047.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test047.java
new file mode 100644
index 000000000..a84e445d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test047.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test047 {
+	public void foo() {
+		for (int i= 10; i < 10; i++)
+			/*]*/for (int z= 10; z < 10; z++)
+				foo();
+		foo()/*[*/;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test048.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test048.java
new file mode 100644
index 000000000..69ae79bb7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test048.java
@@ -0,0 +1,16 @@
+package invalidSelection;
+
+import java.util.Enumeration;
+
+public class A_test048 {
+	public boolean flag;
+	public void foo() {
+		for (/*]*/Enumeration e= tests()/*[*/; e.hasMoreElements(); ) {
+			if (flag)
+				break;
+		}
+	}	
+	public Enumeration tests() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test050.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test050.java
new file mode 100644
index 000000000..1321a1637
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test050.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test050 {
+	public void foo() {
+		while(1 /*]*/</*[*/ 10)
+			foo();
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test051.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test051.java
new file mode 100644
index 000000000..e91b2d4ef
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test051.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test051 {
+	public void foo() {
+		/*]*/while(1 < 10)/*[*/
+			foo();
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test052.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test052.java
new file mode 100644
index 000000000..b374911f8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test052.java
@@ -0,0 +1,14 @@
+package invalidSelection;
+
+public class A_test052 {
+	public boolean b() {
+		return true;
+	}
+	
+	public void foo() {
+		while(b())/*[*/
+			while(b())
+				foo();
+		foo()/*[*/;		
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test060.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test060.java
new file mode 100644
index 000000000..e1b6bdda2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test060.java
@@ -0,0 +1,9 @@
+package invalidSelection;
+
+public class A_test060 {
+	public void foo() {
+		do 
+			foo();
+		while(100 /*]*/>/*[*/  10);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test061.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test061.java
new file mode 100644
index 000000000..a1e56d276
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test061.java
@@ -0,0 +1,9 @@
+package invalidSelection;
+
+public class A_test061 {
+	public void foo() {
+		do 
+			/*]*/foo();
+		while(1 < 10);/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test062.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test062.java
new file mode 100644
index 000000000..49135263e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test062.java
@@ -0,0 +1,9 @@
+package invalidSelection;
+
+public class A_test062 {
+	public void foo() {
+		/*]*/do 
+			foo();/*[*/
+		while(1 < 10);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test063.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test063.java
new file mode 100644
index 000000000..d83494302
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test063.java
@@ -0,0 +1,9 @@
+package invalidSelection;
+
+public class A_test063 {
+	public void foo() {
+		do/*[*/
+			foo();
+		/*]*/while(1 < 10);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test070.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test070.java
new file mode 100644
index 000000000..f2b6365b6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test070.java
@@ -0,0 +1,19 @@
+package invalidSelection;
+
+public class A_test070 {
+	public int foo() {
+		int i= foo();
+		switch/*[*/ (i) {
+			case 1:
+				foo();
+			case 2:
+				foo();
+				foo();
+			case 3:
+				foo();
+			default:
+				foo();	
+		}/*[*/
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test071.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test071.java
new file mode 100644
index 000000000..1e29c19b3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test071.java
@@ -0,0 +1,19 @@
+package invalidSelection;
+
+public class A_test071 {
+	public int foo() {
+		int i= foo();
+		/*]*/switch (i) {
+			case 1:
+				foo();
+			case 2:
+				foo();
+				foo();
+			case 3:
+				foo();
+			default:
+				foo();	
+		/*]*/}
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test072.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test072.java
new file mode 100644
index 000000000..786a1881e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test072.java
@@ -0,0 +1,19 @@
+package invalidSelection;
+
+public class A_test072 {
+	public int foo() {
+		int i= foo();
+		switch (i) {
+			case 1/*]*/:
+				foo()/*[*/;
+			case 2:
+				foo();
+				foo();
+			case 3:
+				foo();
+			default:
+				foo();	
+		}
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test073.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test073.java
new file mode 100644
index 000000000..921196ea6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test073.java
@@ -0,0 +1,19 @@
+package invalidSelection;
+
+public class A_test073 {
+	public int foo() {
+		int i= foo();
+		switch (i) {
+			case 1:/*[*/
+				foo();
+			case/*[*/2:
+				foo();
+				foo();
+			case 3:
+				foo();
+			default:
+				foo();	
+		}
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test080.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test080.java
new file mode 100644
index 000000000..148661a02
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test080.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test080 {
+	public boolean fBoolean;
+	public void foo() {
+		if /*]*/(fBoolean/*[*/)
+			foo();
+		else
+			foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test081.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test081.java
new file mode 100644
index 000000000..088e44489
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test081.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test081 {
+	public boolean fBoolean;
+	public void foo() {
+		/*]*/if (fBoolean)
+			foo();
+		else
+			/*]*/foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test082.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test082.java
new file mode 100644
index 000000000..8e1e3bcb8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test082.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test082 {
+	public boolean fBoolean;
+	public void foo() {
+		/*]*/if (fBoolean)
+			foo();/*[*/
+		else
+			foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test083.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test083.java
new file mode 100644
index 000000000..05af41d9d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test083.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test083 {
+	public boolean fBoolean;
+	public void foo() {
+		/*]*/if (fBoolean)
+			foo();
+		/*]*/else
+			foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test084.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test084.java
new file mode 100644
index 000000000..42cf86816
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test084.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test084 {
+	public boolean fBoolean;
+	public void foo() {
+		/*]*/if (fBoolean)
+			foo();
+		else/*[*/
+			foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test085.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test085.java
new file mode 100644
index 000000000..7969c16ef
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test085.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test085 {
+	public boolean fBoolean;
+	public void foo() {
+		if (fBoolean)
+			foo();
+		/*]*/else
+			foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test090.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test090.java
new file mode 100644
index 000000000..18c6c7190
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test090.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test090 {
+	public void foo() {
+		for (int i= 0; i < 10; i++)
+			/*]*/break/*[*/;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test091.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test091.java
new file mode 100644
index 000000000..a2e5c4c64
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test091.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test091 {
+	public void foo() {
+		for (int i= 0; i < 10; i++)
+			/*]*/continue/*[*/;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test092.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test092.java
new file mode 100644
index 000000000..ccaed0380
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test092.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test092 {
+	public void foo() {
+		while (true)
+			/*]*/break/*[*/;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test093.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test093.java
new file mode 100644
index 000000000..165eb67b7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test093.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test093 {
+	public void foo() {
+		while (true)
+			/*]*/continue/*[*/;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test094.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test094.java
new file mode 100644
index 000000000..d3c0b17a0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test094.java
@@ -0,0 +1,9 @@
+package invalidSelection;
+
+public class A_test094 {
+	public void foo() {
+		do
+			/*]*/break/*[*/;
+		while(true);
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test095.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test095.java
new file mode 100644
index 000000000..e330d16d6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test095.java
@@ -0,0 +1,9 @@
+package invalidSelection;
+
+public class A_test095 {
+	public void foo() {
+		do
+			/*]*/continue/*[*/;
+		while(true);
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test096.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test096.java
new file mode 100644
index 000000000..4b0fe42f4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test096.java
@@ -0,0 +1,12 @@
+package invalidSelection;
+
+public class A_test096 {
+	public void foo() {
+		int i= 10;
+		switch(i) {
+			case 10:
+				foo();
+				/*]*/break/*[*/;
+		}
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test100.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test100.java
new file mode 100644
index 000000000..8113e0b2b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test100.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test100 {
+	public void foo() {
+		try /*]*/{
+			foo();
+		}/*[*/ catch (Exception e) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test101.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test101.java
new file mode 100644
index 000000000..26e171fad
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test101.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test101 {
+	public void foo() {
+		try /*]*/{
+			foo();
+		/*]*/} catch (Exception e) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test102.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test102.java
new file mode 100644
index 000000000..39fd3ffcc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test102.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test102 {
+	public void foo() {
+		try {/*[*/
+			foo();
+		}/*[*/ catch (Exception e) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test103.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test103.java
new file mode 100644
index 000000000..ffe0310d4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test103.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test103 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) /*]*/{
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test104.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test104.java
new file mode 100644
index 000000000..6bb367b04
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test104.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test104 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) {/*[*/
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test105.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test105.java
new file mode 100644
index 000000000..d8f6c1f9b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test105.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test105 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) /*]*/{
+			foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test106.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test106.java
new file mode 100644
index 000000000..d5c166f38
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test106.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test106 {
+	public void foo() {
+		try {
+			foo();
+		} finally /*]*/{
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test107.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test107.java
new file mode 100644
index 000000000..4d8f1bd6b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test107.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test107 {
+	public void foo() {
+		try {
+			foo();
+		} finally {/*[*/
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test108.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test108.java
new file mode 100644
index 000000000..4c79c8848
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test108.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test108 {
+	public void foo() {
+		try {
+			foo();
+		} finally /*]*/{
+			foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test109.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test109.java
new file mode 100644
index 000000000..fa68c0576
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test109.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test109 {
+	public void foo() {
+		/*]*/try {
+			foo();
+		} finally {
+			foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test110.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test110.java
new file mode 100644
index 000000000..6ecade36f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test110.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test110 {
+	public void foo() {
+		try/*[*/{
+			foo();
+		} finally {
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test111.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test111.java
new file mode 100644
index 000000000..c9903fffe
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test111.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test111 {
+	public void foo() {
+		try {
+			foo();
+		} catch (/*]*/Exception e/*[*/) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test112.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test112.java
new file mode 100644
index 000000000..689f85707
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test112.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test112 {
+	public void foo() {
+		try {
+			foo();
+		} /*]*/catch (Exception e) {
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test113.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test113.java
new file mode 100644
index 000000000..2c2db9b16
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test113.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test113 {
+	public void foo() {
+		/*]*/try {
+			foo();
+		}/*[*/ catch (Exception e) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test114.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test114.java
new file mode 100644
index 000000000..1cfce054f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test114.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test114 {
+	public void foo() {
+		try {
+			foo();
+		} /*]*/finally {
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test115.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test115.java
new file mode 100644
index 000000000..37a6af20b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test115.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test115 {
+	public void foo() {
+		try {
+			foo();
+		} catch /*]*/(Exception e)/*[*/ {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test116.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test116.java
new file mode 100644
index 000000000..02f8ef4db
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test116.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test116 {
+	public void foo() {
+		try {
+			foo();
+		} catch (/*]*/Exception e/*[*/) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test120.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test120.java
new file mode 100644
index 000000000..a5fad9871
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test120.java
@@ -0,0 +1,7 @@
+package invalidSelection;
+
+public class A_test120 {
+	public boolean foo() {
+		/*]*/return/*[*/ false;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test121.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test121.java
new file mode 100644
index 000000000..bd734f0b5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test121.java
@@ -0,0 +1,14 @@
+package invalidSelection;
+
+public class A_test121 {
+	public void foo() {
+		int x= 1;
+		int y= 2;
+		
+		/*]*/x= y + x;
+		y= x + y;/*[*/
+		
+		x++;
+		y++;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test122.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test122.java
new file mode 100644
index 000000000..c322a8c38
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test122.java
@@ -0,0 +1,12 @@
+package invalidSelection;
+
+public class A_test122 {
+	public void foo() {
+		int x= 1;
+
+		/*]*/x= x + 2;
+		int y= 10;/*[*/
+		
+		x+= y + 20;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test123.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test123.java
new file mode 100644
index 000000000..ace8f5695
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test123.java
@@ -0,0 +1,7 @@
+package invalidSelection;
+
+public class A_test123 {
+	public void foo() {
+		Object /*]*/temp/*[*/= null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test130.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test130.java
new file mode 100644
index 000000000..b9b833d6a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test130.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test130 {
+	public void foo() {
+		class Inner {
+		}
+		
+		/*]*/Inner inner= new Inner();
+		foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test131.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test131.java
new file mode 100644
index 000000000..4bcbf44c6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test131.java
@@ -0,0 +1,13 @@
+package invalidSelection;
+
+public class A_test131 {
+	public void foo() {
+		
+		/*]*/foo();
+		class Inner {
+		}
+		foo();/*[*/
+		
+		Inner inner= new Inner();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test140.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test140.java
new file mode 100644
index 000000000..19a5f90db
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test140.java
@@ -0,0 +1,20 @@
+package invalidSelection;
+
+public class A_test140 {
+	public boolean flag;
+	public int foo() {
+		int i= 10;
+		/*]*/switch(i) {
+			case 1:
+				if (flag)
+					break;
+				foo();	
+			case 2:
+				return 10;
+			default:
+				throw new NullPointerException();
+		}/*[*/
+			
+		return 10;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test141.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test141.java
new file mode 100644
index 000000000..c2d0f50dd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test141.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test141 {
+	private boolean flag;
+	public int foo() {
+		/*]*/while(flag)
+			return 20;/*[*/
+		return 10;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test142.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test142.java
new file mode 100644
index 000000000..127f39444
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test142.java
@@ -0,0 +1,14 @@
+package invalidSelection;
+
+public class A_test142 {
+	private boolean flag;
+	public int foo() {
+		int i= 10;
+		/*]*/if (flag) {
+			i++;
+			return i;
+		}/*[*/
+		int y= i + 10;
+		return y;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test143.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test143.java
new file mode 100644
index 000000000..b5719da8a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test143.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test143 {
+	public boolean foo() {
+		/*]*/try {
+			return true;
+		} catch (Exception e) {
+		}/*[*/
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test144.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test144.java
new file mode 100644
index 000000000..a53244b77
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test144.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test144 {
+	public boolean foo() {
+		/*]*/try {
+		} catch (Exception e) {
+			return true;
+		}/*[*/
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test145.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test145.java
new file mode 100644
index 000000000..effe0d64b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test145.java
@@ -0,0 +1,13 @@
+package invalidSelection;
+
+public class A_test145 {
+	boolean flag;
+	public boolean foo() {
+		/*]*/do {
+			if (flag)
+				break;
+			return false;
+		} while (flag);/*[*/
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test146.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test146.java
new file mode 100644
index 000000000..d1076db9d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test146.java
@@ -0,0 +1,17 @@
+package invalidSelection;
+
+public class A_test146 {
+	boolean flag;
+	public boolean foo() {
+		while (flag) {
+			/*]*/for (int i= 0; i < 10; i++) {
+				if (flag)
+					break;
+			}
+			if (flag)
+				break;
+			return false;/*[*/
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test147.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test147.java
new file mode 100644
index 000000000..43470cefb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test147.java
@@ -0,0 +1,17 @@
+package invalidSelection;
+
+public class A_test147 {
+	boolean flag;
+	public boolean foo() {
+		/*]*/target: {
+			for (int i= 0; i < 10; i++) {
+				if (flag)
+					break;
+				else
+					break target;
+			}
+			return false;
+		}/*[*/
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test148.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test148.java
new file mode 100644
index 000000000..f030140be
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test148.java
@@ -0,0 +1,15 @@
+package invalidSelection;
+
+public class A_test148 {
+	boolean flag;
+	public boolean foo() {
+		int i= 0;
+		/*]*/switch (i) {
+			case 1:
+				return false;
+			case 2:
+				return true;
+		}/*[*/
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test149.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test149.java
new file mode 100644
index 000000000..adfbf9957
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test149.java
@@ -0,0 +1,17 @@
+package invalidSelection;
+
+public class A_test149 {
+	boolean flag;
+	public boolean foo() {
+		int i= 0;
+		/*]*/switch (i) {
+			case 1:
+				break;
+			case 2:
+				return true;
+			default:
+				return false;
+		}/*[*/
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test150.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test150.java
new file mode 100644
index 000000000..e46908249
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test150.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test150 {
+
+	public void foo() {
+		/*]*/synchronized (this) {
+			foo();
+		/*]*/}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test151.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test151.java
new file mode 100644
index 000000000..b175d5eb7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test151.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test151 {
+
+	public void foo() {
+		synchronized/*[*/ (this) {
+			foo();
+		}/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test152.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test152.java
new file mode 100644
index 000000000..9a29fd872
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test152.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test152 {
+
+	public void foo() {
+		synchronized (this) /*]*/{
+			foo();
+		/*]*/}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test153.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test153.java
new file mode 100644
index 000000000..477b5d280
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test153.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test153 {
+
+	public void foo() {
+		synchronized(this) {/*[*/
+			foo();
+		}/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test160.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test160.java
new file mode 100644
index 000000000..965967c6d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test160.java
@@ -0,0 +1,6 @@
+package invalidSelection;
+
+public class A_test160 {
+	/*]*/public static class Inner {
+	}/*[*/
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test161.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test161.java
new file mode 100644
index 000000000..ee945480f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test161.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test161 {
+	public void foo() {
+		class /*]*/Inner {
+		}/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test170.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test170.java
new file mode 100644
index 000000000..bda6db941
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test170.java
@@ -0,0 +1,7 @@
+package invalidSelection;
+
+public class A_test170 {
+	public void foo() {
+		String tab[] = /*]*/{"hello", "world" } /*[*/;       
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test171.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test171.java
new file mode 100644
index 000000000..cac9b44a9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test171.java
@@ -0,0 +1,7 @@
+package invalidSelection;
+
+public class A_test171 {
+	public void foo() {
+		String /*]*/str = "ggg"/*[*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test172.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test172.java
new file mode 100644
index 000000000..eca6057d5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test172.java
@@ -0,0 +1,7 @@
+package invalidSelection;
+
+public class A_test172 {
+	public void foo() {
+		/*]*/int i= 10/*[*/, j= 20;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test173.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test173.java
new file mode 100644
index 000000000..e9364fcb6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test173.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test173 {
+	public void foo() {
+		/*]*/int i= 10, j= 20;/*[*/
+		g(j);
+		g(i);
+	}
+	public void g(int i) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test180.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test180.java
new file mode 100644
index 000000000..6998bd8eb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test180.java
@@ -0,0 +1,13 @@
+package invalidSelection;
+
+public class A_test180 {
+	public A_test180() {
+		/*]*/this(10);
+		foo();/*[*/
+	}
+	public A_test180(int i) {
+		super();
+	}
+	public void foo() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test181.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test181.java
new file mode 100644
index 000000000..e2ba0eece
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test181.java
@@ -0,0 +1,10 @@
+package invalidSelection;
+
+public class A_test181 {
+	public A_test181() {
+		/*]*/super();
+		foo();/*[*/
+	}
+	public void foo() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test190.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test190.java
new file mode 100644
index 000000000..a3972fe04
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test190.java
@@ -0,0 +1,18 @@
+package invalidSelection;
+
+public class A_test190 {
+	public int foo() {
+		int i= 10;
+		/*]*/switch(i) {
+			case 1:
+				foo();
+				break;
+			case 2:
+				foo();
+			default:
+				return 10;
+		}/*[*/
+		
+		return 20;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test191.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test191.java
new file mode 100644
index 000000000..8bdbd9ded
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test191.java
@@ -0,0 +1,15 @@
+package invalidSelection;
+
+public class A_test191 {
+	private boolean foo(){
+		A_test191 m= new A_test191();
+		/*[*/if (m == null)
+			return true;
+		A_test191 d= m;/*]*/
+		if (d == null)
+			return true;	
+		return true;
+	}
+
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test192.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test192.java
new file mode 100644
index 000000000..228d9ea88
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test192.java
@@ -0,0 +1,9 @@
+package invalidSelection;
+
+public class A_test192 {
+	private void foo(){
+		int i;
+		/*]*/i/*[*/= 10;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test193.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test193.java
new file mode 100644
index 000000000..736a228cb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test193.java
@@ -0,0 +1,8 @@
+package invalidSelection;
+
+public class A_test193 {
+	private void foo(int i, int j){
+		foo(/*]*/10, 10/*[*/);
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test194.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test194.java
new file mode 100644
index 000000000..41a27cfb0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test194.java
@@ -0,0 +1,13 @@
+package invalidSelection;
+
+public class A_test194 {
+	A_test194 fff() {
+		return this;
+	}
+	int yyy() {
+		return 32;
+	}
+	void g() {
+		int f = /*[*/fff/*]*/().yyy();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test195.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test195.java
new file mode 100644
index 000000000..1fe1925a0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test195.java
@@ -0,0 +1,11 @@
+package invalidSelection;
+
+public class A_test195 {
+    void foo() {
+		int i= 10;
+		switch(i) {
+			case /*]*/10/*[*/:
+				break;
+		}
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test196.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test196.java
new file mode 100644
index 000000000..5eb5022a9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test196.java
@@ -0,0 +1,13 @@
+package invalidSelection;
+
+public class A_test196 {
+	public int foo(int y) {
+        int tmp = 0, res = 1;
+        while (res < y) {
+            /*[*/tmp = res;
+            res += 1;/*]*/
+        }
+        return tmp;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test197.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test197.java
new file mode 100644
index 000000000..c5d390932
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test197.java
@@ -0,0 +1,18 @@
+package invalidSelection;
+
+public class A_test197 {
+
+	public void foo() {
+		outer: for (int i= 0; i < 3; i++) {
+			for (int j= 0; j < 3; j++) {
+				/*[*/
+				if(j == 3) {
+					continue outer;
+				}
+				System.out.println();
+				/*]*/
+			}
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test500.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test500.java
new file mode 100644
index 000000000..1bad125e2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test500.java
@@ -0,0 +1,9 @@
+package locals_in;
+
+public class A_test500 {
+	public void foo() {
+		int x= 10;
+		
+		/*[*/int y= x;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test501.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test501.java
new file mode 100644
index 000000000..6edae6c8f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test501.java
@@ -0,0 +1,10 @@
+package locals_in;
+
+public class A_test501 {
+	public void foo() {
+		int x= 10;
+		
+		/*[*/x= 20;
+		int y= x;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test502.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test502.java
new file mode 100644
index 000000000..d7fed072f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test502.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test502 {
+	public void foo() {
+		int x= 0;
+		int y= 0;
+
+		/*[*/x= 10;
+		y= x;
+		x= y;/*]*/		
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test503.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test503.java
new file mode 100644
index 000000000..21e1ef3ac
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test503.java
@@ -0,0 +1,9 @@
+package locals_in;
+
+public class A_test503 {
+	public void foo() {
+		int x= 10;
+		
+		/*[*/x++;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test504.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test504.java
new file mode 100644
index 000000000..d9992f823
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test504.java
@@ -0,0 +1,9 @@
+package locals_in;
+
+public class A_test504 {
+	public void foo() {
+		int x= 10;
+		
+		/*[*/--x;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test505.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test505.java
new file mode 100644
index 000000000..b444a5b98
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test505.java
@@ -0,0 +1,9 @@
+package locals_in;
+
+public class A_test505 {
+	public void foo() {
+		int x= 0;
+		
+		/*[*/x+= 1;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test506.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test506.java
new file mode 100644
index 000000000..f6baf0d10
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test506.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test506 {
+	public void foo() {
+		int x= 0;
+		
+		/*[*/bar(x);/*]*/
+	}
+
+	public void bar(int i) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test507.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test507.java
new file mode 100644
index 000000000..d2d5ad84d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test507.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test507 {
+	public void foo() {
+		int x= 0;
+		
+		/*[*/x= 10;/*]*/
+		
+		int y= x;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test508.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test508.java
new file mode 100644
index 000000000..efc46fee6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test508.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test508 {
+	public void foo() {
+		int x= 0;
+		int y= 0;
+		
+		/*[*/x= 10;
+		y= 20;/*]*/
+		
+		y= x;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test509.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test509.java
new file mode 100644
index 000000000..9b4017923
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test509.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test509 {
+	public void foo() {
+		int x= 0;
+		int y= 0;
+
+		/*[*/y= x;
+		x= 0;/*]*/		
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test510.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test510.java
new file mode 100644
index 000000000..fb32dd0e2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test510.java
@@ -0,0 +1,7 @@
+package locals_in;
+
+public class A_test510 {
+	public void foo() {
+		/*[*/int x= 0;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test511.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test511.java
new file mode 100644
index 000000000..f6230292b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test511.java
@@ -0,0 +1,9 @@
+package locals_in;
+
+public class A_test511 {
+	public void foo() {
+		/*[*/int x= 0;/*]*/
+		
+		x++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test512.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test512.java
new file mode 100644
index 000000000..d7792d771
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test512.java
@@ -0,0 +1,10 @@
+package locals_in;
+
+public class A_test512 {
+	public void foo() {
+		/*[*/int x= 0;
+		int y= x;/*]*/
+		
+		x++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test513.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test513.java
new file mode 100644
index 000000000..de84ff8a0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test513.java
@@ -0,0 +1,10 @@
+package locals_in;
+
+public class A_test513 {
+	public void foo() {
+		/*[*/int x= 0;
+		int y= 0;/*]*/
+		x++;
+		y= 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test514.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test514.java
new file mode 100644
index 000000000..b1d18f7f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test514.java
@@ -0,0 +1,8 @@
+package locals_in;
+
+public class A_test514 {
+	public void foo() {
+		/*[*/int x;/*]*/
+		x= 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test515.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test515.java
new file mode 100644
index 000000000..091b11608
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test515.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test515 {
+	public void foo() {
+		int y= 10;
+		
+		/*[*/int x= y;/*]*/
+		
+		x++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test516.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test516.java
new file mode 100644
index 000000000..7d393fae0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test516.java
@@ -0,0 +1,9 @@
+package locals_in;
+
+public class A_test516 {
+	public void foo() {
+		/*[*/int i= 10, j= 20;/*]*/
+		
+		j++;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test517.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test517.java
new file mode 100644
index 000000000..9d6d133d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test517.java
@@ -0,0 +1,10 @@
+package locals_in;
+
+public class A_test517 {
+	public void foo() {
+		/*[*/int i;
+		int j;
+		j= 20;/*]*/
+		i= j + 10;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test518.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test518.java
new file mode 100644
index 000000000..05a2a55ec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test518.java
@@ -0,0 +1,9 @@
+package locals_in;
+
+public class A_test518 {
+	public void foo() {
+		int i;
+		
+		/*[*/i= 10;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test519.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test519.java
new file mode 100644
index 000000000..6a9996d31
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test519.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test519 {
+	public void foo() {
+		int i;
+
+		/*[*/i= 10;/*]*/
+		
+		i= 20;		
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test520.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test520.java
new file mode 100644
index 000000000..cfb352bab
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test520.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test520 {
+	public void foo() {
+		int i= 0;
+
+		/*[*/int y= i;/*]*/
+		
+		i= 20;		
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test521.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test521.java
new file mode 100644
index 000000000..adb0c44bd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test521.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test521 {
+	public volatile boolean flag;
+	
+	public void foo() {
+		int i= 5;
+		/*[*/if (flag)
+			i= 10;/*]*/
+		i--;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test522.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test522.java
new file mode 100644
index 000000000..6307a5571
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test522.java
@@ -0,0 +1,16 @@
+package locals_in;
+
+public class A_test522 {
+	public volatile boolean flag;
+	
+	public void foo() {
+		int i= 20;
+		/*[*/target: {
+			if (flag)
+				break target;
+			i= 10;
+		}/*]*/
+		i--;
+	}	
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test523.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test523.java
new file mode 100644
index 000000000..cff2b9cc2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test523.java
@@ -0,0 +1,19 @@
+package locals_in;
+
+public class A_test523 {
+	public volatile boolean flag;
+
+	protected void foo() {
+		int i= 0;
+		/*[*/try {
+			if (flag)
+				throw new Exception();
+			i= 10;
+		} catch (Exception e) {
+		}/*]*/
+		read(i);
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test524.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test524.java
new file mode 100644
index 000000000..d693e9775
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test524.java
@@ -0,0 +1,19 @@
+package locals_in;
+
+public class A_test524 {
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 0;
+		try {
+			/*[*/if (flag)
+				throw new Exception();
+			i= 10;/*]*/
+		} catch (Exception e) {
+		}
+		read(i);
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test525.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test525.java
new file mode 100644
index 000000000..21c33dcf1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test525.java
@@ -0,0 +1,29 @@
+package locals_in;
+
+public class A_test525 {
+	private static class Exception1 extends Exception {
+	}
+	private static class Exception2 extends Exception {
+	}
+	
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 10;
+		try {
+			/*[*/try {
+				if (flag)
+					throw new Exception1();
+				if (!flag)
+					throw new Exception2();
+			} catch (Exception1 e) {
+			}
+			i= 10;/*]*/
+		} catch (Exception2 e) {
+		}
+		read(i);
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test526.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test526.java
new file mode 100644
index 000000000..aa98e4f0c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test526.java
@@ -0,0 +1,29 @@
+package locals_in;
+
+public class A_test526 {
+	private static class Exception1 extends Exception {
+	}
+	private static class Exception2 extends Exception {
+	}
+	
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 10;
+		/*[*/try {
+			try {
+				if (flag)
+					throw new Exception1();
+				if (!flag)
+					throw new Exception2();
+			} catch (Exception1 e) {
+			}
+			i= 10;
+		} catch (Exception2 e) {
+		}/*]*/
+		read(i);
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test527.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test527.java
new file mode 100644
index 000000000..5ab2be7ce
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test527.java
@@ -0,0 +1,23 @@
+package locals_in;
+
+public class A_test527 {
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 0;
+		/*[*/try {
+			if (flag)
+				throwException();
+			i= 10;
+		} catch (Exception e) {
+		}/*]*/
+		read(i);
+	}
+
+	private void read(int i) {
+	}
+	
+	private void throwException() throws Exception {
+		throw new Exception();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test528.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test528.java
new file mode 100644
index 000000000..abb347c63
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test528.java
@@ -0,0 +1,14 @@
+package locals_in;
+
+import java.io.IOException;
+
+public class A_test528 {
+	public void foo() throws IOException {
+	}
+
+	static class B extends A_test528 {
+		public void bar() throws IOException {
+			/*[*/super.foo();/*]*/
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test530.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test530.java
new file mode 100644
index 000000000..2b0b44773
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test530.java
@@ -0,0 +1,15 @@
+package locals_in;
+
+public class A_test530 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner= null;
+		
+		/*[*/inner= new Inner();/*]*/
+		
+		inner.x= 10;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test531.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test531.java
new file mode 100644
index 000000000..0d864f8bf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test531.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test531 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner= new Inner();
+		
+		/*[*/inner.x= 10;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test532.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test532.java
new file mode 100644
index 000000000..03c692bb2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test532.java
@@ -0,0 +1,15 @@
+package locals_in;
+
+public class A_test532 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner= new Inner();
+		
+		/*[*/inner.x= 10;/*]*/
+		
+		int y= inner.x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test533.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test533.java
new file mode 100644
index 000000000..40bd1ecb6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test533.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test533 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		/*[*/Inner inner= new Inner();/*]*/
+
+		Inner inner2= inner;		
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test534.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test534.java
new file mode 100644
index 000000000..2e3ce26dd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test534.java
@@ -0,0 +1,15 @@
+package locals_in;
+
+public class A_test534 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner= new Inner();
+		
+		/*[*/inner.x= 10;/*]*/
+		
+		int y= inner.x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test535.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test535.java
new file mode 100644
index 000000000..830b650ce
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test535.java
@@ -0,0 +1,16 @@
+package locals_in;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class A_test535 {
+
+	public void bar() {
+		List allElements= new ArrayList();
+		Iterator iter= allElements.iterator();		
+
+		/*[*/while (iter.hasNext()) {
+			allElements.add(iter.next());
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test536.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test536.java
new file mode 100644
index 000000000..0a9f4c750
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test536.java
@@ -0,0 +1,17 @@
+package locals_in;
+
+public class A_test536 {
+
+	public void bar() {
+		{ int k= 27; k++; }
+		int i= 37;
+		if (i == 0) {
+			int k= 17;
+			/*[*/k= k + 1;
+			k += 2;
+			i += 2;
+			k++;/*]*/
+		}
+		i++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test537.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test537.java
new file mode 100644
index 000000000..cca81a0cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test537.java
@@ -0,0 +1,15 @@
+package locals_in;
+
+public class A_test537 {
+	public void foo() {
+		final int i= 10;
+		
+		/*[*/Runnable run= new Runnable() {
+			public void run() {
+				System.out.println("" + i);
+			}
+		};/*]*/
+		
+		run.run();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test538.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test538.java
new file mode 100644
index 000000000..f65bab678
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test538.java
@@ -0,0 +1,10 @@
+package locals_in;
+
+public class A_test538 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		
+		/*[*/array[i]= 10;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test539.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test539.java
new file mode 100644
index 000000000..cdcdcd6d8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test539.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test539 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		int[] index= new int[1];
+		
+		/*[*/array[index[i]]= 10;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test540.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test540.java
new file mode 100644
index 000000000..cb9f85ebe
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test540.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test540 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		int[] index= new int[1];
+		
+		/*[*/array[0]= index[0];/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test541.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test541.java
new file mode 100644
index 000000000..9f2fbd383
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test541.java
@@ -0,0 +1,14 @@
+package locals_in;
+
+public class A_test541 {
+	class Inner {
+		public int x;
+	}
+	public void foo() {
+		int[] array= new int[10];
+		Inner inner= new Inner();
+		
+		/*[*/array[inner.x]= 10;
+		inner.x= 20;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test542.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test542.java
new file mode 100644
index 000000000..48c483286
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test542.java
@@ -0,0 +1,10 @@
+package locals_in;
+
+public class A_test542 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		
+		/*[*/array[i++]= 10;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test543.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test543.java
new file mode 100644
index 000000000..80b6783cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test543.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test543 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		
+		/*[*/array[i++]= 10;/*]*/
+		
+		i++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test550.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test550.java
new file mode 100644
index 000000000..b7a3f12c3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test550.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test550 {
+
+	public void foo() {
+		int i= 0;
+		while(true) {
+			/*[*/i++;/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test551.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test551.java
new file mode 100644
index 000000000..d3e035013
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test551.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test551 {
+
+	public void foo() {
+		int i= 0;
+		do {
+			/*[*/i++;/*]*/
+		} while (true);
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test552.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test552.java
new file mode 100644
index 000000000..f1629bcb6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test552.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test552 {
+
+	public void foo() {
+		int i= 0;
+		for (;true;) {
+			/*[*/i++;/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test553.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test553.java
new file mode 100644
index 000000000..fc2f2f842
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test553.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test553 {
+
+	public void foo() {
+		int i= 0;
+		for (int x= i++, y= x;true;) {
+			/*[*/x= i;/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test554.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test554.java
new file mode 100644
index 000000000..61bf2a0cb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test554.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test554 {
+	public boolean flag;
+	public void foo() {
+		int x;
+		/*[*/if (flag)
+			x= 10;/*]*/
+		x= 20;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test555.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test555.java
new file mode 100644
index 000000000..e0015a4f1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test555.java
@@ -0,0 +1,14 @@
+package locals_in;
+
+public class A_test555 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		while (true) {
+			for (int y= x; true; ) {
+				/*[*/x= 20;/*]*/
+			}
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test556.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test556.java
new file mode 100644
index 000000000..ac6c3106b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test556.java
@@ -0,0 +1,14 @@
+package locals_in;
+
+public class A_test556 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		while (true) {
+			for (int y= 0; true; y= x) {
+				/*[*/x= 20;/*]*/
+			}
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test557.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test557.java
new file mode 100644
index 000000000..2bef61cb5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test557.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test557 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		for (int y= x; true;) {
+			/*[*/x= 20;/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test558.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test558.java
new file mode 100644
index 000000000..33ed604e7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test558.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test558 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		for (int y= 0; (x= 20) < 10; y= x) {
+			/*[*/x= 20;/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test559.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test559.java
new file mode 100644
index 000000000..ee8f0e75a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test559.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test559 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		for (int y= 0; x < 10; x= 20) {
+			/*[*/x= 20;/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test560.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test560.java
new file mode 100644
index 000000000..8f76dee04
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test560.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test560 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		while (x < 10) {
+			/*[*/x= 20;/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test561.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test561.java
new file mode 100644
index 000000000..6dee2ade9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test561.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test561 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		do {
+			/*[*/x= 20;/*]*/
+		} while (x < 10);
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test562.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test562.java
new file mode 100644
index 000000000..216e4a7b1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test562.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test562 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		do {
+			int y= x;
+			/*[*/x= 20;/*]*/
+		} while (true);
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test563.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test563.java
new file mode 100644
index 000000000..b50218b27
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test563.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test563 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		do {
+			int y= x;
+			/*[*/x= 20;/*]*/
+		} while ((x= 20) < 10);
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test564.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test564.java
new file mode 100644
index 000000000..a0dbe933c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test564.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test564 {
+	void foo(final int out){
+		int i;
+		if (out > 5){
+			/*[*/i= 1;/*]*/
+		} else {
+			i= 2;
+		}
+		i++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test565.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test565.java
new file mode 100644
index 000000000..250c46daf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test565.java
@@ -0,0 +1,8 @@
+package locals_in;
+
+public class A_test565 {
+	void f(byte bytes) {
+		String s= "k";
+		/*[*/System.out.println(s + " " + bytes); /*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test566.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test566.java
new file mode 100644
index 000000000..508705bae
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test566.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test566 {
+	public void foo() {
+		String args[]= null;
+		/*[*/for (int i = 0; i < args.length; i++) {
+			args[i]= "";
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test567.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test567.java
new file mode 100644
index 000000000..d3510f4d0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test567.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test567 {
+	public void foo() {
+		String args[]= null;
+		
+		/*[*/args= new String[4];/*]*/
+		
+		args[0]= args[1];
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test568.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test568.java
new file mode 100644
index 000000000..59ce55b27
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test568.java
@@ -0,0 +1,11 @@
+package locals_in;
+
+public class A_test568 {
+	public void foo() {
+		String[] args[]= null;
+		/*[*/for (int i = 0; i < args.length; i++) {
+			args[i]= null;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test569.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test569.java
new file mode 100644
index 000000000..9392123e8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test569.java
@@ -0,0 +1,12 @@
+package locals_in;
+
+public class A_test569 {
+	public void foo() {
+		String[] args[]= null;
+		
+		/*[*/args= new String[1][4];/*]*/
+		
+		args[0]= args[1];
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test570.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test570.java
new file mode 100644
index 000000000..17b9a985f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test570.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test570 {
+
+	public void foo() {
+		Object[] a= null;
+		int i= 0;
+		for(Object element: a) {
+			/*[*/i++;/*]*/
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test571.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test571.java
new file mode 100644
index 000000000..bcf19a7eb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test571.java
@@ -0,0 +1,16 @@
+package locals_in;
+
+public class A_test571 {
+
+	public void foo() {
+		int i= 0;
+		for(Object element: getArray(i++)) {
+			/*[*/i= 10;/*]*/
+		}
+	}
+	
+	private Object[] getArray(int i) {
+		return null;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test572.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test572.java
new file mode 100644
index 000000000..9c4fb94d6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test572.java
@@ -0,0 +1,18 @@
+package locals_in;
+
+public class A_test572 {
+
+	public void foo() {
+		int i= 0;
+		while (true) {
+			for(Object element: getArray(i)) {
+				/*[*/i= 10;/*]*/
+			}
+		}
+	}
+	
+	private Object[] getArray(int i) {
+		return null;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test575.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test575.java
new file mode 100644
index 000000000..fdaadb422
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test575.java
@@ -0,0 +1,13 @@
+package locals_in;
+
+public class A_test575 {
+
+	public void foo() {
+		/*[*/int i= 0;/*]*/
+		if (true) {
+			i= 10;
+		} else {
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test576.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test576.java
new file mode 100644
index 000000000..6c09c92e7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test576.java
@@ -0,0 +1,14 @@
+package locals_in;
+
+public class A_test576 {
+	public void foo() {
+		/*[*/int avail= 10;/*]*/
+		for (;;) {
+			try {
+			} finally {
+				avail= 20;
+			}
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test577.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test577.java
new file mode 100644
index 000000000..cf025cef1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test577.java
@@ -0,0 +1,15 @@
+package locals_in;
+
+public class A_test577 {
+	public void foo() {
+		int x = 0;
+		for (int i = x; i < 10; i++)
+			/*[*/
+			bar(i, x++);
+			/*]*/
+	}
+	
+	private void bar(int i, int y) {
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test578.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test578.java
new file mode 100644
index 000000000..f4c150e36
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_in/A_test578.java
@@ -0,0 +1,16 @@
+package locals_in;
+
+public class A_test578 {
+	public int foo(boolean b1, boolean b2) {
+		int n = 0;
+		int i = 0;
+		/*[*/
+		if (b1)
+			i = 1;
+		if (b2)
+			n = n + i;
+		/*]*/
+		return n;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test500.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test500.java
new file mode 100644
index 000000000..477a376ec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test500.java
@@ -0,0 +1,13 @@
+package locals_out;
+
+public class A_test500 {
+	public void foo() {
+		int x= 10;
+		
+		extracted(x);
+	}
+
+	protected void extracted(int x) {
+		/*[*/int y= x;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test501.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test501.java
new file mode 100644
index 000000000..e28911ff4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test501.java
@@ -0,0 +1,15 @@
+package locals_out;
+
+public class A_test501 {
+	public void foo() {
+		int x= 10;
+		
+		extracted();
+	}
+
+	protected void extracted() {
+		int x;
+		/*[*/x= 20;
+		int y= x;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test502.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test502.java
new file mode 100644
index 000000000..ba1eb8913
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test502.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+public class A_test502 {
+	public void foo() {
+		int x= 0;
+		int y= 0;
+
+		extracted();		
+	}
+
+	protected void extracted() {
+		int x;
+		int y;
+		/*[*/x= 10;
+		y= x;
+		x= y;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test503.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test503.java
new file mode 100644
index 000000000..99e9d5b8e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test503.java
@@ -0,0 +1,13 @@
+package locals_out;
+
+public class A_test503 {
+	public void foo() {
+		int x= 10;
+		
+		extracted(x);
+	}
+
+	protected void extracted(int x) {
+		/*[*/x++;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test504.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test504.java
new file mode 100644
index 000000000..5d2c633da
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test504.java
@@ -0,0 +1,13 @@
+package locals_out;
+
+public class A_test504 {
+	public void foo() {
+		int x= 10;
+		
+		extracted(x);
+	}
+
+	protected void extracted(int x) {
+		/*[*/--x;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test505.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test505.java
new file mode 100644
index 000000000..59cd11c5d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test505.java
@@ -0,0 +1,13 @@
+package locals_out;
+
+public class A_test505 {
+	public void foo() {
+		int x= 0;
+		
+		extracted(x);
+	}
+
+	protected void extracted(int x) {
+		/*[*/x+= 1;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test506.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test506.java
new file mode 100644
index 000000000..a20ea9a87
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test506.java
@@ -0,0 +1,16 @@
+package locals_out;
+
+public class A_test506 {
+	public void foo() {
+		int x= 0;
+		
+		extracted(x);
+	}
+
+	protected void extracted(int x) {
+		/*[*/bar(x);/*]*/
+	}
+
+	public void bar(int i) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test507.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test507.java
new file mode 100644
index 000000000..38b7d0099
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test507.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test507 {
+	public void foo() {
+		int x= 0;
+		
+		x = extracted();
+		
+		int y= x;
+	}
+
+	protected int extracted() {
+		int x;
+		/*[*/x= 10;/*]*/
+		return x;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test508.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test508.java
new file mode 100644
index 000000000..5f7534496
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test508.java
@@ -0,0 +1,20 @@
+package locals_out;
+
+public class A_test508 {
+	public void foo() {
+		int x= 0;
+		int y= 0;
+		
+		x = extracted();
+		
+		y= x;
+	}
+
+	protected int extracted() {
+		int x;
+		int y;
+		/*[*/x= 10;
+		y= 20;/*]*/
+		return x;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test509.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test509.java
new file mode 100644
index 000000000..9c78abd9b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test509.java
@@ -0,0 +1,16 @@
+package locals_out;
+
+public class A_test509 {
+	public void foo() {
+		int x= 0;
+		int y= 0;
+
+		extracted(x);		
+	}
+
+	protected void extracted(int x) {
+		int y;
+		/*[*/y= x;
+		x= 0;/*]*/
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test510.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test510.java
new file mode 100644
index 000000000..54229431d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test510.java
@@ -0,0 +1,11 @@
+package locals_out;
+
+public class A_test510 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/int x= 0;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test511.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test511.java
new file mode 100644
index 000000000..3cd188876
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test511.java
@@ -0,0 +1,14 @@
+package locals_out;
+
+public class A_test511 {
+	public void foo() {
+		int x = extracted();
+		
+		x++;
+	}
+
+	protected int extracted() {
+		/*[*/int x= 0;/*]*/
+		return x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test512.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test512.java
new file mode 100644
index 000000000..040704c8b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test512.java
@@ -0,0 +1,15 @@
+package locals_out;
+
+public class A_test512 {
+	public void foo() {
+		int x = extracted();
+		
+		x++;
+	}
+
+	protected int extracted() {
+		/*[*/int x= 0;
+		int y= x;/*]*/
+		return x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test513.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test513.java
new file mode 100644
index 000000000..eab0b202e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test513.java
@@ -0,0 +1,16 @@
+package locals_out;
+
+public class A_test513 {
+	public void foo() {
+		int y;
+		int x = extracted();
+		x++;
+		y= 10;
+	}
+
+	protected int extracted() {
+		/*[*/int x= 0;
+		int y= 0;/*]*/
+		return x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test514.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test514.java
new file mode 100644
index 000000000..e84c033b1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test514.java
@@ -0,0 +1,13 @@
+package locals_out;
+
+public class A_test514 {
+	public void foo() {
+		int x;
+		extracted();
+		x= 10;
+	}
+
+	protected void extracted() {
+		/*[*/int x;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test515.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test515.java
new file mode 100644
index 000000000..0da84596f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test515.java
@@ -0,0 +1,16 @@
+package locals_out;
+
+public class A_test515 {
+	public void foo() {
+		int y= 10;
+		
+		int x = extracted(y);
+		
+		x++;
+	}
+
+	protected int extracted(int y) {
+		/*[*/int x= y;/*]*/
+		return x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test516.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test516.java
new file mode 100644
index 000000000..4db76dff7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test516.java
@@ -0,0 +1,14 @@
+package locals_out;
+
+public class A_test516 {
+	public void foo() {
+		int j = extracted();
+		
+		j++;
+	}
+
+	protected int extracted() {
+		/*[*/int i= 10, j= 20;/*]*/
+		return j;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test517.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test517.java
new file mode 100644
index 000000000..50824b754
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test517.java
@@ -0,0 +1,16 @@
+package locals_out;
+
+public class A_test517 {
+	public void foo() {
+		int i;
+		int j = extracted();
+		i= j + 10;
+	}
+
+	protected int extracted() {
+		/*[*/int i;
+		int j;
+		j= 20;/*]*/
+		return j;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test518.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test518.java
new file mode 100644
index 000000000..161986d7e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test518.java
@@ -0,0 +1,14 @@
+package locals_out;
+
+public class A_test518 {
+	public void foo() {
+		int i;
+		
+		extracted();
+	}
+
+	protected void extracted() {
+		int i;
+		/*[*/i= 10;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test519.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test519.java
new file mode 100644
index 000000000..84f6a85bc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test519.java
@@ -0,0 +1,16 @@
+package locals_out;
+
+public class A_test519 {
+	public void foo() {
+		int i;
+
+		extracted();
+		
+		i= 20;		
+	}
+
+	protected void extracted() {
+		int i;
+		/*[*/i= 10;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test520.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test520.java
new file mode 100644
index 000000000..911482815
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test520.java
@@ -0,0 +1,15 @@
+package locals_out;
+
+public class A_test520 {
+	public void foo() {
+		int i= 0;
+
+		extracted(i);
+		
+		i= 20;		
+	}
+
+	protected void extracted(int i) {
+		/*[*/int y= i;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test521.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test521.java
new file mode 100644
index 000000000..af631f02b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test521.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+public class A_test521 {
+	public volatile boolean flag;
+	
+	public void foo() {
+		int i= 5;
+		i = extracted(i);
+		i--;
+	}
+
+	protected int extracted(int i) {
+		/*[*/if (flag)
+			i= 10;/*]*/
+		return i;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test522.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test522.java
new file mode 100644
index 000000000..5b71f5903
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test522.java
@@ -0,0 +1,21 @@
+package locals_out;
+
+public class A_test522 {
+	public volatile boolean flag;
+	
+	public void foo() {
+		int i= 20;
+		i = extracted(i);
+		i--;
+	}
+
+	protected int extracted(int i) {
+		/*[*/target: {
+			if (flag)
+				break target;
+			i= 10;
+		}/*]*/
+		return i;
+	}	
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test523.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test523.java
new file mode 100644
index 000000000..5c679b3b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test523.java
@@ -0,0 +1,24 @@
+package locals_out;
+
+public class A_test523 {
+	public volatile boolean flag;
+
+	protected void foo() {
+		int i= 0;
+		i = extracted(i);
+		read(i);
+	}
+
+	protected int extracted(int i) {
+		/*[*/try {
+			if (flag)
+				throw new Exception();
+			i= 10;
+		} catch (Exception e) {
+		}/*]*/
+		return i;
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test524.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test524.java
new file mode 100644
index 000000000..197089d17
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test524.java
@@ -0,0 +1,25 @@
+package locals_out;
+
+public class A_test524 {
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 0;
+		try {
+			i = extracted();
+		} catch (Exception e) {
+		}
+		read(i);
+	}
+
+	protected int extracted() throws Exception {
+		int i;
+		/*[*/if (flag)
+			throw new Exception();
+		i= 10;/*]*/
+		return i;
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test525.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test525.java
new file mode 100644
index 000000000..b1b666530
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test525.java
@@ -0,0 +1,35 @@
+package locals_out;
+
+public class A_test525 {
+	private static class Exception1 extends Exception {
+	}
+	private static class Exception2 extends Exception {
+	}
+	
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 10;
+		try {
+			i = extracted();
+		} catch (Exception2 e) {
+		}
+		read(i);
+	}
+
+	protected int extracted() throws Exception2 {
+		int i;
+		/*[*/try {
+			if (flag)
+				throw new Exception1();
+			if (!flag)
+				throw new Exception2();
+		} catch (Exception1 e) {
+		}
+		i= 10;/*]*/
+		return i;
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test526.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test526.java
new file mode 100644
index 000000000..33694e76a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test526.java
@@ -0,0 +1,34 @@
+package locals_out;
+
+public class A_test526 {
+	private static class Exception1 extends Exception {
+	}
+	private static class Exception2 extends Exception {
+	}
+	
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 10;
+		i = extracted(i);
+		read(i);
+	}
+
+	protected int extracted(int i) {
+		/*[*/try {
+			try {
+				if (flag)
+					throw new Exception1();
+				if (!flag)
+					throw new Exception2();
+			} catch (Exception1 e) {
+			}
+			i= 10;
+		} catch (Exception2 e) {
+		}/*]*/
+		return i;
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test527.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test527.java
new file mode 100644
index 000000000..0f0b16905
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test527.java
@@ -0,0 +1,28 @@
+package locals_out;
+
+public class A_test527 {
+	public volatile boolean flag;
+	
+	protected void foo() {
+		int i= 0;
+		i = extracted(i);
+		read(i);
+	}
+
+	protected int extracted(int i) {
+		/*[*/try {
+			if (flag)
+				throwException();
+			i= 10;
+		} catch (Exception e) {
+		}/*]*/
+		return i;
+	}
+
+	private void read(int i) {
+	}
+	
+	private void throwException() throws Exception {
+		throw new Exception();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test528.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test528.java
new file mode 100644
index 000000000..1168c9c65
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test528.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+import java.io.IOException;
+
+public class A_test528 {
+	public void foo() throws IOException {
+	}
+
+	static class B extends A_test528 {
+		public void bar() throws IOException {
+			extracted();
+		}
+
+		protected void extracted() throws IOException {
+			/*[*/super.foo();/*]*/
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test530.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test530.java
new file mode 100644
index 000000000..a07c7b3c0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test530.java
@@ -0,0 +1,21 @@
+package locals_out;
+
+public class A_test530 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner= null;
+		
+		inner = extracted();
+		
+		inner.x= 10;
+	}
+
+	protected Inner extracted() {
+		Inner inner;
+		/*[*/inner= new Inner();/*]*/
+		return inner;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test531.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test531.java
new file mode 100644
index 000000000..c44b08a4e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test531.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test531 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner= new Inner();
+		
+		extracted(inner);
+	}
+
+	protected void extracted(Inner inner) {
+		/*[*/inner.x= 10;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test532.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test532.java
new file mode 100644
index 000000000..c45126040
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test532.java
@@ -0,0 +1,19 @@
+package locals_out;
+
+public class A_test532 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner= new Inner();
+		
+		extracted(inner);
+		
+		int y= inner.x;
+	}
+
+	protected void extracted(Inner inner) {
+		/*[*/inner.x= 10;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test533.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test533.java
new file mode 100644
index 000000000..284574b40
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test533.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+public class A_test533 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner = extracted();
+
+		Inner inner2= inner;		
+	}
+
+	protected Inner extracted() {
+		/*[*/Inner inner= new Inner();/*]*/
+		return inner;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test534.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test534.java
new file mode 100644
index 000000000..ecb997906
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test534.java
@@ -0,0 +1,19 @@
+package locals_out;
+
+public class A_test534 {
+	class Inner {
+		public int x;
+	}
+	
+	public void foo() {
+		Inner inner= new Inner();
+		
+		extracted(inner);
+		
+		int y= inner.x;
+	}
+
+	protected void extracted(Inner inner) {
+		/*[*/inner.x= 10;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test535.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test535.java
new file mode 100644
index 000000000..78df88b43
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test535.java
@@ -0,0 +1,20 @@
+package locals_out;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class A_test535 {
+
+	public void bar() {
+		List allElements= new ArrayList();
+		Iterator iter= allElements.iterator();		
+
+		extracted(allElements, iter);
+	}
+
+	protected void extracted(List allElements, Iterator iter) {
+		/*[*/while (iter.hasNext()) {
+			allElements.add(iter.next());
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test536.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test536.java
new file mode 100644
index 000000000..9109a9b1f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test536.java
@@ -0,0 +1,22 @@
+package locals_out;
+
+public class A_test536 {
+
+	public void bar() {
+		{ int k= 27; k++; }
+		int i= 37;
+		if (i == 0) {
+			int k= 17;
+			i = extracted(i, k);
+		}
+		i++;
+	}
+
+	protected int extracted(int i, int k) {
+		/*[*/k= k + 1;
+		k += 2;
+		i += 2;
+		k++;/*]*/
+		return i;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test537.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test537.java
new file mode 100644
index 000000000..6c8a27460
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test537.java
@@ -0,0 +1,20 @@
+package locals_out;
+
+public class A_test537 {
+	public void foo() {
+		final int i= 10;
+		
+		Runnable run = extracted(i);
+		
+		run.run();
+	}
+
+	protected Runnable extracted(final int i) {
+		/*[*/Runnable run= new Runnable() {
+			public void run() {
+				System.out.println("" + i);
+			}
+		};/*]*/
+		return run;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test538.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test538.java
new file mode 100644
index 000000000..9e399791a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test538.java
@@ -0,0 +1,14 @@
+package locals_out;
+
+public class A_test538 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		
+		extracted(i, array);
+	}
+
+	protected void extracted(int i, int[] array) {
+		/*[*/array[i]= 10;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test539.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test539.java
new file mode 100644
index 000000000..746757fc9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test539.java
@@ -0,0 +1,15 @@
+package locals_out;
+
+public class A_test539 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		int[] index= new int[1];
+		
+		extracted(i, array, index);
+	}
+
+	protected void extracted(int i, int[] array, int[] index) {
+		/*[*/array[index[i]]= 10;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test540.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test540.java
new file mode 100644
index 000000000..7f2a9c3af
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test540.java
@@ -0,0 +1,15 @@
+package locals_out;
+
+public class A_test540 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		int[] index= new int[1];
+		
+		extracted(array, index);
+	}
+
+	protected void extracted(int[] array, int[] index) {
+		/*[*/array[0]= index[0];/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test541.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test541.java
new file mode 100644
index 000000000..d8551122e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test541.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test541 {
+	class Inner {
+		public int x;
+	}
+	public void foo() {
+		int[] array= new int[10];
+		Inner inner= new Inner();
+		
+		extracted(array, inner);
+	}
+	protected void extracted(int[] array, Inner inner) {
+		/*[*/array[inner.x]= 10;
+		inner.x= 20;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test542.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test542.java
new file mode 100644
index 000000000..2b40ed683
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test542.java
@@ -0,0 +1,14 @@
+package locals_out;
+
+public class A_test542 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		
+		extracted(i, array);
+	}
+
+	protected void extracted(int i, int[] array) {
+		/*[*/array[i++]= 10;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test543.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test543.java
new file mode 100644
index 000000000..9c35329e1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test543.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test543 {
+	public void foo() {
+		int i= 0;
+		int[] array= new int[10];
+		
+		i = extracted(i, array);
+		
+		i++;
+	}
+
+	protected int extracted(int i, int[] array) {
+		/*[*/array[i++]= 10;/*]*/
+		return i;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test550.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test550.java
new file mode 100644
index 000000000..5c9239e33
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test550.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test550 {
+
+	public void foo() {
+		int i= 0;
+		while(true) {
+			i = extracted(i);
+		}
+	}
+
+	protected int extracted(int i) {
+		/*[*/i++;/*]*/
+		return i;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test551.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test551.java
new file mode 100644
index 000000000..5bbdb393d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test551.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test551 {
+
+	public void foo() {
+		int i= 0;
+		do {
+			i = extracted(i);
+		} while (true);
+	}
+
+	protected int extracted(int i) {
+		/*[*/i++;/*]*/
+		return i;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test552.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test552.java
new file mode 100644
index 000000000..b9cf77e90
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test552.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test552 {
+
+	public void foo() {
+		int i= 0;
+		for (;true;) {
+			i = extracted(i);
+		}
+	}
+
+	protected int extracted(int i) {
+		/*[*/i++;/*]*/
+		return i;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test553.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test553.java
new file mode 100644
index 000000000..7b1a2648d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test553.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test553 {
+
+	public void foo() {
+		int i= 0;
+		for (int x= i++, y= x;true;) {
+			extracted(i);
+		}
+	}
+
+	protected void extracted(int i) {
+		int x;
+		/*[*/x= i;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test554.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test554.java
new file mode 100644
index 000000000..0513731a6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test554.java
@@ -0,0 +1,16 @@
+package locals_out;
+
+public class A_test554 {
+	public boolean flag;
+	public void foo() {
+		int x;
+		extracted();
+		x= 20;
+	}
+	protected void extracted() {
+		int x;
+		/*[*/if (flag)
+			x= 10;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test555.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test555.java
new file mode 100644
index 000000000..f41884a41
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test555.java
@@ -0,0 +1,19 @@
+package locals_out;
+
+public class A_test555 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		while (true) {
+			for (int y= x; true; ) {
+				x = extracted();
+			}
+		}
+	}
+	protected int extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test556.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test556.java
new file mode 100644
index 000000000..429b00727
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test556.java
@@ -0,0 +1,19 @@
+package locals_out;
+
+public class A_test556 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		while (true) {
+			for (int y= 0; true; y= x) {
+				x = extracted();
+			}
+		}
+	}
+	protected int extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test557.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test557.java
new file mode 100644
index 000000000..384cc2d98
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test557.java
@@ -0,0 +1,16 @@
+package locals_out;
+
+public class A_test557 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		for (int y= x; true;) {
+			extracted();
+		}
+	}
+	protected void extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test558.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test558.java
new file mode 100644
index 000000000..57fa418c2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test558.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test558 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		for (int y= 0; (x= 20) < 10; y= x) {
+			x = extracted();
+		}
+	}
+	protected int extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test559.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test559.java
new file mode 100644
index 000000000..049228c8b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test559.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test559 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		for (int y= 0; x < 10; x= 20) {
+			x = extracted();
+		}
+	}
+	protected int extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test560.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test560.java
new file mode 100644
index 000000000..36f3839eb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test560.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test560 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		while (x < 10) {
+			x = extracted();
+		}
+	}
+	protected int extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test561.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test561.java
new file mode 100644
index 000000000..40951a5fd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test561.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test561 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		do {
+			x = extracted();
+		} while (x < 10);
+	}
+	protected int extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test562.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test562.java
new file mode 100644
index 000000000..f444bfba5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test562.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+public class A_test562 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		do {
+			int y= x;
+			x = extracted();
+		} while (true);
+	}
+	protected int extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+		return x;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test563.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test563.java
new file mode 100644
index 000000000..bc13078f1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test563.java
@@ -0,0 +1,17 @@
+package locals_out;
+
+public class A_test563 {
+	public boolean flag;
+	public void foo() {
+		int x= 0;
+		do {
+			int y= x;
+			extracted();
+		} while ((x= 20) < 10);
+	}
+	protected void extracted() {
+		int x;
+		/*[*/x= 20;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test564.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test564.java
new file mode 100644
index 000000000..30f68fe16
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test564.java
@@ -0,0 +1,19 @@
+package locals_out;
+
+public class A_test564 {
+	void foo(final int out){
+		int i;
+		if (out > 5){
+			i = extracted();
+		} else {
+			i= 2;
+		}
+		i++;
+	}
+
+	protected int extracted() {
+		int i;
+		/*[*/i= 1;/*]*/
+		return i;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test565.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test565.java
new file mode 100644
index 000000000..4063f282a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test565.java
@@ -0,0 +1,12 @@
+package locals_out;
+
+public class A_test565 {
+	void f(byte bytes) {
+		String s= "k";
+		extracted(bytes, s);
+	}
+
+	protected void extracted(byte bytes, String s) {
+		/*[*/System.out.println(s + " " + bytes); /*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test566.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test566.java
new file mode 100644
index 000000000..8c96b2f52
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test566.java
@@ -0,0 +1,15 @@
+package locals_out;
+
+public class A_test566 {
+	public void foo() {
+		String args[]= null;
+		extracted(args);
+	}
+
+	protected void extracted(String[] args) {
+		/*[*/for (int i = 0; i < args.length; i++) {
+			args[i]= "";
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test567.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test567.java
new file mode 100644
index 000000000..687d7af67
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test567.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+public class A_test567 {
+	public void foo() {
+		String args[]= null;
+		
+		args = extracted();
+		
+		args[0]= args[1];
+	}
+
+	protected String[] extracted() {
+		String[] args;
+		/*[*/args= new String[4];/*]*/
+		return args;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test568.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test568.java
new file mode 100644
index 000000000..eb7f47c69
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test568.java
@@ -0,0 +1,15 @@
+package locals_out;
+
+public class A_test568 {
+	public void foo() {
+		String[] args[]= null;
+		extracted(args);
+	}
+
+	protected void extracted(String[][] args) {
+		/*[*/for (int i = 0; i < args.length; i++) {
+			args[i]= null;
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test569.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test569.java
new file mode 100644
index 000000000..a18bbaf0e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test569.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+public class A_test569 {
+	public void foo() {
+		String[] args[]= null;
+		
+		args = extracted();
+		
+		args[0]= args[1];
+	}
+
+	protected String[][] extracted() {
+		String[][] args;
+		/*[*/args= new String[1][4];/*]*/
+		return args;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test570.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test570.java
new file mode 100644
index 000000000..8fdf3a9f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test570.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+public class A_test570 {
+
+	public void foo() {
+		Object[] a= null;
+		int i= 0;
+		for(Object element: a) {
+			i = extracted(i);
+		}
+	}
+
+	protected int extracted(int i) {
+		/*[*/i++;/*]*/
+		return i;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test571.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test571.java
new file mode 100644
index 000000000..120c1b945
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test571.java
@@ -0,0 +1,21 @@
+package locals_out;
+
+public class A_test571 {
+
+	public void foo() {
+		int i= 0;
+		for(Object element: getArray(i++)) {
+			extracted();
+		}
+	}
+
+	protected void extracted() {
+		int i;
+		/*[*/i= 10;/*]*/
+	}
+	
+	private Object[] getArray(int i) {
+		return null;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test572.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test572.java
new file mode 100644
index 000000000..a91229ea1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test572.java
@@ -0,0 +1,24 @@
+package locals_out;
+
+public class A_test572 {
+
+	public void foo() {
+		int i= 0;
+		while (true) {
+			for(Object element: getArray(i)) {
+				i = extracted();
+			}
+		}
+	}
+
+	protected int extracted() {
+		int i;
+		/*[*/i= 10;/*]*/
+		return i;
+	}
+	
+	private Object[] getArray(int i) {
+		return null;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test575.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test575.java
new file mode 100644
index 000000000..7c2142cd8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test575.java
@@ -0,0 +1,18 @@
+package locals_out;
+
+public class A_test575 {
+
+	public void foo() {
+		int i;
+		extracted();
+		if (true) {
+			i= 10;
+		} else {
+		}
+	}
+
+	protected void extracted() {
+		/*[*/int i= 0;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test576.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test576.java
new file mode 100644
index 000000000..63f3eeeb4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test576.java
@@ -0,0 +1,19 @@
+package locals_out;
+
+public class A_test576 {
+	public void foo() {
+		int avail;
+		extracted();
+		for (;;) {
+			try {
+			} finally {
+				avail= 20;
+			}
+		}
+	}
+
+	protected void extracted() {
+		/*[*/int avail= 10;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test577.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test577.java
new file mode 100644
index 000000000..7ff37db89
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test577.java
@@ -0,0 +1,20 @@
+package locals_out;
+
+public class A_test577 {
+	public void foo() {
+		int x = 0;
+		for (int i = x; i < 10; i++)
+			x = extracted(x, i);
+	}
+
+	protected int extracted(int x, int i) {
+		/*[*/
+		bar(i, x++);
+		/*]*/
+		return x;
+	}
+	
+	private void bar(int i, int y) {
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test578.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test578.java
new file mode 100644
index 000000000..b138d1d2d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/locals_out/A_test578.java
@@ -0,0 +1,21 @@
+package locals_out;
+
+public class A_test578 {
+	public int foo(boolean b1, boolean b2) {
+		int n = 0;
+		int i = 0;
+		n = extracted(b1, b2, n, i);
+		return n;
+	}
+
+	protected int extracted(boolean b1, boolean b2, int n, int i) {
+		/*[*/
+		if (b1)
+			i = 1;
+		if (b2)
+			n = n + i;
+		/*]*/
+		return n;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test650.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test650.java
new file mode 100644
index 000000000..71c96a88a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test650.java
@@ -0,0 +1,9 @@
+package nested_in;
+
+public class A_test650 {
+	public class Inner {
+		public void foo() {
+			/*[*/foo();/*]*/
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test651.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test651.java
new file mode 100644
index 000000000..52f2c0b64
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test651.java
@@ -0,0 +1,11 @@
+package nested_in;
+
+public class A_test651 {
+	public void foo() {
+		Runnable run= new Runnable() {
+			public void run() {
+				/*[*/foo();/*]*/
+			}
+		};
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test652.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test652.java
new file mode 100644
index 000000000..243b33bcb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test652.java
@@ -0,0 +1,13 @@
+package nested_in;
+
+public class A_test652 {
+	public void foo() {
+		Runnable run= new Runnable() {
+			public void run() {
+				foo();
+			}
+		};
+		
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test653.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test653.java
new file mode 100644
index 000000000..30641411d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test653.java
@@ -0,0 +1,9 @@
+package nested_in;
+
+public class A_test653 {
+	public A_test653() {
+		/*[*/foo();/*]*/
+	}
+	public void foo() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test654.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test654.java
new file mode 100644
index 000000000..bbe154780
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_in/A_test654.java
@@ -0,0 +1,11 @@
+package nested_in;
+
+public class A_test654 {
+	public void foo() {
+		class Inner {
+			public void foo() {
+				/*[*/foo();/*]*/
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test650.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test650.java
new file mode 100644
index 000000000..07036b9d7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test650.java
@@ -0,0 +1,13 @@
+package nested_out;
+
+public class A_test650 {
+	public class Inner {
+		public void foo() {
+			extracted();
+		}
+
+		protected void extracted() {
+			/*[*/foo();/*]*/
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test651.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test651.java
new file mode 100644
index 000000000..efc2c900d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test651.java
@@ -0,0 +1,15 @@
+package nested_out;
+
+public class A_test651 {
+	public void foo() {
+		Runnable run= new Runnable() {
+			public void run() {
+				extracted();
+			}
+
+			protected void extracted() {
+				/*[*/foo();/*]*/
+			}
+		};
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test652.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test652.java
new file mode 100644
index 000000000..0483b5a02
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test652.java
@@ -0,0 +1,17 @@
+package nested_out;
+
+public class A_test652 {
+	public void foo() {
+		Runnable run= new Runnable() {
+			public void run() {
+				foo();
+			}
+		};
+		
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test653.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test653.java
new file mode 100644
index 000000000..49c179bf4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test653.java
@@ -0,0 +1,12 @@
+package nested_out;
+
+public class A_test653 {
+	public A_test653() {
+		extracted();
+	}
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+	public void foo() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test654.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test654.java
new file mode 100644
index 000000000..8dc1bf719
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/nested_out/A_test654.java
@@ -0,0 +1,15 @@
+package nested_out;
+
+public class A_test654 {
+	public void foo() {
+		class Inner {
+			public void foo() {
+				extracted();
+			}
+
+			protected void extracted() {
+				/*[*/foo();/*]*/
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test900.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test900.java
new file mode 100644
index 000000000..29b4951ec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test900.java
@@ -0,0 +1,10 @@
+package parameterName_in;
+
+public class A_test900 {
+	public void foo() {
+		int i= 0;
+		int y= 0;
+		
+		/*]*/System.out.println(i + y);/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test901.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test901.java
new file mode 100644
index 000000000..64d1ecacf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test901.java
@@ -0,0 +1,10 @@
+package parameterName_in;
+
+public class A_test901 {
+	public void foo() {
+		int i= 0;
+		int y= 0;
+		
+		/*]*/System.out.println(i + y);/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test902.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test902.java
new file mode 100644
index 000000000..11fb64674
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test902.java
@@ -0,0 +1,10 @@
+package parameterName_in;
+
+public class A_test902 {
+	public void foo() {
+		int i= 0;
+		int y= 0;
+		
+		/*]*/System.out.println(i + y);/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test903.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test903.java
new file mode 100644
index 000000000..abebe1c14
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test903.java
@@ -0,0 +1,10 @@
+package parameterName_in;
+
+public class A_test903 {
+	public void foo() {
+		int i= 0;
+		float y= 0;
+		
+		/*[*/System.out.println(i + y);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test904.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test904.java
new file mode 100644
index 000000000..99e4f1526
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test904.java
@@ -0,0 +1,10 @@
+package parameterName_in;
+
+public class A_test904 {
+	public void foo() {
+		int i= 0;
+		float y= 0;
+		
+		/*[*/System.out.println(i + y);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test905.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test905.java
new file mode 100644
index 000000000..4f728beba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test905.java
@@ -0,0 +1,9 @@
+package parameterName_in;
+
+public class A_test905 {
+	public void foo() {
+		String x = "x";
+		/*[*/String y = "a" + x;
+		System.out.println(x);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test906.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test906.java
new file mode 100644
index 000000000..80d475cc0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_in/A_test906.java
@@ -0,0 +1,9 @@
+package parameterName_in;
+
+public class A_test906 {
+	public void foo() {
+		int i = 2;
+		/*]*/i = i * 2;/*[*/
+		int a = i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test903.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test903.java
new file mode 100644
index 000000000..861fdc591
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test903.java
@@ -0,0 +1,14 @@
+package parameterName_out;
+
+public class A_test903 {
+	public void foo() {
+		int i= 0;
+		float y= 0;
+		
+		extracted(i, y);
+	}
+
+	protected void extracted(int xxx, float yyyy) {
+		/*[*/System.out.println(xxx + yyyy);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test904.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test904.java
new file mode 100644
index 000000000..696e22e2a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test904.java
@@ -0,0 +1,14 @@
+package parameterName_out;
+
+public class A_test904 {
+	public void foo() {
+		int i= 0;
+		float y= 0;
+		
+		extracted(y, i);
+	}
+
+	protected void extracted(float zz, int xx) {
+		/*[*/System.out.println(xx + zz);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test905.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test905.java
new file mode 100644
index 000000000..bf9710c87
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test905.java
@@ -0,0 +1,13 @@
+package parameterName_out;
+
+public class A_test905 {
+	public void foo() {
+		String x = "x";
+		extracted(x);
+	}
+
+	protected void extracted(String message) {
+		/*[*/String y = "a" + message;
+		System.out.println(message);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test906.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test906.java
new file mode 100644
index 000000000..a85013978
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/parameterName_out/A_test906.java
@@ -0,0 +1,14 @@
+package parameterName_out;
+
+public class A_test906 {
+	public void foo() {
+		int i = 2;
+		/*]*/i = extracted(i);/*[*/
+		int a = i;
+	}
+
+	protected int extracted(int xxx) {
+		xxx = xxx * 2;
+		return xxx;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test700.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test700.java
new file mode 100644
index 000000000..4293ac723
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test700.java
@@ -0,0 +1,7 @@
+package return_in;
+
+public class A_test700 {
+	public void foo() {
+		/*[*/return;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test701.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test701.java
new file mode 100644
index 000000000..5c9c07ca7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test701.java
@@ -0,0 +1,7 @@
+package return_in;
+
+public class A_test701 {
+	public boolean foo() {
+		/*[*/return true;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test702.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test702.java
new file mode 100644
index 000000000..036588825
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test702.java
@@ -0,0 +1,10 @@
+package return_in;
+
+public class A_test702 {
+	public boolean foo() {
+		/*[*/if (10 == 10)
+			return true;
+		else
+			return false;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test703.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test703.java
new file mode 100644
index 000000000..5b44050f9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test703.java
@@ -0,0 +1,14 @@
+package return_in;
+
+public class A_test703 {
+	public boolean foo() {
+		/*[*/if (0 == 0) {
+			if (10 == 10)
+				return true;
+			else
+				return false;
+		}
+		foo();
+		return false;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test704.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test704.java
new file mode 100644
index 000000000..d4cb57701
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test704.java
@@ -0,0 +1,10 @@
+package return_in;
+
+public class A_test704 {
+	private boolean flag;
+	public boolean foo() {
+		/*[*/do {
+			return true;
+		} while (flag);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test705.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test705.java
new file mode 100644
index 000000000..f9d02a2f4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test705.java
@@ -0,0 +1,12 @@
+package return_in;
+
+public class A_test705 {
+	public boolean foo() {
+		/*[*/try {
+			foo();
+		} catch(Exception e) {
+		} finally {
+			return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test706.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test706.java
new file mode 100644
index 000000000..260a393b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test706.java
@@ -0,0 +1,12 @@
+package return_in;
+
+public class A_test706 {
+	public boolean foo() {
+		/*[*/try {
+			foo();
+			return true;
+		} catch(Exception e) {
+			return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test707.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test707.java
new file mode 100644
index 000000000..c727af64d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test707.java
@@ -0,0 +1,15 @@
+package return_in;
+
+public class A_test707 {
+	boolean flag;
+	public boolean foo() {
+		/*[*/target: {
+			do {
+				if (flag)
+					break target;
+				return false;
+			} while (flag);
+		}
+		return true;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test708.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test708.java
new file mode 100644
index 000000000..0d80514ec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test708.java
@@ -0,0 +1,12 @@
+package return_in;
+
+public class A_test708 {
+	boolean flag;
+	public boolean foo() {
+		/*[*/do {
+			if (flag)
+				foo();
+			return true;
+		} while(flag);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test709.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test709.java
new file mode 100644
index 000000000..79db65f41
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test709.java
@@ -0,0 +1,13 @@
+package return_in;
+
+public class A_test709 {
+	public boolean foo() {
+		int i= 0;
+		/*[*/switch (i) {
+			case 1:
+				return true;
+			default:
+				return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test710.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test710.java
new file mode 100644
index 000000000..9243e8931
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test710.java
@@ -0,0 +1,14 @@
+package return_in;
+
+public class A_test710 {
+	public boolean foo() {
+		int i= 0;
+		/*[*/switch (i) {
+			case 1:
+			case 2:
+				return true;
+			default:
+				return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test711.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test711.java
new file mode 100644
index 000000000..8cff14ccc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test711.java
@@ -0,0 +1,15 @@
+package return_in;
+
+public class A_test711 {
+	public boolean foo() {
+		int i= 0;
+		/*[*/switch (i) {
+			case 1:
+				foo();
+			case 2:
+				return true;
+			default:
+				return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test712.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test712.java
new file mode 100644
index 000000000..6346f2171
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test712.java
@@ -0,0 +1,9 @@
+package return_in;
+
+import java.util.List;
+
+public class A_test712 {
+	public List foo() {
+		/*[*/return null;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test713.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test713.java
new file mode 100644
index 000000000..6a4488c57
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test713.java
@@ -0,0 +1,7 @@
+package return_in;
+
+public class A_test713 {
+	public java.util.List foo() {
+		/*[*/return null;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test714.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test714.java
new file mode 100644
index 000000000..8eb6e1b77
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test714.java
@@ -0,0 +1,9 @@
+package return_in;
+
+public class A_test714 {
+	public boolean foo() {
+		/*[*/boolean b= false;
+		foo();
+		return (b == true);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test715.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test715.java
new file mode 100644
index 000000000..ff324073e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test715.java
@@ -0,0 +1,16 @@
+package return_in;
+
+public class A_test715 {
+	public interface I {
+		public boolean run();
+	}
+	public void foo() {
+		/*[*/bar (this, new I() {
+			public boolean run() {
+				return true;
+			}
+		});/*]*/
+	}
+	public void bar(A_test715 a, I i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test716.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test716.java
new file mode 100644
index 000000000..0ef56eb17
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test716.java
@@ -0,0 +1,11 @@
+package return_in;
+
+public class A_test716 {
+	public boolean flag;
+	public boolean foo() {
+		/*[*/if (flag)
+			return false;
+		else
+			throw new NullPointerException();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test717.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test717.java
new file mode 100644
index 000000000..671ac2ff1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test717.java
@@ -0,0 +1,13 @@
+package return_in;
+
+public class A_test717 {
+	public boolean foo() {
+		int i= 0;
+		/*[*/switch(i) {
+			case 10:
+				return false;
+			default:
+				throw new NullPointerException();	
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test718.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test718.java
new file mode 100644
index 000000000..3db68611f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test718.java
@@ -0,0 +1,13 @@
+package return_in;
+
+public class A_test718 {
+	public boolean foo() {
+		int i= 0;
+		/*[*/switch(i) {
+			case 10:
+				throw new NullPointerException();	
+			default:
+				return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test719.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test719.java
new file mode 100644
index 000000000..a8dfced64
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test719.java
@@ -0,0 +1,12 @@
+package return_in;
+public class A_test719 {
+	public boolean foo() {
+		/*[*/if (foo())
+			return true;
+		if (foo())
+			return true;
+		else
+			return false;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test720.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test720.java
new file mode 100644
index 000000000..83632b523
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test720.java
@@ -0,0 +1,16 @@
+package return_in;
+
+public class A_test720 {
+	private boolean flag;
+	public boolean foo() {
+		if (flag) {
+			/*[*/try {
+				foo();
+			} catch(Exception e) {
+			}
+			return false;/*]*/
+		}
+		return true;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test721.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test721.java
new file mode 100644
index 000000000..bab478df5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test721.java
@@ -0,0 +1,15 @@
+package return_in;
+
+public class A_test721 {
+	public volatile boolean flag;
+	
+	public void foo() {
+		int i;
+		/*[*/i= 10;/*]*/
+		if (flag)
+			i= 20;
+		i--;
+	}
+
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test722.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test722.java
new file mode 100644
index 000000000..c46db8e98
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test722.java
@@ -0,0 +1,10 @@
+package return_in;
+
+public class A_test722 {
+	void f(){
+		for (int i = 0; i < 10; i++) {
+			/*[*/for (int j = 0; j < 10; j++) {
+			}/*]*/
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test723.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test723.java
new file mode 100644
index 000000000..40223add2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test723.java
@@ -0,0 +1,11 @@
+package return_in;
+
+public class A_test723 {
+	public void foo() {
+		{
+			int i= 0;
+			/*[*/i--;/*]*/
+			i++;
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test724.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test724.java
new file mode 100644
index 000000000..e2565c101
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test724.java
@@ -0,0 +1,18 @@
+package return_in;
+
+public class A_test724 {
+	protected void foo() {
+		int i= 0;
+		int j= 1;
+		switch (j) {
+			case 1 :
+				/*[*/
+				i= 1;/*]*/
+				break;
+			default :
+				i= -1;
+				break;
+		}
+		System.out.println(i);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test725.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test725.java
new file mode 100644
index 000000000..9b3d2a3c4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test725.java
@@ -0,0 +1,17 @@
+package return_in;
+
+public class A_test725 {
+	private boolean flag;
+	protected void foo() {
+		int i= 0;
+		if (flag) {
+			/*[*/i= 10;/*]*/
+			i= 20;
+		} else {
+			read(i);
+		}
+		read(i);
+	}
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test726.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test726.java
new file mode 100644
index 000000000..93713db15
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test726.java
@@ -0,0 +1,20 @@
+package return_in;
+
+public class A_test726 {
+
+	boolean flag;
+
+	protected void foo() {
+		int j= 0;
+		for(int i= 0; i < 10; i++) {
+			if (flag) {
+				/*[*/j= 10;/*]*/
+			} else {
+				read(j);
+			}
+		}
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test727.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test727.java
new file mode 100644
index 000000000..c58037d3a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test727.java
@@ -0,0 +1,11 @@
+package return_in;
+
+public class A_test727 {
+	public void foo() {
+		/*[*/if (true) return;
+		bar();/*]*/
+	}
+
+	public void bar() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test728.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test728.java
new file mode 100644
index 000000000..73b63e74b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test728.java
@@ -0,0 +1,15 @@
+package return_in;
+
+public class A_test728 {
+	public void foo() {
+		Object runnable= null;
+		Object[] disposeList= null;
+		/*[*/for (int i=0; i < disposeList.length; i++) {
+			if (disposeList [i] == null) {
+				disposeList [i] = runnable;
+				return;
+			}
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test729.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test729.java
new file mode 100644
index 000000000..58bcbc0d7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test729.java
@@ -0,0 +1,14 @@
+package return_in;
+
+public class A_test729 {
+	public void foo(int x) {
+		while (x==3) {
+		}
+		int a = 0;
+		for (int i = 0; i < 3; i++) {
+			/*[*/g(i++);/*]*/
+		}
+	}
+
+	private void g(int i) {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test730.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test730.java
new file mode 100644
index 000000000..ff48056a1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test730.java
@@ -0,0 +1,16 @@
+package return_in;
+
+public class A_test730 {
+	public void foo(int x) {
+		do {
+		} while (x==3);
+		
+		int a = 0;
+		for (int i = 0; i < 3; i++) {
+			/*[*/g(i++);/*]*/
+		}
+	}
+
+	private void g(int i) {}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test731.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test731.java
new file mode 100644
index 000000000..f54974ad2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test731.java
@@ -0,0 +1,16 @@
+package return_in;
+
+public class A_test731 {
+	public void foo(int x) {
+		for (int i = 0; i < 3; i++) {
+		}
+		
+		int a = 0;
+		do {
+			/*[*/g(a++);/*]*/
+		} while (x==3);
+	}
+
+	private void g(int i) {}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test732.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test732.java
new file mode 100644
index 000000000..e43c9e90e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test732.java
@@ -0,0 +1,20 @@
+package return_in;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A_test732 {
+	public void foo(int x) {
+		List<A_test732> list = new ArrayList<A_test732>();
+		for (A_test732 t : list) {
+		}
+		
+		int a = 0;
+		for (int i = 0; i < 3; i++) {
+			/*[*/g(a++);/*]*/
+		}
+	}
+
+	private void g(int i) {}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test733.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test733.java
new file mode 100644
index 000000000..3fdeeb4ab
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test733.java
@@ -0,0 +1,14 @@
+package return_in;
+
+public class A_test733 {
+	public int foo() {
+		/*[*/
+		int x = 1;
+		if (x > 0) {
+			throw new IllegalArgumentException();
+		}
+		return x;
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test734.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test734.java
new file mode 100644
index 000000000..8e56be5d7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_in/A_test734.java
@@ -0,0 +1,14 @@
+package return_in;
+
+public class A_test734 {
+	public int foo() {
+		/*[*/
+		int x = 1;
+		if (x > 0) {
+			return x;
+		}
+		throw new IllegalArgumentException();
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test700.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test700.java
new file mode 100644
index 000000000..07feb81cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test700.java
@@ -0,0 +1,11 @@
+package return_out;
+
+public class A_test700 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/return;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test701.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test701.java
new file mode 100644
index 000000000..9f106b904
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test701.java
@@ -0,0 +1,11 @@
+package return_out;
+
+public class A_test701 {
+	public boolean foo() {
+		return extracted();
+	}
+
+	protected boolean extracted() {
+		/*[*/return true;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test702.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test702.java
new file mode 100644
index 000000000..e7953fc49
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test702.java
@@ -0,0 +1,14 @@
+package return_out;
+
+public class A_test702 {
+	public boolean foo() {
+		return extracted();
+	}
+
+	protected boolean extracted() {
+		/*[*/if (10 == 10)
+			return true;
+		else
+			return false;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test703.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test703.java
new file mode 100644
index 000000000..e773bc215
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test703.java
@@ -0,0 +1,18 @@
+package return_out;
+
+public class A_test703 {
+	public boolean foo() {
+		return extracted();
+	}
+
+	protected boolean extracted() {
+		/*[*/if (0 == 0) {
+			if (10 == 10)
+				return true;
+			else
+				return false;
+		}
+		foo();
+		return false;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test704.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test704.java
new file mode 100644
index 000000000..daca0c941
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test704.java
@@ -0,0 +1,13 @@
+package return_out;
+
+public class A_test704 {
+	private boolean flag;
+	public boolean foo() {
+		return extracted();
+	}
+	protected boolean extracted() {
+		/*[*/do {
+			return true;
+		} while (flag);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test705.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test705.java
new file mode 100644
index 000000000..65f912d92
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test705.java
@@ -0,0 +1,16 @@
+package return_out;
+
+public class A_test705 {
+	public boolean foo() {
+		return extracted();
+	}
+
+	protected boolean extracted() {
+		/*[*/try {
+			foo();
+		} catch(Exception e) {
+		} finally {
+			return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test706.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test706.java
new file mode 100644
index 000000000..fc41c2ac6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test706.java
@@ -0,0 +1,16 @@
+package return_out;
+
+public class A_test706 {
+	public boolean foo() {
+		return extracted();
+	}
+
+	protected boolean extracted() {
+		/*[*/try {
+			foo();
+			return true;
+		} catch(Exception e) {
+			return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test707.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test707.java
new file mode 100644
index 000000000..5e0a282e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test707.java
@@ -0,0 +1,18 @@
+package return_out;
+
+public class A_test707 {
+	boolean flag;
+	public boolean foo() {
+		return extracted();
+	}
+	protected boolean extracted() {
+		/*[*/target: {
+			do {
+				if (flag)
+					break target;
+				return false;
+			} while (flag);
+		}
+		return true;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test708.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test708.java
new file mode 100644
index 000000000..7537b0074
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test708.java
@@ -0,0 +1,15 @@
+package return_out;
+
+public class A_test708 {
+	boolean flag;
+	public boolean foo() {
+		return extracted();
+	}
+	protected boolean extracted() {
+		/*[*/do {
+			if (flag)
+				foo();
+			return true;
+		} while(flag);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test709.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test709.java
new file mode 100644
index 000000000..2bcc6c6ca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test709.java
@@ -0,0 +1,17 @@
+package return_out;
+
+public class A_test709 {
+	public boolean foo() {
+		int i= 0;
+		return extracted(i);
+	}
+
+	protected boolean extracted(int i) {
+		/*[*/switch (i) {
+			case 1:
+				return true;
+			default:
+				return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test710.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test710.java
new file mode 100644
index 000000000..b84ceb8f0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test710.java
@@ -0,0 +1,18 @@
+package return_out;
+
+public class A_test710 {
+	public boolean foo() {
+		int i= 0;
+		return extracted(i);
+	}
+
+	protected boolean extracted(int i) {
+		/*[*/switch (i) {
+			case 1:
+			case 2:
+				return true;
+			default:
+				return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test711.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test711.java
new file mode 100644
index 000000000..cc6dc616f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test711.java
@@ -0,0 +1,19 @@
+package return_out;
+
+public class A_test711 {
+	public boolean foo() {
+		int i= 0;
+		return extracted(i);
+	}
+
+	protected boolean extracted(int i) {
+		/*[*/switch (i) {
+			case 1:
+				foo();
+			case 2:
+				return true;
+			default:
+				return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test712.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test712.java
new file mode 100644
index 000000000..7232b997b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test712.java
@@ -0,0 +1,13 @@
+package return_out;
+
+import java.util.List;
+
+public class A_test712 {
+	public List foo() {
+		return extracted();
+	}
+
+	protected List extracted() {
+		/*[*/return null;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test713.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test713.java
new file mode 100644
index 000000000..ad35cb83c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test713.java
@@ -0,0 +1,11 @@
+package return_out;
+
+public class A_test713 {
+	public java.util.List foo() {
+		return extracted();
+	}
+
+	protected java.util.List extracted() {
+		/*[*/return null;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test714.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test714.java
new file mode 100644
index 000000000..3915c5b93
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test714.java
@@ -0,0 +1,13 @@
+package return_out;
+
+public class A_test714 {
+	public boolean foo() {
+		return extracted();
+	}
+
+	protected boolean extracted() {
+		/*[*/boolean b= false;
+		foo();
+		return (b == true);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test715.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test715.java
new file mode 100644
index 000000000..ac3631e92
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test715.java
@@ -0,0 +1,19 @@
+package return_out;
+
+public class A_test715 {
+	public interface I {
+		public boolean run();
+	}
+	public void foo() {
+		extracted();
+	}
+	protected void extracted() {
+		/*[*/bar (this, new I() {
+			public boolean run() {
+				return true;
+			}
+		});/*]*/
+	}
+	public void bar(A_test715 a, I i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test716.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test716.java
new file mode 100644
index 000000000..e27437552
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test716.java
@@ -0,0 +1,14 @@
+package return_out;
+
+public class A_test716 {
+	public boolean flag;
+	public boolean foo() {
+		return extracted();
+	}
+	protected boolean extracted() {
+		/*[*/if (flag)
+			return false;
+		else
+			throw new NullPointerException();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test717.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test717.java
new file mode 100644
index 000000000..ac4d5e411
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test717.java
@@ -0,0 +1,17 @@
+package return_out;
+
+public class A_test717 {
+	public boolean foo() {
+		int i= 0;
+		return extracted(i);
+	}
+
+	protected boolean extracted(int i) {
+		/*[*/switch(i) {
+			case 10:
+				return false;
+			default:
+				throw new NullPointerException();	
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test718.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test718.java
new file mode 100644
index 000000000..ea2c57bda
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test718.java
@@ -0,0 +1,17 @@
+package return_out;
+
+public class A_test718 {
+	public boolean foo() {
+		int i= 0;
+		return extracted(i);
+	}
+
+	protected boolean extracted(int i) {
+		/*[*/switch(i) {
+			case 10:
+				throw new NullPointerException();	
+			default:
+				return false;
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test719.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test719.java
new file mode 100644
index 000000000..a9dae13c2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test719.java
@@ -0,0 +1,16 @@
+package return_out;
+public class A_test719 {
+	public boolean foo() {
+		return extracted();
+	}
+
+	protected boolean extracted() {
+		/*[*/if (foo())
+			return true;
+		if (foo())
+			return true;
+		else
+			return false;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test720.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test720.java
new file mode 100644
index 000000000..56788553c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test720.java
@@ -0,0 +1,19 @@
+package return_out;
+
+public class A_test720 {
+	private boolean flag;
+	public boolean foo() {
+		if (flag) {
+			return extracted();
+		}
+		return true;
+	}
+	protected boolean extracted() {
+		/*[*/try {
+			foo();
+		} catch(Exception e) {
+		}
+		return false;/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test721.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test721.java
new file mode 100644
index 000000000..37d1e54f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test721.java
@@ -0,0 +1,21 @@
+package return_out;
+
+public class A_test721 {
+	public volatile boolean flag;
+	
+	public void foo() {
+		int i;
+		i = extracted();
+		if (flag)
+			i= 20;
+		i--;
+	}
+
+	protected int extracted() {
+		int i;
+		/*[*/i= 10;/*]*/
+		return i;
+	}
+
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test722.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test722.java
new file mode 100644
index 000000000..e08440169
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test722.java
@@ -0,0 +1,14 @@
+package return_out;
+
+public class A_test722 {
+	void f(){
+		for (int i = 0; i < 10; i++) {
+			extracted();
+		}
+	}
+
+	protected void extracted() {
+		/*[*/for (int j = 0; j < 10; j++) {
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test723.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test723.java
new file mode 100644
index 000000000..61b28ee1d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test723.java
@@ -0,0 +1,16 @@
+package return_out;
+
+public class A_test723 {
+	public void foo() {
+		{
+			int i= 0;
+			i = extracted(i);
+			i++;
+		}
+	}
+
+	protected int extracted(int i) {
+		/*[*/i--;/*]*/
+		return i;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test724.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test724.java
new file mode 100644
index 000000000..cebc24829
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test724.java
@@ -0,0 +1,24 @@
+package return_out;
+
+public class A_test724 {
+	protected void foo() {
+		int i= 0;
+		int j= 1;
+		switch (j) {
+			case 1 :
+				i = extracted();
+				break;
+			default :
+				i= -1;
+				break;
+		}
+		System.out.println(i);
+	}
+
+	protected int extracted() {
+		int i;
+		/*[*/
+		i= 1;/*]*/
+		return i;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test725.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test725.java
new file mode 100644
index 000000000..88fc12eb8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test725.java
@@ -0,0 +1,21 @@
+package return_out;
+
+public class A_test725 {
+	private boolean flag;
+	protected void foo() {
+		int i= 0;
+		if (flag) {
+			extracted();
+			i= 20;
+		} else {
+			read(i);
+		}
+		read(i);
+	}
+	protected void extracted() {
+		int i;
+		/*[*/i= 10;/*]*/
+	}
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test726.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test726.java
new file mode 100644
index 000000000..2d5b9868f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test726.java
@@ -0,0 +1,26 @@
+package return_out;
+
+public class A_test726 {
+
+	boolean flag;
+
+	protected void foo() {
+		int j= 0;
+		for(int i= 0; i < 10; i++) {
+			if (flag) {
+				j = extracted();
+			} else {
+				read(j);
+			}
+		}
+	}
+
+	protected int extracted() {
+		int j;
+		/*[*/j= 10;/*]*/
+		return j;
+	}
+
+	private void read(int i) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test727.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test727.java
new file mode 100644
index 000000000..7b1f6d598
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test727.java
@@ -0,0 +1,15 @@
+package return_out;
+
+public class A_test727 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/if (true) return;
+		bar();/*]*/
+	}
+
+	public void bar() {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test728.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test728.java
new file mode 100644
index 000000000..5db468bc0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test728.java
@@ -0,0 +1,19 @@
+package return_out;
+
+public class A_test728 {
+	public void foo() {
+		Object runnable= null;
+		Object[] disposeList= null;
+		extracted(runnable, disposeList);
+	}
+
+	protected void extracted(Object runnable, Object[] disposeList) {
+		/*[*/for (int i=0; i < disposeList.length; i++) {
+			if (disposeList [i] == null) {
+				disposeList [i] = runnable;
+				return;
+			}
+		}/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test729.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test729.java
new file mode 100644
index 000000000..bda242851
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test729.java
@@ -0,0 +1,19 @@
+package return_in;
+
+public class A_test729 {
+	public void foo(int x) {
+		while (x==3) {
+		}
+		int a = 0;
+		for (int i = 0; i < 3; i++) {
+			i = extracted(i);
+		}
+	}
+
+	protected int extracted(int i) {
+		/*[*/g(i++);/*]*/
+		return i;
+	}
+
+	private void g(int i) {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test730.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test730.java
new file mode 100644
index 000000000..a8fd5c635
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test730.java
@@ -0,0 +1,21 @@
+package return_out;
+
+public class A_test730 {
+	public void foo(int x) {
+		do {
+		} while (x==3);
+		
+		int a = 0;
+		for (int i = 0; i < 3; i++) {
+			i = extracted(i);
+		}
+	}
+
+	protected int extracted(int i) {
+		/*[*/g(i++);/*]*/
+		return i;
+	}
+
+	private void g(int i) {}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test731.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test731.java
new file mode 100644
index 000000000..2b2953c90
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test731.java
@@ -0,0 +1,21 @@
+package return_out;
+
+public class A_test731 {
+	public void foo(int x) {
+		for (int i = 0; i < 3; i++) {
+		}
+		
+		int a = 0;
+		do {
+			a = extracted(a);
+		} while (x==3);
+	}
+
+	protected int extracted(int a) {
+		/*[*/g(a++);/*]*/
+		return a;
+	}
+
+	private void g(int i) {}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test732.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test732.java
new file mode 100644
index 000000000..b3e04c0b3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test732.java
@@ -0,0 +1,25 @@
+package return_out;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A_test732 {
+	public void foo(int x) {
+		List<A_test732> list = new ArrayList<A_test732>();
+		for (A_test732 t : list) {
+		}
+		
+		int a = 0;
+		for (int i = 0; i < 3; i++) {
+			a = extracted(a);
+		}
+	}
+
+	protected int extracted(int a) {
+		/*[*/g(a++);/*]*/
+		return a;
+	}
+
+	private void g(int i) {}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test733.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test733.java
new file mode 100644
index 000000000..9dd6d05ff
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test733.java
@@ -0,0 +1,18 @@
+package return_in;
+
+public class A_test733 {
+	public int foo() {
+		return extracted();
+	}
+
+	protected int extracted() {
+		/*[*/
+		int x = 1;
+		if (x > 0) {
+			throw new IllegalArgumentException();
+		}
+		return x;
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test734.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test734.java
new file mode 100644
index 000000000..d8ec761ba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test734.java
@@ -0,0 +1,18 @@
+package return_in;
+
+public class A_test734 {
+	public int foo() {
+		return extracted();
+	}
+
+	protected int extracted() {
+		/*[*/
+		int x = 1;
+		if (x > 0) {
+			return x;
+		}
+		throw new IllegalArgumentException();
+		/*]*/
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test1.java
new file mode 100644
index 000000000..c12b372a2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test1.java
@@ -0,0 +1,7 @@
+package selection;
+
+public class A_test1 {
+	public void foo() {
+		/*[*/foo()/*]*/;
+	}
+} 
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test2.java
new file mode 100644
index 000000000..06787fa52
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test2.java
@@ -0,0 +1,7 @@
+package selection;
+
+public class A_test2 {
+	public void foo() {
+		/*[*/foo()/*[*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test3.java
new file mode 100644
index 000000000..b8e056745
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test3.java
@@ -0,0 +1,7 @@
+package selection;
+
+public class A_test3 {
+	public void foo() {
+		/*]*/foo()/*]*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test4.java
new file mode 100644
index 000000000..5f984e7cb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/selection/A_test4.java
@@ -0,0 +1,7 @@
+package selection;
+
+public class A_test4 {
+	public void foo() {
+		/*]*/foo()/*[*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test400.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test400.java
new file mode 100644
index 000000000..a37812233
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test400.java
@@ -0,0 +1,7 @@
+package semicolon_in;
+
+public class A_test400 {
+	public void foo() {
+		/*]*/foo()/*]*/;
+	} 
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test401.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test401.java
new file mode 100644
index 000000000..636ae434e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test401.java
@@ -0,0 +1,7 @@
+package semicolon_in;
+
+public class A_test401 {
+	public void foo() {
+		/*[*/foo();/*]*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test402.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test402.java
new file mode 100644
index 000000000..d3368f2c4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test402.java
@@ -0,0 +1,9 @@
+package semicolon_in;
+
+public class A_test402 {
+	public void foo() {
+		/*[*/{
+			foo();
+		}/*]*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test403.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test403.java
new file mode 100644
index 000000000..495cf26df
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test403.java
@@ -0,0 +1,11 @@
+package semicolon_in;
+
+public class A_test403 {
+	public void foo() {
+		/*[*/try {
+			foo();
+		} catch (Exception e) {
+			foo();
+		}/*]*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test404.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test404.java
new file mode 100644
index 000000000..e99c15d87
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test404.java
@@ -0,0 +1,8 @@
+package semicolon_in;
+
+public class A_test404 {
+	public void foo() {
+		/*[*/int x= 0;/*]*/
+		x= 10;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test406.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test406.java
new file mode 100644
index 000000000..88f12d8df
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test406.java
@@ -0,0 +1,8 @@
+package semicolon_in;
+
+public class A_test406 {
+	public void foo() {
+		if (/*[*/1 == 10/*]*/)
+			foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test407.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test407.java
new file mode 100644
index 000000000..64a071a2d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test407.java
@@ -0,0 +1,8 @@
+package semicolon_in;
+
+public class A_test407 {
+	public void foo() {
+		boolean b;
+		b= /*[*/10 == 20/*]*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test409.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test409.java
new file mode 100644
index 000000000..a76ecca55
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test409.java
@@ -0,0 +1,9 @@
+package semicolon_in;
+
+public class A_test409 {
+	public void foo() {
+		/*[*/synchronized (this) {
+			foo();
+		}/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test410.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test410.java
new file mode 100644
index 000000000..b36e847d8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_in/A_test410.java
@@ -0,0 +1,10 @@
+package semicolon_in;
+
+public class A_test410 {
+	public void foo() {
+		/*[*/switch (10) {
+			case 1:
+				foo();
+		}/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test400.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test400.java
new file mode 100644
index 000000000..316cc33f4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test400.java
@@ -0,0 +1,11 @@
+package semicolon_out;
+
+public class A_test400 {
+	public void foo() {
+		/*]*/extracted();
+	}
+
+	protected void extracted() {
+		foo()/*]*/;
+	} 
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test401.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test401.java
new file mode 100644
index 000000000..57a3b8de6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test401.java
@@ -0,0 +1,11 @@
+package semicolon_out;
+
+public class A_test401 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test402.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test402.java
new file mode 100644
index 000000000..9172545b7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test402.java
@@ -0,0 +1,13 @@
+package semicolon_out;
+
+public class A_test402 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/{
+			foo();
+		}/*]*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test403.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test403.java
new file mode 100644
index 000000000..1d28f69e0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test403.java
@@ -0,0 +1,15 @@
+package semicolon_out;
+
+public class A_test403 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/try {
+			foo();
+		} catch (Exception e) {
+			foo();
+		}/*]*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test404.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test404.java
new file mode 100644
index 000000000..a495ae63b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test404.java
@@ -0,0 +1,13 @@
+package semicolon_out;
+
+public class A_test404 {
+	public void foo() {
+		int x;
+		extracted();
+		x= 10;
+	}
+
+	protected void extracted() {
+		/*[*/int x= 0;/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test406.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test406.java
new file mode 100644
index 000000000..5897d373a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test406.java
@@ -0,0 +1,12 @@
+package semicolon_out;
+
+public class A_test406 {
+	public void foo() {
+		if (extracted())
+			foo();
+	}
+
+	protected boolean extracted() {
+		return /*[*/1 == 10/*]*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test407.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test407.java
new file mode 100644
index 000000000..07e2b3502
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test407.java
@@ -0,0 +1,12 @@
+package semicolon_out;
+
+public class A_test407 {
+	public void foo() {
+		boolean b;
+		b= extracted();
+	}
+
+	protected boolean extracted() {
+		return /*[*/10 == 20/*]*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test409.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test409.java
new file mode 100644
index 000000000..7d9b74bf7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test409.java
@@ -0,0 +1,13 @@
+package semicolon_out;
+
+public class A_test409 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/synchronized (this) {
+			foo();
+		}/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test410.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test410.java
new file mode 100644
index 000000000..f46a65673
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/semicolon_out/A_test410.java
@@ -0,0 +1,14 @@
+package semicolon_out;
+
+public class A_test410 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/switch (10) {
+			case 1:
+				foo();
+		}/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java
new file mode 100644
index 000000000..4b3d78977
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java
@@ -0,0 +1,14 @@
+package testing;
+
+import java.awt.peer.LabelPeer;
+
+public class E {
+	private F f;
+	public void foo() {
+		try {
+			f.fun();
+		} catch (Exception e) {
+		}
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/F.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/F.java
new file mode 100644
index 000000000..e26e596be
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/F.java
@@ -0,0 +1,9 @@
+package testing;
+
+import java.lang.reflect.InvocationTargetException;
+
+public class F {
+	public void fun() throws InvocationTargetException {
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test450.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test450.java
new file mode 100644
index 000000000..b7090198b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test450.java
@@ -0,0 +1,12 @@
+package try_in;
+
+public class A_test450 {
+	public void foo() {
+		try {
+			/*[*/g();/*]*/
+		} catch (java.io.IOException e) {
+		}
+	}
+	public void g() throws java.io.IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test451.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test451.java
new file mode 100644
index 000000000..e776b0b5e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test451.java
@@ -0,0 +1,13 @@
+package try_in;
+
+public class A_test451 {
+	public void foo() {
+		/*[*/try {
+			g();
+		} catch (java.io.IOException e) {
+		}/*]*/
+	}
+
+	public void g() throws java.io.IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test452.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test452.java
new file mode 100644
index 000000000..d244cd7ca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test452.java
@@ -0,0 +1,15 @@
+package try_in;
+
+import java.io.IOException;
+
+public class A_test452 {
+	public void foo() {
+		try {
+			/*[*/g();/*]*/
+		} catch (IOException e) {
+		}
+	}
+
+	public void g() throws IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test453.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test453.java
new file mode 100644
index 000000000..0b9fe6a0a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test453.java
@@ -0,0 +1,16 @@
+package try_in;
+
+import java.io.IOException;
+
+public class A_test453 {
+
+	public void foo() {
+		/*[*/try {
+			g();
+		} catch (Exception e) {
+		}/*]*/
+	}
+
+	public void g() throws IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test454.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test454.java
new file mode 100644
index 000000000..19894177d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test454.java
@@ -0,0 +1,13 @@
+package try_in;
+
+import java.io.IOException;
+
+public class A_test454 {
+
+	public void foo() {
+		try {
+			/*[*/throw new IOException("Message");/*]*/
+		} catch (Exception e) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test455.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test455.java
new file mode 100644
index 000000000..f0b38980d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test455.java
@@ -0,0 +1,17 @@
+package try_in;
+
+import java.io.IOException;
+
+public class A_test455 {
+
+	public void foo() {
+		try {
+			/*[*/throw createException();/*]*/
+		} catch (Exception e) {
+		}
+	}
+
+	public IOException createException() {
+		return new IOException("Message");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test456.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test456.java
new file mode 100644
index 000000000..418338d25
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test456.java
@@ -0,0 +1,14 @@
+package try_in;
+
+import java.io.IOException;
+
+public class A_test456 {
+
+	public void foo() {
+		Exception e= new IOException("Message");
+		try {
+			/*[*/throw e;/*]*/
+		} catch (Exception x) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test457.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test457.java
new file mode 100644
index 000000000..19cdfac6a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test457.java
@@ -0,0 +1,14 @@
+package try_in;
+
+import java.io.IOException;
+
+public class A_test457 {
+
+	public void foo() {
+		Exception[] e= new Exception[] { new IOException("Message") };
+		try {
+			/*[*/throw e[0];/*]*/
+		} catch (Exception x) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test458.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test458.java
new file mode 100644
index 000000000..e59f3c2fa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test458.java
@@ -0,0 +1,11 @@
+package try_in;
+
+public class A_test458 {
+	public void foo() throws Throwable{
+		try{
+			new A_test458();
+		} catch (Throwable t){
+			/*[*/throw t;/*]*/
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test459.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test459.java
new file mode 100644
index 000000000..b75c53a1e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test459.java
@@ -0,0 +1,16 @@
+package try_in;
+
+public class A_test459 {
+	public abstract class Protectable {
+		public abstract void protect() throws Exception;
+		public void setUp() throws Exception {
+		}
+	}
+	public void foo() {
+		/*[*/Protectable p= new Protectable() {
+			public void protect() throws Exception {
+				setUp();
+			}
+		};/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test460.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test460.java
new file mode 100644
index 000000000..f3ce449f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test460.java
@@ -0,0 +1,26 @@
+package try_in;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.InvocationTargetException;
+
+public abstract class A_test460 {
+	public void foo() throws InvocationTargetException {
+		/*[*/InputStreamReader in= null;
+		try {
+			bar();
+		} catch (IOException e) {
+			throw new InvocationTargetException(null);
+		} finally {
+			if (in != null) {
+				try {
+					in.close();
+				} catch (IOException e) {
+				}
+			}
+		}/*]*/
+	}
+
+	public abstract void bar() throws IOException;
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test461.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test461.java
new file mode 100644
index 000000000..42a0cbe36
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test461.java
@@ -0,0 +1,13 @@
+package try_in;
+
+import java.io.IOException;
+
+public class A_test461 {
+	void f() throws IOException{
+		/*[*/try{
+			f();
+		} catch (IOException e){
+			throw new IOException();
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test462.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test462.java
new file mode 100644
index 000000000..6c613750d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_in/A_test462.java
@@ -0,0 +1,14 @@
+package try_in;
+
+import java.io.IOException;
+
+public class A_test462 {
+	void f() throws IOException{
+		/*[*/try{
+			f();
+		} catch (IOException e){
+		} finally {
+			throw new IOException();
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test450.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test450.java
new file mode 100644
index 000000000..3bd431a0f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test450.java
@@ -0,0 +1,17 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test450 {
+	public void foo() {
+		try {
+			extracted();
+		} catch (java.io.IOException e) {
+		}
+	}
+	protected void extracted() throws IOException {
+		/*[*/g();/*]*/
+	}
+	public void g() throws java.io.IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test451.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test451.java
new file mode 100644
index 000000000..39dcc7bef
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test451.java
@@ -0,0 +1,17 @@
+package try_out;
+
+public class A_test451 {
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/try {
+			g();
+		} catch (java.io.IOException e) {
+		}/*]*/
+	}
+
+	public void g() throws java.io.IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test452.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test452.java
new file mode 100644
index 000000000..deb4660ec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test452.java
@@ -0,0 +1,19 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test452 {
+	public void foo() {
+		try {
+			extracted();
+		} catch (IOException e) {
+		}
+	}
+
+	protected void extracted() throws IOException {
+		/*[*/g();/*]*/
+	}
+
+	public void g() throws IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test453.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test453.java
new file mode 100644
index 000000000..67492b120
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test453.java
@@ -0,0 +1,20 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test453 {
+
+	public void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/try {
+			g();
+		} catch (Exception e) {
+		}/*]*/
+	}
+
+	public void g() throws IOException {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test454.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test454.java
new file mode 100644
index 000000000..31f72c727
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test454.java
@@ -0,0 +1,17 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test454 {
+
+	public void foo() {
+		try {
+			extracted();
+		} catch (Exception e) {
+		}
+	}
+
+	protected void extracted() throws IOException {
+		/*[*/throw new IOException("Message");/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test455.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test455.java
new file mode 100644
index 000000000..5e9d028fb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test455.java
@@ -0,0 +1,21 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test455 {
+
+	public void foo() {
+		try {
+			extracted();
+		} catch (Exception e) {
+		}
+	}
+
+	protected void extracted() throws IOException {
+		/*[*/throw createException();/*]*/
+	}
+
+	public IOException createException() {
+		return new IOException("Message");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test456.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test456.java
new file mode 100644
index 000000000..bc4702e13
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test456.java
@@ -0,0 +1,18 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test456 {
+
+	public void foo() {
+		Exception e= new IOException("Message");
+		try {
+			extracted(e);
+		} catch (Exception x) {
+		}
+	}
+
+	protected void extracted(Exception e) throws Exception {
+		/*[*/throw e;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test457.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test457.java
new file mode 100644
index 000000000..f1f3b0ff9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test457.java
@@ -0,0 +1,18 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test457 {
+
+	public void foo() {
+		Exception[] e= new Exception[] { new IOException("Message") };
+		try {
+			extracted(e);
+		} catch (Exception x) {
+		}
+	}
+
+	protected void extracted(Exception[] e) throws Exception {
+		/*[*/throw e[0];/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test458.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test458.java
new file mode 100644
index 000000000..408275c26
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test458.java
@@ -0,0 +1,15 @@
+package try_out;
+
+public class A_test458 {
+	public void foo() throws Throwable{
+		try{
+			new A_test458();
+		} catch (Throwable t){
+			extracted(t);
+		}
+	}
+
+	protected void extracted(Throwable t) throws Throwable {
+		/*[*/throw t;/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test459.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test459.java
new file mode 100644
index 000000000..ff79ebf69
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test459.java
@@ -0,0 +1,19 @@
+package try_out;
+
+public class A_test459 {
+	public abstract class Protectable {
+		public abstract void protect() throws Exception;
+		public void setUp() throws Exception {
+		}
+	}
+	public void foo() {
+		extracted();
+	}
+	protected void extracted() {
+		/*[*/Protectable p= new Protectable() {
+			public void protect() throws Exception {
+				setUp();
+			}
+		};/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test460.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test460.java
new file mode 100644
index 000000000..c5a0e013b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test460.java
@@ -0,0 +1,30 @@
+package try_out;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.reflect.InvocationTargetException;
+
+public abstract class A_test460 {
+	public void foo() throws InvocationTargetException {
+		extracted();
+	}
+
+	protected void extracted() throws InvocationTargetException {
+		/*[*/InputStreamReader in= null;
+		try {
+			bar();
+		} catch (IOException e) {
+			throw new InvocationTargetException(null);
+		} finally {
+			if (in != null) {
+				try {
+					in.close();
+				} catch (IOException e) {
+				}
+			}
+		}/*]*/
+	}
+
+	public abstract void bar() throws IOException;
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test461.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test461.java
new file mode 100644
index 000000000..05f761cf3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test461.java
@@ -0,0 +1,17 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test461 {
+	void f() throws IOException{
+		extracted();
+	}
+
+	protected void extracted() throws IOException {
+		/*[*/try{
+			f();
+		} catch (IOException e){
+			throw new IOException();
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test462.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test462.java
new file mode 100644
index 000000000..ba7009c7b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/try_out/A_test462.java
@@ -0,0 +1,18 @@
+package try_out;
+
+import java.io.IOException;
+
+public class A_test462 {
+	void f() throws IOException{
+		extracted();
+	}
+
+	protected void extracted() throws IOException {
+		/*[*/try{
+			f();
+		} catch (IOException e){
+		} finally {
+			throw new IOException();
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test200.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test200.java
new file mode 100644
index 000000000..8d570be8e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test200.java
@@ -0,0 +1,7 @@
+package validSelection;
+
+public class A_test200 {
+	public void foo() {
+		/*]*/foo();/*[*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test201.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test201.java
new file mode 100644
index 000000000..62c304e2a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test201.java
@@ -0,0 +1,7 @@
+package validSelection;
+
+public class A_test201 {
+	public void foo() {/*[*/
+		foo();
+	/*]*/} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test202.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test202.java
new file mode 100644
index 000000000..d8733ef22
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test202.java
@@ -0,0 +1,8 @@
+package validSelection;
+
+public class A_test202 {
+	public void foo() {
+		/*]*/foo();
+		foo();/*[*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test203.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test203.java
new file mode 100644
index 000000000..2edb220f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test203.java
@@ -0,0 +1,9 @@
+package validSelection;
+
+public class A_test203 {
+	public void foo() {
+		/*]*/for (int i= 0; i < 10; i++)
+			foo();
+		foo();/*[*/
+	} 
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test230.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test230.java
new file mode 100644
index 000000000..303534039
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test230.java
@@ -0,0 +1,9 @@
+package validSelection;
+
+public class A_test230 {
+	public void foo() {
+		{/*[*/
+			foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test231.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test231.java
new file mode 100644
index 000000000..3d61594da
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test231.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test231 {
+	public void foo() {
+		{
+			/*]*/foo()/*[*/;
+		}
+		{
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test232.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test232.java
new file mode 100644
index 000000000..a3b5456b7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test232.java
@@ -0,0 +1,9 @@
+package validSelection;
+
+public class A_test232 {
+	public void foo() {
+		/*]*/{
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test233.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test233.java
new file mode 100644
index 000000000..75b38687a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test233.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test233 {
+	public void foo() {
+		{
+			foo();
+		}
+		{
+			/*]*/foo()/*[*/;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test234.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test234.java
new file mode 100644
index 000000000..265b90390
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test234.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test234 {
+	public void foo() {
+		{
+			foo();
+		}
+		{/*[*/
+			foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test235.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test235.java
new file mode 100644
index 000000000..876b18810
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test235.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test235 {
+	public void foo() {
+		{/*[*/
+			foo();
+		/*]*/}
+		{
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test240.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test240.java
new file mode 100644
index 000000000..00c009176
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test240.java
@@ -0,0 +1,8 @@
+package validSelection;
+
+public class A_test240 {
+	public void foo() {/*[*/
+		for (int i= 0; i < 10; i++)
+			foo();
+	/*]*/}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test241.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test241.java
new file mode 100644
index 000000000..b3bb0e2f0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test241.java
@@ -0,0 +1,8 @@
+package validSelection;
+
+public class A_test241 {
+	public void foo() {
+		/*]*/for (int i= 0; i < 10; i++)
+			foo();/*[*/
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test244.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test244.java
new file mode 100644
index 000000000..897ade33f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test244.java
@@ -0,0 +1,8 @@
+package validSelection;
+
+public class A_test244 {
+	public void foo() {
+		for (int i= 0; i < 10; i++)
+			/*]*/foo()/*]*/;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test245.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test245.java
new file mode 100644
index 000000000..af752d230
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test245.java
@@ -0,0 +1,8 @@
+package validSelection;
+
+public class A_test245 {
+	public void foo() {
+		for (int i= 0; i < 10; i++)
+			/*]*/foo();/*[*/
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test246.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test246.java
new file mode 100644
index 000000000..40a1cd1f0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test246.java
@@ -0,0 +1,9 @@
+package validSelection;
+
+public class A_test246 {
+	public void foo() {
+		for (int i= 0; i < 10; i++) {
+			/*]*/foo();/*[*/
+		}
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test247.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test247.java
new file mode 100644
index 000000000..4d5b6aa5b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test247.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test247 {
+	public void foo() {
+		for (int i= 10; i < 10; i++)/*[*/
+			for (int z= 10; z < 10; z++)
+				foo();
+		/*]*/foo();	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test248.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test248.java
new file mode 100644
index 000000000..205fb31e4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test248.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test248 {
+	public void foo() {
+		for (int i= 0; i < 10; i++)
+			foo();
+			
+		/*]*/foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test249.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test249.java
new file mode 100644
index 000000000..2428f1149
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test249.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test249 {
+	public void foo() {
+		/*]*/foo();/*[*/
+		
+		for (int i= 0; i < 10; i++)
+			foo();	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test250.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test250.java
new file mode 100644
index 000000000..18755cda8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test250.java
@@ -0,0 +1,8 @@
+package validSelection;
+
+public class A_test250 {
+	public void foo() {
+		while(1 < 10)/*[*/
+			foo();
+	/*]*/}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test251.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test251.java
new file mode 100644
index 000000000..7a6d6e7e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test251.java
@@ -0,0 +1,8 @@
+package validSelection;
+
+public class A_test251 {
+	public void foo() {
+		/*]*/while(1 < 10)
+			foo();/*]*/
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test252.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test252.java
new file mode 100644
index 000000000..735887685
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test252.java
@@ -0,0 +1,14 @@
+package validSelection;
+
+public class A_test252 {
+	public boolean b() {
+		return true;
+	}
+	
+	public void foo() {
+		while(b())
+			while(b())/*[*/
+				foo();
+		/*]*/foo();		
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test253.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test253.java
new file mode 100644
index 000000000..dffc37768
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test253.java
@@ -0,0 +1,14 @@
+package validSelection;
+
+public class A_test253 {
+	public boolean b() {
+		return true;
+	}
+	
+	public void foo() {
+		while(b())
+			/*]*/while(b())
+				foo();
+		/*]*/foo();		
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test254.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test254.java
new file mode 100644
index 000000000..e22bdc9c5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test254.java
@@ -0,0 +1,14 @@
+package validSelection;
+
+public class A_test254 {
+	public boolean b() {
+		return true;
+	}
+	
+	public void foo() {
+		while(b())
+			foo();
+			
+		/*]*/foo();/*[*/		
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test255.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test255.java
new file mode 100644
index 000000000..d7c84583b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test255.java
@@ -0,0 +1,14 @@
+package validSelection;
+
+public class A_test255 {
+	public boolean b() {
+		return true;
+	}
+	
+	public void foo() {
+		/*]*/foo();/*[*/
+		
+		while(b())
+			foo();	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test260.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test260.java
new file mode 100644
index 000000000..31a00b73b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test260.java
@@ -0,0 +1,9 @@
+package validSelection;
+
+public class A_test260 {
+	public void foo() {
+		/*]*/do
+			foo();
+		while(1 < 10);/*[*/	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test261.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test261.java
new file mode 100644
index 000000000..1ce96b24b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test261.java
@@ -0,0 +1,9 @@
+package validSelection;
+
+public class A_test261 {
+	public void foo() {
+		do /*[*/
+			foo();
+		/*]*/while(1 < 10);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test262.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test262.java
new file mode 100644
index 000000000..0df5d917c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test262.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test262 {
+	public boolean fBoolean;
+	public void foo() {
+		do 
+			foo();
+		while(fBoolean);
+		
+		/*]*/foo()/*[*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test263.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test263.java
new file mode 100644
index 000000000..7af8e454e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test263.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test263 {
+	public boolean fBoolean;
+	public void foo() {
+		/*]*/foo()/*[*/;
+		
+		do 
+			foo();
+		while(fBoolean);		
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test270.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test270.java
new file mode 100644
index 000000000..f9446bb29
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test270.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test270 {
+	public void foo() {
+		/*]*/switch(1) {
+			case 1:
+				foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test271.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test271.java
new file mode 100644
index 000000000..d99c995b3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test271.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test271 {
+	public void foo() {
+		switch(1) {
+			case 1:/*[*/
+				foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test272.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test272.java
new file mode 100644
index 000000000..0648fc528
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test272.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test272 {
+	public void foo() {
+		switch(1) {
+			case 1:
+				foo();
+				/*]*/foo()/*[*/;
+				foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test273.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test273.java
new file mode 100644
index 000000000..191695ba7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test273.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test273 {
+	public void foo() {
+		switch(1) {
+			case 1:/*[*/
+				foo();
+			/*]*/case 2:
+				foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test274.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test274.java
new file mode 100644
index 000000000..2f916a848
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test274.java
@@ -0,0 +1,14 @@
+package validSelection;
+
+public class A_test274 {
+	public void foo() {
+		switch(1) {
+			case 1:
+				foo();
+			case 2:
+				foo();
+		}
+		
+		/*]*/foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test275.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test275.java
new file mode 100644
index 000000000..80511efd6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test275.java
@@ -0,0 +1,14 @@
+package validSelection;
+
+public class A_test275 {
+	public void foo() {
+		/*]*/foo();/*[*/
+		
+		switch(1) {
+			case 1:
+				foo();
+			case 2:
+				foo();
+		}		
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test280.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test280.java
new file mode 100644
index 000000000..33d19963a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test280.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test280 {
+	public boolean fBoolean;
+	public void foo() {
+		/*]*/if (fBoolean)
+			foo();
+		else
+			foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test281.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test281.java
new file mode 100644
index 000000000..7048e9e11
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test281.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test281 {
+	public boolean fBoolean;
+	public void foo() {
+		if (fBoolean)
+			/*]*/foo()/*[*/;
+		else
+			foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test282.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test282.java
new file mode 100644
index 000000000..4bd885628
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test282.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test282 {
+	public boolean fBoolean;
+	public void foo() {
+		if (fBoolean)/*[*/
+			foo();
+		/*]*/else
+			foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test283.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test283.java
new file mode 100644
index 000000000..e060d6ded
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test283.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test283 {
+	public boolean fBoolean;
+	public void foo() {
+		if (fBoolean) {
+		} else {
+			/*]*/foo();/*[*/
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test284.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test284.java
new file mode 100644
index 000000000..06eab5659
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test284.java
@@ -0,0 +1,14 @@
+package validSelection;
+
+public class A_test284 {
+	public boolean fBoolean;
+	public void foo() {
+		if (fBoolean)
+			foo();
+			
+		if (fBoolean) {
+		} else {
+			/*]*/foo();/*[*/
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test285.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test285.java
new file mode 100644
index 000000000..89b939d9f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test285.java
@@ -0,0 +1,14 @@
+package validSelection;
+
+public class A_test285 {
+	public boolean fBoolean;
+	public void foo() {
+		if (fBoolean)
+			/*[*/foo();/*]*/
+			
+		if (fBoolean) {
+		} else {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test286.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test286.java
new file mode 100644
index 000000000..dc0c3debd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test286.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test286 {
+	public boolean fBoolean;
+	public void foo() {
+		/*[*/foo();/*]*/	
+		if (fBoolean)
+			foo();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test287.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test287.java
new file mode 100644
index 000000000..45e4f08c9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test287.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test287 {
+	public boolean fBoolean;
+	public void foo() {
+		if (fBoolean)
+			foo();
+		/*[*/foo();/*]*/	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test300.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test300.java
new file mode 100644
index 000000000..e95eda549
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test300.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test300 {
+	public void foo() {
+		try {/*[*/
+			foo();
+		/*]*/} catch (Exception e) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test301.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test301.java
new file mode 100644
index 000000000..84b93a66e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test301.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test301 {
+	public void foo() {
+		try {
+			/*]*/foo()/*[*/;
+		} catch (Exception e) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test302.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test302.java
new file mode 100644
index 000000000..5e0f55f66
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test302.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test302 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) {/*[*/
+			foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test303.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test303.java
new file mode 100644
index 000000000..003b7b52c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test303.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test303 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) {
+			/*]*/foo()/*[*/;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test304.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test304.java
new file mode 100644
index 000000000..23cc5fbb0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test304.java
@@ -0,0 +1,13 @@
+package validSelection;
+
+public class A_test304 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) {
+			foo();
+		} catch (Throwable t) {
+			/*]*/foo();/*[*/
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test305.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test305.java
new file mode 100644
index 000000000..aa531b24d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test305.java
@@ -0,0 +1,13 @@
+package validSelection;
+
+public class A_test305 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) {
+			/*]*/foo();/*[*/
+		} catch (Throwable t) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test306.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test306.java
new file mode 100644
index 000000000..45338ad2a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test306.java
@@ -0,0 +1,15 @@
+package validSelection;
+
+public class A_test306 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) {
+			foo();
+		} catch (Error e) {
+			/*]*/foo();/*[*/
+		} catch (Throwable t) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test307.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test307.java
new file mode 100644
index 000000000..141a1529a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test307.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test307 {
+	public void foo() {
+		try {
+			foo();
+		} finally {/*[*/
+			foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test308.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test308.java
new file mode 100644
index 000000000..5e598b3b9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test308.java
@@ -0,0 +1,11 @@
+package validSelection;
+
+public class A_test308 {
+	public void foo() {
+		try {
+			foo();
+		} finally {/*[*/
+			foo();
+		/*]*/}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test309.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test309.java
new file mode 100644
index 000000000..f0dc5b075
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test309.java
@@ -0,0 +1,13 @@
+package validSelection;
+
+public class A_test309 {
+	public void foo() {
+		/*]*/try {
+			foo();
+		} catch (Exception e) {
+			foo();
+		} finally {
+			foo();
+		}/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test310.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test310.java
new file mode 100644
index 000000000..3499da6ad
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test310.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test310 {
+	public void foo() {
+		try {
+			foo();
+		} catch (Exception e) {
+			foo();
+		}
+		/*]*/foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test311.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test311.java
new file mode 100644
index 000000000..ce222e8f7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test311.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test311 {
+	public void foo() {
+		/*]*/foo();/*[*/
+		try {
+			foo();
+		} catch (Exception e) {
+			foo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test350.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test350.java
new file mode 100644
index 000000000..d358f5c0c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test350.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test350 {
+
+	public void foo() {
+		/*]*/synchronized (this) {
+			foo();
+		}/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test351.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test351.java
new file mode 100644
index 000000000..521eb6fd0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test351.java
@@ -0,0 +1,12 @@
+package validSelection;
+
+public class A_test351 {
+
+	public void foo() {
+		foo();/*[*/
+		synchronized (this) {
+			foo();
+		}
+		/*]*/foo();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test352.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test352.java
new file mode 100644
index 000000000..97540b746
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test352.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test352 {
+
+	public void foo() {
+		synchronized (this) {/*[*/
+			foo();
+		/*]*/}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test353.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test353.java
new file mode 100644
index 000000000..eee7d6471
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection/A_test353.java
@@ -0,0 +1,10 @@
+package validSelection;
+
+public class A_test353 {
+
+	public void foo() {
+		synchronized (this) {
+			/*]*/foo();/*[*/
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test360.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test360.java
new file mode 100644
index 000000000..35d4adbc9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test360.java
@@ -0,0 +1,8 @@
+package validSelection_in;
+
+public class A_test360 {
+	void f(){
+		/*[*/class AA extends A_test360 {
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test361.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test361.java
new file mode 100644
index 000000000..7a27e8c8d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test361.java
@@ -0,0 +1,8 @@
+package validSelection_in;
+
+public class A_test361 {
+	void f(){
+		/*[*/class AA extends A_test361 {
+		};/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test362.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test362.java
new file mode 100644
index 000000000..0bdc0aaaf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test362.java
@@ -0,0 +1,14 @@
+package validSelection_in;
+
+public class A_test362 {
+	A_test362(int i){
+	}
+	void n(){
+		final int y= 0;
+		/*[*/new A_test362(y){
+			void f(){
+				int y= 9;
+			}
+		};/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test363.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test363.java
new file mode 100644
index 000000000..1506cb6f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test363.java
@@ -0,0 +1,7 @@
+package validSelection_in;
+
+public class A_test363 {
+	public Object foo() {
+		return /*[*/A_test363.class/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test364.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test364.java
new file mode 100644
index 000000000..5e46159fd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test364.java
@@ -0,0 +1,12 @@
+package validSelection_in;
+
+// http://dev.eclipse.org/bugs/show_bug.cgi?id=6680
+public class A_test364 {
+	public int i(){ 
+		return 0;
+	}
+	public void m(){
+		/*[*/i();
+		m();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test365.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test365.java
new file mode 100644
index 000000000..9cbc7c487
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test365.java
@@ -0,0 +1,10 @@
+package validSelection_in;
+
+public class A_test365 {
+	public void bar() throws NullPointerException {
+	}
+	
+	protected void foo() {
+		/*[*/bar();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test366.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test366.java
new file mode 100644
index 000000000..4d4bce38b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test366.java
@@ -0,0 +1,9 @@
+package validSelection_in;
+
+public class A_test366 {
+	protected void foo() {
+		// comment
+		/*[*/foo();/*]*/
+		// comment
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test367.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test367.java
new file mode 100644
index 000000000..e6a7d4993
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test367.java
@@ -0,0 +1,9 @@
+package validSelection_in;
+
+public class A_test367 {
+	protected void foo() {
+		/*[*/// comment
+		foo();/*]*/
+		// comment
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test368.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test368.java
new file mode 100644
index 000000000..c78142e2d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test368.java
@@ -0,0 +1,9 @@
+package validSelection_in;
+
+public class A_test368 {
+	protected void foo() {
+		// comment
+		/*[*/foo();
+		/* comment*/ /*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test369.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test369.java
new file mode 100644
index 000000000..edae5c125
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test369.java
@@ -0,0 +1,9 @@
+package validSelection_in;
+
+public class A_test369 {
+	protected void foo() {
+		/*[*/// comment
+		foo();
+		/* comment*/ /*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test370.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test370.java
new file mode 100644
index 000000000..7029a2209
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test370.java
@@ -0,0 +1,11 @@
+package validSelection_in;
+
+public class A_test370 {
+	protected void foo() {
+		// comment
+		/*[*/foo();
+		// comment
+		foo();/*]*/
+		// comment
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test371.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test371.java
new file mode 100644
index 000000000..37c8123cd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test371.java
@@ -0,0 +1,11 @@
+package validSelection_in;
+
+public class A_test371 {
+	protected void foo() {
+		/*[*/// comment
+		foo();
+		// comment
+		foo();/*]*/
+		// comment
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test372.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test372.java
new file mode 100644
index 000000000..66421e2fc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test372.java
@@ -0,0 +1,12 @@
+package validSelection_in;
+
+public class A_test372 {
+	protected void foo() {
+		// comment
+		/*[*/foo();
+		// comment
+		foo();
+		// comment
+		/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test373.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test373.java
new file mode 100644
index 000000000..1d310b53b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_in/A_test373.java
@@ -0,0 +1,12 @@
+package validSelection_in;
+
+public class A_test373 {
+	protected void foo() {
+		/*[*/// comment
+		foo();
+		// comment
+		foo();
+		// comment
+		/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test360.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test360.java
new file mode 100644
index 000000000..6e6cf4827
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test360.java
@@ -0,0 +1,12 @@
+package validSelection_out;
+
+public class A_test360 {
+	void f(){
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/class AA extends A_test360 {
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test361.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test361.java
new file mode 100644
index 000000000..b514b108a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test361.java
@@ -0,0 +1,12 @@
+package validSelection_out;
+
+public class A_test361 {
+	void f(){
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/class AA extends A_test361 {
+		};/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test362.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test362.java
new file mode 100644
index 000000000..c59897890
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test362.java
@@ -0,0 +1,17 @@
+package validSelection_out;
+
+public class A_test362 {
+	A_test362(int i){
+	}
+	void n(){
+		final int y= 0;
+		extracted(y);
+	}
+	protected void extracted(final int y) {
+		/*[*/new A_test362(y){
+			void f(){
+				int y= 9;
+			}
+		};/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test363.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test363.java
new file mode 100644
index 000000000..cce0400e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test363.java
@@ -0,0 +1,11 @@
+package validSelection_out;
+
+public class A_test363 {
+	public Object foo() {
+		return extracted();
+	}
+
+	protected Class<A_test363> extracted() {
+		return /*[*/A_test363.class/*]*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test364.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test364.java
new file mode 100644
index 000000000..34e72a01c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test364.java
@@ -0,0 +1,15 @@
+package validSelection_out;
+
+// http://dev.eclipse.org/bugs/show_bug.cgi?id=6680
+public class A_test364 {
+	public int i(){ 
+		return 0;
+	}
+	public void m(){
+		extracted();
+	}
+	protected void extracted() {
+		/*[*/i();
+		m();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test365.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test365.java
new file mode 100644
index 000000000..3395e399b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test365.java
@@ -0,0 +1,14 @@
+package validSelection_out;
+
+public class A_test365 {
+	public void bar() throws NullPointerException {
+	}
+	
+	protected void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/bar();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test366.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test366.java
new file mode 100644
index 000000000..265037fc7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test366.java
@@ -0,0 +1,13 @@
+package validSelection_out;
+
+public class A_test366 {
+	protected void foo() {
+		// comment
+		extracted();
+		// comment
+	}
+
+	protected void extracted() {
+		/*[*/foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test367.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test367.java
new file mode 100644
index 000000000..e9baade92
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test367.java
@@ -0,0 +1,13 @@
+package validSelection_out;
+
+public class A_test367 {
+	protected void foo() {
+		extracted();
+		// comment
+	}
+
+	protected void extracted() {
+		/*[*/// comment
+		foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test368.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test368.java
new file mode 100644
index 000000000..e8804d921
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test368.java
@@ -0,0 +1,13 @@
+package validSelection_out;
+
+public class A_test368 {
+	protected void foo() {
+		// comment
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/foo();
+		/* comment*/ /*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test369.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test369.java
new file mode 100644
index 000000000..80cf51d7f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test369.java
@@ -0,0 +1,13 @@
+package validSelection_out;
+
+public class A_test369 {
+	protected void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/// comment
+		foo();
+		/* comment*/ /*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test370.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test370.java
new file mode 100644
index 000000000..593ba636a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test370.java
@@ -0,0 +1,15 @@
+package validSelection_out;
+
+public class A_test370 {
+	protected void foo() {
+		// comment
+		extracted();
+		// comment
+	}
+
+	protected void extracted() {
+		/*[*/foo();
+		// comment
+		foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test371.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test371.java
new file mode 100644
index 000000000..ae2e0a5c3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test371.java
@@ -0,0 +1,15 @@
+package validSelection_out;
+
+public class A_test371 {
+	protected void foo() {
+		extracted();
+		// comment
+	}
+
+	protected void extracted() {
+		/*[*/// comment
+		foo();
+		// comment
+		foo();/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test372.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test372.java
new file mode 100644
index 000000000..8274ef0bd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test372.java
@@ -0,0 +1,16 @@
+package validSelection_out;
+
+public class A_test372 {
+	protected void foo() {
+		// comment
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/foo();
+		// comment
+		foo();
+		// comment
+		/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test373.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test373.java
new file mode 100644
index 000000000..3607fc63a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/validSelection_out/A_test373.java
@@ -0,0 +1,16 @@
+package validSelection_out;
+
+public class A_test373 {
+	protected void foo() {
+		extracted();
+	}
+
+	protected void extracted() {
+		/*[*/// comment
+		foo();
+		// comment
+		foo();
+		// comment
+		/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1200.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1200.java
new file mode 100644
index 000000000..e9dc69fb0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1200.java
@@ -0,0 +1,7 @@
+package varargs_in;
+
+public class A_test1200 {
+	public void foo(String... args) {
+		/*[*/foo(args);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1201.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1201.java
new file mode 100644
index 000000000..f8c018271
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1201.java
@@ -0,0 +1,8 @@
+package varargs_in;
+
+public class A_test1201 {
+	public void foo(String... args) {
+		/*[*/System.out.println(args[1]);
+		System.out.println(args[2]);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1202.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1202.java
new file mode 100644
index 000000000..6494833e6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_in/A_test1202.java
@@ -0,0 +1,11 @@
+package varargs_in;
+
+public class A_test1202 {
+	public String foo(String... strings) {
+		String s= "foo";
+		/*[*/for (String string : strings) {
+			System.out.println(string + s);
+		}/*]*/
+		return s;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1200.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1200.java
new file mode 100644
index 000000000..eb9db68aa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1200.java
@@ -0,0 +1,11 @@
+package varargs_out;
+
+public class A_test1200 {
+	public void foo(String... args) {
+		extracted(args);
+	}
+
+	protected void extracted(String... args) {
+		/*[*/foo(args);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1201.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1201.java
new file mode 100644
index 000000000..bdb49e28d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1201.java
@@ -0,0 +1,12 @@
+package varargs_out;
+
+public class A_test1201 {
+	public void foo(String... args) {
+		extracted(args);
+	}
+
+	protected void extracted(String... args) {
+		/*[*/System.out.println(args[1]);
+		System.out.println(args[2]);/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1202.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1202.java
new file mode 100644
index 000000000..5295e5114
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/varargs_out/A_test1202.java
@@ -0,0 +1,15 @@
+package varargs_out;
+
+public class A_test1202 {
+	public String foo(String... strings) {
+		String s= "foo";
+		extracted(s, strings);
+		return s;
+	}
+
+	protected void extracted(String s, String... strings) {
+		/*[*/for (String string : strings) {
+			System.out.println(string + s);
+		}/*]*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2001.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2001.java
new file mode 100644
index 000000000..bb74eed59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2001.java
@@ -0,0 +1,14 @@
+package wiki_in;
+
+public class A_test2001 {
+
+	int field= 0;
+
+	void fun() {
+		int i;
+		/*[*/
+		i= 0;
+		System.out.println("i, field == " + i++ +", " + field);
+		/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2002.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2002.java
new file mode 100644
index 000000000..d9b468b68
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2002.java
@@ -0,0 +1,13 @@
+package wiki_in;
+
+public class A_test2002 {
+
+	int field= 0;
+	void fun() {
+		int i= 0;
+		/*[*/
+		System.out.println("i, field == " + i++ +", " + field);
+		/*]*/
+		System.out.println("i == " + i);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2003.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2003.java
new file mode 100644
index 000000000..e56f1908e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2003.java
@@ -0,0 +1,18 @@
+package wiki_in;
+
+public class A_test2003 {
+
+	int field= 0;
+
+	void fun() {
+		int i= 0;
+		/*[*/
+		if (field == 1) {
+			i= 1;
+			System.out.println("i, field == " + i + ", " + field);
+		} else {
+			System.out.println("i, field == " + i + ", " + field);
+		}
+		/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2004.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2004.java
new file mode 100644
index 000000000..4078d56be
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2004.java
@@ -0,0 +1,16 @@
+package wiki_in;
+
+public class A_test2004 {
+
+	int field= 0;
+
+	void fun() {
+		int i= 0;
+		while (field < 2) {
+			field++;
+			/*[*/
+			System.out.println("i, field == " + i++ +", " + field);
+			/*]*/
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2005.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2005.java
new file mode 100644
index 000000000..1fcf97c9b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_in/A_test2005.java
@@ -0,0 +1,18 @@
+package wiki_in;
+
+import java.io.IOException;
+
+public class A_test2005 {
+
+	static void fun() throws IOException {
+	}
+
+	public static void main(String args[]) {
+		try {
+			/*[*/
+			fun();
+			/*]*/
+		} catch (Exception e) {
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2001.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2001.java
new file mode 100644
index 000000000..f0fe986bc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2001.java
@@ -0,0 +1,19 @@
+package wiki_out;
+
+public class A_test2001 {
+
+	int field= 0;
+
+	void fun() {
+		int i;
+		extracted();
+	}
+
+	protected void extracted() {
+		int i;
+		/*[*/
+		i= 0;
+		System.out.println("i, field == " + i++ +", " + field);
+		/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2002.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2002.java
new file mode 100644
index 000000000..b235ac3e6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2002.java
@@ -0,0 +1,17 @@
+package wiki_out;
+
+public class A_test2002 {
+
+	int field= 0;
+	void fun() {
+		int i= 0;
+		i = extracted(i);
+		System.out.println("i == " + i);
+	}
+	protected int extracted(int i) {
+		/*[*/
+		System.out.println("i, field == " + i++ +", " + field);
+		/*]*/
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2003.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2003.java
new file mode 100644
index 000000000..54a875656
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2003.java
@@ -0,0 +1,22 @@
+package wiki_out;
+
+public class A_test2003 {
+
+	int field= 0;
+
+	void fun() {
+		int i= 0;
+		extracted(i);
+	}
+
+	protected void extracted(int i) {
+		/*[*/
+		if (field == 1) {
+			i= 1;
+			System.out.println("i, field == " + i + ", " + field);
+		} else {
+			System.out.println("i, field == " + i + ", " + field);
+		}
+		/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2004.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2004.java
new file mode 100644
index 000000000..05fd90f90
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2004.java
@@ -0,0 +1,21 @@
+package wiki_out;
+
+public class A_test2004 {
+
+	int field= 0;
+
+	void fun() {
+		int i= 0;
+		while (field < 2) {
+			field++;
+			i = extracted(i);
+		}
+	}
+
+	protected int extracted(int i) {
+		/*[*/
+		System.out.println("i, field == " + i++ +", " + field);
+		/*]*/
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2005.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2005.java
new file mode 100644
index 000000000..de527bc12
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/wiki_out/A_test2005.java
@@ -0,0 +1,22 @@
+package wiki_out;
+
+import java.io.IOException;
+
+public class A_test2005 {
+
+	static void fun() throws IOException {
+	}
+
+	public static void main(String args[]) {
+		try {
+			extracted();
+		} catch (Exception e) {
+		}
+	}
+
+	protected static void extracted() throws IOException {
+		/*[*/
+		fun();
+		/*]*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/in/A.java
new file mode 100644
index 000000000..2e133d955
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/in/A.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+}
+class B extends A{
+	void m(){}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/out/A.java
new file mode 100644
index 000000000..30d404606
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/out/A.java
@@ -0,0 +1,5 @@
+package p;
+class A{
+}
+class B extends Z{
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/out/Z.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/out/Z.java
new file mode 100644
index 000000000..88c536303
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test0/out/Z.java
@@ -0,0 +1,8 @@
+package p;
+public class Z extends A {
+	public Z() {
+		super();
+	}
+
+	void m() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/in/A.java
new file mode 100644
index 000000000..556eb4231
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/in/A.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	A(int i) {}
+}
+class B extends A{
+	B(int i) { super(i); }
+	void m(){}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/out/A.java
new file mode 100644
index 000000000..e25b69b0b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/out/A.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	A(int i) {}
+}
+class B extends Z{
+	B(int i) { super(i); }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/out/Z.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/out/Z.java
new file mode 100644
index 000000000..f48c0529e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test1/out/Z.java
@@ -0,0 +1,8 @@
+package p;
+public class Z extends A {
+	public Z(int i) {
+		super(i);
+	}
+
+	void m() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/in/A.java
new file mode 100644
index 000000000..71ea2d9fe
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/in/A.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+}
+class B extends A{
+	void m(){}
+	void n() {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/out/A.java
new file mode 100644
index 000000000..30d404606
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/out/A.java
@@ -0,0 +1,5 @@
+package p;
+class A{
+}
+class B extends Z{
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/out/Z.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/out/Z.java
new file mode 100644
index 000000000..175619cbc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test2/out/Z.java
@@ -0,0 +1,10 @@
+package p;
+public class Z extends A {
+	public Z() {
+		super();
+	}
+
+	void m() {}
+
+	void n() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/in/A.java
new file mode 100644
index 000000000..f7efed7f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/in/A.java
@@ -0,0 +1,7 @@
+package p;
+abstract class A{
+}
+class B extends A{
+	void m(){}
+	void n() {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/out/A.java
new file mode 100644
index 000000000..222e270df
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/out/A.java
@@ -0,0 +1,5 @@
+package p;
+abstract class A{
+}
+class B extends Z{
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/out/Z.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/out/Z.java
new file mode 100644
index 000000000..d715cb2f9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test3/out/Z.java
@@ -0,0 +1,10 @@
+package p;
+public abstract class Z extends A {
+	public Z() {
+		super();
+	}
+
+	void m() {}
+
+	void n() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/in/A.java
new file mode 100644
index 000000000..2277d3b3e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/in/A.java
@@ -0,0 +1,8 @@
+package p;
+abstract class A{
+	A(int i) {}
+}
+class B extends A{
+	B(int i) { super(i); }
+	void m(){}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/out/A.java
new file mode 100644
index 000000000..21661db6a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/out/A.java
@@ -0,0 +1,7 @@
+package p;
+abstract class A{
+	A(int i) {}
+}
+class B extends Z{
+	B(int i) { super(i); }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/out/Z.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/out/Z.java
new file mode 100644
index 000000000..6eabf9c6f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/test4/out/Z.java
@@ -0,0 +1,8 @@
+package p;
+public abstract class Z extends A {
+	public Z(int i) {
+		super(i);
+	}
+
+	void m() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/in/A.java
new file mode 100644
index 000000000..ec68627a6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/in/A.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+}
+class B {
+	private void m() {}
+    public void bar() {m();}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/out/A.java
new file mode 100644
index 000000000..a0214cd7f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/out/A.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+}
+class B extends Z {
+	public void bar() {m();}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/out/Z.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/out/Z.java
new file mode 100644
index 000000000..d834ac91d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractSupertype/testBug151683/out/Z.java
@@ -0,0 +1,8 @@
+package p;
+public class Z {
+	public Z() {
+		super();
+	}
+
+	protected void m() {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_in.java
new file mode 100644
index 000000000..b49e01026
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_out.java
new file mode 100644
index 000000000..90eaa1024
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test0_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(int i){
+		int temp= 0;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test100_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test100_in.java
new file mode 100644
index 000000000..a9b9d1bd4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test100_in.java
@@ -0,0 +1,8 @@
+package p; //5, 28, 5, 40
+
+class A {
+	{
+		System.err.println(new Object()instanceof Object);
+		System.err.println(new Object()/**/instanceof Object);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test100_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test100_out.java
new file mode 100644
index 000000000..0d4aa2c54
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test100_out.java
@@ -0,0 +1,9 @@
+package p; //5, 28, 5, 40
+
+class A {
+	{
+		Object temp= new Object();
+		System.err.println(temp instanceof Object);
+		System.err.println(temp/**/instanceof Object);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test101_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test101_in.java
new file mode 100644
index 000000000..bd430424b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test101_in.java
@@ -0,0 +1,11 @@
+package p; //9, 13, 9, 25
+
+import java.util.ArrayList;
+
+class A {
+	{
+		ArrayList list= new ArrayList();
+		for (int i= 0; i < 10; i++)
+			list.get(i);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test101_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test101_out.java
new file mode 100644
index 000000000..ca8f8572f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test101_out.java
@@ -0,0 +1,12 @@
+package p; //9, 13, 9, 25
+
+import java.util.ArrayList;
+
+class A {
+	{
+		ArrayList list= new ArrayList();
+		for (int i= 0; i < 10; i++) {
+			Object temp= list.get(i);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test102_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test102_in.java
new file mode 100644
index 000000000..72ad2f8e3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test102_in.java
@@ -0,0 +1,12 @@
+package p; //9, 24, 9, 29
+
+import java.util.ArrayList;
+
+class A {
+	private void foo(int i) {
+		switch (i) {
+			case 2:
+				int x= 9 + i;
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test102_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test102_out.java
new file mode 100644
index 000000000..e3064c8f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test102_out.java
@@ -0,0 +1,13 @@
+package p; //9, 24, 9, 29
+
+import java.util.ArrayList;
+
+class A {
+	private void foo(int i) {
+		switch (i) {
+			case 2:
+				int temp= 9 + i;
+				int x= temp;
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test103_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test103_in.java
new file mode 100644
index 000000000..f41d14b49
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test103_in.java
@@ -0,0 +1,11 @@
+package p; //7, 21, 7, 33
+
+enum A {
+	X;
+	{
+		if (true)
+			switch (valueOf("X")) {
+				
+			}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test103_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test103_out.java
new file mode 100644
index 000000000..fb3cdae29
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test103_out.java
@@ -0,0 +1,13 @@
+package p; //7, 21, 7, 33
+
+enum A {
+	X;
+	{
+		if (true) {
+			A temp= valueOf("X");
+			switch (temp) {
+				
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_in.java
new file mode 100644
index 000000000..b4d0cbd54
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	int m(int y){
+		while(y==0){
+			int x= 1 + 2;
+		}
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_out.java
new file mode 100644
index 000000000..8d610a0c3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test10_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	int m(int y){
+		int temp= 1 + 2;
+		while(y==0){
+			int x= temp;
+		}
+		return temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_in.java
new file mode 100644
index 000000000..a2ba64abc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	int m(int y){
+		do{
+			int x= 1 + 2;
+		} while(y==0);
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_out.java
new file mode 100644
index 000000000..ef4264aad
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test11_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	int m(int y){
+		int temp= 1 + 2;
+		do{
+			int x= temp;
+		} while(y==0);
+		return temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_in.java
new file mode 100644
index 000000000..2a1b58d36
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	int m(int y){
+		{
+		 int x= 1 + 2;
+		}
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_out.java
new file mode 100644
index 000000000..f2c09fff7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test12_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	int m(int y){
+		int temp= 1 + 2;
+		{
+		 int x= temp;
+		}
+		return temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_in.java
new file mode 100644
index 000000000..06d276fd5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_in.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.ArrayList;
+
+class A{
+	int m(int y){
+		int e= new ArrayList().iterator().hashCode();
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_out.java
new file mode 100644
index 000000000..6552bb206
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test13_out.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+class A{
+	int m(int y){
+		Iterator temp= new ArrayList().iterator();
+		int e= temp.hashCode();
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_in.java
new file mode 100644
index 000000000..95e7fdb7d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_in.java
@@ -0,0 +1,9 @@
+package p;
+
+class A{
+	int m(int y){
+		while(y==0)
+			m(1 + 2);
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_out.java
new file mode 100644
index 000000000..bf74f1f26
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test14_out.java
@@ -0,0 +1,11 @@
+package p;

+

+class A{

+	int m(int y){

+		while(y==0) {

+			int temp= 1 + 2;

+			m(temp);

+		}

+		return 1 + 2;

+	}

+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_in.java
new file mode 100644
index 000000000..ad9a09eb2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_in.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	int m(int y){
+		while(y==0)
+			while(y==0)
+				while(y==0) 
+					m(1 + 2);
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_out.java
new file mode 100644
index 000000000..a5f3e047c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test15_out.java
@@ -0,0 +1,12 @@
+package p;

+class A{

+	int m(int y){

+		while(y==0)

+			while(y==0)

+				while(y==0) {

+					int temp= 1 + 2;

+					m(temp);

+				}

+		return 1 + 2;

+	}

+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_in.java
new file mode 100644
index 000000000..24587e7f7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_in.java
@@ -0,0 +1,11 @@
+package p;
+class A{
+	int m(int y){
+		while(y==0){
+			while(y==0)
+				while(y==0)
+					m(1 + 2);
+		}
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_out.java
new file mode 100644
index 000000000..3eb93224f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test16_out.java
@@ -0,0 +1,13 @@
+package p;

+class A{

+	int m(int y){

+		while(y==0){

+			while(y==0)

+				while(y==0) {

+					int temp= 1 + 2;

+					m(temp);

+				}

+		}

+		return 1 + 2;

+	}

+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_in.java
new file mode 100644
index 000000000..1031cf446
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_in.java
@@ -0,0 +1,11 @@
+package p;
+class A{
+	void m(){
+		{
+			int i= 1 + 2;
+		}
+		{
+			int i= 1 + 2;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_out.java
new file mode 100644
index 000000000..1f280d81f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test17_out.java
@@ -0,0 +1,12 @@
+package p;
+class A{
+	void m(){
+		int temp= 1 + 2;
+		{
+			int i= temp;
+		}
+		{
+			int i= temp;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_in.java
new file mode 100644
index 000000000..9fb2c987a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_in.java
@@ -0,0 +1,15 @@
+package p;
+class A{
+	int m(int y){
+		m(0);
+		{
+			int x= 1 + 2;
+		}
+		{
+			{
+				int x= 1 + 2;
+			}
+		}
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_out.java
new file mode 100644
index 000000000..a1627c6dd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test18_out.java
@@ -0,0 +1,16 @@
+package p;
+class A{
+	int m(int y){
+		m(0);
+		int temp= 1 + 2;
+		{
+			int x= temp;
+		}
+		{
+			{
+				int x= temp;
+			}
+		}
+		return temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_in.java
new file mode 100644
index 000000000..87976fd2d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_in.java
@@ -0,0 +1,11 @@
+package p;
+class A{
+	void m(int i){
+		if (f() == 0){
+			int t= f();
+		}
+	}
+	int f(){
+		return 5;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_out.java
new file mode 100644
index 000000000..301d1ed25
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test19_out.java
@@ -0,0 +1,12 @@
+package p;
+class A{
+	void m(int i){
+		int temp= f();
+		if (temp == 0){
+			int t= temp;
+		}
+	}
+	int f(){
+		return 5;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_in.java
new file mode 100644
index 000000000..b49e01026
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_out.java
new file mode 100644
index 000000000..90eaa1024
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test1_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(int i){
+		int temp= 0;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_in.java
new file mode 100644
index 000000000..45f1b712f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_in.java
@@ -0,0 +1,7 @@
+package p;
+class T {
+	int r(){return 4;}
+	void f(){
+		r();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_out.java
new file mode 100644
index 000000000..233ae438c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test20_out.java
@@ -0,0 +1,7 @@
+package p;
+class T {
+	int r(){return 4;}
+	void f(){
+		int temp= r();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_in.java
new file mode 100644
index 000000000..1a076d1bf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int f;
+	void m(int i){
+		int x= f;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_out.java
new file mode 100644
index 000000000..8f7a8c06b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test21_out.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int f;
+	void m(int i){
+		int temp= f;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_in.java
new file mode 100644
index 000000000..ab4dc5b30
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_in.java
@@ -0,0 +1,9 @@
+package p;
+class T {
+	int r(){return 4;}
+	void f(){
+		{
+			r();
+		}	
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_out.java
new file mode 100644
index 000000000..102b63323
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test22_out.java
@@ -0,0 +1,9 @@
+package p;
+class T {
+	int r(){return 4;}
+	void f(){
+		{
+			int temp= r();
+		}	
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_in.java
new file mode 100644
index 000000000..d0d19e34e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	int r(){return 4;}
+	boolean b(){return true;}
+	void f(int fd){
+		do {
+		} while(b());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_out.java
new file mode 100644
index 000000000..c3af20822
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test23_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	int r(){return 4;}
+	boolean b(){return true;}
+	void f(int fd){
+		boolean temp= b();
+		do {
+		} while(temp);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_in.java
new file mode 100644
index 000000000..b49e01026
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_out.java
new file mode 100644
index 000000000..90eaa1024
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test24_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(int i){
+		int temp= 0;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_in.java
new file mode 100644
index 000000000..2052c0aef
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	boolean f(){
+		return (1 + 1 == 1 + 1);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_out.java
new file mode 100644
index 000000000..1ea95d0d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test25_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	boolean f(){
+		int temp= 1 + 1;
+		return (temp == temp);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_in.java
new file mode 100644
index 000000000..7b57dda72
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_in.java
@@ -0,0 +1,10 @@
+package p;
+class A {
+	void f(){
+		try{
+			int j=0 +0;
+		} finally {
+			int j=0 +0;
+		}
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_out.java
new file mode 100644
index 000000000..194f19eb3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test26_out.java
@@ -0,0 +1,11 @@
+package p;
+class A {
+	void f(){
+		int temp= 0 +0;
+		try{
+			int j=temp;
+		} finally {
+			int j=temp;
+		}
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_in.java
new file mode 100644
index 000000000..3d56e9840
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 0+0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_out.java
new file mode 100644
index 000000000..fb111515e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test27_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(int i){
+		int temp= 0+0;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_in.java
new file mode 100644
index 000000000..27ccd7908
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	boolean m(){
+		return a().length != 3;
+	}
+	int[] a(){
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_out.java
new file mode 100644
index 000000000..850bf4041
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test28_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	boolean m(){
+		boolean temp= a().length != 3;
+		return temp;
+	}
+	int[] a(){
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_in.java
new file mode 100644
index 000000000..a5793502f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_in.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void f(){
+		String f= "k";
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_out.java
new file mode 100644
index 000000000..907f09e59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test29_out.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+	void f(){
+		String temp= "k";
+		String f= temp;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_in.java
new file mode 100644
index 000000000..b49e01026
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_out.java
new file mode 100644
index 000000000..e0472933a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test2_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(int i){
+		final int temp= 0;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_in.java
new file mode 100644
index 000000000..1f7cbd181
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	static final int FF= 2;
+	void f(){
+		int t= A.FF;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_out.java
new file mode 100644
index 000000000..fd329feb5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test30_out.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	static final int FF= 2;
+	void f(){
+		int temp= A.FF;
+		int t= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_in.java
new file mode 100644
index 000000000..e7dd7d6b8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void f(){
+		int i;
+		int y= i =1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_out.java
new file mode 100644
index 000000000..5980b1a9a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test31_out.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	void f(){
+		int i;
+		int temp= i =1;
+		int y= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_in.java
new file mode 100644
index 000000000..cb4def567
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void f(int i){
+		int y= (i= 1) + 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_out.java
new file mode 100644
index 000000000..b54729077
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test32_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void f(int i){
+		int temp= i= 1;
+		int y= temp + 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_in.java
new file mode 100644
index 000000000..5de9404a5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_in.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void m(){
+		Object u= new Object(){};
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_out.java
new file mode 100644
index 000000000..07de4719b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test33_out.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+	void m(){
+		Object temp= new Object(){};
+		Object u= temp;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_in.java
new file mode 100644
index 000000000..697251b11
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_in.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void m(){
+		Object a= new java.util.ArrayList(){};
+	}
+} 
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_out.java
new file mode 100644
index 000000000..251119005
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test34_out.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+	void m(){
+		java.util.ArrayList temp= new java.util.ArrayList(){};
+		Object a= temp;
+	}
+} 
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_in.java
new file mode 100644
index 000000000..78cb2db91
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_in.java
@@ -0,0 +1,15 @@
+package p;
+
+import java.util.List;
+
+class A {
+	void f(){
+		C b= new C();
+		Object x= b.lists();
+	}
+} 
+class C{
+	public List[] lists(){
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_out.java
new file mode 100644
index 000000000..54ecb2bb3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test35_out.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.List;
+
+class A {
+	void f(){
+		C b= new C();
+		List[] temp= b.lists();
+		Object x= temp;
+	}
+} 
+class C{
+	public List[] lists(){
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_in.java
new file mode 100644
index 000000000..7be7a8020
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_in.java
@@ -0,0 +1,14 @@
+package p;
+
+
+class Test {
+
+  public int[] foo() {
+    return null;
+  }  
+  
+  public void bar(Test test) {
+    int[] i = test.foo(); // refactor this
+  }
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_out.java
new file mode 100644
index 000000000..51c30174b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test36_out.java
@@ -0,0 +1,15 @@
+package p;
+
+
+class Test {
+
+  public int[] foo() {
+    return null;
+  }  
+  
+  public void bar(Test test) {
+    int[] temp= test.foo();
+	int[] i = temp; // refactor this
+  }
+
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_in.java
new file mode 100644
index 000000000..48441fc67
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_in.java
@@ -0,0 +1,11 @@
+package p;
+class A {
+	void f(int i) {
+		if (i == 0) {
+			int temp= 0;
+		}
+		if (i == 1) {
+			int x= 0 + 0;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_out.java
new file mode 100644
index 000000000..70b064ab5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test37_out.java
@@ -0,0 +1,12 @@
+package p;
+class A {
+	void f(int i) {
+		if (i == 0) {
+			int temp= 0;
+		}
+		if (i == 1) {
+			int temp= 0 + 0;
+			int x= temp;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_in.java
new file mode 100644
index 000000000..b6325aca8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	private static void foo() {
+		int temp= 4;
+		System.out.println(temp);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_out.java
new file mode 100644
index 000000000..1ec04cbf2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test38_out.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	private static void foo() {
+		int temp= 4;
+		int temp1= temp;
+		System.out.println(temp1);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_in.java
new file mode 100644
index 000000000..6dc1bad09
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	public Object foo(String text) {
+		if (((Object)null).toString() == null) {
+			return (Object)null;
+		}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_out.java
new file mode 100644
index 000000000..763b58f24
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test39_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	public Object foo(String text) {
+		Object temp= (Object)null;
+		if (temp.toString() == null) {
+			return temp;
+		}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_in.java
new file mode 100644
index 000000000..b49e01026
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_out.java
new file mode 100644
index 000000000..e0472933a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test3_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(int i){
+		final int temp= 0;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_in.java
new file mode 100644
index 000000000..875e18053
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void f(){
+		new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_out.java
new file mode 100644
index 000000000..5067667a9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test40_out.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void f(){
+		A temp= new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_in.java
new file mode 100644
index 000000000..411b0ec0f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	int f(){
+		new String("fred").length();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_out.java
new file mode 100644
index 000000000..1e91d7075
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test41_out.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	int f(){
+		int temp= new String("fred").length();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_in.java
new file mode 100644
index 000000000..1754f84f7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_in.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int getLength(){return 0;}
+	int f(){
+		int i= new A().getLength();
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_out.java
new file mode 100644
index 000000000..f22f05540
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test42_out.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	int getLength(){return 0;}
+	int f(){
+		int temp= new A().getLength();
+		int i= temp;
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_in.java
new file mode 100644
index 000000000..dace8a7f3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_in.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	boolean isFred(){return false;}
+	int f(){
+		boolean i= new A().isFred();
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_out.java
new file mode 100644
index 000000000..aea56c5fd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test43_out.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	boolean isFred(){return false;}
+	int f(){
+		boolean temp= new A().isFred();
+		boolean i= temp;
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_in.java
new file mode 100644
index 000000000..76b3b7cce
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	boolean isFred(){return false;}
+	int f(){
+		boolean i= isFred();
+		isFred();
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_out.java
new file mode 100644
index 000000000..46707d056
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test44_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	boolean isFred(){return false;}
+	int f(){
+		boolean temp= isFred();
+		boolean i= temp;
+		isFred();
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_in.java
new file mode 100644
index 000000000..4ea20cd89
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_in.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	int f(){
+		int t= f();
+		f();
+		return 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_out.java
new file mode 100644
index 000000000..037d1e79f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test45_out.java
@@ -0,0 +1,9 @@
+package p;
+class A {
+	int f(){
+		int temp= f();
+		int t= temp;
+		f();
+		return 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_in.java
new file mode 100644
index 000000000..479d52b54
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_in.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	int f(){
+		f();
+		int u= f();
+		return 0;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_out.java
new file mode 100644
index 000000000..27e827d91
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test46_out.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	int f(){
+		int temp= f();
+		int u= temp;
+		return 0;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_in.java
new file mode 100644
index 000000000..45f1b712f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_in.java
@@ -0,0 +1,7 @@
+package p;
+class T {
+	int r(){return 4;}
+	void f(){
+		r();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_out.java
new file mode 100644
index 000000000..b3d22d889
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test47_out.java
@@ -0,0 +1,7 @@
+package p;
+class T {
+	int r(){return 4;}
+	void f(){
+		int temp= r();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_in.java
new file mode 100644
index 000000000..352bdaacf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_in.java
@@ -0,0 +1,6 @@
+package p;
+class T {
+	public String toString() {
+		return super.toString() + new Integer(1).toString();	
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_out.java
new file mode 100644
index 000000000..41ec83ca9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test48_out.java
@@ -0,0 +1,7 @@
+package p;
+class T {
+	public String toString() {
+		String temp= super.toString();
+		return temp + new Integer(1).toString();	
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_in.java
new file mode 100644
index 000000000..2ca0166b9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_in.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	void f(boolean flag){
+		for (int i= 0; i < 10; i++) {
+			f(i==1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_out.java
new file mode 100644
index 000000000..cd01cd629
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test49_out.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	void f(boolean flag){
+		for (int i= 0; i < 10; i++) {
+			boolean temp= i==1;
+			f(temp);
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_in.java
new file mode 100644
index 000000000..b6585d61b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int m(int i){
+		int x= 1 + 2;
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_out.java
new file mode 100644
index 000000000..d2b9d849e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test4_out.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int m(int i){
+		int temp= 1 + 2;
+		int x= temp;
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_in.java
new file mode 100644
index 000000000..015488707
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_in.java
@@ -0,0 +1,11 @@
+package p;
+class A{
+	void f(boolean flag){
+		for (int i= 0; i < 10; i++) {
+			f(i==1);
+		}
+		for (int i= 0; i < 10; i++) {
+			f(i==1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_out.java
new file mode 100644
index 000000000..be22200f4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test50_out.java
@@ -0,0 +1,12 @@
+package p;
+class A{
+	void f(boolean flag){
+		for (int i= 0; i < 10; i++) {
+			boolean temp= i==1;
+			f(temp);
+		}
+		for (int i= 0; i < 10; i++) {
+			f(i==1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_in.java
new file mode 100644
index 000000000..cb1dd9b6b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	void f(boolean flag){
+		if (flag){
+			f(3+5==8); 
+		} else 
+			f(3+5!=8); 
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_out.java
new file mode 100644
index 000000000..cb15af22a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test51_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	void f(boolean flag){
+		int temp= 3+5;
+		if (flag){
+			f(temp==8); 
+		} else 
+			f(temp!=8); 
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_in.java
new file mode 100644
index 000000000..34d9bba1f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_in.java
@@ -0,0 +1,24 @@
+package p;
+
+import java.math.BigDecimal;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.Vector;
+
+class A {
+	private SortedMap fillSortedMap(Vector values, boolean byValue) {
+		TreeMap map= new TreeMap();
+		for (int i= 0; i < values.size(); i += 2) {
+			if (byValue) {
+				map.put(
+					values.get(i + 1),
+					new Integer(((BigDecimal) values.get(i)).intValue()));
+			} else {
+				map.put(
+					new Integer(((BigDecimal) values.get(i)).intValue()),
+					values.get(i + 1));
+			}
+		}
+		return map;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_out.java
new file mode 100644
index 000000000..e74c63ffb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test52_out.java
@@ -0,0 +1,25 @@
+package p;
+
+import java.math.BigDecimal;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.Vector;
+
+class A {
+	private SortedMap fillSortedMap(Vector values, boolean byValue) {
+		TreeMap map= new TreeMap();
+		for (int i= 0; i < values.size(); i += 2) {
+			Object valueOnIndexI= values.get(i);
+			if (byValue) {
+				map.put(
+					values.get(i + 1),
+					new Integer(((BigDecimal) valueOnIndexI).intValue()));
+			} else {
+				map.put(
+					new Integer(((BigDecimal) valueOnIndexI).intValue()),
+					values.get(i + 1));
+			}
+		}
+		return map;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_in.java
new file mode 100644
index 000000000..ec4735408
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_in.java
@@ -0,0 +1,9 @@
+// 6, 17 -> 6, 22
+package p;
+
+class A {
+	void foob() {
+		int e= (2 + 2) * 3 * 1;
+		int c= 2 + 2 * 4 + (28 + 2 + 2) + 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_out.java
new file mode 100644
index 000000000..82582fbd5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test53_out.java
@@ -0,0 +1,10 @@
+// 6, 17 -> 6, 22
+package p;
+
+class A {
+	void foob() {
+		int temp= 2 + 2;
+		int e= temp * 3 * 1;
+		int c= 2 + 2 * 4 + (28 + temp) + 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_in.java
new file mode 100644
index 000000000..3d72343fc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_in.java
@@ -0,0 +1,10 @@
+// 6, 37 -> 6, 43
+package p;
+
+class A {
+	void foob() {
+		int e= (2 + 2) * (27 + 2 * (2+2* 4+1*2));
+		
+		int c= 3 * (2 + 1) + 2 + 2 * 4 + 28;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_out.java
new file mode 100644
index 000000000..263cf5f68
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test54_out.java
@@ -0,0 +1,11 @@
+// 6, 37 -> 6, 43
+package p;
+
+class A {
+	void foob() {
+		int temp= 2+2* 4;
+		int e= (2 + 2) * (27 + 2 * (temp + 1*2));
+		
+		int c= 3 * (2 + 1) + temp + 28;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_in.java
new file mode 100644
index 000000000..105114fb9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_in.java
@@ -0,0 +1,9 @@
+// 6, 19 -> 6, 24
+package p;
+
+class A {
+	void foob() {
+		int f= 5 *3*  1 *(1 + 1);		
+		int e= (2 + 2) * 3 * 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_out.java
new file mode 100644
index 000000000..f60ce2d9a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test55_out.java
@@ -0,0 +1,10 @@
+// 6, 19 -> 6, 24
+package p;
+
+class A {
+	void foob() {
+		int temp= 3*  1;
+		int f= 5 * temp * (1 + 1);		
+		int e= (2 + 2) * temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_in.java
new file mode 100644
index 000000000..87db857f0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_in.java
@@ -0,0 +1,10 @@
+// 6, 24 -> 6, 29
+package p;
+
+class A {
+	void foob() {
+		int a= 2 * 3 + 3 + 1;
+
+		int b= (3 + 1) + 1*1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_out.java
new file mode 100644
index 000000000..713854068
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test56_out.java
@@ -0,0 +1,11 @@
+// 6, 24 -> 6, 29
+package p;
+
+class A {
+	void foob() {
+		int temp= 3 + 1;
+		int a= 2 * 3 + temp;
+
+		int b= temp + 1*1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_in.java
new file mode 100644
index 000000000..de863abf3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_in.java
@@ -0,0 +1,10 @@
+// 8, 30 -> 8, 54
+package p;
+
+
+class A {
+	private void test() {
+        String fdFontName= null;
+        String tmpFileName = "/tmp"+fdFontName+".cff"+".txt";
+    }	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_out.java
new file mode 100644
index 000000000..17e888786
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test57_out.java
@@ -0,0 +1,11 @@
+// 8, 30 -> 8, 54
+package p;
+
+
+class A {
+	private void test() {
+        String fdFontName= null;
+        String newVariable= "/tmp"+fdFontName+".cff";
+		String tmpFileName = newVariable + ".txt";
+    }	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_in.java
new file mode 100644
index 000000000..e5bccf3c3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_in.java
@@ -0,0 +1,9 @@
+//7, 14 -> 7, 30
+package p;
+
+class A {
+	private void foo() {
+		Object str= null; 
+		if(! str.equals(null));
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_out.java
new file mode 100644
index 000000000..ecc1a1adb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test58_out.java
@@ -0,0 +1,10 @@
+//7, 14 -> 7, 30
+package p;
+
+class A {
+	private void foo() {
+		Object str= null; 
+		boolean temp= str.equals(null);
+		if(! temp);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_in.java
new file mode 100644
index 000000000..92d3e264a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_in.java
@@ -0,0 +1,9 @@
+//7, 17 -> 7, 18
+package p;
+
+class A {
+	private void foo() {
+		int s= 0;
+		int z= +s;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_out.java
new file mode 100644
index 000000000..530e6b9a1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test59_out.java
@@ -0,0 +1,10 @@
+//7, 17 -> 7, 18
+package p;
+
+class A {
+	private void foo() {
+		int s= 0;
+		int temp= s;
+		int z= +temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_in.java
new file mode 100644
index 000000000..b6585d61b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int m(int i){
+		int x= 1 + 2;
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_out.java
new file mode 100644
index 000000000..32e6cb193
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test5_out.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int m(int i){
+		int temp= 1 + 2;
+		int x= temp;
+		return temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_in.java
new file mode 100644
index 000000000..c83e913f9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_in.java
@@ -0,0 +1,9 @@
+//7, 17 -> 7, 18
+package p;
+
+class A {
+	private void foo() {
+		int s= 0;
+		int z= -s;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_out.java
new file mode 100644
index 000000000..8b9382ca3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test60_out.java
@@ -0,0 +1,10 @@
+//7, 17 -> 7, 18
+package p;
+
+class A {
+	private void foo() {
+		int s= 0;
+		int temp= s;
+		int z= -temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_in.java
new file mode 100644
index 000000000..4d7b9b250
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_in.java
@@ -0,0 +1,9 @@
+//7, 17 -> 7, 18
+package p;
+
+class A {
+	private void foo() {
+		int s= 0;
+		int z= ~s;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_out.java
new file mode 100644
index 000000000..abe61ae0a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test61_out.java
@@ -0,0 +1,10 @@
+//7, 17 -> 7, 18
+package p;
+
+class A {
+	private void foo() {
+		int s= 0;
+		int temp= s;
+		int z= ~temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_in.java
new file mode 100644
index 000000000..edce7b77f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_in.java
@@ -0,0 +1,15 @@
+package p;//10, 17 - 10, 28
+
+
+class A  {
+	void f() {
+		String x;
+		boolean test= false, test2= false, test3= false;
+		if (test) {
+		} else if (test2) {
+			x = "ExtractMe";
+		} else if (test3) {
+			x = "ExtractMe";
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_out.java
new file mode 100644
index 000000000..69051d900
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test62_out.java
@@ -0,0 +1,18 @@
+package p;//10, 17 - 10, 28
+
+
+class A  {
+	void f() {
+		String x;
+		boolean test= false, test2= false, test3= false;
+		if (test) {
+		} else {
+			String temp= "ExtractMe";
+			if (test2) {
+				x = temp;
+			} else if (test3) {
+				x = temp;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_in.java
new file mode 100644
index 000000000..893bf8d05
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_in.java
@@ -0,0 +1,14 @@
+package p;//9, 20 - 9, 23
+
+
+class A  {
+	void f() {
+		String x;
+		if (true)
+			try{
+				x= "i";
+			} catch (Exception e){
+				x= "i";
+			}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_out.java
new file mode 100644
index 000000000..c3c1e941d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test63_out.java
@@ -0,0 +1,16 @@
+package p;//9, 20 - 9, 23
+
+
+class A  {
+	void f() {
+		String x;
+		if (true) {
+			String temp= "i";
+			try{
+				x= temp;
+			} catch (Exception e){
+				x= temp;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_in.java
new file mode 100644
index 000000000..7ba78c402
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_in.java
@@ -0,0 +1,14 @@
+package p;//10, 17 - 10, 28
+
+
+class A  {
+	void f() {
+		String x;
+		boolean test= false, test2= false, test3= false;
+		if (test) {
+		} else if (test2)
+			x = "ExtractMe";
+		else if (test3)
+			x = "ExtractMe";
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_out.java
new file mode 100644
index 000000000..14fa94153
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test64_out.java
@@ -0,0 +1,17 @@
+package p;//10, 17 - 10, 28
+
+
+class A  {
+	void f() {
+		String x;
+		boolean test= false, test2= false, test3= false;
+		if (test) {
+		} else {
+			String temp= "ExtractMe";
+			if (test2)
+				x = temp;
+			else if (test3)
+				x = temp;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_in.java
new file mode 100644
index 000000000..fa45f1248
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_in.java
@@ -0,0 +1,8 @@
+package p;//6, 19 - 6, 22
+
+
+class A  {
+	void f(String bar) {
+		String x= bar;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_out.java
new file mode 100644
index 000000000..5035ca3b8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test65_out.java
@@ -0,0 +1,9 @@
+package p;//6, 19 - 6, 22
+
+
+class A  {
+	void f(String bar) {
+		String temp= bar;
+		String x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_in.java
new file mode 100644
index 000000000..7b51a58cd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_in.java
@@ -0,0 +1,10 @@
+package p; //7, 32 - 7, 33
+
+class A {
+	void f(String bar) {
+		try {
+		} catch (Exception e) {
+			Exception another= e;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_out.java
new file mode 100644
index 000000000..f47735f35
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test66_out.java
@@ -0,0 +1,11 @@
+package p; //7, 32 - 7, 33
+
+class A {
+	void f(String bar) {
+		try {
+		} catch (Exception e) {
+			Exception temp= e;
+			Exception another= temp;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_in.java
new file mode 100644
index 000000000..202b4a274
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_in.java
@@ -0,0 +1,8 @@
+package p; //6, 16 - 6, 21
+
+class A {
+	void f() {
+		Integer[] is= null;
+		int k= is[0].intValue();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_out.java
new file mode 100644
index 000000000..8b9ceecad
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test67_out.java
@@ -0,0 +1,9 @@
+package p; //6, 16 - 6, 21
+
+class A {
+	void f() {
+		Integer[] is= null;
+		Integer temp= is[0];
+		int k= temp.intValue();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_in.java
new file mode 100644
index 000000000..a5416269b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_in.java
@@ -0,0 +1,8 @@
+package p; //6, 14 - 6, 21
+
+class A {
+	void f() {
+		class D{}
+		D d= new D();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_out.java
new file mode 100644
index 000000000..c2707541e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test68_out.java
@@ -0,0 +1,9 @@
+package p; //6, 14 - 6, 21
+
+class A {
+	void f() {
+		class D{}
+		D temp= new D();
+		D d= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_in.java
new file mode 100644
index 000000000..7730f6651
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_in.java
@@ -0,0 +1,7 @@
+package p; //5, 24 - 5, 26
+
+class A {
+	void f() {
+		String string= "";
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_out.java
new file mode 100644
index 000000000..b3af49e21
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test69_out.java
@@ -0,0 +1,8 @@
+package p; //5, 24 - 5, 26
+
+class A {
+	void f() {
+		String temp= "";
+		String string= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_in.java
new file mode 100644
index 000000000..b6585d61b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int m(int i){
+		int x= 1 + 2;
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_out.java
new file mode 100644
index 000000000..4d6f43d52
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test6_out.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int m(int i){
+		final int temp= 1 + 2;
+		int x= temp;
+		return temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_in.java
new file mode 100644
index 000000000..6e68bfe48
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_in.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	void f() {
+		StringBuffer buf= new StringBuffer();
+		String[] strings= new String[] {"A", "B", "C", "D"};
+		for (int i= 0; i < strings.length; i++) {
+			buf.append(strings[i]);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_out.java
new file mode 100644
index 000000000..2de227f14
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test70_out.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	void f() {
+		StringBuffer buf= new StringBuffer();
+		String[] strings= new String[] {"A", "B", "C", "D"};
+		final int temp= strings.length;
+		for (int i= 0; i < temp; i++) {
+			buf.append(strings[i]);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_in.java
new file mode 100644
index 000000000..6e68bfe48
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_in.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	void f() {
+		StringBuffer buf= new StringBuffer();
+		String[] strings= new String[] {"A", "B", "C", "D"};
+		for (int i= 0; i < strings.length; i++) {
+			buf.append(strings[i]);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_out.java
new file mode 100644
index 000000000..8437eb73b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test71_out.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	void f() {
+		StringBuffer buf= new StringBuffer();
+		String[] strings= new String[] {"A", "B", "C", "D"};
+		for (int i= 0; i < strings.length; i++) {
+			String temp= strings[i];
+			buf.append(temp);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_in.java
new file mode 100644
index 000000000..6e68bfe48
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_in.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	void f() {
+		StringBuffer buf= new StringBuffer();
+		String[] strings= new String[] {"A", "B", "C", "D"};
+		for (int i= 0; i < strings.length; i++) {
+			buf.append(strings[i]);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_out.java
new file mode 100644
index 000000000..ed0b76739
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test72_out.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	void f() {
+		StringBuffer buf= new StringBuffer();
+		String[] strings= new String[] {"A", "B", "C", "D"};
+		for (int i= 0; i < strings.length; i++) {
+			int temp= i;
+			buf.append(strings[temp]);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_in.java
new file mode 100644
index 000000000..865abff59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_in.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			for (int k= 0, p= 17; p < i; k++) {
+				System.out.println(i++ + " " + k);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_out.java
new file mode 100644
index 000000000..b2396598f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test73_out.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			int temp= i;
+			for (int k= 0, p= 17; p < temp; k++) {
+				System.out.println(i++ + " " + k);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_in.java
new file mode 100644
index 000000000..865abff59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_in.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			for (int k= 0, p= 17; p < i; k++) {
+				System.out.println(i++ + " " + k);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_out.java
new file mode 100644
index 000000000..5ab30c79c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test74_out.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			for (int k= 0, p= 17; p < i; k++) {
+				String temp= i++ + " " + k;
+				System.out.println(temp);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_in.java
new file mode 100644
index 000000000..865abff59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_in.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			for (int k= 0, p= 17; p < i; k++) {
+				System.out.println(i++ + " " + k);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_out.java
new file mode 100644
index 000000000..1c6ec5bff
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test75_out.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			for (int k= 0, p= 17; p < i; k++) {
+				int temp= i++;
+				System.out.println(temp + " " + k);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_in.java
new file mode 100644
index 000000000..865abff59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_in.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			for (int k= 0, p= 17; p < i; k++) {
+				System.out.println(i++ + " " + k);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_out.java
new file mode 100644
index 000000000..7eb5a62c2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test76_out.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			for (int k= 0, p= 17; p < i; k++) {
+				int temp= k;
+				System.out.println(i++ + " " + temp);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_in.java
new file mode 100644
index 000000000..d0b47f19d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_in.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	int f(int i) {
+		return i;
+	}
+
+	int f1(int is) {
+		for (f(9), f(8);;) {
+			f(9);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_out.java
new file mode 100644
index 000000000..d5825bbbe
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test77_out.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	int f(int i) {
+		return i;
+	}
+
+	int f1(int is) {
+		for (f(9), f(8);;) {
+			int temp= f(9);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_in.java
new file mode 100644
index 000000000..86ea429bd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_in.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	void f() {
+		Object obj= getO() != null
+				? getO()
+				: new Object();
+	}
+	static Object getO() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_out.java
new file mode 100644
index 000000000..98e3f7cf8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test78_out.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	void f() {
+		Object o2= getO();
+		Object obj= o2 != null
+				? o2
+				: new Object();
+	}
+	static Object getO() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_in.java
new file mode 100644
index 000000000..bb0c81812
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_in.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	String fName;
+	/**
+	 * Override to run the test and assert its state.
+	 * @exception Throwable if any exception is thrown
+	 */
+	protected void runTest() throws Throwable {
+		System.out.println("Method \""+fName+"\" not found");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_out.java
new file mode 100644
index 000000000..9deca3983
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test79_out.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	String fName;
+	/**
+	 * Override to run the test and assert its state.
+	 * @exception Throwable if any exception is thrown
+	 */
+	protected void runTest() throws Throwable {
+		String strong= fName+"\" not found";
+		System.out.println("Method \"" + strong);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_in.java
new file mode 100644
index 000000000..b6585d61b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int m(int i){
+		int x= 1 + 2;
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_out.java
new file mode 100644
index 000000000..4eb519449
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test7_out.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int m(int i){
+		final int temp= 1 + 2;
+		int x= temp;
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_in.java
new file mode 100644
index 000000000..4a68c49fa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_in.java
@@ -0,0 +1,7 @@
+package p;
+
+class A {
+	static {
+		System.out.println("Hello "+" World");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_out.java
new file mode 100644
index 000000000..0089c73df
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test80_out.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	static {
+		String name= " World";
+		System.out.println("Hello "+name);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_in.java
new file mode 100644
index 000000000..6e0a88179
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_in.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	public static final int CONST= 17;
+	Test(int num) {}
+	void run() {
+		new Test(CONST);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_out.java
new file mode 100644
index 000000000..7431a6a41
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test81_out.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	public static final int CONST= 17;
+	Test(int num) {}
+	void run() {
+		int k= CONST;
+		new Test(k);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_in.java
new file mode 100644
index 000000000..98467e22a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_in.java
@@ -0,0 +1,7 @@
+//5, 1 -> 6, 1
+package p;
+class A {
+	void m() {
+		new Integer(1); //Extract Local Variable
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_out.java
new file mode 100644
index 000000000..9f3d80c0c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test82_out.java
@@ -0,0 +1,7 @@
+//5, 1 -> 6, 1
+package p;
+class A {
+	void m() {
+		Integer one= new Integer(1); //Extract Local Variable
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test83_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test83_in.java
new file mode 100644
index 000000000..6f44f5115
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test83_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	enum TEST {
+		PROBE;
+	}
+	void m(int i){
+		TEST x= TEST.PROBE;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test83_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test83_out.java
new file mode 100644
index 000000000..cad02e5f7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test83_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	enum TEST {
+		PROBE;
+	}
+	void m(int i){
+		A.TEST temp= TEST.PROBE;
+		TEST x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test84_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test84_in.java
new file mode 100644
index 000000000..b7d243d35
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test84_in.java
@@ -0,0 +1,7 @@
+package p;
+enum A{
+	TEST;
+	void m(int i){
+		int x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test84_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test84_out.java
new file mode 100644
index 000000000..074830084
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test84_out.java
@@ -0,0 +1,8 @@
+package p;
+enum A{
+	TEST;
+	void m(int i){
+		int temp= 0;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test85_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test85_in.java
new file mode 100644
index 000000000..829fb928e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test85_in.java
@@ -0,0 +1,17 @@
+package p;
+public class A<T> {
+    enum TEST {
+        FIRST, SECOND
+    }
+    void foo() {
+        B<T> b= getB();
+    }
+    B<T> getB() {
+        A.TEST test= TEST.FIRST;
+        return null;
+    }
+    void bar() {
+        A<String> s= new A<String>();
+        A<T> a= new A<T>();
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test85_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test85_out.java
new file mode 100644
index 000000000..6ee636b6d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test85_out.java
@@ -0,0 +1,18 @@
+package p;
+public class A<T> {
+    enum TEST {
+        FIRST, SECOND
+    }
+    void foo() {
+        B<T> b= getB();
+    }
+    B<T> getB() {
+        final A.TEST test2= TEST.FIRST;
+        A.TEST test= test2;
+        return null;
+    }
+    void bar() {
+        A<String> s= new A<String>();
+        A<T> a= new A<T>();
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test86_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test86_in.java
new file mode 100644
index 000000000..829fb928e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test86_in.java
@@ -0,0 +1,17 @@
+package p;
+public class A<T> {
+    enum TEST {
+        FIRST, SECOND
+    }
+    void foo() {
+        B<T> b= getB();
+    }
+    B<T> getB() {
+        A.TEST test= TEST.FIRST;
+        return null;
+    }
+    void bar() {
+        A<String> s= new A<String>();
+        A<T> a= new A<T>();
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test86_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test86_out.java
new file mode 100644
index 000000000..4e88ecadf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test86_out.java
@@ -0,0 +1,18 @@
+package p;
+public class A<T> {
+    enum TEST {
+        FIRST, SECOND
+    }
+    void foo() {
+        B<T> b= getB();
+    }
+    B<T> getB() {
+        A.TEST test= TEST.FIRST;
+        return null;
+    }
+    void bar() {
+        final A<String> name= new A<String>();
+		A<String> s= name;
+        A<T> a= new A<T>();
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test87_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test87_in.java
new file mode 100644
index 000000000..829fb928e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test87_in.java
@@ -0,0 +1,17 @@
+package p;
+public class A<T> {
+    enum TEST {
+        FIRST, SECOND
+    }
+    void foo() {
+        B<T> b= getB();
+    }
+    B<T> getB() {
+        A.TEST test= TEST.FIRST;
+        return null;
+    }
+    void bar() {
+        A<String> s= new A<String>();
+        A<T> a= new A<T>();
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test87_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test87_out.java
new file mode 100644
index 000000000..d13e1de5a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test87_out.java
@@ -0,0 +1,18 @@
+package p;
+public class A<T> {
+    enum TEST {
+        FIRST, SECOND
+    }
+    void foo() {
+        B<T> b= getB();
+    }
+    B<T> getB() {
+        A.TEST test= TEST.FIRST;
+        return null;
+    }
+    void bar() {
+        A<String> s= new A<String>();
+        final A<T> a2= new A<T>();
+		A<T> a= a2;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test88_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test88_in.java
new file mode 100644
index 000000000..3fa8d6163
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test88_in.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.List;
+
+public class A {
+    public List<?> foo() {
+        return null;
+    }
+    
+    void take(List<?> a) {
+        
+    }
+    void bar() {
+        take(foo());
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test88_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test88_out.java
new file mode 100644
index 000000000..05217e6b5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test88_out.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.List;
+
+public class A {
+    public List<?> foo() {
+        return null;
+    }
+    
+    void take(List<?> a) {
+        
+    }
+    void bar() {
+        List<?> foo= foo();
+		take(foo);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test89_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test89_in.java
new file mode 100644
index 000000000..53fc8413c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test89_in.java
@@ -0,0 +1,17 @@
+// 15, 7, 15, 15
+package p;
+
+import a.A;
+
+class C
+{
+   b.A method()
+   {
+      return new b.A();
+   }
+   
+   void failHere()
+   {
+      method(); //extract local variable here
+   }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test89_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test89_out.java
new file mode 100644
index 000000000..94ae0794f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test89_out.java
@@ -0,0 +1,17 @@
+// 15, 7, 15, 15
+package p;
+
+import a.A;
+
+class C
+{
+   b.A method()
+   {
+      return new b.A();
+   }
+   
+   void failHere()
+   {
+      b.A foo= method(); //extract local variable here
+   }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_in.java
new file mode 100644
index 000000000..4ae9a41ea
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	int m(){
+		for (int i= 0; i==0;){
+			int x= 1 + 2;
+		}
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_out.java
new file mode 100644
index 000000000..ce86a2e33
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test8_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	int m(){
+		int temp= 1 + 2;
+		for (int i= 0; i==0;){
+			int x= temp;
+		}
+		return temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test90_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test90_in.java
new file mode 100644
index 000000000..c4efd856d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test90_in.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.ArrayList;
+
+public class A {
+	public void foo() {
+		ArrayList<? extends Number> nl= new ArrayList<Integer>();
+		Number n= nl.get(0);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test90_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test90_out.java
new file mode 100644
index 000000000..8fe845e02
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test90_out.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.ArrayList;
+
+public class A {
+	public void foo() {
+		ArrayList<? extends Number> nl= new ArrayList<Integer>();
+		Number temp= nl.get(0);
+		Number n= temp;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test91_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test91_in.java
new file mode 100644
index 000000000..5a6aa3b23
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test91_in.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.ArrayList;
+
+public class A {
+	public void foo() {
+		ArrayList<? super Integer> nl= new ArrayList<Integer>();
+		Object o= nl.get(0);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test91_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test91_out.java
new file mode 100644
index 000000000..8430a44f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test91_out.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.ArrayList;
+
+public class A {
+	public void foo() {
+		ArrayList<? super Integer> nl= new ArrayList<Integer>();
+		Object temp= nl.get(0);
+		Object o= temp;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test92_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test92_in.java
new file mode 100644
index 000000000..01429dfb6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test92_in.java
@@ -0,0 +1,14 @@
+package p;
+
+import static java.util.Arrays.*;
+
+class Bug {
+	final static String[] side = new String[0];
+	{
+		if (true) {
+			System.out.println(asList(side));
+		} else {
+			System.out.println(asList(side));
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test92_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test92_out.java
new file mode 100644
index 000000000..b3bf38a10
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test92_out.java
@@ -0,0 +1,17 @@
+package p;
+
+import static java.util.Arrays.*;
+
+import java.util.List;
+
+class Bug {
+	final static String[] side = new String[0];
+	{
+		List<String> asList= asList(side);
+		if (true) {
+			System.out.println(asList);
+		} else {
+			System.out.println(asList);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test93_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test93_in.java
new file mode 100644
index 000000000..1c80d3779
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test93_in.java
@@ -0,0 +1,10 @@
+//6, 28, 6, 34
+package p;
+
+class A {
+	{
+		System.out.println("blah");
+
+		for (int i=
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test93_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test93_out.java
new file mode 100644
index 000000000..64b417f3b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test93_out.java
@@ -0,0 +1,11 @@
+//6, 28, 6, 34
+package p;
+
+class A {
+	{
+		String bla= "blah";
+		System.out.println(bla);
+
+		for (int i=
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test94_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test94_in.java
new file mode 100644
index 000000000..4175a0725
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test94_in.java
@@ -0,0 +1,12 @@
+package p;
+
+public class A {
+
+	protected void primExecute() {
+		this.toString();
+	}
+
+	if (image != null) {
+		Object loc = null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test94_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test94_out.java
new file mode 100644
index 000000000..d9135b435
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test94_out.java
@@ -0,0 +1,12 @@
+package p;
+
+public class A {
+
+	protected void primExecute() {
+		String temp= this.toString();
+	}
+
+	if (image != null) {
+		Object loc = null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test95_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test95_in.java
new file mode 100644
index 000000000..4fe819309
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test95_in.java
@@ -0,0 +1,8 @@
+package p; //5, 23, 5, 33
+
+class A {
+	{
+		do{boolean x= this!=null ;} // LINE 2
+		while(this!=null);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test95_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test95_out.java
new file mode 100644
index 000000000..54b3b3590
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test95_out.java
@@ -0,0 +1,9 @@
+package p; //5, 23, 5, 33
+
+class A {
+	{
+		boolean temp= this!=null;
+		do{boolean x= temp ;} // LINE 2
+		while(temp);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test96_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test96_in.java
new file mode 100644
index 000000000..bb2fa45c8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test96_in.java
@@ -0,0 +1,8 @@
+package p; //6, 32, 6, 37
+
+class A {
+	private void method() {
+		for (int i = 0; i < 5; i++)
+			System.out.println(i * i);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test96_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test96_out.java
new file mode 100644
index 000000000..c6abbbdf2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test96_out.java
@@ -0,0 +1,10 @@
+package p; //6, 32, 6, 37
+
+class A {
+	private void method() {
+		for (int i = 0; i < 5; i++) {
+			int isquared= i * i;
+			System.out.println(isquared);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test97_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test97_in.java
new file mode 100644
index 000000000..e2d345ad4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test97_in.java
@@ -0,0 +1,12 @@
+package p; //10, 32, 10, 47
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+class A {
+	void m(Vector v) {
+		Enumeration e= v.elements(); 
+		while (e.hasMoreElements())
+			System.out.println(e.nextElement());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test97_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test97_out.java
new file mode 100644
index 000000000..3cafb812c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test97_out.java
@@ -0,0 +1,14 @@
+package p; //10, 32, 10, 47
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+class A {
+	void m(Vector v) {
+		Enumeration e= v.elements(); 
+		while (e.hasMoreElements()) {
+			Object temp= e.nextElement();
+			System.out.println(temp);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test98_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test98_in.java
new file mode 100644
index 000000000..feecab1cf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test98_in.java
@@ -0,0 +1,10 @@
+package p; //8, 32, 8, 44
+
+import java.util.Collection;
+
+class A {
+	private void test(Collection c) {
+		for (Object o : c)
+			System.out.println(o.toString());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test98_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test98_out.java
new file mode 100644
index 000000000..ab2c560f1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test98_out.java
@@ -0,0 +1,12 @@
+package p; //8, 32, 8, 44
+
+import java.util.Collection;
+
+class A {
+	private void test(Collection c) {
+		for (Object o : c) {
+			final String temp= o.toString();
+			System.out.println(temp);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test99_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test99_in.java
new file mode 100644
index 000000000..d40c1a80b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test99_in.java
@@ -0,0 +1,11 @@
+package p; //7, 32, 7, 36
+
+import java.util.*;
+
+class A<E> extends ArrayList<E> {
+	void inspect() {
+		for (Iterator<E> iter= this.iterator(); iter.hasNext();) {
+			iter.next();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test99_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test99_out.java
new file mode 100644
index 000000000..15aca1b75
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test99_out.java
@@ -0,0 +1,12 @@
+package p; //7, 32, 7, 36
+
+import java.util.*;
+
+class A<E> extends ArrayList<E> {
+	void inspect() {
+		A<E> temp= this;
+		for (Iterator<E> iter= temp.iterator(); iter.hasNext();) {
+			iter.next();
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_in.java
new file mode 100644
index 000000000..4ae9a41ea
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_in.java
@@ -0,0 +1,9 @@
+package p;
+class A{
+	int m(){
+		for (int i= 0; i==0;){
+			int x= 1 + 2;
+		}
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_out.java
new file mode 100644
index 000000000..755762457
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_test9_out.java
@@ -0,0 +1,10 @@
+package p;
+class A{
+	int m(){
+		for (int i= 0; i==0;){
+			int temp= 1 + 2;
+			int x= temp;
+		}
+		return 1 + 2;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_in.java
new file mode 100644
index 000000000..161a7989f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 100;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_out.java
new file mode 100644
index 000000000..7a7ef9e96
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/canExtract/A_testZeroLengthSelection0_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(int i){
+		int temp= 100;
+		int x= temp;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail0.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail0.java
new file mode 100644
index 000000000..35aed6192
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail0.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(){
+		int temp;
+		int i= 1;
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail1.java
new file mode 100644
index 000000000..ec66930f4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail1.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int m(int y){
+		m(y);
+		m(y);
+		return y;
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail10.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail10.java
new file mode 100644
index 000000000..de4ed23b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail10.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void f(){
+		Object[] i= new Object[]{this};
+	}
+}}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail11.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail11.java
new file mode 100644
index 000000000..306ebbd3e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail11.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void f(){
+		A i= new A();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail12.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail12.java
new file mode 100644
index 000000000..63cf080c0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail12.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void f(int i){
+		int y= i == 3 ? 2: 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail13.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail13.java
new file mode 100644
index 000000000..e7dd7d6b8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail13.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void f(){
+		int i;
+		int y= i =1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail14.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail14.java
new file mode 100644
index 000000000..cb4def567
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail14.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void f(int i){
+		int y= (i= 1) + 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail15.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail15.java
new file mode 100644
index 000000000..a5793502f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail15.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void f(){
+		String f= "k";
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail16.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail16.java
new file mode 100644
index 000000000..45f1b712f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail16.java
@@ -0,0 +1,7 @@
+package p;
+class T {
+	int r(){return 4;}
+	void f(){
+		r();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail17.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail17.java
new file mode 100644
index 000000000..ab4dc5b30
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail17.java
@@ -0,0 +1,9 @@
+package p;
+class T {
+	int r(){return 4;}
+	void f(){
+		{
+			r();
+		}	
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail18.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail18.java
new file mode 100644
index 000000000..7ccf3cb18
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail18.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	void m(){
+		for (int k= 0, i= k; k< 10; k++){
+		}
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail19.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail19.java
new file mode 100644
index 000000000..f70aa6791
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail19.java
@@ -0,0 +1,9 @@
+package p;
+
+class A{
+	int temp;
+	void m(){
+		int i= 10;
+		temp= 0;
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail2.java
new file mode 100644
index 000000000..682ef4b1a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail2.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	int m(int y){
+		int y= m(i);
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail20.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail20.java
new file mode 100644
index 000000000..c4bc61a42
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail20.java
@@ -0,0 +1,5 @@
+class A {
+	void f(){
+		throw new NullPointerException();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail22.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail22.java
new file mode 100644
index 000000000..8493af5cb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail22.java
@@ -0,0 +1,7 @@
+package p;
+
+public class A {
+	void f(){
+		f();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail23.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail23.java
new file mode 100644
index 000000000..2907d4b65
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail23.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+    void f(){
+        int a= 0;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail24.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail24.java
new file mode 100644
index 000000000..a648eacbf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail24.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+    void f(){
+        int a= 0;
+        a= 0;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail25.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail25.java
new file mode 100644
index 000000000..b49e01026
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail25.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail26.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail26.java
new file mode 100644
index 000000000..70bde9cd0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail26.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		class Local{}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail27.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail27.java
new file mode 100644
index 000000000..310ac3006
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail27.java
@@ -0,0 +1,13 @@
+// 7, 13 -> 7, 24
+package p;
+
+class A {
+	public boolean fState= false;
+	public void foo() {
+		if (this.fState) {
+			this.fState= false;
+		} else {
+			this.fState= this.fState;
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail28.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail28.java
new file mode 100644
index 000000000..4925fb2ce
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail28.java
@@ -0,0 +1,20 @@
+// 7, 17 -> 7, 28
+package p;
+
+class A {
+	public int fState= 0;
+	public void foo() {
+		fState= this.fState;
+		fState= fState;
+		this.fState= this.fState;
+		this.fState= fState;
+		this.fState++;
+		this.fState--;
+		fState++;
+		fState--;
+		if (fState++ == 0)	return;
+		if (fState-- == 0)	return;
+		if (this.fState++ == 0)	return;
+		if (this.fState-- == 0)	return;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail29.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail29.java
new file mode 100644
index 000000000..5374eab0a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail29.java
@@ -0,0 +1,8 @@
+package p;
+
+class A{
+	void f(){
+		for (int i = 0; i < 1; i++) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail3.java
new file mode 100644
index 000000000..457fb89c7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail3.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	int m(int y){
+		int y= m(y);
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail30.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail30.java
new file mode 100644
index 000000000..5374eab0a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail30.java
@@ -0,0 +1,8 @@
+package p;
+
+class A{
+	void f(){
+		for (int i = 0; i < 1; i++) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail31.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail31.java
new file mode 100644
index 000000000..735beb6f8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail31.java
@@ -0,0 +1,8 @@
+package p;
+
+class A{
+	void f(){
+		for (int i= 0, k= 17; k < 1; i++) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail32.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail32.java
new file mode 100644
index 000000000..865abff59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail32.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+	void f(){
+		for (int i= 0; i < 5; i++) {
+			for (int k= 0, p= 17; p < i; k++) {
+				System.out.println(i++ + " " + k);
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail33.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail33.java
new file mode 100644
index 000000000..d21fd18ec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail33.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	void f(int is) {
+		int i= 0;
+		for (;; i= 0) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail34.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail34.java
new file mode 100644
index 000000000..28706079e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail34.java
@@ -0,0 +1,12 @@
+package p;
+
+class A {
+	int f(int i) {
+		return i;
+	}
+
+	int f1(int is) {
+		for (f(9), f(8);;) {
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail35.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail35.java
new file mode 100644
index 000000000..bb51ecf18
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail35.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	public static final int CONST= 17;
+	void run() {
+		System.out.println(Test.CONST);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail36.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail36.java
new file mode 100644
index 000000000..851d8901c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail36.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	int field= 17;
+	void run() {
+		System.out.println(this.field);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail37.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail37.java
new file mode 100644
index 000000000..d5d734a12
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail37.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	void run() {
+		System.out.println(Other.Inner.CONST_INNER);
+	}
+}
+
+class Other {
+	static class Inner {
+		public static final int CONST_INNER= 18;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail38.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail38.java
new file mode 100644
index 000000000..ab7e837cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail38.java
@@ -0,0 +1,7 @@
+package p;
+
+public class A {
+        void m(@SuppressWarnings({"unused", "bla"}) int arg) {
+                int local;
+        }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail4.java
new file mode 100644
index 000000000..e24b7a116
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail4.java
@@ -0,0 +1,7 @@
+//void expression
+package p;
+class A{
+	void m(){
+		m();
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail5.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail5.java
new file mode 100644
index 000000000..f9c530de2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail5.java
@@ -0,0 +1,5 @@
+package p;
+class A{
+	int y= 1+2;
+	int u= y;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail6.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail6.java
new file mode 100644
index 000000000..21773cc90
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail6.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	A(){
+		this(1 + 1);
+	}
+	A(int y){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail7.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail7.java
new file mode 100644
index 000000000..fda6605dc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail7.java
@@ -0,0 +1,9 @@
+package p;
+class A extends B{
+	A(){
+		super(1 + 1);
+	}
+}
+class B{
+	B(int y){}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail8.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail8.java
new file mode 100644
index 000000000..1f7cbd181
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail8.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	static final int FF= 2;
+	void f(){
+		int t= A.FF;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail9.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail9.java
new file mode 100644
index 000000000..1e55f44b5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractTemp/cannotExtract/A_testFail9.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void f(){
+		Object i= null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext0.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext0.java
new file mode 100644
index 000000000..0e4f1bbb5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext0.java
@@ -0,0 +1,35 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+
+	void f2(){
+	
+	}
+}
+  
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext1.java
new file mode 100644
index 000000000..0e4f1bbb5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext1.java
@@ -0,0 +1,35 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+
+	void f2(){
+	
+	}
+}
+  
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext2.java
new file mode 100644
index 000000000..0e4f1bbb5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext2.java
@@ -0,0 +1,35 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+
+	void f2(){
+	
+	}
+}
+  
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext3.java
new file mode 100644
index 000000000..220f149b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testNext3.java
@@ -0,0 +1,31 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious0.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious0.java
new file mode 100644
index 000000000..220f149b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious0.java
@@ -0,0 +1,31 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious1.java
new file mode 100644
index 000000000..220f149b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious1.java
@@ -0,0 +1,31 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious2.java
new file mode 100644
index 000000000..220f149b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious2.java
@@ -0,0 +1,31 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious3.java
new file mode 100644
index 000000000..220f149b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious3.java
@@ -0,0 +1,31 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious4.java
new file mode 100644
index 000000000..220f149b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious4.java
@@ -0,0 +1,31 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious5.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious5.java
new file mode 100644
index 000000000..a7b2e345b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious5.java
@@ -0,0 +1,35 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+
+	void f2(){
+	
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious6.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious6.java
new file mode 100644
index 000000000..0e4f1bbb5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/GoToNextPreviousMemberAction/A_testPrevious6.java
@@ -0,0 +1,35 @@
+package p;
+
+
+class A {
+	class T{
+	
+	}
+	
+	void f(){
+	
+	}
+	
+	{
+		
+		
+	}
+	
+	int fg;
+
+	static {
+	
+	}
+	
+	/**
+	 * 
+	 */	
+	void f1(){
+	
+	}
+
+	void f2(){
+	
+	}
+}
+  
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCUInferFromCast/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCUInferFromCast/in/A.java
new file mode 100644
index 000000000..aa4878a4c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCUInferFromCast/in/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.Enumeration;
+
+public class A {
+	private void createTestList(TestCollector collector) {
+		Enumeration each= collector.collectTests();
+		while (each.hasMoreElements()) {
+			String s= (String) each.nextElement();
+		}
+	}
+}
+
+interface TestCollector {
+	public Enumeration collectTests();
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCUInferFromCast/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCUInferFromCast/out/A.java
new file mode 100644
index 000000000..0bb18646a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCUInferFromCast/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.Enumeration;
+
+public class A {
+	private void createTestList(TestCollector collector) {
+		Enumeration<String> each= collector.collectTests();
+		while (each.hasMoreElements()) {
+			String s= each.nextElement();
+		}
+	}
+}
+
+interface TestCollector {
+	public Enumeration<String> collectTests();
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddAll/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddAll/in/A.java
new file mode 100644
index 000000000..5523fb36a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddAll/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+import java.util.Vector;
+
+class A {
+    void m() {
+        Vector vector = new Vector();
+        vector.add("Hello");
+        Vector v2= new Vector();
+        v2.add((CharSequence) null);
+        v2.addAll(vector);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddAll/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddAll/out/A.java
new file mode 100644
index 000000000..8928d8e02
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddAll/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+import java.util.Vector;
+
+class A {
+    void m() {
+        Vector<String> vector = new Vector<String>();
+        vector.add("Hello");
+        Vector<CharSequence> v2= new Vector<CharSequence>();
+        v2.add((CharSequence) null);
+        v2.addAll(vector);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetIterator/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetIterator/in/A.java
new file mode 100644
index 000000000..6e9524a0d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetIterator/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+class A {
+	void foo() {
+		List l= new ArrayList();
+		l.add("Eclipse"); l.add("is"); l.add(new String("cool"));
+		for (Iterator iter= l.iterator(); iter.hasNext();) {
+			String word= (String) iter.next();
+			System.out.print(word);
+			System.out.print(" ");
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetIterator/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetIterator/out/A.java
new file mode 100644
index 000000000..af1f2ceac
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetIterator/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+class A {
+	void foo() {
+		List<String> l= new ArrayList<String>();
+		l.add("Eclipse"); l.add("is"); l.add(new String("cool"));
+		for (Iterator<String> iter= l.iterator(); iter.hasNext();) {
+			String word= iter.next();
+			System.out.print(word);
+			System.out.print(" ");
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetString/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetString/in/A.java
new file mode 100644
index 000000000..397cf4922
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetString/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List l= new ArrayList();
+		l.add("Eclipse");
+		String eclipse= (String) l.get(0);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetString/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetString/out/A.java
new file mode 100644
index 000000000..fb52de4b8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddGetString/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List<String> l= new ArrayList<String>();
+		l.add("Eclipse");
+		String eclipse= l.get(0);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddIntegerGetNumber/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddIntegerGetNumber/in/A.java
new file mode 100644
index 000000000..6d6127ccb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddIntegerGetNumber/in/A.java
@@ -0,0 +1,18 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List l= new ArrayList();
+		l.add(new Integer(1));
+		Number n= (Number) l.get(0);
+		Object o1= (Number) l.get(0);
+		Object o2= l.get(0);
+		
+		List l2= new ArrayList();
+		l2.add(n);
+		Integer i= (Integer) l2.get(0);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddIntegerGetNumber/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddIntegerGetNumber/out/A.java
new file mode 100644
index 000000000..3bea6226c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddIntegerGetNumber/out/A.java
@@ -0,0 +1,18 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List<Integer> l= new ArrayList<Integer>();
+		l.add(new Integer(1));
+		Number n= l.get(0);
+		Object o1= l.get(0);
+		Object o2= l.get(0);
+		
+		List<Number> l2= new ArrayList<Number>();
+		l2.add(n);
+		Integer i= (Integer) l2.get(0);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString/in/A.java
new file mode 100644
index 000000000..cf08e44a8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List l= new ArrayList();
+		l.add(new String());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString/out/A.java
new file mode 100644
index 000000000..909aff469
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List<String> l= new ArrayList<String>();
+		l.add(new String());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString2/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString2/in/A.java
new file mode 100644
index 000000000..7f0337f6e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString2/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.AbstractList;
+
+class A {
+	void foo() {
+		AbstractList l= new ArrayList();
+		l.add(new String());
+		l.add("");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString2/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString2/out/A.java
new file mode 100644
index 000000000..d6d3f2fb3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddString2/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.AbstractList;
+
+class A {
+	void foo() {
+		AbstractList<String> l= new ArrayList<String>();
+		l.add(new String());
+		l.add("");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringInteger/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringInteger/in/A.java
new file mode 100644
index 000000000..adc96646e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringInteger/in/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A {
+	void foo() {
+		List l= new ArrayList();
+		l.add("Eclipse");
+		l.add(new Integer(10));
+		bar(l);
+	}
+	void bar(Object o) {
+		((List)o).add(new A());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringInteger/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringInteger/out/A.java
new file mode 100644
index 000000000..e4e64fb25
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringInteger/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class A {
+	void foo() {
+		List<Serializable> l= new ArrayList<Serializable>();
+		l.add("Eclipse");
+		l.add(new Integer(10));
+		bar(l);
+	}
+	void bar(Object o) {
+		((List)o).add(new A());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringIntegerA/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringIntegerA/in/A.java
new file mode 100644
index 000000000..563cd6dd7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringIntegerA/in/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A {
+	void foo() {
+		List l= new ArrayList();
+		l.add("Eclipse");
+		l.add(new Integer(10));
+		bar(l);
+	}
+	void bar(List l) {
+		l.add(new A());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringIntegerA/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringIntegerA/out/A.java
new file mode 100644
index 000000000..1ba5e99b4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAddStringIntegerA/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A {
+	void foo() {
+		List<Object> l= new ArrayList<Object>();
+		l.add("Eclipse");
+		l.add(new Integer(10));
+		bar(l);
+	}
+	void bar(List<Object> l) {
+		l.add(new A());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAnonymous01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAnonymous01/in/A.java
new file mode 100644
index 000000000..a0c2bfbc3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAnonymous01/in/A.java
@@ -0,0 +1,54 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+class Qualified {
+	String qualifier;
+	String name;
+}
+
+class Comparisons {
+	ArrayList fList= new ArrayList();
+	
+	void add(Qualified q) {
+		fList.add(q);
+	}
+	
+	void sort() {
+		Collections.sort(fList, new Comparator() {
+			public int compare(Object o1, Object o2) {
+				Qualified q1= (Qualified) o1;
+				Qualified q2= (Qualified) o2;
+				int qualifierComp = q1.qualifier.compareTo(q2.qualifier);
+				if (qualifierComp != 0)
+					return qualifierComp;
+				else
+					return q1.name.compareTo(q2.name);
+			}
+		});
+	}
+}
+
+class Comparisons2 {
+	ArrayList fList= new ArrayList();
+	
+	void add(Qualified q) {
+		fList.add(q);
+	}
+	
+	void sort() {
+		Collections.sort(fList, new Comparator() {
+			public int compare(Object o1, Object o2) {
+				Qualified q1= (Qualified) o1;
+				Qualified q2= (Qualified) o2;
+				int qualifierComp = q1.qualifier.compareTo(q2.qualifier);
+				if (qualifierComp != 0)
+					return qualifierComp;
+				else
+					return q1.name.compareTo(q2.name);
+			}
+		});
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAnonymous01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAnonymous01/out/A.java
new file mode 100644
index 000000000..17b237a86
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuAnonymous01/out/A.java
@@ -0,0 +1,54 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+class Qualified {
+	String qualifier;
+	String name;
+}
+
+class Comparisons {
+	ArrayList<Qualified> fList= new ArrayList<Qualified>();
+	
+	void add(Qualified q) {
+		fList.add(q);
+	}
+	
+	void sort() {
+		Collections.sort(fList, new Comparator() {
+			public int compare(Object o1, Object o2) {
+				Qualified q1= (Qualified) o1;
+				Qualified q2= (Qualified) o2;
+				int qualifierComp = q1.qualifier.compareTo(q2.qualifier);
+				if (qualifierComp != 0)
+					return qualifierComp;
+				else
+					return q1.name.compareTo(q2.name);
+			}
+		});
+	}
+}
+
+class Comparisons2 {
+	ArrayList<Qualified> fList= new ArrayList<Qualified>();
+	
+	void add(Qualified q) {
+		fList.add(q);
+	}
+	
+	void sort() {
+		Collections.sort(fList, new Comparator() {
+			public int compare(Object o1, Object o2) {
+				Qualified q1= (Qualified) o1;
+				Qualified q2= (Qualified) o2;
+				int qualifierComp = q1.qualifier.compareTo(q2.qualifier);
+				if (qualifierComp != 0)
+					return qualifierComp;
+				else
+					return q1.name.compareTo(q2.name);
+			}
+		});
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays01/in/A.java
new file mode 100644
index 000000000..f71a39763
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays01/in/A.java
@@ -0,0 +1,20 @@
+package p;
+
+import java.util.Arrays;
+import java.util.List;
+
+class A {
+	List l= null; 
+	
+	void add(String s) {
+		l.add(s);
+	}
+	
+	void addAll(String[] ss) {
+		l.addAll(Arrays.asList(ss));
+	}
+	
+	String[] get() {
+		return (String[])l.toArray(new String[l.size()]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays01/out/A.java
new file mode 100644
index 000000000..463571df7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays01/out/A.java
@@ -0,0 +1,20 @@
+package p;
+
+import java.util.Arrays;
+import java.util.List;
+
+class A {
+	List<String> l= null; 
+	
+	void add(String s) {
+		l.add(s);
+	}
+	
+	void addAll(String[] ss) {
+		l.addAll(Arrays.asList(ss));
+	}
+	
+	String[] get() {
+		return l.toArray(new String[l.size()]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays02/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays02/in/A.java
new file mode 100644
index 000000000..7360c6d05
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays02/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.Arrays;
+import java.util.List;
+
+class A {
+	void addAll(String[] ss) {
+		List l= Arrays.asList(ss);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays02/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays02/out/A.java
new file mode 100644
index 000000000..5ac53d490
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays02/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.Arrays;
+import java.util.List;
+
+class A {
+	void addAll(String[] ss) {
+		List<String> l= Arrays.asList(ss);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays03/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays03/in/A.java
new file mode 100644
index 000000000..83caed800
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays03/in/A.java
@@ -0,0 +1,18 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void addAll(String[] ss) {
+		List l= A.asList(ss);
+	}
+	
+	public static <T> List<T> asList(T[] a) {
+		ArrayList<T> res= new ArrayList<T>();
+		for (int i= 0; i < a.length; i++) {
+			res.add(a[i]);
+		}
+		return res;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays03/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays03/out/A.java
new file mode 100644
index 000000000..00cf50d83
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays03/out/A.java
@@ -0,0 +1,18 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void addAll(String[] ss) {
+		List<String> l= A.asList(ss);
+	}
+	
+	public static <T> List<T> asList(T[] a) {
+		ArrayList<T> res= new ArrayList<T>();
+		for (int i= 0; i < a.length; i++) {
+			res.add(a[i]);
+		}
+		return res;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays04/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays04/in/A.java
new file mode 100644
index 000000000..6f68dedef
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays04/in/A.java
@@ -0,0 +1,18 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void addAll(String[] ss) {
+		List l= A.asList(ss);
+	}
+	
+	public static <T> List<T> asList(T... a) {
+		ArrayList<T> res= new ArrayList<T>();
+		for (int i= 0; i < a.length; i++) {
+			res.add(a[i]);
+		}
+		return res;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays04/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays04/out/A.java
new file mode 100644
index 000000000..5391e0b16
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays04/out/A.java
@@ -0,0 +1,18 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void addAll(String[] ss) {
+		List<String> l= A.asList(ss);
+	}
+	
+	public static <T> List<T> asList(T... a) {
+		ArrayList<T> res= new ArrayList<T>();
+		for (int i= 0; i < a.length; i++) {
+			res.add(a[i]);
+		}
+		return res;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays05/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays05/in/A.java
new file mode 100644
index 000000000..b8272aebc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays05/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.List;
+
+class A {
+	List l= null;
+	String[] get() {
+		return (String[]) l.toArray(new String[l.size()]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays05/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays05/out/A.java
new file mode 100644
index 000000000..21b59bbd4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays05/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.List;
+
+class A {
+	List<String> l= null;
+	String[] get() {
+		return l.toArray(new String[l.size()]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays06/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays06/in/A.java
new file mode 100644
index 000000000..c08f7e771
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays06/in/A.java
@@ -0,0 +1,15 @@
+package p;
+
+import java.util.List;
+
+class A {
+	List l= null;
+	
+	void add(String s) {
+		l.add(s);
+	}
+	
+	String[] get() {
+		return (String[]) l.toArray(new String[l.size()]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays06/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays06/out/A.java
new file mode 100644
index 000000000..151385827
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays06/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+import java.util.List;
+
+class A {
+	List<String> l= null;
+	
+	void add(String s) {
+		l.add(s);
+	}
+	
+	String[] get() {
+		return l.toArray(new String[l.size()]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays07/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays07/in/A.java
new file mode 100644
index 000000000..9ccce45a2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays07/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.ArrayList;
+
+@SuppressWarnings("unused")
+class A {
+
+    private Number[] fNumbers;
+    private Integer[] ints;
+
+    public void process() {
+        ArrayList list= new ArrayList();
+        list.add(17);
+        fNumbers= (Number[]) list.toArray(new Integer[list.size()]);
+        ints= (Integer[]) list.toArray(new Integer[list.size()]);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays07/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays07/out/A.java
new file mode 100644
index 000000000..f813e5b97
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuArrays07/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.ArrayList;
+
+@SuppressWarnings("unused")
+class A {
+
+    private Number[] fNumbers;
+    private Integer[] ints;
+
+    public void process() {
+        ArrayList<Integer> list= new ArrayList<Integer>();
+        list.add(17);
+        fNumbers= list.toArray(new Integer[list.size()]);
+        ints= list.toArray(new Integer[list.size()]);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing01/in/A.java
new file mode 100644
index 000000000..55e90e670
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing01/in/A.java
@@ -0,0 +1,27 @@
+package p;
+
+class Cell<T> {
+	T t;
+	public void setT(T t) {
+		this.t= t;
+	}
+	public T getT() {
+		return t;
+	}
+}
+
+class CellTest {
+	public static void main(String[] args) {
+		Cell c1= new Cell();
+		c1.setT(17);
+		
+		Cell c2= new Cell();
+		c2.setT(new Short((short) 8));
+		short s= (Short) c2.getT();
+		
+		Cell c3= new Cell();
+		byte bite= 1;
+		c3.setT(bite);
+		bite= (Byte) c3.getT();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing01/out/A.java
new file mode 100644
index 000000000..96c48e5d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing01/out/A.java
@@ -0,0 +1,27 @@
+package p;
+
+class Cell<T> {
+	T t;
+	public void setT(T t) {
+		this.t= t;
+	}
+	public T getT() {
+		return t;
+	}
+}
+
+class CellTest {
+	public static void main(String[] args) {
+		Cell<Integer> c1= new Cell<Integer>();
+		c1.setT(17);
+		
+		Cell<Short> c2= new Cell<Short>();
+		c2.setT(new Short((short) 8));
+		short s= c2.getT();
+		
+		Cell<Byte> c3= new Cell<Byte>();
+		byte bite= 1;
+		c3.setT(bite);
+		bite= c3.getT();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing02/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing02/in/A.java
new file mode 100644
index 000000000..db07ddac8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing02/in/A.java
@@ -0,0 +1,26 @@
+package p;
+
+class Cell<T> {
+	T t;
+	public void setT(T t) {
+		this.t= t;
+	}
+	public T getT() {
+		return t;
+	}
+}
+
+class CellTest {
+	public static void main(String[] args) {
+		Cell c1= new Cell();
+		c1.setT(17);
+		c1.setT(17.3f);
+		Number n= (Number) c1.getT();
+		
+		Cell c2= null;
+		c2.setT(18);
+		Cell c3= new Cell();
+		c3.setT(new Long(23));
+		c2= c3;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing02/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing02/out/A.java
new file mode 100644
index 000000000..d2f8f31cf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuBoxing02/out/A.java
@@ -0,0 +1,26 @@
+package p;
+
+class Cell<T> {
+	T t;
+	public void setT(T t) {
+		this.t= t;
+	}
+	public T getT() {
+		return t;
+	}
+}
+
+class CellTest {
+	public static void main(String[] args) {
+		Cell<Number> c1= new Cell<Number>();
+		c1.setT(17);
+		c1.setT(17.3f);
+		Number n= c1.getT();
+		
+		Cell<Number> c2= null;
+		c2.setT(18);
+		Cell<Number> c3= new Cell<Number>();
+		c3.setT(new Long(23));
+		c2= c3;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCannotStringDouble/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCannotStringDouble/in/A.java
new file mode 100644
index 000000000..72514191e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCannotStringDouble/in/A.java
@@ -0,0 +1,26 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+interface J {
+	public List getList(); // cannot infer a return type (except List<?>)
+}
+
+class D implements J {
+	public List getList() {
+		List dList= new ArrayList();
+		dList.add(new Double(1.2d));
+		Double d= (Double) dList.get(0);
+		return dList;
+	}
+}
+
+class S implements J {
+	public List getList() {
+		List sList= new ArrayList();
+		sList.add("String");
+		String s= (String) sList.get(0);
+		return sList;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCannotStringDouble/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCannotStringDouble/out/A.java
new file mode 100644
index 000000000..00d525c5b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCannotStringDouble/out/A.java
@@ -0,0 +1,26 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+interface J {
+	public List getList(); // cannot infer a return type (except List<?>)
+}
+
+class D implements J {
+	public List getList() {
+		List<Double> dList= new ArrayList<Double>();
+		dList.add(new Double(1.2d));
+		Double d= dList.get(0);
+		return dList;
+	}
+}
+
+class S implements J {
+	public List getList() {
+		List<String> sList= new ArrayList<String>();
+		sList.add("String");
+		String s= sList.get(0);
+		return sList;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCollectionsMin/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCollectionsMin/in/A.java
new file mode 100644
index 000000000..a9dc42ffa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCollectionsMin/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+class A {
+	public void foo() {
+		String min= (String) Collections.min(getNames());
+	}
+	public List getNames() {
+		ArrayList result= new ArrayList();
+		result.add("Zwyssig");
+		result.add("Abaecherli");
+		return result;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCollectionsMin/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCollectionsMin/out/A.java
new file mode 100644
index 000000000..2279e48f0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCollectionsMin/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+class A {
+	public void foo() {
+		String min= Collections.min(getNames());
+	}
+	public List<String> getNames() {
+		ArrayList<String> result= new ArrayList<String>();
+		result.add("Zwyssig");
+		result.add("Abaecherli");
+		return result;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCommonSuper/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCommonSuper/in/A.java
new file mode 100644
index 000000000..2c105a9c2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCommonSuper/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List list= new ArrayList();
+		list.add(new Double(1.7));
+		list.add(new Integer(1));
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCommonSuper/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCommonSuper/out/A.java
new file mode 100644
index 000000000..6d41b825d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuCommonSuper/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List<Number> list= new ArrayList<Number>();
+		list.add(new Double(1.7));
+		list.add(new Integer(1));
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuConstructor01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuConstructor01/in/A.java
new file mode 100644
index 000000000..182ede5dc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuConstructor01/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+class Tuple<T1, T2> {
+	private T1 t1;
+	private T2 t2;
+	
+	public Tuple(T1 o1, T2 o2) {
+		t1= o1;
+		t2= o2;
+	}
+}
+
+class Main {
+	public static void main(String[] args) {
+		Tuple t= new Tuple(new String(), new Integer(10));
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuConstructor01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuConstructor01/out/A.java
new file mode 100644
index 000000000..6a361d035
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuConstructor01/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+class Tuple<T1, T2> {
+	private T1 t1;
+	private T2 t2;
+	
+	public Tuple(T1 o1, T2 o2) {
+		t1= o1;
+		t2= o2;
+	}
+}
+
+class Main {
+	public static void main(String[] args) {
+		Tuple<String, Integer> t= new Tuple<String, Integer>(new String(), new Integer(10));
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuContains/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuContains/in/A.java
new file mode 100644
index 000000000..ca0300c2c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuContains/in/A.java
@@ -0,0 +1,21 @@
+package p;
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List l= new ArrayList();
+		l.add("Eclipse");
+		boolean has= l.contains("is");
+	}
+	void fooObj() {
+		List lObj= new ArrayList();
+		lObj.add("Eclipse");
+		boolean has= lObj.contains(new Object());
+	}
+	void fooInteger() {
+		List lInteger= new ArrayList();
+		lInteger.add("Eclipse");
+		boolean has= lInteger.contains(new Integer(1));
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuContains/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuContains/out/A.java
new file mode 100644
index 000000000..0def0f656
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuContains/out/A.java
@@ -0,0 +1,21 @@
+package p;
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List<String> l= new ArrayList<String>();
+		l.add("Eclipse");
+		boolean has= l.contains("is");
+	}
+	void fooObj() {
+		List<String> lObj= new ArrayList<String>();
+		lObj.add("Eclipse");
+		boolean has= lObj.contains(new Object());
+	}
+	void fooInteger() {
+		List<String> lInteger= new ArrayList<String>();
+		lInteger.add("Eclipse");
+		boolean has= lInteger.contains(new Integer(1));
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuExistingParameterized01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuExistingParameterized01/in/A.java
new file mode 100644
index 000000000..6d2e79d9f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuExistingParameterized01/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	
+	void foo() {
+		List l= new ArrayList();
+		bar(l);
+		l.add(new Object());
+	}
+	
+	void bar(List<String> l) {
+		
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuExistingParameterized01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuExistingParameterized01/out/A.java
new file mode 100644
index 000000000..6d2e79d9f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuExistingParameterized01/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	
+	void foo() {
+		List l= new ArrayList();
+		bar(l);
+		l.add(new Object());
+	}
+	
+	void bar(List<String> l) {
+		
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess01/in/A.java
new file mode 100644
index 000000000..255d7b9ee
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess01/in/A.java
@@ -0,0 +1,24 @@
+package p;
+
+class Cell<T> {
+	T t;
+	public void setT(T t) {
+		this.t= t;
+	}
+	public T getT() {
+		return t;
+	}
+}
+
+class CellTest {
+	public static void main(String[] args) {
+		Cell c1= new Cell();
+		c1.setT(17);
+		Number n= (Number) c1.t;
+		
+		Cell c2= new Cell();
+		c2.t= Boolean.TRUE;
+		boolean b= (Boolean) c2.t;
+		boolean b2= (Boolean) c2.getT();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess01/out/A.java
new file mode 100644
index 000000000..27226d016
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess01/out/A.java
@@ -0,0 +1,24 @@
+package p;
+
+class Cell<T> {
+	T t;
+	public void setT(T t) {
+		this.t= t;
+	}
+	public T getT() {
+		return t;
+	}
+}
+
+class CellTest {
+	public static void main(String[] args) {
+		Cell<Integer> c1= new Cell<Integer>();
+		c1.setT(17);
+		Number n= c1.t;
+		
+		Cell<Boolean> c2= new Cell<Boolean>();
+		c2.t= Boolean.TRUE;
+		boolean b= c2.t;
+		boolean b2= c2.getT();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess02/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess02/in/A.java
new file mode 100644
index 000000000..b71f5c119
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess02/in/A.java
@@ -0,0 +1,31 @@
+package p;
+
+import java.util.*;
+
+class Cell<T> {
+	List<T> t;
+	public void setT(AbstractList<T> t) {
+		this.t= t;
+	}
+	public Collection<T> getT() {
+		return t;
+	}
+}
+
+class CellTest {
+	public static void main(String[] args) {
+		ArrayList booleanList= new ArrayList();
+		booleanList.add(Boolean.FALSE);
+		
+		Cell c1= new Cell();
+		c1.t= booleanList;
+		c1.setT(booleanList);
+		Iterable t= c1.t;
+		Iterator iter= (Iterator) c1.t.iterator();
+		Iterator iter2= c1.t.iterator();
+		boolean bool= (Boolean) c1.t.iterator().next();
+		
+		Cell c2= new Cell();
+		c2.t= booleanList;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess02/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess02/out/A.java
new file mode 100644
index 000000000..596e3ff45
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuFieldAccess02/out/A.java
@@ -0,0 +1,31 @@
+package p;
+
+import java.util.*;
+
+class Cell<T> {
+	List<T> t;
+	public void setT(AbstractList<T> t) {
+		this.t= t;
+	}
+	public Collection<T> getT() {
+		return t;
+	}
+}
+
+class CellTest {
+	public static void main(String[] args) {
+		ArrayList<Boolean> booleanList= new ArrayList<Boolean>();
+		booleanList.add(Boolean.FALSE);
+		
+		Cell<Boolean> c1= new Cell<Boolean>();
+		c1.t= booleanList;
+		c1.setT(booleanList);
+		Iterable<Boolean> t= c1.t;
+		Iterator<Boolean> iter= (Iterator<Boolean>) c1.t.iterator();
+		Iterator<Boolean> iter2= c1.t.iterator();
+		boolean bool= c1.t.iterator().next();
+		
+		Cell<Boolean> c2= new Cell<Boolean>();
+		c2.t= booleanList;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass/in/A.java
new file mode 100644
index 000000000..b7c967a73
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass/in/A.java
@@ -0,0 +1,23 @@
+package p;
+
+class A {
+	void calc(Class superClass) {
+		superClass= superClass.getSuperclass();
+	}
+	void call(Process pro) {
+		calc(pro.getClass());
+	}
+}
+
+class Exposer {
+	private void foo() {
+		new Generic(getClass());
+		new Generic(Exposer.class);
+	}
+}
+
+class Generic<T> {
+	Generic(Class<T> clazz) {
+		
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass/out/A.java
new file mode 100644
index 000000000..1f63adf22
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass/out/A.java
@@ -0,0 +1,23 @@
+package p;
+
+class A {
+	void calc(Class superClass) {
+		superClass= superClass.getSuperclass();
+	}
+	void call(Process pro) {
+		calc(pro.getClass());
+	}
+}
+
+class Exposer {
+	private void foo() {
+		new Generic(getClass());
+		new Generic<Exposer>(Exposer.class);
+	}
+}
+
+class Generic<T> {
+	Generic(Class<T> clazz) {
+		
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass2/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass2/in/A.java
new file mode 100644
index 000000000..feb4b2d45
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass2/in/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A {
+	void m(Object someObject) {
+		someObject.getClass();
+	}
+	void m1(Object someObject) {
+		Class c= someObject.getClass();
+	}
+	void i(Integer someInt) {
+		someInt.getClass();
+	}
+	void i1(Integer someInt) {
+		Class c= someInt.getClass();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass2/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass2/out/A.java
new file mode 100644
index 000000000..4c5ecfb08
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClass2/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+class A {
+	void m(Object someObject) {
+		someObject.getClass();
+	}
+	void m1(Object someObject) {
+		Class<? extends Object> c= someObject.getClass();
+	}
+	void i(Integer someInt) {
+		someInt.getClass();
+	}
+	void i1(Integer someInt) {
+		Class<? extends Integer> c= someInt.getClass();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClassNewInstance/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClassNewInstance/in/A.java
new file mode 100644
index 000000000..49f08f4cd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClassNewInstance/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	void doNothing() throws Exception {
+		getClass().newInstance();
+		this.getClass().newInstance();
+		A newInstance= (A) getClass().newInstance();
+		A test= (A) this.getClass().newInstance();
+		
+		RuntimeException rte= (RuntimeException) new ClassCastException().getClass().newInstance();
+		ClassCastException cce= (ClassCastException) rte.getClass().newInstance();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClassNewInstance/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClassNewInstance/out/A.java
new file mode 100644
index 000000000..f5838241d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetClassNewInstance/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+class A {
+	void doNothing() throws Exception {
+		getClass().newInstance();
+		this.getClass().newInstance();
+		A newInstance= getClass().newInstance();
+		A test= this.getClass().newInstance();
+		
+		RuntimeException rte= new ClassCastException().getClass().newInstance();
+		ClassCastException cce= (ClassCastException) rte.getClass().newInstance();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetSuperclass/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetSuperclass/in/A.java
new file mode 100644
index 000000000..6115203c9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetSuperclass/in/A.java
@@ -0,0 +1,7 @@
+package p;
+
+class TestSuite {
+	public TestSuite(Class theClass) {
+		theClass = theClass.getSuperclass();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetSuperclass/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetSuperclass/out/A.java
new file mode 100644
index 000000000..6115203c9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetSuperclass/out/A.java
@@ -0,0 +1,7 @@
+package p;
+
+class TestSuite {
+	public TestSuite(Class theClass) {
+		theClass = theClass.getSuperclass();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/in/A.java
new file mode 100644
index 000000000..8d94872d9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/in/A.java
@@ -0,0 +1,27 @@
+package p;
+
+public class A {
+	static void takeP(Class c) {}
+	static void takePQ(Class c) {}
+	
+	class P {
+		{
+			Class p= getClass();
+			takeP(p);
+			takePQ(p);
+		}
+	}
+	
+	class Q {
+		{
+			Class q= getClass();
+			takePQ(q);
+		}
+	}
+	
+	class Z {
+		{
+			Class z= getClass();
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/out/A.java
new file mode 100644
index 000000000..4e4a78147
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuGetTakeClassStayRaw/out/A.java
@@ -0,0 +1,27 @@
+package p;
+
+public class A {
+	static void takeP(Class c) {}
+	static void takePQ(Class c) {}
+	
+	class P {
+		{
+			Class p= getClass();
+			takeP(p);
+			takePQ(p);
+		}
+	}
+	
+	class Q {
+		{
+			Class q= getClass();
+			takePQ(q);
+		}
+	}
+	
+	class Z {
+		{
+			Class<? extends Z> z= getClass();
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuHalfPair/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuHalfPair/in/A.java
new file mode 100644
index 000000000..a2a8535f4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuHalfPair/in/A.java
@@ -0,0 +1,18 @@
+package p;
+
+import java.util.ArrayList;
+
+class A<T, U> {
+	// cannot infer type for U -> leave raw
+    T t;
+    U u;
+    
+    void addT(T arg) {
+        t= arg;
+    }
+    
+    static void m() {
+        A p = new A();
+        p.addT("Hello");
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuHalfPair/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuHalfPair/out/A.java
new file mode 100644
index 000000000..a2a8535f4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuHalfPair/out/A.java
@@ -0,0 +1,18 @@
+package p;
+
+import java.util.ArrayList;
+
+class A<T, U> {
+	// cannot infer type for U -> leave raw
+    T t;
+    U u;
+    
+    void addT(T arg) {
+        t= arg;
+    }
+    
+    static void m() {
+        A p = new A();
+        p.addT("Hello");
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuInferTypeVariable01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuInferTypeVariable01/in/A.java
new file mode 100644
index 000000000..8ed5e4302
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuInferTypeVariable01/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.Vector;
+
+class Cell {
+	public <T> T f1(T l) {
+		Vector v= new Vector();
+		v.add(l);
+		return (T) v.get(0);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuInferTypeVariable01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuInferTypeVariable01/out/A.java
new file mode 100644
index 000000000..6c7a3b194
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuInferTypeVariable01/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.Vector;
+
+class Cell {
+	public <T> T f1(T l) {
+		Vector<T> v= new Vector<T>();
+		v.add(l);
+		return v.get(0);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuIntermediateLocal/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuIntermediateLocal/in/A.java
new file mode 100644
index 000000000..bbe04637f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuIntermediateLocal/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		AbstractList l= new ArrayList();
+		List list= l;
+		list.add("Eclipse");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuIntermediateLocal/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuIntermediateLocal/out/A.java
new file mode 100644
index 000000000..b01ac1e6f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuIntermediateLocal/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		AbstractList<String> l= new ArrayList<String>();
+		List<String> list= l;
+		list.add("Eclipse");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMapEntry01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMapEntry01/in/A.java
new file mode 100644
index 000000000..0d156927b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMapEntry01/in/A.java
@@ -0,0 +1,14 @@
+package p;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+class A {
+	void sets() {
+		Map map= new HashMap();
+		map.put("key", new Integer(17));
+		Iterator iter= map.entrySet().iterator();
+		Map.Entry entry= (Map.Entry) iter.next();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMapEntry01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMapEntry01/out/A.java
new file mode 100644
index 000000000..48783afad
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMapEntry01/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+class A {
+	void sets() {
+		Map<String, Integer> map= new HashMap<String, Integer>();
+		map.put("key", new Integer(17));
+		Iterator<Entry<String, Integer>> iter= map.entrySet().iterator();
+		Entry<String, Integer> entry= iter.next();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMemberOfRaw/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMemberOfRaw/in/A.java
new file mode 100644
index 000000000..0c59758f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMemberOfRaw/in/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class NodeList<E> {
+    class Cursor { }
+    {
+        NodeList.Cursor cursor;
+        NodeList<String>.Cursor c2;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMemberOfRaw/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMemberOfRaw/out/A.java
new file mode 100644
index 000000000..0c59758f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMemberOfRaw/out/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class NodeList<E> {
+    class Cursor { }
+    {
+        NodeList.Cursor cursor;
+        NodeList<String>.Cursor c2;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric01/in/A.java
new file mode 100644
index 000000000..ad1d56b97
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric01/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+    void call(My my) {
+        my.method("Eclipse1", new Integer(1));
+    }
+}
+
+class My<C> {
+    <M> void method(C c, M m) {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric01/out/A.java
new file mode 100644
index 000000000..61659d22b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric01/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+class A {
+    void call(My<String> my) {
+        my.method("Eclipse1", new Integer(1));
+    }
+}
+
+class My<C> {
+    <M> void method(C c, M m) {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric02/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric02/in/A.java
new file mode 100644
index 000000000..f9beb3993
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric02/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+class A {
+    void call(Ex ex) {
+        ex.method("Eclipse1", new Integer(1));
+        Top top= ex;
+        top.method("Eclipse2", new Integer(2));
+    }
+}
+
+class Top<TC> {
+    <TM> void method(TC cTop, TM mTop) {}
+}
+
+class Ex<C extends String> extends Top<C> {
+    <M extends Integer> void method(C cEx, M mEx) {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric02/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric02/out/A.java
new file mode 100644
index 000000000..4aa66536c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodAndTypeGeneric02/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+class A {
+    void call(Ex<String> ex) {
+        ex.method("Eclipse1", new Integer(1));
+        Top<String> top= ex;
+        top.method("Eclipse2", new Integer(2));
+    }
+}
+
+class Top<TC> {
+    <TM> void method(TC cTop, TM mTop) {}
+}
+
+class Ex<C extends String> extends Top<C> {
+    <M extends Integer> void method(C cEx, M mEx) {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodParam/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodParam/in/A.java
new file mode 100644
index 000000000..e0d153e18
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodParam/in/A.java
@@ -0,0 +1,20 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+class A {
+	void foo() {
+		List l= new ArrayList();
+		l.add("Eclipse");
+		bar(l);
+	}
+	
+	void bar(List arg) {
+		for (Iterator iter= arg.iterator(); iter.hasNext();) {
+			String element= (String) iter.next();
+			System.out.println(element);
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodParam/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodParam/out/A.java
new file mode 100644
index 000000000..de0bbae80
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodParam/out/A.java
@@ -0,0 +1,20 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+class A {
+	void foo() {
+		List<String> l= new ArrayList<String>();
+		l.add("Eclipse");
+		bar(l);
+	}
+	
+	void bar(List<String> arg) {
+		for (Iterator<String> iter= arg.iterator(); iter.hasNext();) {
+			String element= iter.next();
+			System.out.println(element);
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodReturns/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodReturns/in/A.java
new file mode 100644
index 000000000..b9335b0e7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodReturns/in/A.java
@@ -0,0 +1,30 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+class A {
+	public void foo() {
+		for (Iterator iter= getList().iterator(); iter.hasNext();) {
+			String element= (String) iter.next();
+			System.out.println(element);
+		}
+	}
+	
+	public List getList() {
+		ArrayList result= new ArrayList();
+		result.add("Tom");
+		result.add("Jerry");
+		return result;
+	}
+	
+	public Iterator getIterator(List list) {
+		list= getList();
+		return list.iterator();
+	}
+	
+	public Iterator getIterator2(List list2) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodReturns/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodReturns/out/A.java
new file mode 100644
index 000000000..f26cff116
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodReturns/out/A.java
@@ -0,0 +1,30 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+class A {
+	public void foo() {
+		for (Iterator<String> iter= getList().iterator(); iter.hasNext();) {
+			String element= iter.next();
+			System.out.println(element);
+		}
+	}
+	
+	public List<String> getList() {
+		ArrayList<String> result= new ArrayList<String>();
+		result.add("Tom");
+		result.add("Jerry");
+		return result;
+	}
+	
+	public Iterator<String> getIterator(List<String> list) {
+		list= getList();
+		return list.iterator();
+	}
+	
+	public Iterator getIterator2(List list2) {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodTypeParam/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodTypeParam/in/A.java
new file mode 100644
index 000000000..64cebc652
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodTypeParam/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.Vector;
+
+public class A {
+    public <T> T f1(T l) {
+        Vector v = new Vector();
+        v.add(l);
+        return (T) v.get(0);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodTypeParam/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodTypeParam/out/A.java
new file mode 100644
index 000000000..7d4d55cae
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuMethodTypeParam/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.Vector;
+
+public class A {
+    public <T> T f1(T l) {
+        Vector<T> v = new Vector<T>();
+        v.add(l);
+        return v.get(0);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/in/A.java
new file mode 100644
index 000000000..7b72a408c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/in/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	void m() {
+		Cell c= new Cell();
+		c.put("X");
+		Cell nested= new Cell();
+		nested.put(c);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/in/Cell.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/in/Cell.java
new file mode 100644
index 000000000..f448a9363
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/in/Cell.java
@@ -0,0 +1,7 @@
+package p;
+
+public class Cell<T> {
+	public void put(T t) {
+		
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/out/A.java
new file mode 100644
index 000000000..eac1c62a5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedCells1/out/A.java
@@ -0,0 +1,10 @@
+package p;
+
+class A {
+	void m() {
+		Cell<String> c= new Cell<String>();
+		c.put("X");
+		Cell<Cell<String>> nested= new Cell<Cell<String>>();
+		nested.put(c);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors0/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors0/in/A.java
new file mode 100644
index 000000000..23bbf6d56
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors0/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.Vector;
+
+class A {
+
+	void k() {
+		Vector v1= new Vector();
+		Vector v2= new Vector();
+		Vector v3= new Vector();
+
+		v3.add(new String("fff")); // String <= E[v3] --> String is
+												// not parametric --> nothing to unify
+		v2.add(v3);           // v3 <= E[v2] --> 2. unify (E[v3], E[E[v2]])
+		v1.add(v2.get(0)); // E[v2] <= E[v1] --> 1. unify (E[E[v2]], E[E[v1]])
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors0/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors0/out/A.java
new file mode 100644
index 000000000..29aa2aedb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors0/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.Vector;
+
+class A {
+
+	void k() {
+		Vector<Vector<String>> v1= new Vector<Vector<String>>();
+		Vector<Vector<String>> v2= new Vector<Vector<String>>();
+		Vector<String> v3= new Vector<String>();
+
+		v3.add(new String("fff")); // String <= E[v3] --> String is
+												// not parametric --> nothing to unify
+		v2.add(v3);           // v3 <= E[v2] --> 2. unify (E[v3], E[E[v2]])
+		v1.add(v2.get(0)); // E[v2] <= E[v1] --> 1. unify (E[E[v2]], E[E[v1]])
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors1/in/A.java
new file mode 100644
index 000000000..ec669b8e7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors1/in/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.Vector;
+
+class A {
+	void foo() {
+		Vector v1= new Vector();
+		Vector v2= new Vector();
+		v2.add(v1);
+		v1.add(v2);
+	}
+	void bar() {
+		Vector v3= new Vector();
+		v3.add(v3);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors1/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors1/out/A.java
new file mode 100644
index 000000000..d70e94cda
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuNestedVectors1/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.Vector;
+
+class A {
+	void foo() {
+		Vector<Vector<Vector>> v1= new Vector<Vector<Vector>>();
+		Vector<Vector> v2= new Vector<Vector>();
+		v2.add(v1);
+		v1.add(v2);
+	}
+	void bar() {
+		Vector<Vector> v3= new Vector<Vector>();
+		v3.add(v3);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuParameterizedTypes1/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuParameterizedTypes1/in/A.java
new file mode 100644
index 000000000..39f95617f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuParameterizedTypes1/in/A.java
@@ -0,0 +1,4 @@
+package p;
+
+class A<T extends A<T>> {}
+class B<T> extends A<B<T>> {}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuParameterizedTypes1/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuParameterizedTypes1/out/A.java
new file mode 100644
index 000000000..39f95617f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuParameterizedTypes1/out/A.java
@@ -0,0 +1,4 @@
+package p;
+
+class A<T extends A<T>> {}
+class B<T> extends A<B<T>> {}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuQualifiedName/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuQualifiedName/in/A.java
new file mode 100644
index 000000000..97ee5717c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuQualifiedName/in/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A {
+	A() {
+		java.util.List list= new java.util.ArrayList();
+		list.add(1);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuQualifiedName/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuQualifiedName/out/A.java
new file mode 100644
index 000000000..888816341
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuQualifiedName/out/A.java
@@ -0,0 +1,8 @@
+package p;
+
+public class A {
+	A() {
+		java.util.List<Integer> list= new java.util.ArrayList<Integer>();
+		list.add(1);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods/in/A.java
new file mode 100644
index 000000000..4148448ef
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods/in/A.java
@@ -0,0 +1,26 @@
+package p;
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+public class A {
+	private void createTestList(TestCollector collector) {
+		Enumeration each= collector.collectTests();
+		while (each.hasMoreElements()) {
+			String s= (String) each.nextElement();
+		}
+	}
+}
+
+interface TestCollector {
+	public Enumeration collectTests();
+}
+
+class Collector implements TestCollector {
+	public Enumeration collectTests() {
+		Vector v= new Vector();
+		v.add("Test1");
+		return v.elements();
+	}
+	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods/out/A.java
new file mode 100644
index 000000000..d576632bf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods/out/A.java
@@ -0,0 +1,26 @@
+package p;
+
+import java.util.Enumeration;
+import java.util.Vector;
+
+public class A {
+	private void createTestList(TestCollector collector) {
+		Enumeration<String> each= collector.collectTests();
+		while (each.hasMoreElements()) {
+			String s= each.nextElement();
+		}
+	}
+}
+
+interface TestCollector {
+	public Enumeration<String> collectTests();
+}
+
+class Collector implements TestCollector {
+	public Enumeration<String> collectTests() {
+		Vector<String> v= new Vector<String>();
+		v.add("Test1");
+		return v.elements();
+	}
+	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods2/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods2/in/A.java
new file mode 100644
index 000000000..b579e86fa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods2/in/A.java
@@ -0,0 +1,22 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+interface I {
+	public List getList();
+}
+
+class A implements I {
+	public List getList() {
+		List list= new ArrayList();
+		list.add("X");
+		return list;
+	}
+}
+
+class B extends A {
+	public List getList() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods2/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods2/out/A.java
new file mode 100644
index 000000000..532990045
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods2/out/A.java
@@ -0,0 +1,22 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+interface I {
+	public List<String> getList();
+}
+
+class A implements I {
+	public List<String> getList() {
+		List<String> list= new ArrayList<String>();
+		list.add("X");
+		return list;
+	}
+}
+
+class B extends A {
+	public List<String> getList() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods3/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods3/in/A.java
new file mode 100644
index 000000000..094994df3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods3/in/A.java
@@ -0,0 +1,31 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	public List getList() {
+		List list= new ArrayList();
+		list.add("X");
+		return list;
+	}
+}
+
+interface I {
+	public List getList();
+}
+
+class C extends A implements I {
+	// Inherits getList() from A and I, but does NOT induce a connection
+	// between them by redeclaring the method.
+	//
+	// Ways to deal:
+	// A) Always calculate RippleMethods (but only once per method!).
+	// B) If CU of C is found & processed:
+	//     connect inherited methods from A with matching methods from I.
+	//     If it is not guaranteed that C will be processed:
+	//     need a subtype hierarchy on A and I  ==>  A) RippleMethods.
+//	void use() {
+//		List l= getList();
+//	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods3/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods3/out/A.java
new file mode 100644
index 000000000..629c0ee48
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuRippleMethods3/out/A.java
@@ -0,0 +1,31 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	public List<String> getList() {
+		List<String> list= new ArrayList<String>();
+		list.add("X");
+		return list;
+	}
+}
+
+interface I {
+	public List<String> getList();
+}
+
+class C extends A implements I {
+	// Inherits getList() from A and I, but does NOT induce a connection
+	// between them by redeclaring the method.
+	//
+	// Ways to deal:
+	// A) Always calculate RippleMethods (but only once per method!).
+	// B) If CU of C is found & processed:
+	//     connect inherited methods from A with matching methods from I.
+	//     If it is not guaranteed that C will be processed:
+	//     need a subtype hierarchy on A and I  ==>  A) RippleMethods.
+//	void use() {
+//		List l= getList();
+//	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSuperAndSub/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSuperAndSub/in/A.java
new file mode 100644
index 000000000..840b82329
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSuperAndSub/in/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List list= new ArrayList();
+		list.add(new Super());
+		List l= list;
+		l.add(new Sub());
+	}
+}
+
+class Super {}
+class Sub extends Super {}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSuperAndSub/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSuperAndSub/out/A.java
new file mode 100644
index 000000000..cbc7104dc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSuperAndSub/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	void foo() {
+		List<Super> list= new ArrayList<Super>();
+		list.add(new Super());
+		List<Super> l= list;
+		l.add(new Sub());
+	}
+}
+
+class Super {}
+class Sub extends Super {}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSynchronizedList/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSynchronizedList/in/A.java
new file mode 100644
index 000000000..0c0248c19
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSynchronizedList/in/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.*;
+
+class A {
+    private final List _binPaths = Collections.synchronizedList(new ArrayList());
+    
+    List get() {
+        return new ArrayList(_binPaths);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSynchronizedList/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSynchronizedList/out/A.java
new file mode 100644
index 000000000..76c847400
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuSynchronizedList/out/A.java
@@ -0,0 +1,11 @@
+package p;
+
+import java.util.*;
+
+class A {
+    private final List<?> _binPaths = Collections.synchronizedList(new ArrayList<Object>());
+    
+    List<?> get() {
+        return new ArrayList<Object>(_binPaths);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray01/in/A.java
new file mode 100644
index 000000000..b5c9404b1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray01/in/A.java
@@ -0,0 +1,23 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+@SuppressWarnings("unused")
+class A {
+    {
+        Collection c= new LinkedList();
+        c.add(42);
+        Generic g= new Generic();
+        List list= g.toList(c);
+        ArrayList arrayList= (ArrayList) g.toList(c);
+    }
+}
+
+class Generic<E> {
+    public <T> List<T> toList(Collection<T> c) {
+        return new ArrayList<T>(c);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray01/out/A.java
new file mode 100644
index 000000000..fbbd5cf30
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray01/out/A.java
@@ -0,0 +1,23 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+@SuppressWarnings("unused")
+class A {
+    {
+        Collection<Integer> c= new LinkedList<Integer>();
+        c.add(42);
+        Generic g= new Generic();
+        List<Integer> list= g.toList(c);
+        ArrayList<Integer> arrayList= (ArrayList<Integer>) g.toList(c);
+    }
+}
+
+class Generic<E> {
+    public <T> List<T> toList(Collection<T> c) {
+        return new ArrayList<T>(c);
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray02/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray02/in/A.java
new file mode 100644
index 000000000..c5b211385
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray02/in/A.java
@@ -0,0 +1,30 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A {
+    
+    String[] m() {
+        List l= new ArrayList();
+        l.add("Hello");
+        return (String[]) l.toArray(new String[l.size()]);
+    }
+    String[][] m2() {
+        List l= new ArrayList();
+        l.add(new String[] {"Hello"});
+        return (String[][]) l.toArray(new String[l.size()][]);
+    }
+    
+    
+    String[] test() {
+        ArrayList list= new ArrayList();
+        list.add(42);
+        return (String[]) list.toArray(new String[list.size()]);
+    }
+
+    String[] test2() {
+        ArrayList list= new ArrayList();
+        return (String[]) list.toArray(new String[list.size()]);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray02/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray02/out/A.java
new file mode 100644
index 000000000..b303bad58
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuToArray02/out/A.java
@@ -0,0 +1,30 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class A {
+    
+    String[] m() {
+        List<String> l= new ArrayList<String>();
+        l.add("Hello");
+        return l.toArray(new String[l.size()]);
+    }
+    String[][] m2() {
+        List<String[]> l= new ArrayList<String[]>();
+        l.add(new String[] {"Hello"});
+        return l.toArray(new String[l.size()][]);
+    }
+    
+    
+    String[] test() {
+        ArrayList<Integer> list= new ArrayList<Integer>();
+        list.add(42);
+        return list.toArray(new String[list.size()]);
+    }
+
+    String[] test2() {
+        ArrayList list= new ArrayList();
+        return (String[]) list.toArray(new String[list.size()]);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTwoVectorElements/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTwoVectorElements/in/A.java
new file mode 100644
index 000000000..8b129d060
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTwoVectorElements/in/A.java
@@ -0,0 +1,14 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+class A {
+	public static void exec() {
+        ArrayList v1= new ArrayList();
+        ArrayList v2= new ArrayList();
+        v2.add("");
+        Iterator iterator1 = v1.iterator();
+        Iterator iterator2 = v2.iterator();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTwoVectorElements/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTwoVectorElements/out/A.java
new file mode 100644
index 000000000..7830ab663
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTwoVectorElements/out/A.java
@@ -0,0 +1,14 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+class A {
+	public static void exec() {
+        ArrayList v1= new ArrayList();
+        ArrayList<String> v2= new ArrayList<String>();
+        v2.add("");
+        Iterator iterator1 = v1.iterator();
+        Iterator<String> iterator2 = v2.iterator();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeLiteral/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeLiteral/in/A.java
new file mode 100644
index 000000000..71c5bfe64
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeLiteral/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.lang.reflect.Method;
+
+@SuppressWarnings("deprecation")
+public class A {
+	void m(A a) throws Exception {
+		Class clazz = a.getClass();
+		Method method = clazz.getMethod("m", A.class);
+		SuppressWarnings suppressed = method.getAnnotation(SuppressWarnings.class);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeLiteral/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeLiteral/out/A.java
new file mode 100644
index 000000000..13ec32c76
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeLiteral/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+import java.lang.reflect.Method;
+
+@SuppressWarnings("deprecation")
+public class A {
+	void m(A a) throws Exception {
+		Class<? extends A> clazz = a.getClass();
+		Method method = clazz.getMethod("m", A.class);
+		SuppressWarnings suppressed = method.getAnnotation(SuppressWarnings.class);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeParams9/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeParams9/in/A.java
new file mode 100644
index 000000000..d4d21756d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeParams9/in/A.java
@@ -0,0 +1,13 @@
+package p;
+
+import java.util.Vector;
+
+class TypeParams9<T1 extends Number & Comparable> {
+	Comparable f(T1 t1) {
+		Vector v1 = new Vector();
+		v1.add(t1);
+		v1.add(new Integer(1));
+		v1.add("");
+		return (Comparable) v1.get(0);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeParams9/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeParams9/out/A.java
new file mode 100644
index 000000000..3263a7a42
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuTypeParams9/out/A.java
@@ -0,0 +1,13 @@
+package p;
+
+import java.util.Vector;
+
+class TypeParams9<T1 extends Number & Comparable> {
+	Comparable f(T1 t1) {
+		Vector<Comparable> v1 = new Vector<Comparable>();
+		v1.add(t1);
+		v1.add(new Integer(1));
+		v1.add("");
+		return v1.get(0);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuVarargs01/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuVarargs01/in/A.java
new file mode 100644
index 000000000..483a39ace
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuVarargs01/in/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	{
+		ArrayList arrayList = new ArrayList();
+		arrayList.add(12L);
+		take("");
+		take("", arrayList);
+		take("", new ArrayList[] {arrayList});
+		take("", arrayList, arrayList);
+	}
+	void take(String format, List... args) {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuVarargs01/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuVarargs01/out/A.java
new file mode 100644
index 000000000..b636b51de
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testCuVarargs01/out/A.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class A {
+	{
+		ArrayList<Long> arrayList = new ArrayList<Long>();
+		arrayList.add(12L);
+		take("");
+		take("", arrayList);
+		take("", new ArrayList[] {arrayList});
+		take("", arrayList, arrayList);
+	}
+	void take(String format, List... args) {}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/A.java
new file mode 100644
index 000000000..e89288b11
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class PairDance {
+    public static void main(String[] args) {
+        InvertedPair/*<Integer, Double>*/ ip= new InvertedPair/*<Integer, Double>*/();
+        Pair/*<Double, Integer>*/ p= ip;
+        p.setA(new Double(1.1));
+        Double a= (Double) ip.getA();
+        ip.setB(new Integer(2));
+        System.out.println(ip);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/InvertedPair.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/InvertedPair.java
new file mode 100644
index 000000000..39e41fe32
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/InvertedPair.java
@@ -0,0 +1,10 @@
+package p;
+
+class InvertedPair<A, B> extends Pair<B, A> {
+    public B getA() {
+        return super.getA();
+    }
+    public void setB(A bee) {
+        super.setB(bee);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/Pair.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/Pair.java
new file mode 100644
index 000000000..57d04c113
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/in/Pair.java
@@ -0,0 +1,22 @@
+package p;
+
+public class Pair<A, B> {
+    private A a;
+    private B b;
+    
+    public A getA() {
+        return a;
+    }
+    public void setA(A a) {
+        this.a= a;
+    }
+    public B getB() {
+        return b;
+    }
+    public void setB(B bee) {
+        b= bee;
+    }
+    public String toString() {
+        return super.toString() + ", a=" + a + ", b=" + b;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/A.java
new file mode 100644
index 000000000..048a34133
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/A.java
@@ -0,0 +1,12 @@
+package p;
+
+class PairDance {
+    public static void main(String[] args) {
+        InvertedPair/*<Integer, Double>*/<Integer, Double> ip= new InvertedPair/*<Integer, Double>*/<Integer, Double>();
+        Pair/*<Double, Integer>*/<Double, Integer> p= ip;
+        p.setA(new Double(1.1));
+        Double a= ip.getA();
+        ip.setB(new Integer(2));
+        System.out.println(ip);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/InvertedPair.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/InvertedPair.java
new file mode 100644
index 000000000..39e41fe32
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/InvertedPair.java
@@ -0,0 +1,10 @@
+package p;
+
+class InvertedPair<A, B> extends Pair<B, A> {
+    public B getA() {
+        return super.getA();
+    }
+    public void setB(A bee) {
+        super.setB(bee);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/Pair.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/Pair.java
new file mode 100644
index 000000000..57d04c113
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InferTypeArguments/testPairDance/out/Pair.java
@@ -0,0 +1,22 @@
+package p;
+
+public class Pair<A, B> {
+    private A a;
+    private B b;
+    
+    public A getA() {
+        return a;
+    }
+    public void setA(A a) {
+        this.a= a;
+    }
+    public B getB() {
+        return b;
+    }
+    public void setB(B bee) {
+        b= bee;
+    }
+    public String toString() {
+        return super.toString() + ", a=" + a + ", b=" + b;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/in/C.java
new file mode 100644
index 000000000..47de648f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/in/C.java
@@ -0,0 +1,10 @@
+// 5, 30 -> 5, 36  replaceAll == true, removeDeclaration == false
+package p;
+
+class C {
+	private static final int FOOBAR= 0;
+	
+	private static void jb() {
+		System.out.println("Ceci, ce n'est pas une pipe: " + FOOBAR + " ;");
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/out/C.java
new file mode 100644
index 000000000..e8466a2d6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test0/out/C.java
@@ -0,0 +1,10 @@
+// 5, 30 -> 5, 36  replaceAll == true, removeDeclaration == false
+package p;
+
+class C {
+	private static final int FOOBAR= 0;
+	
+	private static void jb() {
+		System.out.println("Ceci, ce n'est pas une pipe: " + 0 + " ;");
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/in/C.java
new file mode 100644
index 000000000..928c335fa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/in/C.java
@@ -0,0 +1,22 @@
+// 3, 33 -> 3, 40  removeDeclaration == false, replaceAll == true
+class C {
+	public static final boolean I_EXIST= true;
+	
+	static {
+		boolean beans= I_EXIST;
+	}
+}
+
+class D {
+	int object_oriented_programming() {
+		return false || (!false && C.I_EXIST && (false != true));
+	}
+}
+
+class CPlusPlus extends C {
+	public static final int JAVA= I_EXIST ? 0xCAFEBABE : OxO;
+	
+	void beans() {
+		System.err.println(C          .           I_EXIST);	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/out/C.java
new file mode 100644
index 000000000..0eb48a8f1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test1/out/C.java
@@ -0,0 +1,22 @@
+// 3, 33 -> 3, 40  removeDeclaration == false, replaceAll == true
+class C {
+	public static final boolean I_EXIST= true;
+	
+	static {
+		boolean beans= true;
+	}
+}
+
+class D {
+	int object_oriented_programming() {
+		return false || (!false && true && (false != true));
+	}
+}
+
+class CPlusPlus extends C {
+	public static final int JAVA= true ? 0xCAFEBABE : OxO;
+	
+	void beans() {
+		System.err.println(true);	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/A.java
new file mode 100644
index 000000000..ddbf9f55d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/A.java
@@ -0,0 +1,7 @@
+package p1;
+
+public class A {
+	public static final String EARTH= "Elysium";
+	
+	public static final String ELYSIUM= EARTH;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/B.java
new file mode 100644
index 000000000..487d1dd9e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/in/B.java
@@ -0,0 +1,11 @@
+// 9, 28 -> 9, 37  replaceAll == false
+package p2;
+
+import p1.A;
+
+class B {
+
+	public static void main(String[] args) {
+		System.out.println(A.ELYSIUM);	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/A.java
new file mode 100644
index 000000000..ddbf9f55d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/A.java
@@ -0,0 +1,7 @@
+package p1;
+
+public class A {
+	public static final String EARTH= "Elysium";
+	
+	public static final String ELYSIUM= EARTH;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/B.java
new file mode 100644
index 000000000..e79665f1a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test10/out/B.java
@@ -0,0 +1,11 @@
+// 9, 28 -> 9, 37  replaceAll == false
+package p2;
+
+import p1.A;
+
+class B {
+
+	public static void main(String[] args) {
+		System.out.println(A.EARTH);	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/A.java
new file mode 100644
index 000000000..0e499f487
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/A.java
@@ -0,0 +1,10 @@
+// 8, 25 -> 8, 25  replaceAll == false 
+package p1;
+
+import p2.B;
+
+public class A {
+	void f() {
+		int j= 4 * B.ZEMENT + 1;	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/B.java
new file mode 100644
index 000000000..3e2d1cda0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/B.java
@@ -0,0 +1,7 @@
+package p2;
+
+import p3.C;
+
+public class B {
+	public static final int ZEMENT= 4*C.BEGRIFF + p3.C.BEGRIFF;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/C.java
new file mode 100644
index 000000000..a2f3a71a5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/in/C.java
@@ -0,0 +1,5 @@
+package p3;
+
+public class C {
+	public static final int BEGRIFF= "Der Begriff";	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/A.java
new file mode 100644
index 000000000..628296dc1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/A.java
@@ -0,0 +1,10 @@
+// 8, 25 -> 8, 25  replaceAll == false 
+package p1;
+
+import p3.C;
+
+public class A {
+	void f() {
+		int j= 4 * (4*C.BEGRIFF + p3.C.BEGRIFF) + 1;	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/B.java
new file mode 100644
index 000000000..3e2d1cda0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/B.java
@@ -0,0 +1,7 @@
+package p2;
+
+import p3.C;
+
+public class B {
+	public static final int ZEMENT= 4*C.BEGRIFF + p3.C.BEGRIFF;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/C.java
new file mode 100644
index 000000000..a2f3a71a5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test11/out/C.java
@@ -0,0 +1,5 @@
+package p3;
+
+public class C {
+	public static final int BEGRIFF= "Der Begriff";	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/Declarer.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/Declarer.java
new file mode 100644
index 000000000..6e0cca0d4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/Declarer.java
@@ -0,0 +1,7 @@
+package p1;
+
+public class Declarer {
+	public static final String CONSTANT= foo;
+	
+	public static String foo= "foo_for_now";
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/InlineSite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/InlineSite.java
new file mode 100644
index 000000000..0081d1408
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/in/InlineSite.java
@@ -0,0 +1,9 @@
+// Here, an import is added for a type needed only after a qualification is added.
+// 7, 37 -> 7, 43  replaceAll == true, removeDeclaration == false
+package p2;
+
+class InlineSite {
+	static {
+		System.out.println(p1.Declarer.CONSTANT);	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/Declarer.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/Declarer.java
new file mode 100644
index 000000000..6e0cca0d4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/Declarer.java
@@ -0,0 +1,7 @@
+package p1;
+
+public class Declarer {
+	public static final String CONSTANT= foo;
+	
+	public static String foo= "foo_for_now";
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/InlineSite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/InlineSite.java
new file mode 100644
index 000000000..6ffb232f1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test12/out/InlineSite.java
@@ -0,0 +1,11 @@
+// Here, an import is added for a type needed only after a qualification is added.
+// 7, 37 -> 7, 43  replaceAll == true, removeDeclaration == false
+package p2;
+
+import p1.Declarer;
+
+class InlineSite {
+	static {
+		System.out.println(Declarer.foo);	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/A.java
new file mode 100644
index 000000000..8b20772f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/A.java
@@ -0,0 +1,9 @@
+package p1;
+
+public class A {
+	public class B {
+		public static final Object CONSTANT= ALFRED;	
+	}
+	
+	public static final Object ALFRED= null;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/InlineSite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/InlineSite.java
new file mode 100644
index 000000000..04b860a2d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/in/InlineSite.java
@@ -0,0 +1,9 @@
+// Here, an import is added for a type needed only after a qualification is added.
+// 8, 19 -> 8, 29  removeAll == false
+package p2;
+
+import p1.A.B;
+
+class InlineSite {
+	Object thing= B.CONSTANT;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/A.java
new file mode 100644
index 000000000..8b20772f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/A.java
@@ -0,0 +1,9 @@
+package p1;
+
+public class A {
+	public class B {
+		public static final Object CONSTANT= ALFRED;	
+	}
+	
+	public static final Object ALFRED= null;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/InlineSite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/InlineSite.java
new file mode 100644
index 000000000..331196ba2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test13/out/InlineSite.java
@@ -0,0 +1,9 @@
+// Here, an import is added for a type needed only after a qualification is added.
+// 8, 19 -> 8, 29  removeAll == false
+package p2;
+
+import p1.A;
+
+class InlineSite {
+	Object thing= A.ALFRED;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/in/GrueziWohl.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/in/GrueziWohl.java
new file mode 100644
index 000000000..11d4e1e11
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/in/GrueziWohl.java
@@ -0,0 +1,17 @@
+// 7, 35 -> 7, 35  replaceAll == true, removeDeclaration == false;
+package cantonzuerich;
+
+public class GrueziWohl {
+	private static String gruezi= "Gruezi";
+	private static boolean jh= true;
+	private static final boolean WOHL= jh && "Gruezi".equals(gruezi);
+	
+	public String holenGruss() {
+		String gruezi= "Gruezi";
+		return gruezi + (WOHL ? " Wohl" : "") + "!";
+	}
+	
+	private boolean wohl() {
+		return WOHL;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/out/GrueziWohl.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/out/GrueziWohl.java
new file mode 100644
index 000000000..d9f0854ee
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test14/out/GrueziWohl.java
@@ -0,0 +1,17 @@
+// 7, 35 -> 7, 35  replaceAll == true, removeDeclaration == false;
+package cantonzuerich;
+
+public class GrueziWohl {
+	private static String gruezi= "Gruezi";
+	private static boolean jh= true;
+	private static final boolean WOHL= jh && "Gruezi".equals(gruezi);
+	
+	public String holenGruss() {
+		String gruezi= "Gruezi";
+		return gruezi + (jh && "Gruezi".equals(GrueziWohl.gruezi) ? " Wohl" : "") + "!";
+	}
+	
+	private boolean wohl() {
+		return jh && "Gruezi".equals(gruezi);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/in/Froehlichkeit.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/in/Froehlichkeit.java
new file mode 100644
index 000000000..5cf853d98
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/in/Froehlichkeit.java
@@ -0,0 +1,21 @@
+// 14, 16 -> 14, 32  replaceAll == true, removeDeclaration == false
+package schweiz.zuerich.zuerich;
+
+public abstract class Froehlichkeit {
+	static class MeineFroehlichkeit extends Froehlichkeit {
+		MeineFroehlichkeit(Object o) {}
+	}
+	private static Object something= new Object();
+	private static final Froehlichkeit dieFroehlichkeit= new MeineFroehlichkeit(something);
+
+	public Froehlichkeit holenFroehlichkeit() {
+		class MeineFroehlichkeit {
+		}
+		return dieFroehlichkeit;
+	}
+
+	public Froehlichkeit deineFroehlichkeit() {
+		Object something= "";
+		return dieFroehlichkeit;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/out/Froehlichkeit.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/out/Froehlichkeit.java
new file mode 100644
index 000000000..8002a212a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test15/out/Froehlichkeit.java
@@ -0,0 +1,21 @@
+// 14, 16 -> 14, 32  replaceAll == true, removeDeclaration == false
+package schweiz.zuerich.zuerich;
+
+public abstract class Froehlichkeit {
+	static class MeineFroehlichkeit extends Froehlichkeit {
+		MeineFroehlichkeit(Object o) {}
+	}
+	private static Object something= new Object();
+	private static final Froehlichkeit dieFroehlichkeit= new MeineFroehlichkeit(something);
+
+	public Froehlichkeit holenFroehlichkeit() {
+		class MeineFroehlichkeit {
+		}
+		return new Froehlichkeit.MeineFroehlichkeit(something);
+	}
+
+	public Froehlichkeit deineFroehlichkeit() {
+		Object something= "";
+		return new MeineFroehlichkeit(Froehlichkeit.something);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test16/in/IntegerMath.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test16/in/IntegerMath.java
new file mode 100644
index 000000000..f85359c33
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test16/in/IntegerMath.java
@@ -0,0 +1,22 @@
+//8, 23 -> 8, 23  replaceAll == true, removeDeclaration == true
+package p;
+
+class IntegerMath<E> {
+	/**
+	 * This is {@link #PI}
+	 */
+	static final int PI= 3;
+	/**
+	 * This uses {@link #PI}
+	 */
+	int getCircumference(int radius) {
+		return 2 * radius * PI/*.14159265*/;
+	}
+}
+
+/**
+ * @see IntegerMath#PI
+ */
+class Test {
+	int c= new IntegerMath<String>().getCircumference(IntegerMath.PI);
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test16/out/IntegerMath.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test16/out/IntegerMath.java
new file mode 100644
index 000000000..130456563
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test16/out/IntegerMath.java
@@ -0,0 +1,18 @@
+//8, 23 -> 8, 23  replaceAll == true, removeDeclaration == true
+package p;
+
+class IntegerMath<E> {
+	/**
+	 * This uses {@link #PI}
+	 */
+	int getCircumference(int radius) {
+		return 2 * radius * 3/*.14159265*/;
+	}
+}
+
+/**
+ * @see IntegerMath#PI
+ */
+class Test {
+	int c= new IntegerMath<String>().getCircumference(3);
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test17/in/EnumRef.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test17/in/EnumRef.java
new file mode 100644
index 000000000..fd7998bc6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test17/in/EnumRef.java
@@ -0,0 +1,8 @@
+//4, 59 -> 4, 59  replaceAll == true, removeDeclaration == true
+package p;
+
+enum Letter { A, B, C { }; public static final Letter MAIN= A; }
+
+class EnumRef {
+    Letter l= Letter.MAIN;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test17/out/EnumRef.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test17/out/EnumRef.java
new file mode 100644
index 000000000..9bd9aa971
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test17/out/EnumRef.java
@@ -0,0 +1,8 @@
+//4, 59 -> 4, 59  replaceAll == true, removeDeclaration == true
+package p;
+
+enum Letter { A, B, C { } }
+
+class EnumRef {
+    Letter l= Letter.A;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test18/in/Annot.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test18/in/Annot.java
new file mode 100644
index 000000000..b31fa872c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test18/in/Annot.java
@@ -0,0 +1,14 @@
+//5, 18 -> 5, 18  replaceAll == true, removeDeclaration == true
+package p;
+
+@interface Annot {
+	String DEFAULT_NAME= "Paul";
+	String value();
+}
+@Annot(Annot.DEFAULT_NAME)
+class Test {
+	@Annot(value=Annot.DEFAULT_NAME)
+	String m(Annot a) {
+		return a.DEFAULT_NAME;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test18/out/Annot.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test18/out/Annot.java
new file mode 100644
index 000000000..efd5224bc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test18/out/Annot.java
@@ -0,0 +1,13 @@
+//5, 18 -> 5, 18  replaceAll == true, removeDeclaration == true
+package p;
+
+@interface Annot {
+	String value();
+}
+@Annot("Paul")
+class Test {
+	@Annot(value="Paul")
+	String m(Annot a) {
+		return "Paul";
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test19/in/Test.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test19/in/Test.java
new file mode 100644
index 000000000..70ed7484a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test19/in/Test.java
@@ -0,0 +1,17 @@
+//7, 36 -> 7, 36  replaceAll == true, removeDeclaration == false
+package p;
+
+@Test.Annot(Test.Annot.DEFAULT)
+class Test {
+	@interface Annot {
+		public static final String DEFAULT= "John";
+		String value();
+	}
+	@Annot(Annot.DEFAULT)
+	int a;
+	@Annot(value=Annot.DEFAULT)
+	int b;
+}
+
+@Test.Annot(value=Test.Annot.DEFAULT)
+enum Test2 {}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test19/out/Test.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test19/out/Test.java
new file mode 100644
index 000000000..cd73f156a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test19/out/Test.java
@@ -0,0 +1,17 @@
+//7, 36 -> 7, 36  replaceAll == true, removeDeclaration == false
+package p;
+
+@Test.Annot("John")
+class Test {
+	@interface Annot {
+		public static final String DEFAULT= "John";
+		String value();
+	}
+	@Annot("John")
+	int a;
+	@Annot(value="John")
+	int b;
+}
+
+@Test.Annot(value="John")
+enum Test2 {}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/in/Klass.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/in/Klass.java
new file mode 100644
index 000000000..44afdd638
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/in/Klass.java
@@ -0,0 +1,14 @@
+// 10, 22 -> 10, 30  replaceAll == false
+
+package p;
+
+class Klass {
+	static final Klass KONSTANT=           new   Klass()  ;
+	
+	
+	static void f() {
+		Klass klass= KONSTANT;	
+	}
+	
+	Klass klass=KONSTANT;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/out/Klass.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/out/Klass.java
new file mode 100644
index 000000000..26f644e46
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test2/out/Klass.java
@@ -0,0 +1,14 @@
+// 10, 22 -> 10, 30  replaceAll == false
+
+package p;
+
+class Klass {
+	static final Klass KONSTANT=           new   Klass()  ;
+	
+	
+	static void f() {
+		Klass klass= new   Klass();	
+	}
+	
+	Klass klass=KONSTANT;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test20/in/Test.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test20/in/Test.java
new file mode 100644
index 000000000..55fc62b85
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test20/in/Test.java
@@ -0,0 +1,14 @@
+//10, 21 -> 10, 21  replaceAll == true, removeDeclaration == true
+package p;
+
+class Test {
+	private enum Color {
+		PINK, YELLOW;
+		final static Color CORPORATE_COLOR= Color.PINK;
+	}
+	private enum Box {
+		FIRST(Color.CORPORATE_COLOR);
+		public Box(Color c) {}
+	}
+	Color c= Color.CORPORATE_COLOR;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test20/out/Test.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test20/out/Test.java
new file mode 100644
index 000000000..4879da057
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test20/out/Test.java
@@ -0,0 +1,13 @@
+//10, 21 -> 10, 21  replaceAll == true, removeDeclaration == true
+package p;
+
+class Test {
+	private enum Color {
+		PINK, YELLOW
+	}
+	private enum Box {
+		FIRST(Test.Color.PINK);
+		public Box(Color c) {}
+	}
+	Color c= Test.Color.PINK;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/in/A.java
new file mode 100644
index 000000000..ce144d38f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/in/A.java
@@ -0,0 +1,10 @@
+//8, 16 -> 8, 19  replaceAll == true, removeDeclaration == false
+package p;
+
+import static q.Consts.III;
+
+class A {
+	int getIII() {
+		return III;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/in/Consts.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/in/Consts.java
new file mode 100644
index 000000000..3b42e84d5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/in/Consts.java
@@ -0,0 +1,6 @@
+package q;
+
+public interface Consts {
+	int I= 1;
+	int III= I + I + I;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/out/A.java
new file mode 100644
index 000000000..d667ede57
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/out/A.java
@@ -0,0 +1,10 @@
+//8, 16 -> 8, 19  replaceAll == true, removeDeclaration == false
+package p;
+
+import static q.Consts.I;
+
+class A {
+	int getIII() {
+		return I + I + I;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/out/Consts.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/out/Consts.java
new file mode 100644
index 000000000..3b42e84d5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test21/out/Consts.java
@@ -0,0 +1,6 @@
+package q;
+
+public interface Consts {
+	int I= 1;
+	int III= I + I + I;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/A.java
new file mode 100644
index 000000000..4c892c643
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/A.java
@@ -0,0 +1,13 @@
+//11, 16 -> 11, 19  replaceAll == true, removeDeclaration == true
+package p;
+
+import static q.Consts.III;
+
+public class A {
+	public static final int getCount() { return 42; }
+	public static final int getCount2() { return 42; }
+	
+	int getIII() {
+		return III;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/Consts.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/Consts.java
new file mode 100644
index 000000000..030b0affe
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/Consts.java
@@ -0,0 +1,11 @@
+package q;
+
+import p.A;
+import r.Third;
+import static p.A.getCount2;
+import static r.Third.B;
+
+public interface Consts {
+	int I= 1;
+	int III= I + A.getCount() + getCount2() + Third.A + B;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/Third.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/Third.java
new file mode 100644
index 000000000..094ecaacd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/in/Third.java
@@ -0,0 +1,6 @@
+package r;
+
+public class Third {
+	public static final int A= -23;
+	public static final int B= 23;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/A.java
new file mode 100644
index 000000000..3eb15bfc1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/A.java
@@ -0,0 +1,16 @@
+//11, 16 -> 11, 19  replaceAll == true, removeDeclaration == true
+package p;
+
+import static p.A.getCount2;
+import static q.Consts.I;
+import static r.Third.B;
+import r.Third;
+
+public class A {
+	public static final int getCount() { return 42; }
+	public static final int getCount2() { return 42; }
+	
+	int getIII() {
+		return I + A.getCount() + getCount2() + Third.A + B;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Consts.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Consts.java
new file mode 100644
index 000000000..3736dc848
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Consts.java
@@ -0,0 +1,6 @@
+package q;
+
+
+public interface Consts {
+	int I= 1;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Third.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Third.java
new file mode 100644
index 000000000..094ecaacd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test22/out/Third.java
@@ -0,0 +1,6 @@
+package r;
+
+public class Third {
+	public static final int A= -23;
+	public static final int B= 23;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test23/in/Test.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test23/in/Test.java
new file mode 100644
index 000000000..ad7d403ca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test23/in/Test.java
@@ -0,0 +1,14 @@
+//6, 26 -> 6, 26  replaceAll == false, removeDeclaration == false
+package p;
+
+class Test {
+	Runnable getExecutor() {
+		return Runnables.DO_NOTHING;
+	}
+}
+
+class Runnables {
+	public static final Runnable DO_NOTHING= new Runnable() {
+		public void run() { }
+	};
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test23/out/Test.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test23/out/Test.java
new file mode 100644
index 000000000..f8de45084
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test23/out/Test.java
@@ -0,0 +1,16 @@
+//6, 26 -> 6, 26  replaceAll == false, removeDeclaration == false
+package p;
+
+class Test {
+	Runnable getExecutor() {
+		return new Runnable() {
+			public void run() { }
+		};
+	}
+}
+
+class Runnables {
+	public static final Runnable DO_NOTHING= new Runnable() {
+		public void run() { }
+	};
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/in/A.java
new file mode 100644
index 000000000..0c877af07
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/in/A.java
@@ -0,0 +1,16 @@
+//14, 17, 14, 17  replaceAll == true, removeDeclaration == true
+package p;
+
+import static q.Consts.III;
+import q.Consts;
+
+public class A {
+	public static final int getCount() { return 42; }
+	public static final int getCount2() { return 42; }
+	
+	int getIII() {
+		int i= q.Consts.III;
+		int ii= Consts.III;
+		return III + i + ii;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/in/Consts.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/in/Consts.java
new file mode 100644
index 000000000..0d21194ce
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/in/Consts.java
@@ -0,0 +1,10 @@
+package q;
+
+import p.A;
+import static p.A.getCount2;
+
+public interface Consts {
+	int I= 1;
+	int III= I + Consts.I + q.Consts.I
+			+ p.A.getCount() + A.getCount() + getCount2();
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/A.java
new file mode 100644
index 000000000..1fec883a9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/A.java
@@ -0,0 +1,20 @@
+//14, 17, 14, 17  replaceAll == true, removeDeclaration == true
+package p;
+
+import static p.A.getCount2;
+import static q.Consts.I;
+import q.Consts;
+
+public class A {
+	public static final int getCount() { return 42; }
+	public static final int getCount2() { return 42; }
+	
+	int getIII() {
+		int i= Consts.I + Consts.I + q.Consts.I
+				+ p.A.getCount() + A.getCount() + getCount2();
+		int ii= Consts.I + Consts.I + q.Consts.I
+				+ p.A.getCount() + A.getCount() + getCount2();
+		return (I + Consts.I + q.Consts.I
+				+ p.A.getCount() + A.getCount() + getCount2()) + i + ii;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/Consts.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/Consts.java
new file mode 100644
index 000000000..3736dc848
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test24/out/Consts.java
@@ -0,0 +1,6 @@
+package q;
+
+
+public interface Consts {
+	int I= 1;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test25/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test25/in/A.java
new file mode 100644
index 000000000..767ac7c54
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test25/in/A.java
@@ -0,0 +1,13 @@
+//5, 32, 5, 32
+package p;
+
+class A {
+	private static final int CONST = 9;
+
+	/*
+	 * (non-Javadoc) comment
+	 */
+	public void foo() {
+		final int lineNumber2= /*preserve*/CONST/*this*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test25/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test25/out/A.java
new file mode 100644
index 000000000..e59316fcb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test25/out/A.java
@@ -0,0 +1,11 @@
+//5, 32, 5, 32
+package p;
+
+class A {
+	/*
+	 * (non-Javadoc) comment
+	 */
+	public void foo() {
+		final int lineNumber2= /*preserve*/9/*this*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test26/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test26/in/A.java
new file mode 100644
index 000000000..098f7f927
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test26/in/A.java
@@ -0,0 +1,14 @@
+//5, 42, 5, 42
+package p;
+
+class A {
+	private static final StringBuffer logger_= getLogger(A.class);
+
+	public static void handleException(final Throwable t) {
+		System.out.println(logger_);
+	}
+
+	private static StringBuffer getLogger(Class name) {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test26/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test26/out/A.java
new file mode 100644
index 000000000..dbe1e6276
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test26/out/A.java
@@ -0,0 +1,12 @@
+//5, 42, 5, 42
+package p;
+
+class A {
+	public static void handleException(final Throwable t) {
+		System.out.println(getLogger(A.class));
+	}
+
+	private static StringBuffer getLogger(Class name) {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test27/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test27/in/A.java
new file mode 100644
index 000000000..16055daf9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test27/in/A.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	static final int[] array = {};
+	{
+		for (int i = array.length; i < array.length; array[i] = i)
+			;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test27/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test27/out/A.java
new file mode 100644
index 000000000..77452abc9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test27/out/A.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	{
+		for (int i = new int[]{}.length; i < new int[]{}.length; new int[]{}[i] = i)
+			;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/AnotherClass.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/AnotherClass.java
new file mode 100644
index 000000000..871da96f1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/AnotherClass.java
@@ -0,0 +1,7 @@
+package p;
+
+public class AnotherClass {
+	{
+		Const.someArr2[0] = null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/Const.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/Const.java
new file mode 100644
index 000000000..eea5ac149
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/Const.java
@@ -0,0 +1,10 @@
+package p;
+
+import q.UsedClass;
+
+class Const {
+	public static final UsedClass someArr2[] = {};
+	{
+		someArr2[0] = null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/UsedClass.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/UsedClass.java
new file mode 100644
index 000000000..23ac9ec39
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/in/UsedClass.java
@@ -0,0 +1,3 @@
+package q;
+public class UsedClass {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/AnotherClass.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/AnotherClass.java
new file mode 100644
index 000000000..86def5c0b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/AnotherClass.java
@@ -0,0 +1,9 @@
+package p;
+
+import q.UsedClass;
+
+public class AnotherClass {
+	{
+		new UsedClass[]{}[0] = null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/Const.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/Const.java
new file mode 100644
index 000000000..6ffb4a5f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/Const.java
@@ -0,0 +1,9 @@
+package p;
+
+import q.UsedClass;
+
+class Const {
+	{
+		new UsedClass[]{}[0] = null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/UsedClass.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/UsedClass.java
new file mode 100644
index 000000000..23ac9ec39
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test28/out/UsedClass.java
@@ -0,0 +1,3 @@
+package q;
+public class UsedClass {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test29/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test29/in/A.java
new file mode 100644
index 000000000..3eab5a04a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test29/in/A.java
@@ -0,0 +1,17 @@
+package p;
+
+import java.util.Collections;
+import java.util.Map;
+
+class A {
+	private static final Map<Float, Float> EMPTY_MAP= Collections.emptyMap();
+	
+	<T extends Number> A(Map<T, T> map) { }
+	
+	A() {
+		this(EMPTY_MAP);
+		Map<Float, Float> emptyMap= EMPTY_MAP;
+		Map<?, ?> emptyMap2= EMPTY_MAP;
+		new A(EMPTY_MAP);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test29/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test29/out/A.java
new file mode 100644
index 000000000..645716f1b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test29/out/A.java
@@ -0,0 +1,15 @@
+package p;
+
+import java.util.Collections;
+import java.util.Map;
+
+class A {
+	<T extends Number> A(Map<T, T> map) { }
+	
+	A() {
+		this(Collections.<Float, Float>emptyMap());
+		Map<Float, Float> emptyMap= Collections.emptyMap();
+		Map<?, ?> emptyMap2= Collections.emptyMap();
+		new A(Collections.<Float, Float>emptyMap());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/in/LeVinSuperieure.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/in/LeVinSuperieure.java
new file mode 100644
index 000000000..df91fba97
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/in/LeVinSuperieure.java
@@ -0,0 +1,11 @@
+// 5, 32 -> 5, 43  replaceAll == true, removeDeclaration == true
+package p;
+
+class LeVinSuperieure {
+	public static final String LE_CONSTANT= "Pharmacology";
+	
+	public LeVinSuperieure(final String appelation) {
+		String leNom= appelation == null ? LE_CONSTANT : appelation;
+		System.out.println("Nous avons cree un superieure vin, appelle " + leNom);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/out/LeVinSuperieure.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/out/LeVinSuperieure.java
new file mode 100644
index 000000000..d354d6053
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test3/out/LeVinSuperieure.java
@@ -0,0 +1,9 @@
+// 5, 32 -> 5, 43  replaceAll == true, removeDeclaration == true
+package p;
+
+class LeVinSuperieure {
+	public LeVinSuperieure(final String appelation) {
+		String leNom= appelation == null ? "Pharmacology" : appelation;
+		System.out.println("Nous avons cree un superieure vin, appelle " + leNom);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/A.java
new file mode 100644
index 000000000..c118c3529
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+import static q.Consts.constant;
+
+class A {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/B.java
new file mode 100644
index 000000000..08c354cca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/B.java
@@ -0,0 +1,8 @@
+package p;
+
+import static q.Consts.constant;
+
+class B {
+	String fS= constant;
+	int fI= constant();
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/C.java
new file mode 100644
index 000000000..7e997d4bc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/C.java
@@ -0,0 +1,7 @@
+package p;
+
+import static q.Consts.constant;
+
+class C {
+	String fS= constant;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/Consts.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/Consts.java
new file mode 100644
index 000000000..580ae6df1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/Consts.java
@@ -0,0 +1,7 @@
+//5, 32 -> 5, 40  replaceAll == true, removeDeclaration == true
+package q;
+
+public class Consts {
+	public static final String constant="";
+	public static int constant() { return -1; }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/D.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/D.java
new file mode 100644
index 000000000..fafd1cc19
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/in/D.java
@@ -0,0 +1,7 @@
+package p;
+
+import static q.Consts.constant;
+
+class D {
+	int fI= constant();
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/A.java
new file mode 100644
index 000000000..f6ef9fb04
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/A.java
@@ -0,0 +1,5 @@
+package p;
+
+
+class A {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/B.java
new file mode 100644
index 000000000..26b3284be
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/B.java
@@ -0,0 +1,8 @@
+package p;
+
+import static q.Consts.constant;
+
+class B {
+	String fS= "";
+	int fI= constant();
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/C.java
new file mode 100644
index 000000000..08977441b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/C.java
@@ -0,0 +1,6 @@
+package p;
+
+
+class C {
+	String fS= "";
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/Consts.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/Consts.java
new file mode 100644
index 000000000..b2a3d4747
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/Consts.java
@@ -0,0 +1,6 @@
+//5, 32 -> 5, 40  replaceAll == true, removeDeclaration == true
+package q;
+
+public class Consts {
+	public static int constant() { return -1; }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/D.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/D.java
new file mode 100644
index 000000000..fafd1cc19
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test30/out/D.java
@@ -0,0 +1,7 @@
+package p;
+
+import static q.Consts.constant;
+
+class D {
+	int fI= constant();
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test31/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test31/in/A.java
new file mode 100644
index 000000000..1ee05b665
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test31/in/A.java
@@ -0,0 +1,7 @@
+package p;
+
+class A {
+	static final long CONST = 2;
+	
+	long much = CONST * Integer.MAX_VALUE;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test31/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test31/out/A.java
new file mode 100644
index 000000000..6a433712d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test31/out/A.java
@@ -0,0 +1,5 @@
+package p;
+
+class A {
+	long much = (long) 2 * Integer.MAX_VALUE;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test32/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test32/in/A.java
new file mode 100644
index 000000000..2b6ab0f57
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test32/in/A.java
@@ -0,0 +1,7 @@
+package p;
+
+class A {
+	static final long CONST = 2 + 1;
+	
+	long much = CONST * Integer.MAX_VALUE;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test32/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test32/out/A.java
new file mode 100644
index 000000000..500f2d802
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test32/out/A.java
@@ -0,0 +1,5 @@
+package p;
+
+class A {
+	long much = (long) (2 + 1) * Integer.MAX_VALUE;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test33/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test33/in/A.java
new file mode 100644
index 000000000..5b15f5f7e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test33/in/A.java
@@ -0,0 +1,18 @@
+package p;
+
+class A {
+    public static final int B= 12;
+    public static final int C= B - 1; //inline C
+    public static final int K= 99;
+
+    public static void main(String[] args) {
+        int f1= K - 1 - C;
+        int f2= K - C - C - C;
+
+        int x1= K + C;
+        int x2= K - C;
+        int x3= K + 1 - C;
+        int x4= K - 1 + C;
+        int x5= K + 1 + C - C - C;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test33/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test33/out/A.java
new file mode 100644
index 000000000..030e3a65d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test33/out/A.java
@@ -0,0 +1,17 @@
+package p;
+
+class A {
+    public static final int B= 12;
+    public static final int K= 99;
+
+    public static void main(String[] args) {
+        int f1= K - 1 - (B - 1);
+        int f2= K - (B - 1) - (B - 1) - (B - 1);
+
+        int x1= K + (B - 1);
+        int x2= K - (B - 1);
+        int x3= K + 1 - (B - 1);
+        int x4= K - 1 + (B - 1);
+        int x5= K + 1 + (B - 1) - (B - 1) - (B - 1);
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test34/in/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test34/in/A.java
new file mode 100644
index 000000000..63c78d0d6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test34/in/A.java
@@ -0,0 +1,6 @@
+package p;
+
+class A {
+    static final Short C= 1;
+    boolean b= equals(C);
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test34/out/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test34/out/A.java
new file mode 100644
index 000000000..be3025cde
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test34/out/A.java
@@ -0,0 +1,5 @@
+package p;
+
+class A {
+    boolean b= equals((short) 1);
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/in/Klus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/in/Klus.java
new file mode 100644
index 000000000..ced6dc795
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/in/Klus.java
@@ -0,0 +1,8 @@
+// 5, 36 -> 5, 36  replaceAll == true, removeDeclaration == false
+package p;
+
+class Klus {
+	private static final int KLUSPLATZ= 34;
+	
+	private int kreuzplatz= (kreuzplatz= -1 +KLUSPLATZ+ (-1));
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/out/Klus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/out/Klus.java
new file mode 100644
index 000000000..56daf649a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test4/out/Klus.java
@@ -0,0 +1,8 @@
+// 5, 36 -> 5, 36  replaceAll == true, removeDeclaration == false
+package p;
+
+class Klus {
+	private static final int KLUSPLATZ= 34;
+	
+	private int kreuzplatz= (kreuzplatz= -1 +34+ (-1));
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/in/PartOfDeclNameSelected.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/in/PartOfDeclNameSelected.java
new file mode 100644
index 000000000..6a5ea9381
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/in/PartOfDeclNameSelected.java
@@ -0,0 +1,9 @@
+// 5, 32 -> 5, 34  replaceAllReferences == true,  removeDeclaration == true
+package p;
+
+class PartOfDeclNameSelected {
+	public static final long foooo= 1;
+	static {
+		long l= foooo;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/out/PartOfDeclNameSelected.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/out/PartOfDeclNameSelected.java
new file mode 100644
index 000000000..a50f61a07
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test5/out/PartOfDeclNameSelected.java
@@ -0,0 +1,8 @@
+// 5, 32 -> 5, 34  replaceAllReferences == true,  removeDeclaration == true
+package p;
+
+class PartOfDeclNameSelected {
+	static {
+		long l= (long) 1;	
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/in/CursorPositionedInReference.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/in/CursorPositionedInReference.java
new file mode 100644
index 000000000..5441bb274
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/in/CursorPositionedInReference.java
@@ -0,0 +1,10 @@
+// 8, 57 -> 8, 57  replaceAll == false
+package p;
+
+class CursorPositionedInReference {
+	static final String VISUALAGE_FOR_COBOL= "simply irresistible";
+	
+	public static CursorPositionedInReference eat() {
+		System.out.println("Refactoring is " + VISUALAGE_FOR_COBOL);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/out/CursorPositionedInReference.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/out/CursorPositionedInReference.java
new file mode 100644
index 000000000..079cba539
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test6/out/CursorPositionedInReference.java
@@ -0,0 +1,10 @@
+// 8, 57 -> 8, 57  replaceAll == false
+package p;
+
+class CursorPositionedInReference {
+	static final String VISUALAGE_FOR_COBOL= "simply irresistible";
+	
+	public static CursorPositionedInReference eat() {
+		System.out.println("Refactoring is " + "simply irresistible");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/in/PartOfReferenceSelected.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/in/PartOfReferenceSelected.java
new file mode 100644
index 000000000..3777c201d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/in/PartOfReferenceSelected.java
@@ -0,0 +1,10 @@
+// 8, 52 -> 8, 62  replaceAll == false
+package p;
+
+class PartOfReferenceSelected {
+	static final String VISUALAGE_FOR_COBOL= "simply irresistible";
+	
+	public static CursorPositionedInReference eat() {
+		System.out.println("Refactoring is " + VISUALAGE_FOR_COBOL);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/out/PartOfReferenceSelected.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/out/PartOfReferenceSelected.java
new file mode 100644
index 000000000..5d2c1654d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test7/out/PartOfReferenceSelected.java
@@ -0,0 +1,10 @@
+// 8, 52 -> 8, 62  replaceAll == false
+package p;
+
+class PartOfReferenceSelected {
+	static final String VISUALAGE_FOR_COBOL= "simply irresistible";
+	
+	public static CursorPositionedInReference eat() {
+		System.out.println("Refactoring is " + "simply irresistible");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/C.java
new file mode 100644
index 000000000..8808f0596
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/C.java
@@ -0,0 +1,6 @@
+// 5, 29 -> 5, 37  replaceAll == true, removeDeclaration == false
+package p1;
+
+public class C {
+	public static final int CONSTANT= 12345;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/D.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/D.java
new file mode 100644
index 000000000..e65ae9102
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/in/D.java
@@ -0,0 +1,9 @@
+package p2;
+
+import p1.C;
+
+class D {
+	void f() {
+		int j= C.CONSTANT;	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/C.java
new file mode 100644
index 000000000..8808f0596
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/C.java
@@ -0,0 +1,6 @@
+// 5, 29 -> 5, 37  replaceAll == true, removeDeclaration == false
+package p1;
+
+public class C {
+	public static final int CONSTANT= 12345;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java
new file mode 100644
index 000000000..9b9ad0a0f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test8/out/D.java
@@ -0,0 +1,8 @@
+package p2;
+
+
+class D {
+	void f() {
+		int j= 12345;	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/C.java
new file mode 100644
index 000000000..806e8588a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/C.java
@@ -0,0 +1,5 @@
+package p1;
+
+public class C {
+	public static final int CONSTANT= 12345;	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/D.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/D.java
new file mode 100644
index 000000000..9ea4920d9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/D.java
@@ -0,0 +1,10 @@
+// 8, 18 -> 8, 26  replaceAll == true, removeDeclaration == true
+package p2;
+
+import p1.C;
+
+class D {
+	void f() {
+		int j= C.CONSTANT;	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/E.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/E.java
new file mode 100644
index 000000000..6d6b96a93
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/in/E.java
@@ -0,0 +1,7 @@
+package p3;
+
+import p1.C;
+
+public class E {
+	static int e= 1 + C.CONSTANT;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/C.java
new file mode 100644
index 000000000..1df4f81ab
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/C.java
@@ -0,0 +1,4 @@
+package p1;
+
+public class C {	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java
new file mode 100644
index 000000000..74ccf93ed
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/D.java
@@ -0,0 +1,9 @@
+// 8, 18 -> 8, 26  replaceAll == true, removeDeclaration == true
+package p2;
+
+
+class D {
+	void f() {
+		int j= 12345;	
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java
new file mode 100644
index 000000000..282fbc6ef
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/canInline/test9/out/E.java
@@ -0,0 +1,6 @@
+package p3;
+
+
+public class E {
+	static int e= 1 + 12345;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail0/in/NeueZuercherZeitung.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail0/in/NeueZuercherZeitung.java
new file mode 100644
index 000000000..40b9ea98d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail0/in/NeueZuercherZeitung.java
@@ -0,0 +1,7 @@
+// 5, 27 -> 5, 28, replaceAll= true removeDeclaration == false
+package foo;
+
+class NeueZuercherZeitung {
+	public static Object foob;
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail1/in/Fun.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail1/in/Fun.java
new file mode 100644
index 000000000..071ae4c28
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail1/in/Fun.java
@@ -0,0 +1,10 @@
+// 8, 35 -> 8, 35  replaceAll == false
+package fun;
+
+import java.util.*;
+
+class Fun {
+	int m() {
+		return GregorianCalendar.BC;
+	}	
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail2/in/EnumRef.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail2/in/EnumRef.java
new file mode 100644
index 000000000..da630063a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineConstant/cannotInline/testFail2/in/EnumRef.java
@@ -0,0 +1,8 @@
+//7, 22 -> 7, 22  replaceAll == true, removeDeclaration == true
+package p;
+
+enum Letter { A, B, C }
+
+class EnumRef {
+    Letter l= Letter.A;
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/.cvsignore b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/.cvsignore
new file mode 100644
index 000000000..eddeac1f8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/.cvsignore
@@ -0,0 +1,3 @@
+.metadata
+bin
+*.class
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.classpath b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.classpath
new file mode 100644
index 000000000..5e812821d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="binary/|binary_src/" kind="src" path=""/>
+	<classpathentry output="binary" kind="src" path="binary_src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.cvsignore b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.cvsignore
new file mode 100644
index 000000000..21a301303
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.cvsignore
@@ -0,0 +1,2 @@
+bin
+*.class
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.project b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.project
new file mode 100644
index 000000000..86a5ef6c8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>TestCases</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/A.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/A.java
new file mode 100644
index 000000000..8520e3281
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/A.java
@@ -0,0 +1,7 @@
+import static java.lang.Math.PI;
+
+public class A {
+	void bar() {
+		double i= PI;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/B.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/B.java
new file mode 100644
index 000000000..b85709438
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/B.java
@@ -0,0 +1,6 @@
+public class B {
+	public void foo() {
+		A a= null;
+		a.bar();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/C.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/C.java
new file mode 100644
index 000000000..987c439eb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/C.java
@@ -0,0 +1,8 @@
+class C {
+    int m(){
+        return 6 + 6;
+    }
+    void f(C a){
+       m();
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/E.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/E.java
new file mode 100644
index 000000000..4087d98e1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/E.java
@@ -0,0 +1,6 @@
+public class E {
+	public void main() {
+		B b= null;
+		b.foo();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/InlineBug.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/InlineBug.java
new file mode 100644
index 000000000..64e656db2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/InlineBug.java
@@ -0,0 +1,26 @@
+import java.io.Writer;
+
+public class InlineBug
+{
+	public void caller(Writer out) throws Exception
+	{
+		out.write("start caller");
+		inlineMe(out);
+		out.write("end caller");
+	}
+
+	public void inlineMe(Writer out) throws Exception
+	{
+		out.write("start render");
+		subroutine(true, out);
+		out.write("end render");
+	}
+
+	void subroutine(boolean isSelected, Writer out) throws Exception
+	{
+		if (isSelected)
+		{
+			out.write("selected");
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/Test.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/Test.java
new file mode 100644
index 000000000..1595b3db5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/Test.java
@@ -0,0 +1,20 @@
+public class Test {
+
+  private int bb(int u, int v, int w) {
+	return (u & v) | (~u & w);
+  }
+
+  private int aa(int x, int n) {
+	return (x << n) | (x >>> (32 - n));
+  }
+
+  protected void processBlock() {
+	int a = 0;
+	int b = 1;
+	int c = 2;
+	int d = 3;
+    
+	a = aa((a + bb( b, c, d)), 0) + b;
+  }    
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/Test91470.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/Test91470.java
new file mode 100644
index 000000000..ffd6b7ab4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/Test91470.java
@@ -0,0 +1,13 @@
+package argument_in;
+
+import java.text.MessageFormat;
+
+public class Test91470 {
+	public static final String format(String key, Object... args) {
+	    return MessageFormat.format(key, args);
+	}
+	
+	public void use() {
+		/*]*/format("key", "value");/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestArray.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestArray.java
new file mode 100644
index 000000000..c36ae2677
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestArray.java
@@ -0,0 +1,12 @@
+package argument_in;
+
+public class TestArray {
+
+	public int bar(int a[]) {
+		return a[0];
+	}
+	
+	public void main() {
+		int i= /*]*/bar(new int[] {1})/*[*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestFieldReference.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestFieldReference.java
new file mode 100644
index 000000000..955978fda
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestFieldReference.java
@@ -0,0 +1,13 @@
+package argument_in;
+
+public class TestFieldReference {
+	private String field;
+	
+	public void main() {
+		/*]*/bar(field);/*[*/
+	}
+
+	public void bar(Object o) {
+		o.toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceRead.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceRead.java
new file mode 100644
index 000000000..18158f59f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceRead.java
@@ -0,0 +1,15 @@
+package argument_in;
+
+public class TestLiteralReferenceRead {
+	public void main() {
+		/*]*/foo(10);/*[*/
+	}
+	
+	public void foo(int x) {
+		int i= x;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceWrite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceWrite.java
new file mode 100644
index 000000000..4095f2c6f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLiteralReferenceWrite.java
@@ -0,0 +1,15 @@
+package argument_in;
+
+public class TestLiteralReferenceWrite {
+	public void main() {
+		/*]*/foo(10);/*[*/
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop.java
new file mode 100644
index 000000000..84939e28f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop.java
@@ -0,0 +1,18 @@
+package argument_in;
+
+public class TestLocalReferenceLoop {
+	public void main() {
+		int i= 10;
+		for (int z= 0; z < i; z++) {
+			/*]*/foo(i);/*[*/
+		}
+	}
+	
+	public void foo(int x) {
+		x= x + 10;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop1.java
new file mode 100644
index 000000000..580b24503
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop1.java
@@ -0,0 +1,18 @@
+package argument_in;
+
+public class TestLocalReferenceLoop1 {
+	public void main() {
+    	int z= 10;
+    	while (condition()) {
+    		/*[*/toInline(z)/*]*/;
+    	}
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop2.java
new file mode 100644
index 000000000..153b3b884
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop2.java
@@ -0,0 +1,19 @@
+package argument_in;
+
+public class TestLocalReferenceLoop2 {
+	public int main() {
+    	int z= 10;
+    	while (condition()) {
+    		/*[*/toInline(z)/*]*/;
+    	}
+    	return z;
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop3.java
new file mode 100644
index 000000000..eed97c0d6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop3.java
@@ -0,0 +1,20 @@
+package argument_in;
+
+public class TestLocalReferenceLoop3 {
+	public int main() {
+    	int z= 10;
+    	while (condition()) {
+    		z= 10;
+    		/*[*/toInline(z)/*]*/;
+    	}
+    	return z;
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop4.java
new file mode 100644
index 000000000..0277ec889
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop4.java
@@ -0,0 +1,20 @@
+package argument_in;
+
+public class TestLocalReferenceLoop4 {
+	public int main() {
+    	int z= 10;
+    	while (condition()) {
+    		/*[*/toInline(z)/*]*/;
+    	}
+		z= 10;
+    	return z;
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop5.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop5.java
new file mode 100644
index 000000000..fda1b27e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceLoop5.java
@@ -0,0 +1,21 @@
+package argument_in;
+
+public class TestLocalReferenceLoop5 {
+	public int main() {
+    	int z= 10;
+    	while (condition()) {
+    		z= 10;
+    		/*[*/toInline(z)/*]*/;
+    	}
+		z= 10;
+    	return z;
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferencePrefix.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferencePrefix.java
new file mode 100644
index 000000000..bbd32a183
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferencePrefix.java
@@ -0,0 +1,20 @@
+package argument_in;
+
+public class TestLocalReferencePrefix {
+	public void main() {
+		int a = 0;
+		int b = 1;
+		int c = 2;
+		int d = 3;
+    
+		a = aa((a + /*]*/bb( b, c, d)/*[*/), 0) + b;
+	}
+	
+	private int bb(int u, int v, int w) {
+	  return (u & v) | (~u & w);
+	}
+
+	private int aa(int x, int n) {
+	  return (x << n) | (x >>> (32 - n));
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead.java
new file mode 100644
index 000000000..e8bf7482b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead.java
@@ -0,0 +1,13 @@
+package argument_in;
+
+public class TestLocalReferenceRead {
+	public void main() {
+		int foo = 0;
+		/*]*/inlineMe(foo);/*[*/
+		System.out.println(foo);
+	}
+	
+	public void inlineMe(int bar) {
+		bar++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead2.java
new file mode 100644
index 000000000..27d6484cd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceRead2.java
@@ -0,0 +1,17 @@
+package argument_in;
+
+public class TestLocalReferenceRead2 {
+	public void main() {
+		int i= 10;
+		/*]*/foo(i);/*[*/
+		System.out.println(i);
+	}
+	
+	public void foo(int x) {
+		x= x + 10;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceUnused.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceUnused.java
new file mode 100644
index 000000000..7553a3d7b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceUnused.java
@@ -0,0 +1,17 @@
+package argument_in;
+
+public class TestLocalReferenceUnused {
+	public void main() {
+		int i= 10;
+		/*]*/foo(i);/*[*/
+		int x= 7;
+	}
+	
+	public void foo(int x) {
+		x= x + 10;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceWrite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceWrite.java
new file mode 100644
index 000000000..4785a8597
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestLocalReferenceWrite.java
@@ -0,0 +1,18 @@
+package argument_in;
+
+public class TestLocalReferenceWrite {
+	public void main() {
+		int i= 10;
+		/*]*/foo(i);/*[*/
+		i= 10;
+		System.out.println(i);
+	}
+	
+	public void foo(int x) {
+		x= x + 10;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestOneRead.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestOneRead.java
new file mode 100644
index 000000000..0ba1bda38
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestOneRead.java
@@ -0,0 +1,15 @@
+package argument_in;
+
+public class TestOneRead {
+	public void main() {
+		/*]*/foo(value());/*[*/
+	}
+	
+	public void foo(int x) {
+		int i= x;
+	}
+	
+	public int value() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused1.java
new file mode 100644
index 000000000..04a288cd3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused1.java
@@ -0,0 +1,18 @@
+package argument_in;
+
+public class TestParameterNameUnused1 {
+	public void main() {
+		{
+			int x= 20;
+		}
+		/*]*/foo(10);/*[*/
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused2.java
new file mode 100644
index 000000000..3681e7e8f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused2.java
@@ -0,0 +1,17 @@
+package argument_in;
+
+public class TestParameterNameUnused2 {
+	public void main() {
+		for (int x= 10; x < 20; x++)
+			main();
+		/*]*/foo(10);/*[*/
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused3.java
new file mode 100644
index 000000000..035db192e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUnused3.java
@@ -0,0 +1,18 @@
+package argument_in;
+
+public class TestParameterNameUnused3 {
+	public void main() {
+		class T {
+			int x;
+		}
+		/*]*/foo(10);/*[*/
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed1.java
new file mode 100644
index 000000000..4bd83e510
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed1.java
@@ -0,0 +1,16 @@
+package argument_in;
+
+public class TestParameterNameUsed1 {
+	public void main() {
+		int x= 20;
+		/*]*/foo(10);/*[*/
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed2.java
new file mode 100644
index 000000000..273620b8b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed2.java
@@ -0,0 +1,16 @@
+package argument_in;
+
+public class TestParameterNameUsed2 {
+	public void main() {
+		/*]*/foo(10);/*[*/
+		int x= 20;
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed3.java
new file mode 100644
index 000000000..14c140e73
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed3.java
@@ -0,0 +1,18 @@
+package argument_in;
+
+public class TestParameterNameUsed3 {
+	public void main() {
+		/*]*/foo(10);/*[*/
+		{
+			int x= 20;
+		}
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed4.java
new file mode 100644
index 000000000..3462b5e9f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestParameterNameUsed4.java
@@ -0,0 +1,16 @@
+package argument_in;
+
+public class TestParameterNameUsed4 {
+	public void main() {
+		class x {}
+		/*]*/foo(10);/*[*/
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestTwoReads.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestTwoReads.java
new file mode 100644
index 000000000..8315049f8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestTwoReads.java
@@ -0,0 +1,16 @@
+package argument_in;
+
+public class TestTwoReads {
+	public void main() {
+		/*]*/foo(value());/*[*/
+	}
+	
+	public void foo(int x) {
+		int i= x;
+		int y= x;
+	}
+	
+	public int value() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs.java
new file mode 100644
index 000000000..99a431b21
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs.java
@@ -0,0 +1,14 @@
+package argument_in;
+
+public class TestVarargs {
+
+	public void bar(String... args) {
+		for(String arg: args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void main() {
+		/*]*/bar("Hello", "Eclipse");/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs2.java
new file mode 100644
index 000000000..d543aa7c1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs2.java
@@ -0,0 +1,12 @@
+package argument_in;
+
+public class TestVarargs2 {
+
+	public void bar(int i, String... args) {
+		System.out.println(args[i]);
+	}
+	
+	public void main() {
+		/*]*/bar(1, "Hello", "Eclipse");/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs3.java
new file mode 100644
index 000000000..3b71111fb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs3.java
@@ -0,0 +1,14 @@
+package argument_in;
+
+public class TestVarargs3 {
+
+	public void bar(String... args) {
+		for(String arg: args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void main() {
+		/*]*/bar();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs4.java
new file mode 100644
index 000000000..6fe1d3993
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs4.java
@@ -0,0 +1,15 @@
+package argument_in;
+
+public class TestVarargs4 {
+
+	public void bar(String... args) {
+		for(String arg: args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void main() {
+		String[] strings= {"Hello", "Eclipse"};
+		/*]*/bar(strings);/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs5.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs5.java
new file mode 100644
index 000000000..a835c0051
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs5.java
@@ -0,0 +1,15 @@
+package argument_in;
+
+public class TestVarargs5 {
+
+	public void bar(Object... args) {
+		for(Object arg: args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void main() {
+		String[] strings= {"Hello", "Eclipse"};
+		/*]*/bar(strings);/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs6.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs6.java
new file mode 100644
index 000000000..720f80184
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestVarargs6.java
@@ -0,0 +1,19 @@
+package argument_in;
+
+import java.io.Serializable;
+
+public class TestVarargs6 {
+
+	private static class Warnings {};
+	
+	public void varargs(Serializable... args) {
+		for (Serializable arg : args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void singleArgumentTransfer() {
+		Warnings[] args= { new Warnings(), new Warnings() };
+		/*]*/varargs(args);/*[*/
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestWrite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestWrite.java
new file mode 100644
index 000000000..533182742
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_in/TestWrite.java
@@ -0,0 +1,15 @@
+package argument_in;
+
+public class TestWrite {
+	public void main() {
+		/*]*/foo(value());/*[*/
+	}
+	
+	public void foo(int x) {
+		x= 10;
+	}
+	
+	public int value() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/Test91470.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/Test91470.java
new file mode 100644
index 000000000..3ff869f59
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/Test91470.java
@@ -0,0 +1,14 @@
+package argument_out;
+
+import java.text.MessageFormat;
+
+public class Test91470 {
+	public static final String format(String key, Object... args) {
+	    return MessageFormat.format(key, args);
+	}
+	
+	public void use() {
+		/*]*/Object[] args = {"value"};
+		MessageFormat.format("key", args);/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestArray.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestArray.java
new file mode 100644
index 000000000..21d2e25d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestArray.java
@@ -0,0 +1,12 @@
+package argument_out;
+
+public class TestArray {
+
+	public int bar(int a[]) {
+		return a[0];
+	}
+	
+	public void main() {
+		int i= (new int[] {1})[0];
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestFieldReference.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestFieldReference.java
new file mode 100644
index 000000000..58cdfe61e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestFieldReference.java
@@ -0,0 +1,13 @@
+package argument_out;
+
+public class TestFieldReference {
+	private String field;
+	
+	public void main() {
+		field.toString();
+	}
+
+	public void bar(Object o) {
+		o.toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceRead.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceRead.java
new file mode 100644
index 000000000..6e1c292eb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceRead.java
@@ -0,0 +1,16 @@
+package argument_out;
+
+public class TestLiteralReferenceRead {
+	public void main() {
+		int i= 10;
+		bar(10);
+	}
+	
+	public void foo(int x) {
+		int i= x;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceWrite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceWrite.java
new file mode 100644
index 000000000..a9ab2b0f1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceWrite.java
@@ -0,0 +1,17 @@
+package argument_out;
+
+public class TestLiteralReferenceWrite {
+	public void main() {
+		int x = 10;
+		x= 20;
+		bar(x);
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop.java
new file mode 100644
index 000000000..d40a766b9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop.java
@@ -0,0 +1,20 @@
+package argument_out;
+
+public class TestLocalReferenceLoop {
+	public void main() {
+		int i= 10;
+		for (int z= 0; z < i; z++) {
+			int x = i;
+			x= x + 10;
+			bar(x);
+		}
+	}
+	
+	public void foo(int x) {
+		x= x + 10;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop1.java
new file mode 100644
index 000000000..0d3c79ad9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop1.java
@@ -0,0 +1,19 @@
+package argument_out;
+
+public class TestLocalReferenceLoop1 {
+	public void main() {
+    	int z= 10;
+    	while (condition()) {
+    		/*[*/int i = z;
+			i= i + 1;
+    	}
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop2.java
new file mode 100644
index 000000000..adb1189e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop2.java
@@ -0,0 +1,20 @@
+package argument_out;
+
+public class TestLocalReferenceLoop2 {
+	public int main() {
+    	int z= 10;
+    	while (condition()) {
+    		/*[*/int i = z;
+			i= i + 1;
+    	}
+    	return z;
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop3.java
new file mode 100644
index 000000000..8d335df95
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop3.java
@@ -0,0 +1,21 @@
+package argument_out;
+
+public class TestLocalReferenceLoop3 {
+	public int main() {
+    	int z= 10;
+    	while (condition()) {
+    		z= 10;
+			int i = z;
+    		/*[*/i= i + 1;
+    	}
+    	return z;
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop4.java
new file mode 100644
index 000000000..d83cf880b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop4.java
@@ -0,0 +1,21 @@
+package argument_out;
+
+public class TestLocalReferenceLoop4 {
+	public int main() {
+    	int z= 10;
+    	while (condition()) {
+    		/*[*/int i = z;
+			i= i + 1;
+    	}
+		z= 10;
+    	return z;
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop5.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop5.java
new file mode 100644
index 000000000..0de4c178c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop5.java
@@ -0,0 +1,21 @@
+package argument_out;
+
+public class TestLocalReferenceLoop5 {
+	public int main() {
+    	int z= 10;
+    	while (condition()) {
+    		z= 10;
+    		/*[*/z= z + 1;
+    	}
+		z= 10;
+    	return z;
+	}
+	
+    public void toInline(int i) {
+    	i= i + 1;
+    }
+    
+    public boolean condition() {
+    	return false;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferencePrefix.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferencePrefix.java
new file mode 100644
index 000000000..6e1c0dedf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferencePrefix.java
@@ -0,0 +1,20 @@
+package argument_out;
+
+public class TestLocalReferencePrefix {
+	public void main() {
+		int a = 0;
+		int b = 1;
+		int c = 2;
+		int d = 3;
+    
+		a = aa((a + ((b & c) | (~b & d))), 0) + b;
+	}
+	
+	private int bb(int u, int v, int w) {
+	  return (u & v) | (~u & w);
+	}
+
+	private int aa(int x, int n) {
+	  return (x << n) | (x >>> (32 - n));
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead.java
new file mode 100644
index 000000000..7730ce0af
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead.java
@@ -0,0 +1,14 @@
+package argument_out;
+
+public class TestLocalReferenceRead {
+	public void main() {
+		int foo = 0;
+		int bar = foo;
+		bar++;
+		System.out.println(foo);
+	}
+	
+	public void inlineMe(int bar) {
+		bar++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead2.java
new file mode 100644
index 000000000..6cf271ae4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead2.java
@@ -0,0 +1,19 @@
+package argument_out;
+
+public class TestLocalReferenceRead2 {
+	public void main() {
+		int i= 10;
+		int x = i;
+		x= x + 10;
+		bar(x);
+		System.out.println(i);
+	}
+	
+	public void foo(int x) {
+		x= x + 10;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceUnused.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceUnused.java
new file mode 100644
index 000000000..49a3742ea
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceUnused.java
@@ -0,0 +1,18 @@
+package argument_out;
+
+public class TestLocalReferenceUnused {
+	public void main() {
+		int i= 10;
+		i= i + 10;
+		bar(i);
+		int x= 7;
+	}
+	
+	public void foo(int x) {
+		x= x + 10;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceWrite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceWrite.java
new file mode 100644
index 000000000..94c351b5d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceWrite.java
@@ -0,0 +1,19 @@
+package argument_out;
+
+public class TestLocalReferenceWrite {
+	public void main() {
+		int i= 10;
+		i= i + 10;
+		bar(i);
+		i= 10;
+		System.out.println(i);
+	}
+	
+	public void foo(int x) {
+		x= x + 10;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestOneRead.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestOneRead.java
new file mode 100644
index 000000000..53b000589
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestOneRead.java
@@ -0,0 +1,15 @@
+package argument_out;
+
+public class TestOneRead {
+	public void main() {
+		int i= value();
+	}
+	
+	public void foo(int x) {
+		int i= x;
+	}
+	
+	public int value() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused1.java
new file mode 100644
index 000000000..fab2ca92e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused1.java
@@ -0,0 +1,20 @@
+package argument_out;
+
+public class TestParameterNameUnused1 {
+	public void main() {
+		{
+			int x= 20;
+		}
+		int x = 10;
+		x= 20;
+		bar(x);
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused2.java
new file mode 100644
index 000000000..fe2842864
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused2.java
@@ -0,0 +1,19 @@
+package argument_out;
+
+public class TestParameterNameUnused2 {
+	public void main() {
+		for (int x= 10; x < 20; x++)
+			main();
+		int x = 10;
+		x= 20;
+		bar(x);
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused3.java
new file mode 100644
index 000000000..430090417
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused3.java
@@ -0,0 +1,20 @@
+package argument_out;
+
+public class TestParameterNameUnused3 {
+	public void main() {
+		class T {
+			int x;
+		}
+		int x = 10;
+		x= 20;
+		bar(x);
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed1.java
new file mode 100644
index 000000000..a548c66c3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed1.java
@@ -0,0 +1,18 @@
+package argument_out;
+
+public class TestParameterNameUsed1 {
+	public void main() {
+		int x= 20;
+		int x1 = 10;
+		x1= 20;
+		bar(x1);
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed2.java
new file mode 100644
index 000000000..eb396861a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed2.java
@@ -0,0 +1,18 @@
+package argument_out;
+
+public class TestParameterNameUsed2 {
+	public void main() {
+		int x1 = 10;
+		x1= 20;
+		bar(x1);
+		int x= 20;
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed3.java
new file mode 100644
index 000000000..52ea32711
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed3.java
@@ -0,0 +1,20 @@
+package argument_out;
+
+public class TestParameterNameUsed3 {
+	public void main() {
+		int x1 = 10;
+		x1= 20;
+		bar(x1);
+		{
+			int x= 20;
+		}
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed4.java
new file mode 100644
index 000000000..839cbe041
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed4.java
@@ -0,0 +1,18 @@
+package argument_out;
+
+public class TestParameterNameUsed4 {
+	public void main() {
+		class x {}
+		int x1 = 10;
+		x1= 20;
+		bar(x1);
+	}
+	
+	public void foo(int x) {
+		x= 20;
+		bar(x);
+	}
+	
+	public void bar(int z) {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestTwoReads.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestTwoReads.java
new file mode 100644
index 000000000..d7b61992d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestTwoReads.java
@@ -0,0 +1,18 @@
+package argument_out;
+
+public class TestTwoReads {
+	public void main() {
+		int x = value();
+		int i= x;
+		int y= x;
+	}
+	
+	public void foo(int x) {
+		int i= x;
+		int y= x;
+	}
+	
+	public int value() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs.java
new file mode 100644
index 000000000..e7e71d6e2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs.java
@@ -0,0 +1,17 @@
+package argument_out;
+
+public class TestVarargs {
+
+	public void bar(String... args) {
+		for(String arg: args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void main() {
+		String[] args = {"Hello", "Eclipse"};
+		for(String arg: args) {
+			System.out.println(arg);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs2.java
new file mode 100644
index 000000000..191816e0c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs2.java
@@ -0,0 +1,13 @@
+package argument_out;
+
+public class TestVarargs2 {
+
+	public void bar(int i, String... args) {
+		System.out.println(args[i]);
+	}
+	
+	public void main() {
+		String[] args = {"Hello", "Eclipse"};
+		System.out.println(args[1]);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs3.java
new file mode 100644
index 000000000..1260f6cda
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs3.java
@@ -0,0 +1,17 @@
+package argument_out;
+
+public class TestVarargs3 {
+
+	public void bar(String... args) {
+		for(String arg: args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void main() {
+		String[] args = {};
+		for(String arg: args) {
+			System.out.println(arg);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs4.java
new file mode 100644
index 000000000..a7aa07d54
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs4.java
@@ -0,0 +1,17 @@
+package argument_out;
+
+public class TestVarargs4 {
+
+	public void bar(String... args) {
+		for(String arg: args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void main() {
+		String[] strings= {"Hello", "Eclipse"};
+		for(String arg: strings) {
+			System.out.println(arg);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs5.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs5.java
new file mode 100644
index 000000000..79d647211
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs5.java
@@ -0,0 +1,17 @@
+package argument_out;
+
+public class TestVarargs5 {
+
+	public void bar(Object... args) {
+		for(Object arg: args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void main() {
+		String[] strings= {"Hello", "Eclipse"};
+		for(Object arg: strings) {
+			System.out.println(arg);
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs6.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs6.java
new file mode 100644
index 000000000..3f164d35d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestVarargs6.java
@@ -0,0 +1,22 @@
+package argument_out;
+
+import java.io.Serializable;
+
+public class TestVarargs6 {
+
+	private static class Warnings {};
+	
+	public void varargs(Serializable... args) {
+		for (Serializable arg : args) {
+			System.out.println(arg);
+		}
+	}
+	
+	public void singleArgumentTransfer() {
+		Warnings[] args= { new Warnings(), new Warnings() };
+		Serializable[] args1 = {args};
+		/*]*/for (Serializable arg : args1) {
+			System.out.println(arg);
+		}/*[*/
+	}	
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestWrite.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestWrite.java
new file mode 100644
index 000000000..23ec3775f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/argument_out/TestWrite.java
@@ -0,0 +1,16 @@
+package argument_out;
+
+public class TestWrite {
+	public void main() {
+		int x = value();
+		x= 10;
+	}
+	
+	public void foo(int x) {
+		x= 10;
+	}
+	
+	public int value() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryInlineAll.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryInlineAll.java
new file mode 100644
index 000000000..ee8ad0512
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryInlineAll.java
@@ -0,0 +1,17 @@
+package binary_in;
+
+import classes.Target;
+import classes.Target2;
+
+public class TestBinaryInlineAll {
+	void use() {
+		int len = Target2.logMessage("Hello");
+		System.err.println("logged " + len + " chars");
+	}
+	int use2() {
+		return Target2.logMessage("Hi");
+	}
+	int doesNotUse() {
+		return new Target().logMessage("Go");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryInlineSingle.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryInlineSingle.java
new file mode 100644
index 000000000..842fcbc14
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryInlineSingle.java
@@ -0,0 +1,10 @@
+package binary_in;
+
+import classes.Target;
+
+public class TestBinaryInlineSingle {
+	void use() {
+		int len = new Target()./*]*/logMessage/*[*/("Hello");
+		System.err.println("logged " + len + " chars");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryNoSource.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryNoSource.java
new file mode 100644
index 000000000..1998460d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/TestBinaryNoSource.java
@@ -0,0 +1,7 @@
+package binary_in;
+
+public class TestBinaryNoSource {
+	int test() {
+		return Integer./*]*/parseInt/*[*/("42");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/Test_133575.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/Test_133575.java
new file mode 100644
index 000000000..d23037dea
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_in/Test_133575.java
@@ -0,0 +1,9 @@
+package binary_in;
+
+import classes.BinEnum;
+
+public class Test_133575 {
+	public void foo(BinEnum<String> e) {
+		boolean b = e./*]*/isEnum/*[*/();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/TestBinaryInlineAll.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/TestBinaryInlineAll.java
new file mode 100644
index 000000000..918ea8c72
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/TestBinaryInlineAll.java
@@ -0,0 +1,17 @@
+package binary_out;
+
+import classes.Target;
+import classes.Target2;
+
+public class TestBinaryInlineAll {
+	void use() {
+		int len = new Target().logMessage("Hello");
+		System.err.println("logged " + len + " chars");
+	}
+	int use2() {
+		return new Target().logMessage("Hi");
+	}
+	int doesNotUse() {
+		return new Target().logMessage("Go");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/TestBinaryInlineSingle.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/TestBinaryInlineSingle.java
new file mode 100644
index 000000000..31e67a2b1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/TestBinaryInlineSingle.java
@@ -0,0 +1,12 @@
+package binary_out;
+
+import classes.Target;
+
+public class TestBinaryInlineSingle {
+	void use() {
+		Target r = new Target();
+		System.out.println("Hello");
+		int len = "Hello".length();
+		System.err.println("logged " + len + " chars");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/Test_133575.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/Test_133575.java
new file mode 100644
index 000000000..ede2d11e3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_out/Test_133575.java
@@ -0,0 +1,9 @@
+package binary_out;
+
+import classes.BinEnum;
+
+public class Test_133575 {
+	public void foo(BinEnum<String> e) {
+		boolean b = true;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/BinEnum.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/BinEnum.java
new file mode 100644
index 000000000..86c48ff2a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/BinEnum.java
@@ -0,0 +1,7 @@
+package classes;
+
+public class BinEnum<E> {
+	public boolean isEnum() {
+		return true;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/Target.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/Target.java
new file mode 100644
index 000000000..152633a58
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/Target.java
@@ -0,0 +1,13 @@
+package classes;
+
+public class Target {
+	/**
+	 * @param message the string to log
+	 * @return the length of the logged message
+	 * @deprecated inline implementation
+	 */
+	public int logMessage(String message) {
+		System.out.println(message);
+		return message.length();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/Target2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/Target2.java
new file mode 100644
index 000000000..e408dd285
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/binary_src/classes/Target2.java
@@ -0,0 +1,10 @@
+package classes;
+
+public class Target2 {
+	/**
+	 * @deprecated inline implementation
+	 */
+	public static int logMessage(String message) {
+		return new Target().logMessage(message);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_117053.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_117053.java
new file mode 100644
index 000000000..d4df6cc8d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_117053.java
@@ -0,0 +1,15 @@
+package bugs_in;
+
+public class Test_117053 {
+	void foo(int x) {
+		if (x++ < 6)
+			x++;
+	}
+	void bar() {
+		int x = 2;
+		if (x < 10)
+			x++;
+		else
+			/*]*/foo(x);/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_123356.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_123356.java
new file mode 100644
index 000000000..9f24b6632
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_123356.java
@@ -0,0 +1,13 @@
+package bugs_in;
+
+public class Test_123356 {
+	static String[] field;
+
+	public static void main(String[] args) {
+		/*]*/add((field = args).length, field.hashCode());/*[*/
+	}
+
+	static int add(int x, int y) {
+		return y + x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_287378.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_287378.java
new file mode 100644
index 000000000..9c28a7b2e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_287378.java
@@ -0,0 +1,16 @@
+package bugs_in;
+
+public class Test_287378 {
+	Test_287378 other;
+	int x;
+
+	protected void f() {
+		other.extracted().x = 5;
+		int a = other.extracted().x;
+		other.extracted();
+	}
+
+	protected Test_287378 /*]*/extracted/*[*/() {
+		return /*A*/other/*B*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_44419.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_44419.java
new file mode 100644
index 000000000..ef330cc63
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_44419.java
@@ -0,0 +1,10 @@
+package bugs_in;
+
+public class Test_44419 {
+	
+	protected long fValue1= /*]*/getValue(1 + 3)/*[*/;
+	
+	long getValue(int i) {
+		return System.currentTimeMillis() * i;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_44419_2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_44419_2.java
new file mode 100644
index 000000000..073ebd30e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_44419_2.java
@@ -0,0 +1,14 @@
+package bugs_in;
+
+public class Test_44419_2 {
+
+	public void foo() {
+		String s= null;
+		if (!/*]*/isString(s)/*[*/) {
+		}
+	}
+    
+    boolean isString(Object o) {
+        return o instanceof String;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_50139.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_50139.java
new file mode 100644
index 000000000..57ce4a7c8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_50139.java
@@ -0,0 +1,15 @@
+package bugs_in;
+
+public class Test_50139 {
+	static class Provider {
+	    public static final String ID= "id";
+
+	    public static String getId() {
+	        return ID;
+	    }
+	}
+	
+    public void foo() {
+        String s= Provider./*]*/getId()/*[*/;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_72836.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_72836.java
new file mode 100644
index 000000000..81b44b07c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_72836.java
@@ -0,0 +1,11 @@
+package bugs_in;
+
+public class Test_72836 {
+    private void foo() {
+        System.out.println();
+    }
+    
+    private void bar() {
+        this./*]*/foo()/*[*/;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_76241.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_76241.java
new file mode 100644
index 000000000..f50d818d1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_76241.java
@@ -0,0 +1,23 @@
+package bugs_in;
+
+public class Test_76241 {
+	protected void toInline(String s) {
+		System.out.println("A.foo()");
+	}
+
+	protected void toInline(Integer i) {
+		System.out.println("A.foo()");
+	}
+}
+
+class Test_76241_B1 extends Test_76241 {
+	public void bar1() {
+		toInline(null);
+	}
+}
+
+class Test_76241_B2 extends Test_76241 {
+	public void bar2() {
+		toInline(null);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_94426.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_94426.java
new file mode 100644
index 000000000..c2d914e7b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_94426.java
@@ -0,0 +1,14 @@
+package bugs_in;
+
+public class Test_94426 {
+	/**
+	 * @see Other#foo()
+	 */
+	public void toInline() {
+		System.out.println("foo");
+	}
+	
+	void m() {
+		toInline();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_95128.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_95128.java
new file mode 100644
index 000000000..d9884fef5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_95128.java
@@ -0,0 +1,20 @@
+package bugs_in;
+
+import java.util.HashMap;
+
+public class Test_95128 extends HashMap<String, String> {
+	private static final long serialVersionUID = 1L;
+
+	public HashMap<String, String> toInline() {
+		return this;
+	}
+	
+	private String useOne(String s) {
+		return toInline().get(s);
+	}
+	
+	private static void useTwo() {
+		Test_95128 test= null;
+		String s= test.toInline().get(null);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_98856.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_98856.java
new file mode 100644
index 000000000..b6152fff2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_in/Test_98856.java
@@ -0,0 +1,20 @@
+package bugs_in;
+
+public class Test_98856 {
+	class Inner {
+		String field;
+	}
+
+	Inner inner;
+	String string;
+
+	static void foo() {
+		Test_98856 t = new Test_98856();
+		t./*]*/bar()/*[*/;
+	}
+
+	void bar() {
+		inner.field = "Eclipse";
+		string = "Eclipse";
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_117053.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_117053.java
new file mode 100644
index 000000000..fcf67efa5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_117053.java
@@ -0,0 +1,16 @@
+package bugs_out;
+
+public class Test_117053 {
+	void foo(int x) {
+		if (x++ < 6)
+			x++;
+	}
+	void bar() {
+		int x = 2;
+		if (x < 10)
+			x++;
+		else
+			if (x++ < 6)
+				x++;/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_123356.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_123356.java
new file mode 100644
index 000000000..88f4f9a3d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_123356.java
@@ -0,0 +1,15 @@
+package bugs_out;
+
+public class Test_123356 {
+	static String[] field;
+
+	public static void main(String[] args) {
+		/*]*/int x = (field = args).length;
+		int y = field.hashCode();
+		int add = y + x;/*[*/
+	}
+
+	static int add(int x, int y) {
+		return y + x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_287378.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_287378.java
new file mode 100644
index 000000000..0a5f6b349
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_287378.java
@@ -0,0 +1,11 @@
+package bugs_out;
+
+public class Test_287378 {
+	Test_287378 other;
+	int x;
+
+	protected void f() {
+		other./*A*/other/*B*/.x = 5;
+		int a = other./*A*/other/*B*/.x;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_44419.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_44419.java
new file mode 100644
index 000000000..c200562b6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_44419.java
@@ -0,0 +1,10 @@
+package bugs_out;
+
+public class Test_44419 {
+	
+	protected long fValue1= /*]*/System.currentTimeMillis() * (1 + 3)/*[*/;
+	
+	long getValue(int i) {
+		return System.currentTimeMillis() * i;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_44419_2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_44419_2.java
new file mode 100644
index 000000000..884e6be23
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_44419_2.java
@@ -0,0 +1,14 @@
+package bugs_out;
+
+public class Test_44419_2 {
+
+	public void foo() {
+		String s= null;
+		if (!/*]*/(s instanceof String)/*[*/) {
+		}
+	}
+    
+    boolean isString(Object o) {
+        return o instanceof String;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_50139.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_50139.java
new file mode 100644
index 000000000..9fd5a14fb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_50139.java
@@ -0,0 +1,15 @@
+package bugs_out;
+
+public class Test_50139 {
+	static class Provider {
+	    public static final String ID= "id";
+
+	    public static String getId() {
+	        return ID;
+	    }
+	}
+	
+    public void foo() {
+        String s= Provider.ID/*[*/;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_72836.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_72836.java
new file mode 100644
index 000000000..6483b983a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_72836.java
@@ -0,0 +1,11 @@
+package bugs_out;
+
+public class Test_72836 {
+    private void foo() {
+        System.out.println();
+    }
+    
+    private void bar() {
+        System.out.println();
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_76241.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_76241.java
new file mode 100644
index 000000000..d14ebab3e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_76241.java
@@ -0,0 +1,19 @@
+package bugs_out;
+
+public class Test_76241 {
+	protected void toInline(Integer i) {
+		System.out.println("A.foo()");
+	}
+}
+
+class Test_76241_B1 extends Test_76241 {
+	public void bar1() {
+		toInline(null);
+	}
+}
+
+class Test_76241_B2 extends Test_76241 {
+	public void bar2() {
+		toInline(null);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_94426.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_94426.java
new file mode 100644
index 000000000..6653f49f3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_94426.java
@@ -0,0 +1,7 @@
+package bugs_out;
+
+public class Test_94426 {
+	void m() {
+		System.out.println("foo");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_95128.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_95128.java
new file mode 100644
index 000000000..b72cab710
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_95128.java
@@ -0,0 +1,16 @@
+package bugs_out;
+
+import java.util.HashMap;
+
+public class Test_95128 extends HashMap<String, String> {
+	private static final long serialVersionUID = 1L;
+
+	private String useOne(String s) {
+		return this.get(s);
+	}
+	
+	private static void useTwo() {
+		Test_95128 test= null;
+		String s= test.get(null);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_98856.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_98856.java
new file mode 100644
index 000000000..d40d3315c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/bugs_out/Test_98856.java
@@ -0,0 +1,21 @@
+package bugs_out;
+
+public class Test_98856 {
+	class Inner {
+		String field;
+	}
+
+	Inner inner;
+	String string;
+
+	static void foo() {
+		Test_98856 t = new Test_98856();
+		t.inner.field = "Eclipse";
+		t.string = "Eclipse";
+	}
+
+	void bar() {
+		inner.field = "Eclipse";
+		string = "Eclipse";
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatement.java
new file mode 100644
index 000000000..fdb631359
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatement.java
@@ -0,0 +1,11 @@
+package call_in;
+
+public class TestExpressionStatement {
+	public void main() {
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		System.out.println("Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatementWithReturn.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatementWithReturn.java
new file mode 100644
index 000000000..8ede88c81
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestExpressionStatementWithReturn.java
@@ -0,0 +1,12 @@
+package call_in;
+
+public class TestExpressionStatementWithReturn {
+	public void main() {
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		System.out.println("Eclipse");
+		return;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestParenthesis.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestParenthesis.java
new file mode 100644
index 000000000..08547eb47
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestParenthesis.java
@@ -0,0 +1,15 @@
+package call_in;
+
+import java.util.List;
+
+public class TestParenthesis {
+	Object list;
+	
+	public void main() {
+		Object element= /*]*/getList()/*[*/.get(0);
+	}
+	
+	public List getList() {
+		return (List)list;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction1.java
new file mode 100644
index 000000000..ecc346cb4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction1.java
@@ -0,0 +1,11 @@
+package call_in;
+
+class TestStatementWithFunction1 {
+    public void main(){
+       /*]*/foo();/*[*/
+    }
+    
+    public int foo(){
+        return 6;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction2.java
new file mode 100644
index 000000000..2d80defd0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_in/TestStatementWithFunction2.java
@@ -0,0 +1,15 @@
+package call_in;
+
+class TestStatementWithFunction2 {
+    public void main(){
+       /*]*/foo();/*[*/
+    }
+    
+    public int foo(){
+        return bar();
+    }
+    public int bar() {
+    	System.out.println("Bar called");
+    	return 10;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatement.java
new file mode 100644
index 000000000..8f08de85b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatement.java
@@ -0,0 +1,11 @@
+package call_out;
+
+public class TestExpressionStatement {
+	public void main() {
+		System.out.println("Eclipse");
+	}
+	
+	public void foo() {
+		System.out.println("Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatementWithReturn.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatementWithReturn.java
new file mode 100644
index 000000000..351775089
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestExpressionStatementWithReturn.java
@@ -0,0 +1,12 @@
+package call_out;
+
+public class TestExpressionStatementWithReturn {
+	public void main() {
+		System.out.println("Eclipse");
+	}
+	
+	public void foo() {
+		System.out.println("Eclipse");
+		return;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestParenthesis.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestParenthesis.java
new file mode 100644
index 000000000..a5d693737
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestParenthesis.java
@@ -0,0 +1,15 @@
+package call_out;
+
+import java.util.List;
+
+public class TestParenthesis {
+	Object list;
+	
+	public void main() {
+		Object element= ((List)list).get(0);
+	}
+	
+	public List getList() {
+		return (List)list;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction1.java
new file mode 100644
index 000000000..360c031f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction1.java
@@ -0,0 +1,10 @@
+package call_out;
+
+class TestStatementWithFunction1 {
+    public void main(){
+    }
+    
+    public int foo(){
+        return 6;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction2.java
new file mode 100644
index 000000000..6dbe89a46
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/call_out/TestStatementWithFunction2.java
@@ -0,0 +1,15 @@
+package call_out;
+
+class TestStatementWithFunction2 {
+    public void main(){
+       bar();
+    }
+    
+    public int foo(){
+        return bar();
+    }
+    public int bar() {
+    	System.out.println("Bar called");
+    	return 10;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloaded.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloaded.java
new file mode 100644
index 000000000..9fc021459
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloaded.java
@@ -0,0 +1,26 @@
+package cast_in;
+
+class Woo1 {
+}
+
+class Zoo1 extends Woo1 {
+}
+
+class Base1 {
+	public void foo(Woo1 w) {
+	}
+}
+
+class Derived1 extends Base1 {
+	public void foo(Zoo1 z) {
+	}
+}
+
+public class TestHierarchyOverloaded {
+	public Woo1 goo() {
+		return new Zoo1();
+	}
+	public void main(Derived1 d) {
+		d.foo(/*]*/goo()/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrimitives.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrimitives.java
new file mode 100644
index 000000000..28e737e7a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrimitives.java
@@ -0,0 +1,20 @@
+package cast_in;
+
+class Base2 {
+	public void foo(int i) {
+	}
+}
+
+class Derived2 extends Base2 {
+	public void foo(char c) {
+	}
+}
+
+public class TestHierarchyOverloadedPrimitives {
+	public int goo() {
+		return 'a';
+	}
+	public void main(Derived2 d) {
+		d.foo(/*]*/goo()/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrivate.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrivate.java
new file mode 100644
index 000000000..2e4b5e06a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestHierarchyOverloadedPrivate.java
@@ -0,0 +1,20 @@
+package cast_in;
+
+class Base3 {
+	public void foo(int i) {
+	}
+}
+
+class Derived3 extends Base3 {
+	private void foo(char c) {
+	}
+}
+
+public class TestHierarchyOverloadedPrivate {
+	public int goo() {
+		return 'a';
+	}
+	public void main(Derived3 d) {
+		d.foo(/*]*/goo()/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNoCast.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNoCast.java
new file mode 100644
index 000000000..67343d057
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNoCast.java
@@ -0,0 +1,11 @@
+package cast_in;
+
+public class TestNoCast {
+	String fName;
+	String getName() {
+		return fName;
+	}
+	void foo(TestNoCast o) {
+		System.out.println(/*]*/o.getName()/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotCastableOverloaded.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotCastableOverloaded.java
new file mode 100644
index 000000000..86c2eda7e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotCastableOverloaded.java
@@ -0,0 +1,17 @@
+package cast_in;
+
+class Woo4 {
+}
+
+public class TestNotCastableOverloaded {
+	public void foo(int i) {
+	}
+	public void foo(Woo4 w) {
+	}
+	public int goo() {
+		return 'a';
+	}
+	public void main() {
+		foo(/*]*/goo()/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotOverloaded.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotOverloaded.java
new file mode 100644
index 000000000..a5c913cf3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestNotOverloaded.java
@@ -0,0 +1,12 @@
+package cast_in;
+
+public class TestNotOverloaded {
+	public void foo(int i) {
+	}
+	public int goo() {
+		return 'a';
+	}
+	public void main() {
+		foo(/*]*/goo()/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloaded.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloaded.java
new file mode 100644
index 000000000..ea7dcc565
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloaded.java
@@ -0,0 +1,20 @@
+package cast_in;
+
+class Base5 {
+}
+
+class Derived5 extends Base5 {
+}
+
+public class TestOverloaded {
+	public void foo(Derived5 d) {
+	}
+	public void foo(Base5 b) {
+	}
+	public Base5 goo() {
+		return new Derived5();
+	}
+	public void main() {
+		foo(/*]*/goo()/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloadedPrimitives.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloadedPrimitives.java
new file mode 100644
index 000000000..fa3d42f22
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestOverloadedPrimitives.java
@@ -0,0 +1,14 @@
+package cast_in;
+
+public class TestOverloadedPrimitives {
+	public void foo(int i) {
+	}
+	public void foo(char c) {
+	}
+	public int goo() {
+		return 'a';
+	}
+	public void main() {
+		foo(/*]*/goo()/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestReceiverCast.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestReceiverCast.java
new file mode 100644
index 000000000..e84c9beeb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_in/TestReceiverCast.java
@@ -0,0 +1,11 @@
+package cast_in;
+
+public class TestReceiverCast {
+	private void foo(Object obj){
+		String s= /*]*/goo/*[*/((String)obj);
+	}
+
+	private static String goo(String string){
+		return string.intern();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloaded.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloaded.java
new file mode 100644
index 000000000..d5b4e5d92
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloaded.java
@@ -0,0 +1,26 @@
+package cast_out;
+
+class Woo1 {
+}
+
+class Zoo1 extends Woo1 {
+}
+
+class Base1 {
+	public void foo(Woo1 w) {
+	}
+}
+
+class Derived1 extends Base1 {
+	public void foo(Zoo1 z) {
+	}
+}
+
+public class TestHierarchyOverloaded {
+	public Woo1 goo() {
+		return new Zoo1();
+	}
+	public void main(Derived1 d) {
+		d.foo((Woo1) new Zoo1());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrimitives.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrimitives.java
new file mode 100644
index 000000000..1c0874c4e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrimitives.java
@@ -0,0 +1,20 @@
+package cast_out;
+
+class Base2 {
+	public void foo(int i) {
+	}
+}
+
+class Derived2 extends Base2 {
+	public void foo(char c) {
+	}
+}
+
+public class TestHierarchyOverloadedPrimitives {
+	public int goo() {
+		return 'a';
+	}
+	public void main(Derived2 d) {
+		d.foo((int) 'a');
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrivate.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrivate.java
new file mode 100644
index 000000000..34c3c84d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestHierarchyOverloadedPrivate.java
@@ -0,0 +1,20 @@
+package cast_out;
+
+class Base3 {
+	public void foo(int i) {
+	}
+}
+
+class Derived3 extends Base3 {
+	private void foo(char c) {
+	}
+}
+
+public class TestHierarchyOverloadedPrivate {
+	public int goo() {
+		return 'a';
+	}
+	public void main(Derived3 d) {
+		d.foo((int) 'a');
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNoCast.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNoCast.java
new file mode 100644
index 000000000..c3eceb638
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNoCast.java
@@ -0,0 +1,11 @@
+package cast_out;
+
+public class TestNoCast {
+	String fName;
+	String getName() {
+		return fName;
+	}
+	void foo(TestNoCast o) {
+		System.out.println(o.fName);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotCastableOverloaded.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotCastableOverloaded.java
new file mode 100644
index 000000000..0562ef808
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotCastableOverloaded.java
@@ -0,0 +1,17 @@
+package cast_out;
+
+class Woo4 {
+}
+
+public class TestNotCastableOverloaded {
+	public void foo(int i) {
+	}
+	public void foo(Woo4 w) {
+	}
+	public int goo() {
+		return 'a';
+	}
+	public void main() {
+		foo('a');
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotOverloaded.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotOverloaded.java
new file mode 100644
index 000000000..782788e62
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestNotOverloaded.java
@@ -0,0 +1,12 @@
+package cast_out;
+
+public class TestNotOverloaded {
+	public void foo(int i) {
+	}
+	public int goo() {
+		return 'a';
+	}
+	public void main() {
+		foo('a');
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloaded.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloaded.java
new file mode 100644
index 000000000..3b86d83c5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloaded.java
@@ -0,0 +1,20 @@
+package cast_out;
+
+class Base5 {
+}
+
+class Derived5 extends Base5 {
+}
+
+public class TestOverloaded {
+	public void foo(Derived5 d) {
+	}
+	public void foo(Base5 b) {
+	}
+	public Base5 goo() {
+		return new Derived5();
+	}
+	public void main() {
+		foo((Base5) new Derived5());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloadedPrimitives.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloadedPrimitives.java
new file mode 100644
index 000000000..b89eb2075
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestOverloadedPrimitives.java
@@ -0,0 +1,14 @@
+package cast_out;
+
+public class TestOverloadedPrimitives {
+	public void foo(int i) {
+	}
+	public void foo(char c) {
+	}
+	public int goo() {
+		return 'a';
+	}
+	public void main() {
+		foo((int) 'a');
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestReceiverCast.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestReceiverCast.java
new file mode 100644
index 000000000..0fd78ed3a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/cast_out/TestReceiverCast.java
@@ -0,0 +1,11 @@
+package cast_out;
+
+public class TestReceiverCast {
+	private void foo(Object obj){
+		String s= ((String)obj).intern();
+	}
+
+	private static String goo(String string){
+		return string.intern();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIf.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIf.java
new file mode 100644
index 000000000..8b2feb2a3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIf.java
@@ -0,0 +1,17 @@
+package controlStatement_in;
+
+public class TestDanglingIf {
+	boolean a, b;
+
+	void toInline() {
+		if (a)
+			hashCode();
+	}
+
+	void m() {
+		if (b)
+			/*]*/toInline()/*[*/;
+		else
+			toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIfBug229734.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIfBug229734.java
new file mode 100644
index 000000000..205eafa75
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIfBug229734.java
@@ -0,0 +1,18 @@
+package controlStatement_in;
+
+public class TestDanglingIf {
+	boolean a, b;
+
+	void toInline() {
+		while (true)
+			if (a)
+				hashCode();
+	}
+
+	void m() {
+		if (b)
+			/*]*/toInline()/*[*/;
+		else
+			toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIfBug229734_2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIfBug229734_2.java
new file mode 100644
index 000000000..84ca28542
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestDanglingIfBug229734_2.java
@@ -0,0 +1,18 @@
+package controlStatement_in;
+
+public class TestDanglingIf {
+	boolean a, b;
+
+	void toInline() {
+		label: for (;;)
+			if (a)
+				hashCode();
+	}
+
+	void m() {
+		if (b)
+			/*]*/toInline()/*[*/;
+		else
+			toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestEnhancedForOne.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestEnhancedForOne.java
new file mode 100644
index 000000000..3a5df1117
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestEnhancedForOne.java
@@ -0,0 +1,15 @@
+package controlStatement_in;
+
+public class TestEnhancedForOne {
+	public void main() {
+		int[] array= null;
+		for (int value: array)
+			/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestEnhancedForTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestEnhancedForTwo.java
new file mode 100644
index 000000000..b0aeb8925
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestEnhancedForTwo.java
@@ -0,0 +1,16 @@
+package controlStatement_in;
+
+public class TestEnhancedForTwo {
+	public void main() {
+		int[] array= null;
+		for (int value: array)
+			/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentOne.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentOne.java
new file mode 100644
index 000000000..047a3daa9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentOne.java
@@ -0,0 +1,13 @@
+package controlStatement_in;
+
+public class TestForAssignmentOne {
+	public void main() {
+		int x;
+		for (int i= 0; i < 10; i++)
+			x= /*]*/foo()/*[*/;
+	}
+	
+	public int foo() {
+		return 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentTwo.java
new file mode 100644
index 000000000..6b18aee5e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForAssignmentTwo.java
@@ -0,0 +1,14 @@
+package controlStatement_in;
+
+public class TestForAssignmentTwo {
+	public void main() {
+		int x;
+		for (int i= 0; i < 10; i++)
+			x= /*]*/foo()/*[*/;
+	}
+	
+	public int foo() {
+		int x;
+		return 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForEmpty.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForEmpty.java
new file mode 100644
index 000000000..e8054e146
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForEmpty.java
@@ -0,0 +1,11 @@
+package controlStatement_in;
+
+public class TestForEmpty {
+	public void main() {
+		for (int i= 0; i < 10; i++)
+			/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForOne.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForOne.java
new file mode 100644
index 000000000..424a14567
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForOne.java
@@ -0,0 +1,14 @@
+package controlStatement_in;
+
+public class TestForOne {
+	public void main() {
+		for (int i= 0; i < 10; i++)
+			/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForTwo.java
new file mode 100644
index 000000000..696973873
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestForTwo.java
@@ -0,0 +1,15 @@
+package controlStatement_in;
+
+public class TestForTwo {
+	public void main() {
+		for (int i= 0; i < 10; i++)
+			/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfElseTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfElseTwo.java
new file mode 100644
index 000000000..040147225
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfElseTwo.java
@@ -0,0 +1,17 @@
+package controlStatement_in;
+
+public class TestIfElseTwo {
+	public void main() {
+		if (true)
+			main();
+		else
+			/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfThenTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfThenTwo.java
new file mode 100644
index 000000000..4853ef045
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfThenTwo.java
@@ -0,0 +1,17 @@
+package controlStatement_in;
+
+public class TestIfThenTwo {
+	public void main() {
+		if (true)
+			/*]*/foo();/*[*/
+		else
+			main();
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfWithVariable.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfWithVariable.java
new file mode 100644
index 000000000..a4bd0d9e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestIfWithVariable.java
@@ -0,0 +1,18 @@
+package controlStatement_in;
+
+public class TestIfWithVariable {
+
+	public boolean activate(String wizard) {
+		return true;
+	}
+
+	public boolean activate(Object refactoring, String wizard) {
+		String wizard1 = wizard;
+		return activate(wizard1);
+	}
+
+	private void foo() {
+		if (this != null)
+			/*]*/activate/*[*/(new Object(), new String());
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestLabelOne.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestLabelOne.java
new file mode 100644
index 000000000..369658aa6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestLabelOne.java
@@ -0,0 +1,14 @@
+package controlStatement_in;
+
+public class TestEnhancedForOne {
+	public void main() {
+		int[] array= null;
+		aLabel: /*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestLabelTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestLabelTwo.java
new file mode 100644
index 000000000..65a67c7db
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_in/TestLabelTwo.java
@@ -0,0 +1,15 @@
+package controlStatement_in;
+
+public class TestEnhancedForOne {
+	public void main() {
+		int[] array= null;
+		aLabel: /*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIf.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIf.java
new file mode 100644
index 000000000..4fb5a34af
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIf.java
@@ -0,0 +1,18 @@
+package controlStatement_out;
+
+public class TestDanglingIf {
+	boolean a, b;
+
+	void toInline() {
+		if (a)
+			hashCode();
+	}
+
+	void m() {
+		if (b) {
+			if (a)
+				hashCode();
+		} else
+			toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIfBug229734.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIfBug229734.java
new file mode 100644
index 000000000..d0c4adff9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIfBug229734.java
@@ -0,0 +1,20 @@
+package controlStatement_out;
+
+public class TestDanglingIf {
+	boolean a, b;
+
+	void toInline() {
+		while (true)
+			if (a)
+				hashCode();
+	}
+
+	void m() {
+		if (b) {
+			while (true)
+			if (a)
+				hashCode();
+		} else
+			toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIfBug229734_2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIfBug229734_2.java
new file mode 100644
index 000000000..03426aeb5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestDanglingIfBug229734_2.java
@@ -0,0 +1,20 @@
+package controlStatement_out;
+
+public class TestDanglingIf {
+	boolean a, b;
+
+	void toInline() {
+		label: for (;;)
+			if (a)
+				hashCode();
+	}
+
+	void m() {
+		if (b) {
+			label: for (;;)
+			if (a)
+				hashCode();
+		} else
+			toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestEnhancedForOne.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestEnhancedForOne.java
new file mode 100644
index 000000000..907959efe
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestEnhancedForOne.java
@@ -0,0 +1,15 @@
+package controlStatement_out;
+
+public class TestEnhancedForOne {
+	public void main() {
+		int[] array= null;
+		for (int value: array)
+			bar();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestEnhancedForTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestEnhancedForTwo.java
new file mode 100644
index 000000000..61f34650b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestEnhancedForTwo.java
@@ -0,0 +1,18 @@
+package controlStatement_out;
+
+public class TestEnhancedForTwo {
+	public void main() {
+		int[] array= null;
+		for (int value: array) {
+			bar();
+			bar();
+		}/*[*/
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentOne.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentOne.java
new file mode 100644
index 000000000..205f5fed4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentOne.java
@@ -0,0 +1,13 @@
+package controlStatement_out;
+
+public class TestForAssignmentOne {
+	public void main() {
+		int x;
+		for (int i= 0; i < 10; i++)
+			x= 20;
+	}
+	
+	public int foo() {
+		return 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentTwo.java
new file mode 100644
index 000000000..c223ed047
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentTwo.java
@@ -0,0 +1,16 @@
+package controlStatement_out;
+
+public class TestForAssignmentTwo {
+	public void main() {
+		int x;
+		for (int i= 0; i < 10; i++) {
+			int x1;
+			x= 20;
+		}
+	}
+	
+	public int foo() {
+		int x;
+		return 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForEmpty.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForEmpty.java
new file mode 100644
index 000000000..974a70916
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForEmpty.java
@@ -0,0 +1,10 @@
+package controlStatement_out;
+
+public class TestForEmpty {
+	public void main() {
+		for (int i= 0; i < 10; i++);
+	}
+	
+	public void foo() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForOne.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForOne.java
new file mode 100644
index 000000000..76df6d31a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForOne.java
@@ -0,0 +1,14 @@
+package controlStatement_out;
+
+public class TestForOne {
+	public void main() {
+		for (int i= 0; i < 10; i++)
+			bar();
+	}
+	
+	public void foo() {
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForTwo.java
new file mode 100644
index 000000000..e00d9a788
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForTwo.java
@@ -0,0 +1,17 @@
+package controlStatement_out;
+
+public class TestForTwo {
+	public void main() {
+		for (int i= 0; i < 10; i++) {
+			bar();
+			bar();
+		}
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfElseTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfElseTwo.java
new file mode 100644
index 000000000..c55f339c2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfElseTwo.java
@@ -0,0 +1,19 @@
+package controlStatement_out;
+
+public class TestIfElseTwo {
+	public void main() {
+		if (true)
+			main();
+		else {
+			bar();
+			bar();
+		}
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfThenTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfThenTwo.java
new file mode 100644
index 000000000..998c73c4d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfThenTwo.java
@@ -0,0 +1,18 @@
+package controlStatement_out;
+
+public class TestIfThenTwo {
+	public void main() {
+		if (true) {
+			bar();
+			bar();
+		} else
+			main();
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfWithVariable.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfWithVariable.java
new file mode 100644
index 000000000..e306b2bf6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestIfWithVariable.java
@@ -0,0 +1,20 @@
+package controlStatement_out;
+
+public class TestIfWithVariable {
+
+	public boolean activate(String wizard) {
+		return true;
+	}
+
+	public boolean activate(Object refactoring, String wizard) {
+		String wizard1 = wizard;
+		return activate(wizard1);
+	}
+
+	private void foo() {
+		if (this != null) {
+			String wizard1 = new String();
+			activate(wizard1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestLabelOne.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestLabelOne.java
new file mode 100644
index 000000000..5ee462c67
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestLabelOne.java
@@ -0,0 +1,14 @@
+package controlStatement_out;
+
+public class TestEnhancedForOne {
+	public void main() {
+		int[] array= null;
+		aLabel: /*]*/bar();/*[*/
+	}
+	
+	public void foo() {
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestLabelTwo.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestLabelTwo.java
new file mode 100644
index 000000000..cfb425475
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestLabelTwo.java
@@ -0,0 +1,18 @@
+package controlStatement_out;
+
+public class TestEnhancedForOne {
+	public void main() {
+		int[] array= null;
+		aLabel: /*]*/{
+			bar();
+			bar();
+		}/*[*/
+	}
+	
+	public void foo() {
+		bar();
+		bar();
+	}
+	public void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_in/TestAnonymousEnum.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_in/TestAnonymousEnum.java
new file mode 100644
index 000000000..d2c0d5713
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_in/TestAnonymousEnum.java
@@ -0,0 +1,12 @@
+package enum_in;
+
+public enum TestAnonymousEnum {
+	A {
+		void foo() {
+			/*]*/bar()/*[*/;
+		}
+		void bar() {
+			System.out.println("Hello Eclipse");
+		}
+	};
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_in/TestBasic.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_in/TestBasic.java
new file mode 100644
index 000000000..35c6e5794
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_in/TestBasic.java
@@ -0,0 +1,12 @@
+package enum_in;
+
+public enum TestBasic {
+	A, B;
+	
+	void foo() {
+		/*]*/bar()/*[*/;
+	}
+	void bar() {
+		System.out.println("Hello Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_out/TestAnonymousEnum.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_out/TestAnonymousEnum.java
new file mode 100644
index 000000000..9e052d951
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_out/TestAnonymousEnum.java
@@ -0,0 +1,12 @@
+package enum_out;
+
+public enum TestAnonymousEnum {
+	A {
+		void foo() {
+			System.out.println("Hello Eclipse");
+		}
+		void bar() {
+			System.out.println("Hello Eclipse");
+		}
+	};
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_out/TestBasic.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_out/TestBasic.java
new file mode 100644
index 000000000..dd3643b06
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/enum_out/TestBasic.java
@@ -0,0 +1,12 @@
+package enum_out;
+
+public enum TestBasic {
+	A, B;
+	
+	void foo() {
+		System.out.println("Hello Eclipse");
+	}
+	void bar() {
+		System.out.println("Hello Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestAssignment.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestAssignment.java
new file mode 100644
index 000000000..90b101e63
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestAssignment.java
@@ -0,0 +1,12 @@
+package expression_in;
+
+public class TestAssignment {
+	public void main() {
+		int i= 0;
+		i= /*]*/foo()/*[*/;
+	}
+	public int foo() {
+		int x= 20;
+		return x++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestConditionalExpression.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestConditionalExpression.java
new file mode 100644
index 000000000..5decedf63
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestConditionalExpression.java
@@ -0,0 +1,10 @@
+package expression_in;
+
+public class TestConditionalExpression {
+	int i(Object s, int k) {
+		return k == 3 ? s.hashCode() : 3;
+	}
+	void f(int p) {
+		int u = /*]*/i(this, p)/*[*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestReturnStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestReturnStatement.java
new file mode 100644
index 000000000..f128bb3aa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestReturnStatement.java
@@ -0,0 +1,14 @@
+package expression_in;
+
+public class TestReturnStatement {
+	public int main() {
+		return /*]*/foo()/*[*/;
+	}
+	
+	public int foo() {
+		if (true) {
+			return 10;
+		}
+		return 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleBody.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleBody.java
new file mode 100644
index 000000000..be20e2ede
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleBody.java
@@ -0,0 +1,11 @@
+package expression_in;
+
+public class TestSimpleBody {
+	public void main() {
+		int i= 10 * /*]*/foo()/*[*/;
+	}
+	
+	public int foo() {
+		return 1 + 2;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpression.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpression.java
new file mode 100644
index 000000000..e6a6c921c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpression.java
@@ -0,0 +1,11 @@
+package expression_in;
+
+public class TestSimpleExpression {
+	public void main() {
+		int i= /*]*/foo()/*[*/;
+	}
+	
+	public int foo() {
+		return 1 + 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpressionWithStatements.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpressionWithStatements.java
new file mode 100644
index 000000000..3b4ca4c94
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_in/TestSimpleExpressionWithStatements.java
@@ -0,0 +1,12 @@
+package expression_in;
+
+public class TestSimpleExpressionWithStatements {
+	public void main() {
+		int i= /*]*/foo()/*[*/;
+	}
+	
+	public int foo() {
+		int x= 20;
+		return x + 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestAssignment.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestAssignment.java
new file mode 100644
index 000000000..32b42c5e3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestAssignment.java
@@ -0,0 +1,13 @@
+package expression_out;
+
+public class TestAssignment {
+	public void main() {
+		int i= 0;
+		int x= 20;
+		i= x++;
+	}
+	public int foo() {
+		int x= 20;
+		return x++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestConditionalExpression.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestConditionalExpression.java
new file mode 100644
index 000000000..701f409d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestConditionalExpression.java
@@ -0,0 +1,10 @@
+package expression_out;
+
+public class TestConditionalExpression {
+	int i(Object s, int k) {
+		return k == 3 ? s.hashCode() : 3;
+	}
+	void f(int p) {
+		int u = (p == 3 ? this.hashCode() : 3);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestReturnStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestReturnStatement.java
new file mode 100644
index 000000000..42468990c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestReturnStatement.java
@@ -0,0 +1,17 @@
+package expression_out;
+
+public class TestReturnStatement {
+	public int main() {
+		if (true) {
+			return 10;
+		}
+		return 20;
+	}
+	
+	public int foo() {
+		if (true) {
+			return 10;
+		}
+		return 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleBody.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleBody.java
new file mode 100644
index 000000000..9845306c3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleBody.java
@@ -0,0 +1,11 @@
+package expression_out;
+
+public class TestSimpleBody {
+	public void main() {
+		int i= 10 * (1 + 2);
+	}
+	
+	public int foo() {
+		return 1 + 2;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpression.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpression.java
new file mode 100644
index 000000000..5338d2639
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpression.java
@@ -0,0 +1,11 @@
+package expression_out;
+
+public class TestSimpleExpression {
+	public void main() {
+		int i= 1 + 1;
+	}
+	
+	public int foo() {
+		return 1 + 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpressionWithStatements.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpressionWithStatements.java
new file mode 100644
index 000000000..ac31c8fca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpressionWithStatements.java
@@ -0,0 +1,13 @@
+package expression_out;
+
+public class TestSimpleExpressionWithStatements {
+	public void main() {
+		int x= 20;
+		int i= x + 1;
+	}
+	
+	public int foo() {
+		int x= 20;
+		return x + 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestClassInstance.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestClassInstance.java
new file mode 100644
index 000000000..b5ac636c1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestClassInstance.java
@@ -0,0 +1,15 @@
+package generic_in;
+
+public class TestClassInstance {
+	void bar() {
+		X<String, Number> x= new X<String, Number>();
+		x./*]*/foo()/*[*/;
+	}
+}
+
+class X<T, E> {
+	public void foo() {
+		T t= null;
+		E e= null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestClassInstance2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestClassInstance2.java
new file mode 100644
index 000000000..b372becfb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestClassInstance2.java
@@ -0,0 +1,19 @@
+package generic_in;
+
+public class TestClassInstance2<T, E> {
+	public void toInline() {
+		T t= null;
+		E e= null;
+	}
+}
+
+class TestClassInstance2References {
+	void bar() {
+		TestClassInstance2<String, Number> x= new TestClassInstance2<String, Number>();
+		x.toInline();
+	}
+	void baz() {
+		TestClassInstance2<Integer, Boolean> x= new TestClassInstance2<Integer, Boolean>();
+		x.toInline();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance1.java
new file mode 100644
index 000000000..6eaffe456
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance1.java
@@ -0,0 +1,10 @@
+package generic_in;
+
+public class TestMethodInstance1 {
+	void bar() {
+		/*]*/foo("Eclipse");/*[*/
+	}
+	private <T> void foo(T param) {
+		T t= null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance2.java
new file mode 100644
index 000000000..0eb6b929b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance2.java
@@ -0,0 +1,11 @@
+package generic_in;
+
+public class TestMethodInstance2 {
+	String bar() {
+		return /*]*/foo()/*[*/;
+	}
+	private <T> T foo() {
+		T t= null;
+		return t;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance3.java
new file mode 100644
index 000000000..cf332f2f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestMethodInstance3.java
@@ -0,0 +1,18 @@
+package generic_in;
+
+public class TestMethodInstance3 {
+	public <T> void toInline(T param) {
+		T t= null;
+	}
+}
+
+class TestMethodInstance3References {
+	void bar() {
+		TestMethodInstance3 var= null;
+		var.toInline("Eclipse");
+	}
+	void baz() {
+		TestMethodInstance3 var= null;
+		var.toInline(Boolean.TRUE);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType1.java
new file mode 100644
index 000000000..c1d569034
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType1.java
@@ -0,0 +1,14 @@
+package generic_in;
+
+import java.util.Vector;
+
+public class TestParameterizedType1 {
+	void use () {
+        Vector<? extends Number> vn = /*]*/me()/*[*/;
+    }
+    private Vector<? extends Number> me() {
+        Vector<Integer> vn= new Vector<Integer>();
+        vn.add(13);
+        return vn;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType2.java
new file mode 100644
index 000000000..00e05887c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType2.java
@@ -0,0 +1,14 @@
+package generic_in;
+
+import java.util.Vector;
+
+public class TestParameterizedType2 {
+	void use () {
+        Vector<? super Integer> vn = /*]*/me()/*[*/;
+    }
+    private Vector<? super Integer> me() {
+        Vector<? super Integer> vn= new Vector<Integer>();
+        vn.add(13);
+        return vn;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType3.java
new file mode 100644
index 000000000..fb8e97d0e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestParameterizedType3.java
@@ -0,0 +1,15 @@
+package generic_in;
+
+import java.util.ArrayList;
+
+public class TestParameterizedType3 {
+	class Inner<T extends ArrayList> {
+		public final T[] get() {
+			return (T[])new ArrayList[0];
+		}
+	}
+	
+	void use() {
+		new Inner<ArrayList>()./*]*/get()/*[*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestSubClass1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestSubClass1.java
new file mode 100644
index 000000000..6d1dad94e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestSubClass1.java
@@ -0,0 +1,15 @@
+package generic_in;
+
+class SuperClass1<T, E> {
+	public void foo() {
+		T t= null;
+		E e= null;
+	}
+}
+
+public class TestSubClass1<A, B> extends SuperClass1<A, B> {
+	void bar() {
+		/*]*/foo()/*[*/;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestSubClass2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestSubClass2.java
new file mode 100644
index 000000000..3266953fa
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_in/TestSubClass2.java
@@ -0,0 +1,15 @@
+package generic_in;
+
+class SuperClass2<T, E> {
+	public void foo() {
+		T t= null;
+		E e= null;
+	}
+}
+
+public class TestSubClass2<A, B> extends SuperClass2<B, A> {
+	void bar() {
+		/*]*/foo()/*[*/;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestClassInstance.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestClassInstance.java
new file mode 100644
index 000000000..e8022095a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestClassInstance.java
@@ -0,0 +1,16 @@
+package generic_out;
+
+public class TestClassInstance {
+	void bar() {
+		X<String, Number> x= new X<String, Number>();
+		String t= null;
+		Number e= null;
+	}
+}
+
+class X<T, E> {
+	public void foo() {
+		T t= null;
+		E e= null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestClassInstance2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestClassInstance2.java
new file mode 100644
index 000000000..a17e0a3d3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestClassInstance2.java
@@ -0,0 +1,17 @@
+package generic_out;
+
+public class TestClassInstance2<T, E> {
+}
+
+class TestClassInstance2References {
+	void bar() {
+		TestClassInstance2<String, Number> x= new TestClassInstance2<String, Number>();
+		String t= null;
+		Number e= null;
+	}
+	void baz() {
+		TestClassInstance2<Integer, Boolean> x= new TestClassInstance2<Integer, Boolean>();
+		Integer t= null;
+		Boolean e= null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance1.java
new file mode 100644
index 000000000..18fb9b491
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance1.java
@@ -0,0 +1,10 @@
+package generic_out;
+
+public class TestMethodInstance1 {
+	void bar() {
+		String t= null;
+	}
+	private <T> void foo(T param) {
+		T t= null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance2.java
new file mode 100644
index 000000000..b395f144c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance2.java
@@ -0,0 +1,12 @@
+package generic_out;
+
+public class TestMethodInstance2 {
+	String bar() {
+		String t= null;
+		return t;
+	}
+	private <T> T foo() {
+		T t= null;
+		return t;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance3.java
new file mode 100644
index 000000000..3ec3f46e1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestMethodInstance3.java
@@ -0,0 +1,15 @@
+package generic_out;
+
+public class TestMethodInstance3 {
+}
+
+class TestMethodInstance3References {
+	void bar() {
+		TestMethodInstance3 var= null;
+		String t= null;
+	}
+	void baz() {
+		TestMethodInstance3 var= null;
+		Boolean t= null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType1.java
new file mode 100644
index 000000000..ee039a832
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType1.java
@@ -0,0 +1,16 @@
+package generic_out;
+
+import java.util.Vector;
+
+public class TestParameterizedType1 {
+	void use () {
+        Vector<Integer> vn1= new Vector<Integer>();
+		vn1.add(13);
+		Vector<? extends Number> vn = /*]*/vn1/*[*/;
+    }
+    private Vector<? extends Number> me() {
+        Vector<Integer> vn= new Vector<Integer>();
+        vn.add(13);
+        return vn;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType2.java
new file mode 100644
index 000000000..2bb75ed3f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType2.java
@@ -0,0 +1,16 @@
+package generic_out;
+
+import java.util.Vector;
+
+public class TestParameterizedType2 {
+	void use () {
+        Vector<? super Integer> vn1= new Vector<Integer>();
+		vn1.add(13);
+		Vector<? super Integer> vn = /*]*/vn1/*[*/;
+    }
+    private Vector<? super Integer> me() {
+        Vector<? super Integer> vn= new Vector<Integer>();
+        vn.add(13);
+        return vn;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType3.java
new file mode 100644
index 000000000..c613574ae
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestParameterizedType3.java
@@ -0,0 +1,16 @@
+package generic_out;
+
+import java.util.ArrayList;
+
+public class TestParameterizedType3 {
+	class Inner<T extends ArrayList> {
+		public final T[] get() {
+			return (T[])new ArrayList[0];
+		}
+	}
+	
+	void use() {
+		Inner<ArrayList> r = new Inner<ArrayList>();
+		ArrayList[] get = (ArrayList[])new ArrayList[0];
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestSubClass1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestSubClass1.java
new file mode 100644
index 000000000..bcc15d909
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestSubClass1.java
@@ -0,0 +1,16 @@
+package generic_out;
+
+class SuperClass1<T, E> {
+	public void foo() {
+		T t= null;
+		E e= null;
+	}
+}
+
+public class TestSubClass1<A, B> extends SuperClass1<A, B> {
+	void bar() {
+		A t= null;
+		B e= null;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestSubClass2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestSubClass2.java
new file mode 100644
index 000000000..ec5db4e52
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/generic_out/TestSubClass2.java
@@ -0,0 +1,16 @@
+package generic_out;
+
+class SuperClass2<T, E> {
+	public void foo() {
+		T t= null;
+		E e= null;
+	}
+}
+
+public class TestSubClass2<A, B> extends SuperClass2<B, A> {
+	void bar() {
+		B t= null;
+		A e= null;
+	}
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/Provider.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/Provider.java
new file mode 100644
index 000000000..45f24ed1a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/Provider.java
@@ -0,0 +1,46 @@
+package import_in;
+
+import import_use.List;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Map;
+import static java.lang.Math.PI;
+
+public class Provider {
+	public File useAsReturn() {
+		return null;
+	}
+	public void useInArgument(File file) {
+		file= null;
+	}
+	public void useInDecl() {
+		List list= null;
+	}
+	public int useInDecl2(){
+	  return new ArrayList().size();
+	}	
+	public Object useInDecl3(){
+	  return new java.util.HashMap();
+	}	
+	public void useInClassLiteral() {
+		Class clazz= File.class;
+	}
+	public void useArray() {
+		List[] lists= null;
+	}
+	public void useInLocalClass() {
+		class Local extends File {
+			private static final long serialVersionUID = 1L;
+			public Local(String s) {
+				super(s);
+			}
+			public void foo(Map map) {
+			}
+			public void bar(Byte b) {
+			}
+		}
+	}
+	public void useStaticImport() {
+		double i= PI;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestStaticImport.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestStaticImport.java
new file mode 100644
index 000000000..da4b99803
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestStaticImport.java
@@ -0,0 +1,8 @@
+package import_in;
+
+public class TestStaticImport {
+	void foo() {
+		Provider p= null;
+		p./*]*/useStaticImport()/*[*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestStaticImport2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestStaticImport2.java
new file mode 100644
index 000000000..3e31108c0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestStaticImport2.java
@@ -0,0 +1,9 @@
+package import_in;
+
+public class TestStaticImport2 {
+	public static final double PI= 3.14;
+	void foo() {
+		Provider p= null;
+		p./*]*/useStaticImport()/*[*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseArray.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseArray.java
new file mode 100644
index 000000000..370848aaf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseArray.java
@@ -0,0 +1,8 @@
+package import_in;
+
+public class TestUseArray {
+	public void main() {
+		Provider p= null;
+		/*]*/p.useArray();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInArgument.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInArgument.java
new file mode 100644
index 000000000..95afaef8d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInArgument.java
@@ -0,0 +1,8 @@
+package import_in;
+
+public class TestUseInArgument {
+	public void main() {
+		Provider p= null;
+		/*]*/p.useInArgument(p.useAsReturn());/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInClassLiteral.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInClassLiteral.java
new file mode 100644
index 000000000..2ae4e908c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInClassLiteral.java
@@ -0,0 +1,8 @@
+package import_in;
+
+public class TestUseInClassLiteral {
+	public void main() {
+		Provider p= null;
+		/*]*/p.useInClassLiteral();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl.java
new file mode 100644
index 000000000..a301cbb43
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl.java
@@ -0,0 +1,8 @@
+package import_in;
+
+public class TestUseInDecl {
+	public void main() {
+		Provider p= null;
+		/*]*/p.useInDecl();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl2.java
new file mode 100644
index 000000000..a43d24fde
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl2.java
@@ -0,0 +1,8 @@
+package import_in;
+
+public class TestUseInDecl2 {
+	public void main() {
+		Provider p= null;
+		/*]*/p.useInDecl2();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl3.java
new file mode 100644
index 000000000..efb6168fd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDecl3.java
@@ -0,0 +1,8 @@
+package import_in;
+
+public class TestUseInDecl3 {
+	public void main() {
+		Provider p= null;
+		/*]*/p.useInDecl3();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDeclClash.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDeclClash.java
new file mode 100644
index 000000000..5dd4a4d90
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInDeclClash.java
@@ -0,0 +1,11 @@
+package import_in;
+
+import java.util.List;
+
+public class TestUseInDeclClash {
+	List fList;
+	public void main() {
+		Provider p= null;
+		/*]*/p.useInDecl();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInLocalClass.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInLocalClass.java
new file mode 100644
index 000000000..a66a7f857
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_in/TestUseInLocalClass.java
@@ -0,0 +1,8 @@
+package import_in;
+
+public class TestUseInLocalClass {
+	public void main() {
+		Provider p= null;
+		/*]*/p.useInLocalClass();/*[*/
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/Provider.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/Provider.java
new file mode 100644
index 000000000..a692f527d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/Provider.java
@@ -0,0 +1,46 @@
+package import_out;
+
+import import_use.List;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Map;
+import static java.lang.Math.PI;
+
+public class Provider {
+	public File useAsReturn() {
+		return null;
+	}
+	public void useInArgument(File file) {
+		file= null;
+	}
+	public void useInDecl() {
+		List list= null;
+	}
+	public int useInDecl2(){
+	  return new ArrayList().size();
+	}	
+	public Object useInDecl3(){
+	  return new java.util.HashMap();
+	}	
+	public void useInClassLiteral() {
+		Class clazz= File.class;
+	}
+	public void useArray() {
+		List[] lists= null;
+	}
+	public void useInLocalClass() {
+		class Local extends File {
+			private static final long serialVersionUID = 1L;
+			public Local(String s) {
+				super(s);
+			}
+			public void foo(Map map) {
+			}
+			public void bar(Byte b) {
+			}
+		}
+	}
+	public void useStaticImport() {
+		double i= PI;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestStaticImport.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestStaticImport.java
new file mode 100644
index 000000000..288a00042
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestStaticImport.java
@@ -0,0 +1,10 @@
+package import_out;
+
+import static java.lang.Math.PI;
+
+public class TestStaticImport {
+	void foo() {
+		Provider p= null;
+		double i= PI;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestStaticImport2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestStaticImport2.java
new file mode 100644
index 000000000..079747765
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestStaticImport2.java
@@ -0,0 +1,9 @@
+package import_out;
+
+public class TestStaticImport2 {
+	public static final double PI= 3.14;
+	void foo() {
+		Provider p= null;
+		double i= Math.PI;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseArray.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseArray.java
new file mode 100644
index 000000000..9ee15c54a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseArray.java
@@ -0,0 +1,10 @@
+package import_out;
+
+import import_use.List;
+
+public class TestUseArray {
+	public void main() {
+		Provider p= null;
+		List[] lists= null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInArgument.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInArgument.java
new file mode 100644
index 000000000..cbed05273
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInArgument.java
@@ -0,0 +1,11 @@
+package import_out;
+
+import java.io.File;
+
+public class TestUseInArgument {
+	public void main() {
+		Provider p= null;
+		File file = p.useAsReturn();
+		file= null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInClassLiteral.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInClassLiteral.java
new file mode 100644
index 000000000..7b76c234e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInClassLiteral.java
@@ -0,0 +1,10 @@
+package import_out;
+
+import java.io.File;
+
+public class TestUseInClassLiteral {
+	public void main() {
+		Provider p= null;
+		Class clazz= File.class;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl.java
new file mode 100644
index 000000000..22039cccd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl.java
@@ -0,0 +1,10 @@
+package import_out;
+
+import import_use.List;
+
+public class TestUseInDecl {
+	public void main() {
+		Provider p= null;
+		List list= null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl2.java
new file mode 100644
index 000000000..f6b67d9f5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl2.java
@@ -0,0 +1,10 @@
+package import_out;
+
+import java.util.ArrayList;
+
+public class TestUseInDecl2 {
+	public void main() {
+		Provider p= null;
+		new ArrayList().size();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl3.java
new file mode 100644
index 000000000..241bd0f44
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl3.java
@@ -0,0 +1,8 @@
+package import_out;
+
+public class TestUseInDecl3 {
+	public void main() {
+		Provider p= null;
+		new java.util.HashMap();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDeclClash.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDeclClash.java
new file mode 100644
index 000000000..e8a1986c4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDeclClash.java
@@ -0,0 +1,11 @@
+package import_out;
+
+import java.util.List;
+
+public class TestUseInDeclClash {
+	List fList;
+	public void main() {
+		Provider p= null;
+		import_use.List list= null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInLocalClass.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInLocalClass.java
new file mode 100644
index 000000000..175aeeaed
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_out/TestUseInLocalClass.java
@@ -0,0 +1,20 @@
+package import_out;
+
+import java.io.File;
+import java.util.Map;
+
+public class TestUseInLocalClass {
+	public void main() {
+		Provider p= null;
+		class Local extends File {
+			private static final long serialVersionUID = 1L;
+			public Local(String s) {
+				super(s);
+			}
+			public void foo(Map map) {
+			}
+			public void bar(Byte b) {
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_use/List.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_use/List.java
new file mode 100644
index 000000000..b41be5b5b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/import_use/List.java
@@ -0,0 +1,4 @@
+package import_use;
+
+public class List {
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError1.java
new file mode 100644
index 000000000..ac7bd5a29
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError1.java
@@ -0,0 +1,11 @@
+package invalid;
+
+public class TestCompileError1 {
+	public void main() {
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		T t= null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError2.java
new file mode 100644
index 000000000..be0c8615d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError2.java
@@ -0,0 +1,11 @@
+package invalid;
+
+public class TestCompileError2 {
+	public void main() {
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		main()
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError3.java
new file mode 100644
index 000000000..b13e24963
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestCompileError3.java
@@ -0,0 +1,11 @@
+package invalid;
+
+public class TestCompileError3 {
+	public void main() {
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		{
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestComplexBody.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestComplexBody.java
new file mode 100644
index 000000000..ddf310b76
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestComplexBody.java
@@ -0,0 +1,12 @@
+package invalid;
+
+public class TestComplexBody {
+	public void main() {
+		int i= 10 + /*]*/foo()/*[*/;
+	}
+	
+	public int foo() {
+		int i= 20;
+		return i + 2;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedExecutionFlow.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedExecutionFlow.java
new file mode 100644
index 000000000..54258869a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedExecutionFlow.java
@@ -0,0 +1,16 @@
+package invalid;
+
+public class TestInterruptedExecutionFlow {
+	public void main() {
+		int i;
+		i= /*]*/foo()/*[*/;
+	}
+	
+	public int foo() {
+		try {
+			return 10;
+		} catch(Exception e) {
+			return 20;
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedStatement.java
new file mode 100644
index 000000000..2bb989d97
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInterruptedStatement.java
@@ -0,0 +1,14 @@
+package invalid;
+
+public class TestInterruptedStatement {
+	public void main() {
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		if (true) {
+			System.out.println("Eclipse");
+			return;
+		}	
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer1.java
new file mode 100644
index 000000000..3c0bcae03
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer1.java
@@ -0,0 +1,11 @@
+package invalid;
+
+public class TestInvalidFieldInitializer1 {
+	
+	private int field= /*]*/foo()/*[*/;	
+	
+	public int foo() {
+		int a= 0;
+		return 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer2.java
new file mode 100644
index 000000000..6574596ed
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer2.java
@@ -0,0 +1,10 @@
+package invalid;
+
+public class TestInvalidFieldInitializer2 {
+	
+	private int field= /*]*/foo(null)/*[*/;	
+	
+	public Object foo(Object obj) {
+		return obj = new Object();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer3.java
new file mode 100644
index 000000000..995fc42c4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestInvalidFieldInitializer3.java
@@ -0,0 +1,10 @@
+package invalid;
+
+public class TestInvalidFieldInitializer3 {
+	
+	private Object field= /*]*/foo()/*[*/;	
+	
+	public Object foo() {
+		return field;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestLocalInitializer.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestLocalInitializer.java
new file mode 100644
index 000000000..d5a94ab4e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestLocalInitializer.java
@@ -0,0 +1,15 @@
+package invalid;
+
+public class TestLocalInitializer {
+	
+	public void foo() {
+		int i= /*]*/bar()/*[*/;
+	}
+
+	public int bar() {
+		if (true)
+			return 1;
+		else
+			return 2;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultiLocal.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultiLocal.java
new file mode 100644
index 000000000..f7c88b5f8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultiLocal.java
@@ -0,0 +1,15 @@
+package invalid;
+
+public class TestMultiLocal {
+	
+	public void foo() {
+		int i= /*]*/bar()/*[*/, x;
+	}
+
+	public int bar() {
+		if (true)
+			return 1;
+		else
+			return 2;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultipleMethods.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultipleMethods.java
new file mode 100644
index 000000000..86ee33054
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestMultipleMethods.java
@@ -0,0 +1,15 @@
+package invalid;
+
+public class TestMultipleMethods {
+	void bar() {
+		toInline("");
+	}
+
+	public void toInline(String d) {
+		System.out.println(d);
+	}
+
+	public void toInline(String d) {
+		System.out.println("");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestNotMethodName.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestNotMethodName.java
new file mode 100644
index 000000000..b19d43ed2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestNotMethodName.java
@@ -0,0 +1,8 @@
+package invalid;
+
+public class TestNotMethodName {
+	private static Class thisClass= TestNotMethodName.class;
+	static {
+        System.out.println(/*]*/thisClass/*[*/);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestRecursion.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestRecursion.java
new file mode 100644
index 000000000..015f407f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestRecursion.java
@@ -0,0 +1,11 @@
+package invalid;
+
+public class TestRecursion {
+	public void main() {
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		foo();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestSuperInThis.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestSuperInThis.java
new file mode 100644
index 000000000..531b0cceb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/invalid/TestSuperInThis.java
@@ -0,0 +1,15 @@
+package invalid;
+
+public class TestSuperInThis {
+	public void main() {
+		new TestSuperInThis(){
+			public void f(){
+				int u= /*[*/TestSuperInThis.this.toInline()/*]*/;
+			}
+		};
+	}
+	
+	public int toInline() {
+		return super.hashCode();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestBlocks.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestBlocks.java
new file mode 100644
index 000000000..a190210af
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestBlocks.java
@@ -0,0 +1,16 @@
+package nameconflict_in;
+
+public class TestBlocks {
+	public void main() {
+		if (true) {
+			/*]*/foo();/*[*/
+		}
+		if (true) {
+			int x= 1;
+		}
+	}
+	
+	private void foo() {
+		int x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestFieldInType.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestFieldInType.java
new file mode 100644
index 000000000..5063a2c07
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestFieldInType.java
@@ -0,0 +1,14 @@
+package nameconflict_in;
+
+public class TestFieldInType {
+	public void main() {
+		/*]*/foo();/*[*/
+		class T {
+			int x;
+		}
+	}
+	
+	public void foo() {
+		int x= 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestLocalInType.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestLocalInType.java
new file mode 100644
index 000000000..9054cacb2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestLocalInType.java
@@ -0,0 +1,17 @@
+package nameconflict_in;
+
+public class TestLocalInType {
+	public void main() {
+		/*]*/foo();/*[*/
+		class T {
+			void bar() {
+				int x;
+			}
+		}
+	}
+	
+	public void foo() {
+		int x= 10;
+		int bar= 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameLocal.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameLocal.java
new file mode 100644
index 000000000..fa24585ee
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameLocal.java
@@ -0,0 +1,13 @@
+package nameconflict_in;
+
+public class TestSameLocal {
+	public void main() {
+		int i= 10;
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		int i= 20;
+		i++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameType.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameType.java
new file mode 100644
index 000000000..2983de764
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameType.java
@@ -0,0 +1,17 @@
+package nameconflict_in;
+
+public class TestSameType {
+	public void main() {
+		class T {
+			public T() {}
+		}
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		class T {
+			T t;
+			public T() {}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeAfter.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeAfter.java
new file mode 100644
index 000000000..8e618b12d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeAfter.java
@@ -0,0 +1,17 @@
+package nameconflict_in;
+
+public class TestSameTypeAfter {
+	public void main() {
+		/*]*/foo();/*[*/
+		class T {
+			public T() {}
+		}
+	}
+	
+	public void foo() {
+		class T {
+			T t;
+			public T() {}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeInSibling.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeInSibling.java
new file mode 100644
index 000000000..7c4bfce41
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSameTypeInSibling.java
@@ -0,0 +1,25 @@
+package nameconflict_in;
+
+public class TestSameTypeInSibling {
+	public void main() {
+		class T {
+			public T() {}
+		}
+		int x= 10;
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+		class T {
+			T t;
+			public T() {}
+		}
+		class X {
+			T t;
+			void foo() {
+				int x;
+				T t;
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSwitchStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSwitchStatement.java
new file mode 100644
index 000000000..d244af1a4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestSwitchStatement.java
@@ -0,0 +1,19 @@
+package nameconflict_in;
+
+public class TestSwitchStatement {
+	public void main() {
+		int i= 10;
+		switch(i) {
+			case 0:
+				break;
+			case 10:
+				/*]*/foo();/*[*/
+				break;
+		}
+	}
+	
+	public void foo() {
+		int i= 20;
+		i++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestTwoCalls.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestTwoCalls.java
new file mode 100644
index 000000000..85942ca62
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_in/TestTwoCalls.java
@@ -0,0 +1,13 @@
+package nameconflict_in;
+
+public class TestTwoCalls {
+	public void main() {
+		int x= 0;
+		/*]*/foo();/*[*/
+		/*]*/foo();/*[*/
+	}
+	
+	private void foo() {
+		int x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestBlocks.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestBlocks.java
new file mode 100644
index 000000000..46c0d4d80
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestBlocks.java
@@ -0,0 +1,16 @@
+package nameconflict_out;
+
+public class TestBlocks {
+	public void main() {
+		if (true) {
+			int x= 1;
+		}
+		if (true) {
+			int x= 1;
+		}
+	}
+	
+	private void foo() {
+		int x= 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestFieldInType.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestFieldInType.java
new file mode 100644
index 000000000..488df1c6e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestFieldInType.java
@@ -0,0 +1,14 @@
+package nameconflict_out;
+
+public class TestFieldInType {
+	public void main() {
+		int x= 10;
+		class T {
+			int x;
+		}
+	}
+	
+	public void foo() {
+		int x= 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestLocalInType.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestLocalInType.java
new file mode 100644
index 000000000..70a0c2696
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestLocalInType.java
@@ -0,0 +1,18 @@
+package nameconflict_out;
+
+public class TestLocalInType {
+	public void main() {
+		int x= 10;
+		int bar= 20;
+		class T {
+			void bar() {
+				int x;
+			}
+		}
+	}
+	
+	public void foo() {
+		int x= 10;
+		int bar= 20;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameLocal.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameLocal.java
new file mode 100644
index 000000000..3b029eab8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameLocal.java
@@ -0,0 +1,14 @@
+package nameconflict_out;
+
+public class TestSameLocal {
+	public void main() {
+		int i= 10;
+		int i1= 20;
+		i1++;
+	}
+	
+	public void foo() {
+		int i= 20;
+		i++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameType.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameType.java
new file mode 100644
index 000000000..6b7b552e5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameType.java
@@ -0,0 +1,20 @@
+package nameconflict_out;
+
+public class TestSameType {
+	public void main() {
+		class T {
+			public T() {}
+		}
+		class T1 {
+			T1 t;
+			public T1() {}
+		}
+	}
+	
+	public void foo() {
+		class T {
+			T t;
+			public T() {}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeAfter.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeAfter.java
new file mode 100644
index 000000000..a17c1022d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeAfter.java
@@ -0,0 +1,20 @@
+package nameconflict_out;
+
+public class TestSameTypeAfter {
+	public void main() {
+		class T1 {
+			T1 t;
+			public T1() {}
+		}
+		class T {
+			public T() {}
+		}
+	}
+	
+	public void foo() {
+		class T {
+			T t;
+			public T() {}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeInSibling.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeInSibling.java
new file mode 100644
index 000000000..ce2dcb57d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeInSibling.java
@@ -0,0 +1,35 @@
+package nameconflict_out;
+
+public class TestSameTypeInSibling {
+	public void main() {
+		class T {
+			public T() {}
+		}
+		int x= 10;
+		class T1 {
+			T1 t;
+			public T1() {}
+		}
+		class X {
+			T1 t;
+			void foo() {
+				int x;
+				T1 t;
+			}
+		}
+	}
+	
+	public void foo() {
+		class T {
+			T t;
+			public T() {}
+		}
+		class X {
+			T t;
+			void foo() {
+				int x;
+				T t;
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSwitchStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSwitchStatement.java
new file mode 100644
index 000000000..5c9d870c9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSwitchStatement.java
@@ -0,0 +1,20 @@
+package nameconflict_out;
+
+public class TestSwitchStatement {
+	public void main() {
+		int i= 10;
+		switch(i) {
+			case 0:
+				break;
+			case 10:
+				int i1= 20;
+				i1++;
+				break;
+		}
+	}
+	
+	public void foo() {
+		int i= 20;
+		i++;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPlus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPlus.java
new file mode 100644
index 000000000..7272ad58d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPlus.java
@@ -0,0 +1,13 @@
+package operator_in;
+
+public class TestPlusPlus {
+	int result;
+	
+	public void foo() {
+		result= /*]*/inline(10 + 10)/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 1 + x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPostfix.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPostfix.java
new file mode 100644
index 000000000..c907077d1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPostfix.java
@@ -0,0 +1,14 @@
+package operator_in;
+
+public class TestPlusPostfix {
+	int result;
+	
+	public void foo() {
+		int i= 10;
+		result= /*]*/inline(10 + 10)/*[*/;
+	}
+	
+	public int inline(int x) {
+		return x++;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPrefix.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPrefix.java
new file mode 100644
index 000000000..9755a7708
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusPrefix.java
@@ -0,0 +1,14 @@
+package operator_in;
+
+public class TestPlusPrefix {
+	int result;
+	
+	public void foo() {
+		int i= 10;
+		result= /*]*/inline(10 + 10)/*[*/;
+	}
+	
+	public int inline(int x) {
+		return ++x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusTimes.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusTimes.java
new file mode 100644
index 000000000..abd34a121
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPlusTimes.java
@@ -0,0 +1,13 @@
+package operator_in;
+
+public class TestPlusTimes {
+	int result;
+	
+	public void foo() {
+		result= /*]*/inline(10 + 10)/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 3 * x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPostfixPlus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPostfixPlus.java
new file mode 100644
index 000000000..835efe935
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPostfixPlus.java
@@ -0,0 +1,14 @@
+package operator_in;
+
+public class TestPostfixPlus {
+	int result;
+	
+	public void foo() {
+		int i= 10;
+		result= /*]*/inline(i++)/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 1 + x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPrefixPlus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPrefixPlus.java
new file mode 100644
index 000000000..31fa1302a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestPrefixPlus.java
@@ -0,0 +1,14 @@
+package operator_in;
+
+public class TestPrefixPlus {
+	int result;
+	
+	public void foo() {
+		int i= 10;
+		result= /*]*/inline(++i)/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 1 + x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestTimesPlus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestTimesPlus.java
new file mode 100644
index 000000000..182eb5bf7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_in/TestTimesPlus.java
@@ -0,0 +1,13 @@
+package operator_in;
+
+public class TestTimesPlus {
+	int result;
+	
+	public void foo() {
+		result= /*]*/inline(10 * 10)/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 1 + x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPlus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPlus.java
new file mode 100644
index 000000000..5fb46f3a2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPlus.java
@@ -0,0 +1,13 @@
+package operator_out;
+
+public class TestPlusPlus {
+	int result;
+	
+	public void foo() {
+		result= /*]*/1 + 10 + 10/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 1 + x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPostfix.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPostfix.java
new file mode 100644
index 000000000..a17387e57
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPostfix.java
@@ -0,0 +1,15 @@
+package operator_out;
+
+public class TestPlusPostfix {
+	int result;
+	
+	public void foo() {
+		int i= 10;
+		int x = 10 + 10;
+		result= /*]*/x++/*[*/;
+	}
+	
+	public int inline(int x) {
+		return x++;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPrefix.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPrefix.java
new file mode 100644
index 000000000..350411fa0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusPrefix.java
@@ -0,0 +1,15 @@
+package operator_out;
+
+public class TestPlusPrefix {
+	int result;
+	
+	public void foo() {
+		int i= 10;
+		int x = 10 + 10;
+		result= /*]*/++x/*[*/;
+	}
+	
+	public int inline(int x) {
+		return ++x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusTimes.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusTimes.java
new file mode 100644
index 000000000..4dbfeae51
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPlusTimes.java
@@ -0,0 +1,13 @@
+package operator_out;
+
+public class TestPlusTimes {
+	int result;
+	
+	public void foo() {
+		result= /*]*/3 * (10 + 10)/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 3 * x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPostfixPlus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPostfixPlus.java
new file mode 100644
index 000000000..a5cf2a322
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPostfixPlus.java
@@ -0,0 +1,14 @@
+package operator_out;
+
+public class TestPostfixPlus {
+	int result;
+	
+	public void foo() {
+		int i= 10;
+		result= /*]*/1 + i++/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 1 + x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPrefixPlus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPrefixPlus.java
new file mode 100644
index 000000000..4cd7e196a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestPrefixPlus.java
@@ -0,0 +1,14 @@
+package operator_out;
+
+public class TestPrefixPlus {
+	int result;
+	
+	public void foo() {
+		int i= 10;
+		result= /*]*/1 + ++i/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 1 + x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestTimesPlus.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestTimesPlus.java
new file mode 100644
index 000000000..661058678
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/operator_out/TestTimesPlus.java
@@ -0,0 +1,13 @@
+package operator_out;
+
+public class TestTimesPlus {
+	int result;
+	
+	public void foo() {
+		result= /*]*/1 + 10 * 10/*[*/;
+	}
+	
+	public int inline(int x) {
+		return 1 + x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitStaticThisFieldReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitStaticThisFieldReceiver.java
new file mode 100644
index 000000000..55232f38f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitStaticThisFieldReceiver.java
@@ -0,0 +1,20 @@
+package receiver_in;
+
+public class TestExplicitStaticThisFieldReceiver {
+    static Logger2 LOG = Logger2.getLogger("");
+    
+    protected Logger2 getLOG() {
+        return LOG;
+    }
+    public void ref() {
+    	this./*]*/getLOG()/*[*/.info("message");
+    }
+}
+
+class Logger2 {
+	public static Logger2 getLogger(String string) {
+		return null;
+	}
+	public void info(String string) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitStaticThisMethodReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitStaticThisMethodReceiver.java
new file mode 100644
index 000000000..78846975f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitStaticThisMethodReceiver.java
@@ -0,0 +1,21 @@
+package receiver_in;
+
+public class TestExplicitStaticThisMethodReceiver {
+    static Logger3 getLogger() {
+    	return Logger3.getLogger("");
+    }
+    protected Logger3 getLOG() {
+        return getLogger();
+    }
+    public void ref() {
+    	this./*]*/getLOG()/*[*/.info("message");
+    }
+}
+
+class Logger3 {
+	public static Logger3 getLogger(String string) {
+		return null;
+	}
+	public void info(String string) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitThisFieldReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitThisFieldReceiver.java
new file mode 100644
index 000000000..cf044e70c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitThisFieldReceiver.java
@@ -0,0 +1,20 @@
+package receiver_in;
+
+public class TestExplicitThisFieldReceiver {
+    Logger LOG = Logger.getLogger("");
+    
+    protected Logger getLOG() {
+        return LOG;
+    }
+    public void ref() {
+    	this./*]*/getLOG()/*[*/.info("message");
+    }
+}
+
+class Logger {
+	public static Logger getLogger(String string) {
+		return null;
+	}
+	public void info(String string) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitThisMethodReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitThisMethodReceiver.java
new file mode 100644
index 000000000..bc9a38427
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExplicitThisMethodReceiver.java
@@ -0,0 +1,21 @@
+package receiver_in;
+
+public class TestExplicitThisMethodReceiver {
+	protected Logger4 getLogger() {
+		return Logger.getLogger("");
+	}
+    protected Logger4 getLOG() {
+        return getLogger();
+    }
+    public void ref() {
+    	this./*]*/getLOG()/*[*/.info("message");
+    }
+}
+
+class Logger4 {
+	public static Logger4 getLogger(String string) {
+		return null;
+	}
+	public void info(String string) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionOneImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionOneImplicitReceiver.java
new file mode 100644
index 000000000..0097b0db7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionOneImplicitReceiver.java
@@ -0,0 +1,19 @@
+package receiver_in;
+
+public class TestExpressionOneImplicitReceiver {
+	private class ImplicitReceiver {
+		public void foo() {
+			bar();
+		}
+		public void bar() {
+		}
+	}
+
+	public void main() {
+		/*]*/getObject().foo();/*[*/
+	}
+	
+	private ImplicitReceiver getObject() {
+		return new ImplicitReceiver();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionTwoImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionTwoImplicitReceiver.java
new file mode 100644
index 000000000..82362c023
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionTwoImplicitReceiver.java
@@ -0,0 +1,20 @@
+package receiver_in;
+
+public class TestExpressionTwoImplicitReceiver {
+	private class ImplicitReceiver {
+		public void foo() {
+			bar();
+			bar();
+		}
+		public void bar() {
+		}
+	}
+
+	public void main() {
+		/*]*/getObject().foo();/*[*/
+	}
+	
+	private ImplicitReceiver getObject() {
+		return new ImplicitReceiver();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionZeroImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionZeroImplicitReceiver.java
new file mode 100644
index 000000000..92fbe6cb3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestExpressionZeroImplicitReceiver.java
@@ -0,0 +1,17 @@
+package receiver_in;
+
+public class TestExpressionZeroImplicitReceiver {
+	private class ImplicitReceiver {
+		public void foo() {
+			System.out.println("Eclipse");
+		}
+	}
+
+	public void main() {
+		/*]*/getObject().foo();/*[*/
+	}
+	
+	private ImplicitReceiver getObject() {
+		return new ImplicitReceiver();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestFieldReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestFieldReceiver.java
new file mode 100644
index 000000000..59c498f75
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestFieldReceiver.java
@@ -0,0 +1,14 @@
+package receiver_in;
+
+public class TestFieldReceiver {
+    public Object object;
+    public Object getObject() {
+        return object;
+    }
+}
+class Client2 {
+    void test() {
+    	TestFieldReceiver r= new TestFieldReceiver();
+        Object o= /*]*/r.getObject()/*[*/;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestImplicitReceiverField.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestImplicitReceiverField.java
new file mode 100644
index 000000000..43118db6f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestImplicitReceiverField.java
@@ -0,0 +1,11 @@
+package receiver_in;
+
+public class TestImplicitReceiverField {
+	String field;
+	public void foo() {
+		/*]*/bar();/*[*/
+	}
+	public void bar() {
+		field= "Eclipse";
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestImplicitReceiverMethod.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestImplicitReceiverMethod.java
new file mode 100644
index 000000000..a2c1a5370
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestImplicitReceiverMethod.java
@@ -0,0 +1,13 @@
+package receiver_in;
+
+public class TestImplicitReceiverMethod {
+	public void foo() {
+		/*]*/bar();/*[*/
+	}
+	public void bar() {
+		faz();
+		faz();
+	}
+	public void faz() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameImplicitReceiver.java
new file mode 100644
index 000000000..8c9a71e0d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameImplicitReceiver.java
@@ -0,0 +1,17 @@
+package receiver_in;
+
+public class TestNameImplicitReceiver {
+	private class ImplicitReceiver {
+		public void foo() {
+			bar();
+		}
+		public void bar() {
+		}
+	}
+	
+	public void main() {
+		ImplicitReceiver a= new ImplicitReceiver();
+		
+		/*]*/a.foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameThisReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameThisReceiver.java
new file mode 100644
index 000000000..c84f1c8b7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNameThisReceiver.java
@@ -0,0 +1,17 @@
+package receiver_in;
+
+public class TestNameThisReceiver {
+	class ThisReceiver {
+		public void foo() {
+			this.bar();
+		}
+		public void bar() {
+		}
+	}
+
+	public void main() {
+		ThisReceiver a= new ThisReceiver();
+		
+		/*]*/a.foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNoImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNoImplicitReceiver.java
new file mode 100644
index 000000000..ee31fa15c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestNoImplicitReceiver.java
@@ -0,0 +1,15 @@
+package receiver_in;
+
+public class TestNoImplicitReceiver {
+	class NoImplicitReceiver {
+		public void foo() {
+			System.out.println("Eclipse");
+		}
+	}
+
+	public void main() {
+		NoImplicitReceiver a= new NoImplicitReceiver();
+		
+		/*]*/a.foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestReceiverWithStatic.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestReceiverWithStatic.java
new file mode 100644
index 000000000..963075574
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestReceiverWithStatic.java
@@ -0,0 +1,20 @@
+package receiver_in;
+
+public class TestReceiverWithStatic {
+	private static class ThisReceiver {
+		public void foo() {
+			bar();
+			baz();
+		}
+		public void bar() {
+		}
+		public static void baz() {
+		}
+	}
+
+	public void main() {
+		ThisReceiver a= new ThisReceiver();
+		
+		/*]*/a.foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestRemoteFieldReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestRemoteFieldReceiver.java
new file mode 100644
index 000000000..3b835f407
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestRemoteFieldReceiver.java
@@ -0,0 +1,23 @@
+package receiver_in;
+
+public class TestRemoteFieldReceiver {
+	RFRTarget fTarget;
+
+	void toInline() {
+		TestRemoteFieldReceiver i= this.fTarget.fId;
+		TestRemoteFieldReceiver j= fTarget.fId;
+		RFRTarget k= fTarget.fId.fTarget.fId.fTarget;
+	}
+}
+
+class RFRTarget {
+	public TestRemoteFieldReceiver fId;
+}
+
+class RFRCaller {
+	TestRemoteFieldReceiver fX;
+
+	public void analyseCode() {
+		fX./*]*/toInline()/*[*/;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestStaticReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestStaticReceiver.java
new file mode 100644
index 000000000..6726f535d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestStaticReceiver.java
@@ -0,0 +1,15 @@
+package receiver_in;
+
+public class TestStaticReceiver {
+	private static class StaticReceiver {
+		public static void foo() {
+			bar();
+		}
+		public static void bar() {
+		}
+	}
+
+	public void main() {
+		/*]*/StaticReceiver.foo();/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisExpression.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisExpression.java
new file mode 100644
index 000000000..f2f9135cb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisExpression.java
@@ -0,0 +1,25 @@
+package receiver_in;
+
+public class TestThisExpression {
+	void m(C c){
+		c.m(this);
+		class X {
+			void foo() {
+				foo();
+			}
+		}
+	}
+}
+
+class C {
+	void m(TestThisExpression t){
+	}
+}
+
+class Client{
+	void f(){
+		TestThisExpression t= null;
+		C c= null;
+		/*]*/t.m(c);/*[*/
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisReceiver.java
new file mode 100644
index 000000000..acc1c16c5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_in/TestThisReceiver.java
@@ -0,0 +1,13 @@
+package receiver_in;
+
+public class TestThisReceiver {
+    private Object data;
+
+    private void use(Object data) {
+    	this.toInline(data);
+    }
+
+	private void toInline(Object data) {
+		this.data= data;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitStaticThisFieldReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitStaticThisFieldReceiver.java
new file mode 100644
index 000000000..a9163e002
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitStaticThisFieldReceiver.java
@@ -0,0 +1,20 @@
+package receiver_out;
+
+public class TestExplicitStaticThisFieldReceiver {
+    static Logger2 LOG = Logger2.getLogger("");
+    
+    protected Logger2 getLOG() {
+        return LOG;
+    }
+    public void ref() {
+    	LOG.info("message");
+    }
+}
+
+class Logger2 {
+	public static Logger2 getLogger(String string) {
+		return null;
+	}
+	public void info(String string) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitStaticThisMethodReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitStaticThisMethodReceiver.java
new file mode 100644
index 000000000..20f11fbd6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitStaticThisMethodReceiver.java
@@ -0,0 +1,21 @@
+package receiver_out;
+
+public class TestExplicitStaticThisMethodReceiver {
+    static Logger3 getLogger() {
+    	return Logger3.getLogger("");
+    }
+    protected Logger3 getLOG() {
+        return getLogger();
+    }
+    public void ref() {
+    	getLogger().info("message");
+    }
+}
+
+class Logger3 {
+	public static Logger3 getLogger(String string) {
+		return null;
+	}
+	public void info(String string) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitThisFieldReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitThisFieldReceiver.java
new file mode 100644
index 000000000..abd8dd439
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitThisFieldReceiver.java
@@ -0,0 +1,20 @@
+package receiver_out;
+
+public class TestExplicitThisFieldReceiver {
+    Logger LOG = Logger.getLogger("");
+    
+    protected Logger getLOG() {
+        return LOG;
+    }
+    public void ref() {
+    	this.LOG.info("message");
+    }
+}
+
+class Logger {
+	public static Logger getLogger(String string) {
+		return null;
+	}
+	public void info(String string) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitThisMethodReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitThisMethodReceiver.java
new file mode 100644
index 000000000..163144c47
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExplicitThisMethodReceiver.java
@@ -0,0 +1,21 @@
+package receiver_in;
+
+public class TestExplicitThisMethodReceiver {
+	protected Logger4 getLogger() {
+		return Logger.getLogger("");
+	}
+    protected Logger4 getLOG() {
+        return getLogger();
+    }
+    public void ref() {
+    	this.getLogger().info("message");
+    }
+}
+
+class Logger4 {
+	public static Logger4 getLogger(String string) {
+		return null;
+	}
+	public void info(String string) {
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionOneImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionOneImplicitReceiver.java
new file mode 100644
index 000000000..283dd1bdc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionOneImplicitReceiver.java
@@ -0,0 +1,19 @@
+package receiver_out;
+
+public class TestExpressionOneImplicitReceiver {
+	private class ImplicitReceiver {
+		public void foo() {
+			bar();
+		}
+		public void bar() {
+		}
+	}
+
+	public void main() {
+		getObject().bar();
+	}
+	
+	private ImplicitReceiver getObject() {
+		return new ImplicitReceiver();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionTwoImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionTwoImplicitReceiver.java
new file mode 100644
index 000000000..0097c4af7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionTwoImplicitReceiver.java
@@ -0,0 +1,22 @@
+package receiver_out;
+
+public class TestExpressionTwoImplicitReceiver {
+	private class ImplicitReceiver {
+		public void foo() {
+			bar();
+			bar();
+		}
+		public void bar() {
+		}
+	}
+
+	public void main() {
+		ImplicitReceiver r = getObject();
+		r.bar();
+		r.bar();
+	}
+	
+	private ImplicitReceiver getObject() {
+		return new ImplicitReceiver();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionZeroImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionZeroImplicitReceiver.java
new file mode 100644
index 000000000..5bcd749bc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestExpressionZeroImplicitReceiver.java
@@ -0,0 +1,18 @@
+package receiver_out;
+
+public class TestExpressionZeroImplicitReceiver {
+	private class ImplicitReceiver {
+		public void foo() {
+			System.out.println("Eclipse");
+		}
+	}
+
+	public void main() {
+		ImplicitReceiver r = getObject();
+		System.out.println("Eclipse");
+	}
+	
+	private ImplicitReceiver getObject() {
+		return new ImplicitReceiver();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestFieldReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestFieldReceiver.java
new file mode 100644
index 000000000..c42e4d580
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestFieldReceiver.java
@@ -0,0 +1,14 @@
+package receiver_out;
+
+public class TestFieldReceiver {
+    public Object object;
+    public Object getObject() {
+        return object;
+    }
+}
+class Client2 {
+    void test() {
+    	TestFieldReceiver r= new TestFieldReceiver();
+        Object o= r.object;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestImplicitReceiverField.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestImplicitReceiverField.java
new file mode 100644
index 000000000..bba5cf54b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestImplicitReceiverField.java
@@ -0,0 +1,11 @@
+package receiver_out;
+
+public class TestImplicitReceiverField {
+	String field;
+	public void foo() {
+		/*]*/field= "Eclipse";/*[*/
+	}
+	public void bar() {
+		field= "Eclipse";
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestImplicitReceiverMethod.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestImplicitReceiverMethod.java
new file mode 100644
index 000000000..d6eb7fcb9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestImplicitReceiverMethod.java
@@ -0,0 +1,14 @@
+package receiver_out;
+
+public class TestImplicitReceiverMethod {
+	public void foo() {
+		/*]*/faz();
+		faz();/*[*/
+	}
+	public void bar() {
+		faz();
+		faz();
+	}
+	public void faz() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameImplicitReceiver.java
new file mode 100644
index 000000000..8b733bff3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameImplicitReceiver.java
@@ -0,0 +1,17 @@
+package receiver_out;
+
+public class TestNameImplicitReceiver {
+	private class ImplicitReceiver {
+		public void foo() {
+			bar();
+		}
+		public void bar() {
+		}
+	}
+	
+	public void main() {
+		ImplicitReceiver a= new ImplicitReceiver();
+		
+		a.bar();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameThisReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameThisReceiver.java
new file mode 100644
index 000000000..443c12f34
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNameThisReceiver.java
@@ -0,0 +1,17 @@
+package receiver_out;
+
+public class TestNameThisReceiver {
+	class ThisReceiver {
+		public void foo() {
+			this.bar();
+		}
+		public void bar() {
+		}
+	}
+
+	public void main() {
+		ThisReceiver a= new ThisReceiver();
+		
+		a.bar();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNoImplicitReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNoImplicitReceiver.java
new file mode 100644
index 000000000..c364faced
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestNoImplicitReceiver.java
@@ -0,0 +1,15 @@
+package receiver_out;
+
+public class TestNoImplicitReceiver {
+	class NoImplicitReceiver {
+		public void foo() {
+			System.out.println("Eclipse");
+		}
+	}
+
+	public void main() {
+		NoImplicitReceiver a= new NoImplicitReceiver();
+		
+		System.out.println("Eclipse");
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestReceiverWithStatic.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestReceiverWithStatic.java
new file mode 100644
index 000000000..c01012ee4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestReceiverWithStatic.java
@@ -0,0 +1,21 @@
+package receiver_out;
+
+public class TestReceiverWithStatic {
+	private static class ThisReceiver {
+		public void foo() {
+			bar();
+			baz();
+		}
+		public void bar() {
+		}
+		public static void baz() {
+		}
+	}
+
+	public void main() {
+		ThisReceiver a= new ThisReceiver();
+		
+		a.bar();
+		ThisReceiver.baz();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestRemoteFieldReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestRemoteFieldReceiver.java
new file mode 100644
index 000000000..5733d0b41
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestRemoteFieldReceiver.java
@@ -0,0 +1,25 @@
+package receiver_out;
+
+public class TestRemoteFieldReceiver {
+	RFRTarget fTarget;
+
+	void toInline() {
+		TestRemoteFieldReceiver i= this.fTarget.fId;
+		TestRemoteFieldReceiver j= fTarget.fId;
+		RFRTarget k= fTarget.fId.fTarget.fId.fTarget;
+	}
+}
+
+class RFRTarget {
+	public TestRemoteFieldReceiver fId;
+}
+
+class RFRCaller {
+	TestRemoteFieldReceiver fX;
+
+	public void analyseCode() {
+		TestRemoteFieldReceiver i= fX.fTarget.fId;
+		TestRemoteFieldReceiver j= fX.fTarget.fId;
+		RFRTarget k= fX.fTarget.fId.fTarget.fId.fTarget;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestStaticReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestStaticReceiver.java
new file mode 100644
index 000000000..a4cb0a754
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestStaticReceiver.java
@@ -0,0 +1,15 @@
+package receiver_out;
+
+public class TestStaticReceiver {
+	private static class StaticReceiver {
+		public static void foo() {
+			bar();
+		}
+		public static void bar() {
+		}
+	}
+
+	public void main() {
+		StaticReceiver.bar();
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisExpression.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisExpression.java
new file mode 100644
index 000000000..201042274
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisExpression.java
@@ -0,0 +1,30 @@
+package receiver_out;
+
+public class TestThisExpression {
+	void m(C c){
+		c.m(this);
+		class X {
+			void foo() {
+				foo();
+			}
+		}
+	}
+}
+
+class C {
+	void m(TestThisExpression t){
+	}
+}
+
+class Client{
+	void f(){
+		TestThisExpression t= null;
+		C c= null;
+		c.m(t);
+		class X {
+			void foo() {
+				foo();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisReceiver.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisReceiver.java
new file mode 100644
index 000000000..66b1b7c8d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/receiver_out/TestThisReceiver.java
@@ -0,0 +1,9 @@
+package receiver_out;
+
+public class TestThisReceiver {
+    private Object data;
+
+    private void use(Object data) {
+    	this.data= data;
+    }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic1.java
new file mode 100644
index 000000000..6a573d259
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic1.java
@@ -0,0 +1,13 @@
+package simple_in;
+
+public class TestBasic1 {
+	public void main() {
+		/*]*/bar();/*[*/
+	}
+	
+	public void bar() {
+		baz();
+	}
+	public void baz() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic2.java
new file mode 100644
index 000000000..275a1d88a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestBasic2.java
@@ -0,0 +1,16 @@
+package simple_in;
+
+public class TestBasic2 {
+	public void main() {
+		/*]*/bar();/*[*/
+	}
+	
+	public void bar() {
+		for (int i= 0; i < 10; i++) {
+			baz();
+		}
+		baz();
+	}
+	public void baz() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestCatchClause.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestCatchClause.java
new file mode 100644
index 000000000..40f35496a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestCatchClause.java
@@ -0,0 +1,17 @@
+package simple_in;
+
+public class TestCatchClause {
+	public int foo() {
+		int i= 0;
+		switch(i) {
+			case 10:
+				return /*]*/bar()/*[*/;
+			case 20:
+				return bar();
+		}
+		return 0;
+	}
+	int bar() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestComment1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestComment1.java
new file mode 100644
index 000000000..270b60311
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestComment1.java
@@ -0,0 +1,16 @@
+package simple_in;
+
+public class TestComment1 {
+	public void toInline() {
+		// comment
+		bar();
+		// comment
+		bar();
+		// comment
+	}
+	private void bar() {
+	}
+	public void ref() {
+		toInline();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor1.java
new file mode 100644
index 000000000..160199679
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor1.java
@@ -0,0 +1,14 @@
+package simple_in;
+
+public class TestConstructor1 {
+	
+	private Object object;
+
+	public TestConstructor1(Object o) {
+		object= o;
+	}
+
+	public TestConstructor1(Object o, int i) {
+		/*]*/this(o)/*[*/;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor2.java
new file mode 100644
index 000000000..1d77c7568
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestConstructor2.java
@@ -0,0 +1,14 @@
+package simple_in;
+
+public class TestConstructor2 {
+	
+	private Object object;
+
+	public TestConstructor2(Object o) {
+		object= o;
+	}
+
+	public TestConstructor2(Object o, int i) {
+		this(o);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestEmptyBody.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestEmptyBody.java
new file mode 100644
index 000000000..ff0466489
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestEmptyBody.java
@@ -0,0 +1,10 @@
+package simple_in;
+
+public class TestEmptyBody {
+	public void main() {
+		/*]*/foo();/*[*/
+	}
+	
+	public void foo() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer1.java
new file mode 100644
index 000000000..a60565060
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer1.java
@@ -0,0 +1,10 @@
+package simple_in;
+
+public class TestFieldInitializer1 {
+	
+	private int field= /*]*/foo()/*[*/;	
+	
+	public int foo() {
+		return 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer2.java
new file mode 100644
index 000000000..261ca49de
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializer2.java
@@ -0,0 +1,14 @@
+package simple_in;
+
+public class TestFieldInitializer2 {
+	
+	public void foo() {
+		class Woo {
+			private int field= /*]*/goo()/*[*/;
+			
+			public int goo() {
+				return 1;
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializerAnonymous.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializerAnonymous.java
new file mode 100644
index 000000000..a9196c4e3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestFieldInitializerAnonymous.java
@@ -0,0 +1,18 @@
+package simple_in;
+
+public class TestFieldInitializerAnonymous {
+
+	Object field = new Object() {
+		{
+			if (0 < hashCode())
+				;
+			else
+				/*]*/foo()/*[*/;
+		}
+	};
+
+	void foo() {
+		toString();
+		toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestInitializer.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestInitializer.java
new file mode 100644
index 000000000..719475ead
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestInitializer.java
@@ -0,0 +1,11 @@
+package simple_in;
+
+public class TestInitializer {
+	static {
+		/*]*/foo();/*[*/
+	}
+	
+	public static void foo() {
+		System.out.println("Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestLabeledStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestLabeledStatement.java
new file mode 100644
index 000000000..5db688ab1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestLabeledStatement.java
@@ -0,0 +1,15 @@
+package simple_in;
+
+public class TestLabeledStatement {
+
+	public static void main() {
+		/*]*/foo();/*[*/
+	}
+
+	public static void foo() {
+		the_label:
+		while(true) {
+			break the_label;
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestNestedCalls.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestNestedCalls.java
new file mode 100644
index 000000000..6cd6ee69d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestNestedCalls.java
@@ -0,0 +1,14 @@
+package simple_in;
+
+public class TestNestedCalls {
+	public static String toInline(String s, String s2) {
+		return s;
+	}
+	static class Inner {
+		void bar() {
+			System.out.println(
+					TestNestedCalls.toInline("outer", 
+							TestNestedCalls.toInline("inner", "hello")));
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestPrimitiveArray.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestPrimitiveArray.java
new file mode 100644
index 000000000..0ddaae373
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestPrimitiveArray.java
@@ -0,0 +1,11 @@
+package simple_in;
+
+public class TestPrimitiveArray {
+	public void main() {
+		/*]*/foo(null);/*[*/
+	}
+	
+	public void foo(int[][] x) {
+		x= new int[10][];
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSuper.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSuper.java
new file mode 100644
index 000000000..4e5d09b91
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSuper.java
@@ -0,0 +1,17 @@
+package simple_in;
+
+public class TestSuper {
+  private static class A {
+    void foo() {
+    	bar();    
+    }
+    void bar() {
+    }
+  }
+  private static class B extends A {
+    void foo() {
+      /*]*/super.foo();/*[*/
+    }
+  }
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSurroundingCallers.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSurroundingCallers.java
new file mode 100644
index 000000000..2677821fc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestSurroundingCallers.java
@@ -0,0 +1,15 @@
+package simple_in;
+
+public class TestSurroundingCallers {
+	void callOne() {
+		toInline();
+	}
+	
+	void toInline() {
+		System.out.println("Hello Eclipse");
+	}
+	
+	void callTwo() {
+		toInline();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTwoCalls.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTwoCalls.java
new file mode 100644
index 000000000..924bd9069
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTwoCalls.java
@@ -0,0 +1,18 @@
+package simple_in;
+
+public class TestTwoCalls {
+	public void main() {
+		toInline(10);
+		baz();
+		toInline(10);
+	}
+	void toInline(int i) {
+		i= 10;
+		bar();
+		bar();
+	}
+	void baz() {
+	}
+	void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTypeArray.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTypeArray.java
new file mode 100644
index 000000000..0299c06ba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_in/TestTypeArray.java
@@ -0,0 +1,11 @@
+package simple_in;
+
+public class TestTypeArray {
+	public void main() {
+		/*]*/foo(null);/*[*/
+	}
+	
+	public void foo(TestTypeArray[][] x) {
+		x= new TestTypeArray[10][];
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic1.java
new file mode 100644
index 000000000..d0f07049a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic1.java
@@ -0,0 +1,13 @@
+package simple_out;
+
+public class TestBasic1 {
+	public void main() {
+		baz();
+	}
+	
+	public void bar() {
+		baz();
+	}
+	public void baz() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic2.java
new file mode 100644
index 000000000..cc0e7cc76
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic2.java
@@ -0,0 +1,19 @@
+package simple_out;
+
+public class TestBasic2 {
+	public void main() {
+		for (int i= 0; i < 10; i++) {
+			baz();
+		}
+		baz();
+	}
+	
+	public void bar() {
+		for (int i= 0; i < 10; i++) {
+			baz();
+		}
+		baz();
+	}
+	public void baz() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestCatchClause.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestCatchClause.java
new file mode 100644
index 000000000..fa2126cec
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestCatchClause.java
@@ -0,0 +1,17 @@
+package simple_out;
+
+public class TestCatchClause {
+	public int foo() {
+		int i= 0;
+		switch(i) {
+			case 10:
+				return 10;
+			case 20:
+				return bar();
+		}
+		return 0;
+	}
+	int bar() {
+		return 10;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestComment1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestComment1.java
new file mode 100644
index 000000000..3ae11dcd6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestComment1.java
@@ -0,0 +1,13 @@
+package simple_out;
+
+public class TestComment1 {
+	private void bar() {
+	}
+	public void ref() {
+		// comment
+		bar();
+		// comment
+		bar();
+		// comment
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor1.java
new file mode 100644
index 000000000..dda9f7e06
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor1.java
@@ -0,0 +1,14 @@
+package simple_out;
+
+public class TestConstructor1 {
+	
+	private Object object;
+
+	public TestConstructor1(Object o) {
+		object= o;
+	}
+
+	public TestConstructor1(Object o, int i) {
+		object= o;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor2.java
new file mode 100644
index 000000000..e3aeb9634
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestConstructor2.java
@@ -0,0 +1,10 @@
+package simple_out;
+
+public class TestConstructor2 {
+	
+	private Object object;
+
+	public TestConstructor2(Object o, int i) {
+		object= o;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestEmptyBody.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestEmptyBody.java
new file mode 100644
index 000000000..3347ca683
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestEmptyBody.java
@@ -0,0 +1,9 @@
+package simple_out;
+
+public class TestEmptyBody {
+	public void main() {
+	}
+	
+	public void foo() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer1.java
new file mode 100644
index 000000000..34b1297b8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer1.java
@@ -0,0 +1,10 @@
+package simple_out;
+
+public class TestFieldInitializer1 {
+	
+	private int field= 1;	
+	
+	public int foo() {
+		return 1;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer2.java
new file mode 100644
index 000000000..77405c873
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializer2.java
@@ -0,0 +1,14 @@
+package simple_out;
+
+public class TestFieldInitializer2 {
+	
+	public void foo() {
+		class Woo {
+			private int field= 1;
+			
+			public int goo() {
+				return 1;
+			}
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializerAnonymous.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializerAnonymous.java
new file mode 100644
index 000000000..65a926887
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestFieldInitializerAnonymous.java
@@ -0,0 +1,20 @@
+package simple_out;
+
+public class TestFieldInitializerAnonymous {
+
+	Object field = new Object() {
+		{
+			if (0 < hashCode())
+				;
+			else {
+				toString();
+				toString();
+			}
+		}
+	};
+
+	void foo() {
+		toString();
+		toString();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestInitializer.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestInitializer.java
new file mode 100644
index 000000000..28ac06c5c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestInitializer.java
@@ -0,0 +1,11 @@
+package simple_out;
+
+public class TestInitializer {
+	static {
+		System.out.println("Eclipse");
+	}
+	
+	public static void foo() {
+		System.out.println("Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestLabeledStatement.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestLabeledStatement.java
new file mode 100644
index 000000000..6c2c07ef7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestLabeledStatement.java
@@ -0,0 +1,18 @@
+package simple_out;
+
+public class TestLabeledStatement {
+
+	public static void main() {
+		the_label:
+		while(true) {
+			break the_label;
+		}
+	}
+
+	public static void foo() {
+		the_label:
+		while(true) {
+			break the_label;
+		}
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestNestedCalls.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestNestedCalls.java
new file mode 100644
index 000000000..d0d1c6acb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestNestedCalls.java
@@ -0,0 +1,14 @@
+package simple_out;
+
+public class TestNestedCalls {
+	public static String toInline(String s, String s2) {
+		return s;
+	}
+	static class Inner {
+		void bar() {
+			System.out.println(
+					TestNestedCalls.toInline("outer", 
+							"inner"));
+		}
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestPrimitiveArray.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestPrimitiveArray.java
new file mode 100644
index 000000000..c552365d5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestPrimitiveArray.java
@@ -0,0 +1,12 @@
+package simple_out;
+
+public class TestPrimitiveArray {
+	public void main() {
+		int[][] x = null;
+		x= new int[10][];
+	}
+	
+	public void foo(int[][] x) {
+		x= new int[10][];
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSuper.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSuper.java
new file mode 100644
index 000000000..982531510
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSuper.java
@@ -0,0 +1,17 @@
+package simple_out;
+
+public class TestSuper {
+  private static class A {
+    void foo() {
+    	bar();    
+    }
+    void bar() {
+    }
+  }
+  private static class B extends A {
+    void foo() {
+      bar();
+    }
+  }
+}
+
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSurroundingCallers.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSurroundingCallers.java
new file mode 100644
index 000000000..83e182523
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestSurroundingCallers.java
@@ -0,0 +1,11 @@
+package simple_out;
+
+public class TestSurroundingCallers {
+	void callOne() {
+		System.out.println("Hello Eclipse");
+	}
+	
+	void callTwo() {
+		System.out.println("Hello Eclipse");
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTwoCalls.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTwoCalls.java
new file mode 100644
index 000000000..494a69adc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTwoCalls.java
@@ -0,0 +1,19 @@
+package simple_out;
+
+public class TestTwoCalls {
+	public void main() {
+		int i = 10;
+		i= 10;
+		bar();
+		bar();
+		baz();
+		int i1 = 10;
+		i1= 10;
+		bar();
+		bar();
+	}
+	void baz() {
+	}
+	void bar() {
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTypeArray.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTypeArray.java
new file mode 100644
index 000000000..a3d238b2d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineMethodWorkspace/TestCases/simple_out/TestTypeArray.java
@@ -0,0 +1,12 @@
+package simple_out;
+
+public class TestTypeArray {
+	public void main() {
+		TestTypeArray[][] x = null;
+		x= new TestTypeArray[10][];
+	}
+	
+	public void foo(TestTypeArray[][] x) {
+		x= new TestTypeArray[10][];
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_in.java
new file mode 100644
index 000000000..0519ecba6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_in.java
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_out.java
new file mode 100644
index 000000000..0519ecba6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_out.java
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_in.java
new file mode 100644
index 000000000..b49e01026
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_in.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	void m(int i){
+		int x= 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_out.java
new file mode 100644
index 000000000..4a984550a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test0_out.java
@@ -0,0 +1,5 @@
+package p;
+class A{
+	void m(int i){
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_in.java
new file mode 100644
index 000000000..016340b8a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_in.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+	public void testRLV() {
+			boolean test= true;
+			boolean t= (test);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_out.java
new file mode 100644
index 000000000..d13c7f429
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test10_out.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	public void testRLV() {
+			boolean t= (true);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_in.java
new file mode 100644
index 000000000..3ee356c05
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_in.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	boolean d;
+	public void test() {
+			boolean test= d;
+			boolean t= (test);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_out.java
new file mode 100644
index 000000000..72e9efb2d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test11_out.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+	boolean d;
+	public void test() {
+			boolean t= (d);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_in.java
new file mode 100644
index 000000000..e16e429a6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_in.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	boolean d;
+	public void test() {
+			A test= this;
+			A s1= test;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_out.java
new file mode 100644
index 000000000..a9e0f11f0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test12_out.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+	boolean d;
+	public void test() {
+			A s1= this;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_in.java
new file mode 100644
index 000000000..455b2f42a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_in.java
@@ -0,0 +1,8 @@
+package p;
+class A {
+	public void test() {
+			int i= 0;
+			int j= i=2;
+			int k= j + 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_out.java
new file mode 100644
index 000000000..054416bbf
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test13_out.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+	public void test() {
+			int i= 0;
+			int k= (i=2) + 1;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_in.java
new file mode 100644
index 000000000..b390bb611
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int i(){
+		int i= 0, j= 1;
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_out.java
new file mode 100644
index 000000000..ef2438bba
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test14_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int i(){
+		int j= 1;
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_in.java
new file mode 100644
index 000000000..b390bb611
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int i(){
+		int i= 0, j= 1;
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_out.java
new file mode 100644
index 000000000..7d7a3ba0b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test15_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int i(){
+		int i= 0;
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_in.java
new file mode 100644
index 000000000..1e48a3909
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_in.java
@@ -0,0 +1,8 @@
+package p;
+class Test {
+	void m(){
+		Object object = new Integer(2);
+		Integer integer = (Integer) object;
+		int i = integer.intValue();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_out.java
new file mode 100644
index 000000000..21e3afb3d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test16_out.java
@@ -0,0 +1,7 @@
+package p;
+class Test {
+	void m(){
+		Object object = new Integer(2);
+		int i = ((Integer) object).intValue();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_in.java
new file mode 100644
index 000000000..fd1a76739
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_in.java
@@ -0,0 +1,11 @@
+package p;
+
+class Test {
+  
+  public static final Test FOO = new Test() {
+    public void foo() {
+      int var = 1;
+      int var2 = var;
+    }
+  };
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_out.java
new file mode 100644
index 000000000..fa0b55d2c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test17_out.java
@@ -0,0 +1,10 @@
+package p;
+
+class Test {
+  
+  public static final Test FOO = new Test() {
+    public void foo() {
+      int var2 = 1;
+    }
+  };
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_in.java
new file mode 100644
index 000000000..dd9cf55b3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_in.java
@@ -0,0 +1,8 @@
+package p;
+
+class Test {
+    public void foo() {
+      int var = 1;
+      int var2 = var;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_out.java
new file mode 100644
index 000000000..d29449ae8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test18_out.java
@@ -0,0 +1,7 @@
+package p;
+
+class Test {
+    public void foo() {
+      int var2 = 1;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_in.java
new file mode 100644
index 000000000..dd9cf55b3
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_in.java
@@ -0,0 +1,8 @@
+package p;
+
+class Test {
+    public void foo() {
+      int var = 1;
+      int var2 = var;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_out.java
new file mode 100644
index 000000000..d29449ae8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test19_out.java
@@ -0,0 +1,7 @@
+package p;
+
+class Test {
+    public void foo() {
+      int var2 = 1;
+    }
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_in.java
new file mode 100644
index 000000000..db82b66b7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int m(int i){
+		int x= 0;
+		return x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_out.java
new file mode 100644
index 000000000..c52dbda60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test1_out.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	int m(int i){
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_in.java
new file mode 100644
index 000000000..7caf0a5ae
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_in.java
@@ -0,0 +1,7 @@
+package p;
+class A {
+	void f(boolean init){
+		boolean d= init;
+		if (! d);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_out.java
new file mode 100644
index 000000000..4ea16ebca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test20_out.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void f(boolean init){
+		if (! init);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_in.java
new file mode 100644
index 000000000..9e61a99bd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_in.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	private static void foo(String[] parameters, int j) {
+		int temp1 = parameters.length + j;
+		int temp = temp1;
+		System.out.println(temp);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_out.java
new file mode 100644
index 000000000..6ac096bd5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test21_out.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	private static void foo(String[] parameters, int j) {
+		int temp = parameters.length + j;
+		System.out.println(temp);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_in.java
new file mode 100644
index 000000000..dac7ca562
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_in.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	private static void foo(int i, int j) {
+		int temp = 1+2;
+		System.out.println(temp);
+		foo(temp*7, temp);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_out.java
new file mode 100644
index 000000000..6fec89034
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test22_out.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	private static void foo(int i, int j) {
+		System.out.println(1+2);
+		foo((1+2)*7, 1+2);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_in.java
new file mode 100644
index 000000000..9401d5f2f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_in.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	void f(){
+		String xxxx= "xx";
+		String y= ( xxxx );
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_out.java
new file mode 100644
index 000000000..20e852746
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test23_out.java
@@ -0,0 +1,7 @@
+package p;
+
+class A {
+	void f(){
+		String y= ( "xx" );
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_in.java
new file mode 100644
index 000000000..684d939cc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_in.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	void foo() {
+		final int value= 42;
+		// some valuable important comment which will be erased
+		System.out.println(value);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_out.java
new file mode 100644
index 000000000..4daf58548
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test24_out.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	void foo() {
+		// some valuable important comment which will be erased
+		System.out.println(42);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_in.java
new file mode 100644
index 000000000..6c3cfc556
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_in.java
@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	void foo() {
+		final int value= 42;//temp comment
+		// some valuable important comment which will be erased
+		System.out.println(value);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_out.java
new file mode 100644
index 000000000..4daf58548
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test25_out.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	void foo() {
+		// some valuable important comment which will be erased
+		System.out.println(42);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test26_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test26_in.java
new file mode 100644
index 000000000..b230d6bc0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test26_in.java
@@ -0,0 +1,11 @@
+package p;
+class Test<T> {
+	void m(){
+		Object object = new Test<T>();
+		Test<T> test = (Test<T>) object;
+		int i = test.n();
+	}
+	int n() {
+		return 0;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test26_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test26_out.java
new file mode 100644
index 000000000..3c5cff3bd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test26_out.java
@@ -0,0 +1,10 @@
+package p;
+class Test<T> {
+	void m(){
+		Object object = new Test<T>();
+		int i = ((Test<T>) object).n();
+	}
+	int n() {
+		return 0;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test27_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test27_in.java
new file mode 100644
index 000000000..c904e7f0d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test27_in.java
@@ -0,0 +1,11 @@
+package p;
+class Test<T> {
+	void m(){
+		Object object = new Test<String>();
+		Test<String> test = (Test<String>) object;
+		int i = test.n();
+	}
+	int n() {
+		return 0;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test27_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test27_out.java
new file mode 100644
index 000000000..d9302aac7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test27_out.java
@@ -0,0 +1,10 @@
+package p;
+class Test<T> {
+	void m(){
+		Object object = new Test<String>();
+		int i = ((Test<String>) object).n();
+	}
+	int n() {
+		return 0;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test28_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test28_in.java
new file mode 100644
index 000000000..3a254d059
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test28_in.java
@@ -0,0 +1,14 @@
+package p;
+class Test<T> {
+	enum TEST {
+		FIRST, SECOND;
+		int n() {
+			return 0;
+		}
+	}
+	void m(){
+		Object object = TEST.FIRST;
+		TEST test = (TEST) object;
+		int i = test.n();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test28_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test28_out.java
new file mode 100644
index 000000000..4fccc3f7f
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test28_out.java
@@ -0,0 +1,13 @@
+package p;
+class Test<T> {
+	enum TEST {
+		FIRST, SECOND;
+		int n() {
+			return 0;
+		}
+	}
+	void m(){
+		Object object = TEST.FIRST;
+		int i = ((TEST) object).n();
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test29_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test29_in.java
new file mode 100644
index 000000000..2735618fd
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test29_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+ void f(A a){
+   A[] arr= {a};
+   arr[0]= null;
+ }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test29_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test29_out.java
new file mode 100644
index 000000000..17518eaf4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test29_out.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+ void f(A a){
+   new A[]{a}[0]= null;
+ }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_in.java
new file mode 100644
index 000000000..db82b66b7
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int m(int i){
+		int x= 0;
+		return x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_out.java
new file mode 100644
index 000000000..c52dbda60
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test2_out.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	int m(int i){
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test30_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test30_in.java
new file mode 100644
index 000000000..07fdf3694
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test30_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+ void f(A a){
+   A[] arr[]= {};
+   arr[0][1]= null;
+ }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test30_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test30_out.java
new file mode 100644
index 000000000..1b51ae360
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test30_out.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+ void f(A a){
+   new A[][]{}[0][1]= null;
+ }
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test31_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test31_in.java
new file mode 100644
index 000000000..3a4bd552b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test31_in.java
@@ -0,0 +1,30 @@
+package p;
+
+import java.util.Collections;
+import java.util.Map;
+
+class A extends Sup<String> {
+	public A(Map<String, Integer> map) {
+		Map<String, Integer> emptyMap= Collections.emptyMap(/*nada*/);
+		method(emptyMap);
+		method2(emptyMap);
+		method3(emptyMap);
+		new A(emptyMap);
+		super.sup(emptyMap);
+		
+		Map<String, Integer> emptyMap2= emptyMap;
+		emptyMap2= emptyMap;
+		Object o= emptyMap;
+		Map<? extends String, ?> emptyMap3= emptyMap;
+		
+		Integer first= emptyMap.values().iterator().next();
+	}
+
+	void method(Map<String, Integer> map) { }
+	void method2(Map<? extends String, ?> map) {	}
+	void method3(Object map) {	}
+}
+
+class Sup<S> {
+	<A extends S, B> void sup(Map<A, B> map) {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test31_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test31_out.java
new file mode 100644
index 000000000..0d991f620
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test31_out.java
@@ -0,0 +1,29 @@
+package p;
+
+import java.util.Collections;
+import java.util.Map;
+
+class A extends Sup<String> {
+	public A(Map<String, Integer> map) {
+		method(Collections.<String, Integer>emptyMap(/*nada*/));
+		method2(Collections.<String, Integer>emptyMap(/*nada*/));
+		method3(Collections.<String, Integer>emptyMap(/*nada*/));
+		new A(Collections.<String, Integer>emptyMap(/*nada*/));
+		super.sup(Collections.<String, Integer>emptyMap(/*nada*/));
+		
+		Map<String, Integer> emptyMap2= Collections.emptyMap(/*nada*/);
+		emptyMap2= Collections.emptyMap(/*nada*/);
+		Object o= Collections.emptyMap(/*nada*/);
+		Map<? extends String, ?> emptyMap3= Collections.emptyMap(/*nada*/);
+		
+		Integer first= Collections.<String, Integer>emptyMap(/*nada*/).values().iterator().next();
+	}
+
+	void method(Map<String, Integer> map) { }
+	void method2(Map<? extends String, ?> map) {	}
+	void method3(Object map) {	}
+}
+
+class Sup<S> {
+	<A extends S, B> void sup(Map<A, B> map) {}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test32_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test32_in.java
new file mode 100644
index 000000000..5bb18b358
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test32_in.java
@@ -0,0 +1,24 @@
+package p;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+class A {
+	public A(List<? extends Number> arg) {
+		List<Integer> list= Arrays.asList(1, 2, 3 + 4*5);
+		method(list);
+		method2(list);
+		method3(list);
+		new A(list);
+		
+		List<Integer> list2= list;
+		list2= list;
+		Object o= list;
+	}
+
+	void method(List<Integer> l) { }
+	void method2(Collection<Integer> c) {	}
+	void method3(Object o) {	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test32_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test32_out.java
new file mode 100644
index 000000000..aab0e73bc
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test32_out.java
@@ -0,0 +1,23 @@
+package p;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+class A {
+	public A(List<? extends Number> arg) {
+		method(Arrays.asList(1, 2, 3 + 4*5));
+		method2(Arrays.asList(1, 2, 3 + 4*5));
+		method3(Arrays.asList(1, 2, 3 + 4*5));
+		new A(Arrays.asList(1, 2, 3 + 4*5));
+		
+		List<Integer> list2= Arrays.asList(1, 2, 3 + 4*5);
+		list2= Arrays.asList(1, 2, 3 + 4*5);
+		Object o= Arrays.asList(1, 2, 3 + 4*5);
+	}
+
+	void method(List<Integer> l) { }
+	void method2(Collection<Integer> c) {	}
+	void method3(Object o) {	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test33_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test33_in.java
new file mode 100644
index 000000000..899fcf6ca
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test33_in.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	public long inline(int i) {
+		long l = i;
+		return l << 50;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test33_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test33_out.java
new file mode 100644
index 000000000..349aea5f6
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test33_out.java
@@ -0,0 +1,7 @@
+package p;
+
+class A {
+	public long inline(int i) {
+		return (long) i << 50;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test34_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test34_in.java
new file mode 100644
index 000000000..688284beb
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test34_in.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	public void m() {
+		Integer i = 3;
+		System.out.println(i.doubleValue());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test34_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test34_out.java
new file mode 100644
index 000000000..239cfa4f0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test34_out.java
@@ -0,0 +1,7 @@
+package p;
+
+class A {
+	public void m() {
+		System.out.println(((Integer) 3).doubleValue());
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test35_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test35_in.java
new file mode 100644
index 000000000..fb9d17da0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test35_in.java
@@ -0,0 +1,16 @@
+package p;
+
+import java.util.List;
+
+class A {
+	void x() {
+		List<? extends Number> nums = getNums();
+		for (Number n : nums) {
+			System.out.println(n);
+		}
+	}
+
+	private List getNums() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test35_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test35_out.java
new file mode 100644
index 000000000..a21637f6b
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test35_out.java
@@ -0,0 +1,15 @@
+package p;
+
+import java.util.List;
+
+class A {
+	void x() {
+		for (Number n : (List<? extends Number>) getNums()) {
+			System.out.println(n);
+		}
+	}
+
+	private List getNums() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test36_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test36_in.java
new file mode 100644
index 000000000..93d89d6d2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test36_in.java
@@ -0,0 +1,10 @@
+package p;
+
+import java.util.List;
+
+class A {
+	void x() {
+		long two = 1 + 1;
+		long much = two * Integer.MAX_VALUE;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test36_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test36_out.java
new file mode 100644
index 000000000..c36ab0568
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test36_out.java
@@ -0,0 +1,9 @@
+package p;
+
+import java.util.List;
+
+class A {
+	void x() {
+		long much = (long) (1 + 1) * Integer.MAX_VALUE;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test37_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test37_in.java
new file mode 100644
index 000000000..0bac05d34
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test37_in.java
@@ -0,0 +1,12 @@
+package p;
+
+class A<E> {
+	String x() {
+		String t = bar();
+		return t;
+	}
+
+	static <T> T bar() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test37_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test37_out.java
new file mode 100644
index 000000000..6e7401ad5
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test37_out.java
@@ -0,0 +1,11 @@
+package p;
+
+class A<E> {
+	String x() {
+		return A.<String>bar();
+	}
+
+	static <T> T bar() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test38_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test38_in.java
new file mode 100644
index 000000000..1c786e5d8
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test38_in.java
@@ -0,0 +1,12 @@
+package p;
+
+class A<E> {
+	String x() {
+		String t = bar();
+		return t;
+	}
+
+	<T> T bar() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test38_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test38_out.java
new file mode 100644
index 000000000..d603f015e
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test38_out.java
@@ -0,0 +1,11 @@
+package p;
+
+class A<E> {
+	String x() {
+		return this.<String>bar();
+	}
+
+	<T> T bar() {
+		return null;
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test39_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test39_in.java
new file mode 100644
index 000000000..a32ccfcce
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test39_in.java
@@ -0,0 +1,18 @@
+package p;
+
+class A<E> extends Super {
+	String x() {
+		String t = super.bar();
+		return t;
+	}
+
+	<T> T bar() {
+		return null;
+	}
+}
+
+class Super {
+	<T> T bar() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test39_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test39_out.java
new file mode 100644
index 000000000..6ae975fda
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test39_out.java
@@ -0,0 +1,17 @@
+package p;
+
+class A<E> extends Super {
+	String x() {
+		return super.<String>bar();
+	}
+
+	<T> T bar() {
+		return null;
+	}
+}
+
+class Super {
+	<T> T bar() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_in.java
new file mode 100644
index 000000000..275e73e1d
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int m(int i){
+		int x= 0 + 1;
+		return x * x;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_out.java
new file mode 100644
index 000000000..42c7eeade
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test3_out.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	int m(int i){
+		return (0 + 1) * (0 + 1);
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test40_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test40_in.java
new file mode 100644
index 000000000..96c2b18c1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test40_in.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	void foo() {
+		Float plan= Float.parseFloat(""), met= Float.parseFloat("");
+	    boolean flag= equals(met > plan);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test40_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test40_out.java
new file mode 100644
index 000000000..70f8d58e2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test40_out.java
@@ -0,0 +1,8 @@
+package p;
+
+class A {
+	void foo() {
+		Float plan= Float.parseFloat("");
+	    boolean flag= equals(Float.parseFloat("") > plan);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_in.java
new file mode 100644
index 000000000..bd6778bf4
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_in.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int m(int i){
+		int x= i + 1;
+		return x * x + m(m(i));
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_out.java
new file mode 100644
index 000000000..8c50ce390
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test4_out.java
@@ -0,0 +1,6 @@
+package p;
+class A{
+	int m(int i){
+		return (i + 1) * (i + 1) + m(m(i));
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_in.java
new file mode 100644
index 000000000..620cb668a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_in.java
@@ -0,0 +1,7 @@
+package p;

+class A{

+	int m(int i){

+		int x= i + 1;

+		return x * x + m(m(x));

+	}

+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_out.java
new file mode 100644
index 000000000..1bd438c4a
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test5_out.java
@@ -0,0 +1,6 @@
+package p;

+class A{

+	int m(int i){

+		return (i + 1) * (i + 1) + m(m(i + 1));

+	}

+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_in.java
new file mode 100644
index 000000000..99478d217
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_in.java
@@ -0,0 +1,12 @@
+package p;
+class A{
+	int i(){
+		for (;false;){
+			//
+		}
+		//d
+		i();
+		int i= 0;
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_out.java
new file mode 100644
index 000000000..cd8a848e1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test6_out.java
@@ -0,0 +1,11 @@
+package p;
+class A{
+	int i(){
+		for (;false;){
+			//
+		}
+		//d
+		i();
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_in.java
new file mode 100644
index 000000000..99478d217
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_in.java
@@ -0,0 +1,12 @@
+package p;
+class A{
+	int i(){
+		for (;false;){
+			//
+		}
+		//d
+		i();
+		int i= 0;
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_out.java
new file mode 100644
index 000000000..cd8a848e1
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test7_out.java
@@ -0,0 +1,11 @@
+package p;
+class A{
+	int i(){
+		for (;false;){
+			//
+		}
+		//d
+		i();
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_in.java
new file mode 100644
index 000000000..2fa8abc4c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_in.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int i(){
+		int[] a= new int[6];
+		int i= a[9];
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_out.java
new file mode 100644
index 000000000..5766e8029
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test8_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int i(){
+		int[] a= new int[6];
+		return a[9];
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_in.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_in.java
new file mode 100644
index 000000000..2fa8abc4c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_in.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	int i(){
+		int[] a= new int[6];
+		int i= a[9];
+		return i;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_out.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_out.java
new file mode 100644
index 000000000..5766e8029
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/canInline/A_test9_out.java
@@ -0,0 +1,7 @@
+package p;
+class A{
+	int i(){
+		int[] a= new int[6];
+		return a[9];
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail0.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail0.java
new file mode 100644
index 000000000..24454b212
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail0.java
@@ -0,0 +1,8 @@
+//compile errors
+package p;
+class A{
+	void m(){
+		/*[*/final int i= 0;/*]*/
+		List l;
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail1.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail1.java
new file mode 100644
index 000000000..3d1901065
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail1.java
@@ -0,0 +1,8 @@
+//syntax errors
+errorCulprit
+package p;
+class A{
+	void m(){
+		/*[*/final int i= 0;/*]*/
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail10.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail10.java
new file mode 100644
index 000000000..be2d519c0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail10.java
@@ -0,0 +1,4 @@
+package p;
+class A{
+	int temp= 0;
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail11.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail11.java
new file mode 100644
index 000000000..ff452666c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail11.java
@@ -0,0 +1,15 @@
+package p;
+
+import java.io.File;
+import java.net.MalformedURLException;
+
+class F {
+	public void foo() { 
+		File file= null; 
+		 
+		try { 
+			file.toURL(); 
+		} catch (MalformedURLException e) { 
+		} 
+	} 
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail12.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail12.java
new file mode 100644
index 000000000..946e712da
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail12.java
@@ -0,0 +1,12 @@
+//compile errors
+package p;
+class A{
+	int f;
+	protected void primExecute(int t) {
+		this.toString();
+	}
+
+	if (image != null) {
+		Object loc = null;
+	}
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail13.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail13.java
new file mode 100644
index 000000000..e1b734021
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail13.java
@@ -0,0 +1,6 @@
+package p;
+class A {
+	void f() {
+		for (int i= 0; i < 4;);
+	}
+}
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail2.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail2.java
new file mode 100644
index 000000000..02e5c19d9
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail2.java
@@ -0,0 +1,10 @@
+//incorrect selection
+package p;
+class A{
+	int m(){
+		/*[*/int i;
+		if (true)
+			i= 0;	/*]*/
+		return 9;
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail3.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail3.java
new file mode 100644
index 000000000..d151bdf57
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail3.java
@@ -0,0 +1,10 @@
+//not initialized
+package p;
+class A{
+	int m(){
+		/*[*/int i;/*]*/
+		if (true)
+			i= 0;
+		return 9;
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail4.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail4.java
new file mode 100644
index 000000000..5b456cc9c
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail4.java
@@ -0,0 +1,10 @@
+//assigned to more than once
+package p;
+class A{
+	int m(){
+		/*[*/int i= 0;/*]*/
+		if (true)
+			i= 0;
+		return 9;
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail5.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail5.java
new file mode 100644
index 000000000..bd6b682f2
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail5.java
@@ -0,0 +1,8 @@
+//assigned to more than once
+package p;
+class A{
+	int m(){
+		/*[*/int i= 0;/*]*/
+		return i++;
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail6.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail6.java
new file mode 100644
index 000000000..4e71012ea
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail6.java
@@ -0,0 +1,8 @@
+//assigned to more than once
+package p;
+class A{
+	int m(int y){
+		/*[*/int i= 0;/*]*/
+		return y + (i--);
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail7.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail7.java
new file mode 100644
index 000000000..2c55d5071
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail7.java
@@ -0,0 +1,5 @@
+package p;
+class A{
+	void m(/*[*/int i/*]*/){
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail8.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail8.java
new file mode 100644
index 000000000..d6e2d8242
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail8.java
@@ -0,0 +1,8 @@
+package p;
+class A{
+	void m(){
+		try{
+		} catch (/*[*/Exception e/*]*/){
+		}
+	};
+}
\ No newline at end of file
diff --git a/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail9.java b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail9.java
new file mode 100644
index 000000000..be2d519c0
--- /dev/null
+++ b/testplugins/org.eclipse.jdt.ui.tests.refactoring/resources/InlineTemp/cannotInline/A_testFail9.java
@@ -0,0 +1,4 @@
+package p;
+class A{
+	int temp= 0;
+}
\ No newline at end of file