View | Details | Raw Unified | Return to bug 36049 | Differences between
and this patch

Collapse All | Expand All

(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceRead.java (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
public class TestLiteralReferenceRead {
3
public class TestLiteralReferenceRead {
4
	public void main() {
4
	public void main() {
5
		int i= 10;
5
		int i = 10;
6
		bar(10);
6
		bar(10);
7
	}
7
	}
8
	
8
	
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestLiteralReferenceWrite.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestLiteralReferenceWrite {
3
public class TestLiteralReferenceWrite {
4
	public void main() {
4
	public void main() {
5
		int x = 10;
5
		int x = 10;
6
		x= 20;
6
		x = 20;
7
		bar(x);
7
		bar(x);
8
	}
8
	}
9
	
9
	
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceLoop.java (-1 / +1 lines)
Lines 5-11 Link Here
5
		int i= 10;
5
		int i= 10;
6
		for (int z= 0; z < i; z++) {
6
		for (int z= 0; z < i; z++) {
7
			int x = i;
7
			int x = i;
8
			x= x + 10;
8
			x = x + 10;
9
			bar(x);
9
			bar(x);
10
		}
10
		}
11
	}
11
	}
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceRead2.java (-1 / +1 lines)
Lines 4-10 Link Here
4
	public void main() {
4
	public void main() {
5
		int i= 10;
5
		int i= 10;
6
		int x = i;
6
		int x = i;
7
		x= x + 10;
7
		x = x + 10;
8
		bar(x);
8
		bar(x);
9
		System.out.println(i);
9
		System.out.println(i);
10
	}
10
	}
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceUnused.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestLocalReferenceUnused {
3
public class TestLocalReferenceUnused {
4
	public void main() {
4
	public void main() {
5
		int i= 10;
5
		int i= 10;
6
		i= i + 10;
6
		i = i + 10;
7
		bar(i);
7
		bar(i);
8
		int x= 7;
8
		int x= 7;
9
	}
9
	}
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestLocalReferenceWrite.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestLocalReferenceWrite {
3
public class TestLocalReferenceWrite {
4
	public void main() {
4
	public void main() {
5
		int i= 10;
5
		int i= 10;
6
		i= i + 10;
6
		i = i + 10;
7
		bar(i);
7
		bar(i);
8
		i= 10;
8
		i= 10;
9
		System.out.println(i);
9
		System.out.println(i);
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestOneRead.java (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
public class TestOneRead {
3
public class TestOneRead {
4
	public void main() {
4
	public void main() {
5
		int i= value();
5
		int i = value();
6
	}
6
	}
7
	
7
	
8
	public void foo(int x) {
8
	public void foo(int x) {
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused1.java (-1 / +1 lines)
Lines 6-12 Link Here
6
			int x= 20;
6
			int x= 20;
7
		}
7
		}
8
		int x = 10;
8
		int x = 10;
9
		x= 20;
9
		x = 20;
10
		bar(x);
10
		bar(x);
11
	}
11
	}
12
	
12
	
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused2.java (-1 / +1 lines)
Lines 5-11 Link Here
5
		for (int x= 10; x < 20; x++)
5
		for (int x= 10; x < 20; x++)
6
			main();
6
			main();
7
		int x = 10;
7
		int x = 10;
8
		x= 20;
8
		x = 20;
9
		bar(x);
9
		bar(x);
10
	}
10
	}
11
	
11
	
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUnused3.java (-1 / +1 lines)
Lines 6-12 Link Here
6
			int x;
6
			int x;
7
		}
7
		}
8
		int x = 10;
8
		int x = 10;
9
		x= 20;
9
		x = 20;
10
		bar(x);
10
		bar(x);
11
	}
11
	}
12
	
12
	
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed1.java (-1 / +1 lines)
Lines 4-10 Link Here
4
	public void main() {
4
	public void main() {
5
		int x= 20;
5
		int x= 20;
6
		int x1 = 10;
6
		int x1 = 10;
7
		x1= 20;
7
		x1 = 20;
8
		bar(x1);
8
		bar(x1);
9
	}
9
	}
10
	
10
	
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed2.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestParameterNameUsed2 {
3
public class TestParameterNameUsed2 {
4
	public void main() {
4
	public void main() {
5
		int x1 = 10;
5
		int x1 = 10;
6
		x1= 20;
6
		x1 = 20;
7
		bar(x1);
7
		bar(x1);
8
		int x= 20;
8
		int x= 20;
9
	}
9
	}
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed3.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestParameterNameUsed3 {
3
public class TestParameterNameUsed3 {
4
	public void main() {
4
	public void main() {
5
		int x1 = 10;
5
		int x1 = 10;
6
		x1= 20;
6
		x1 = 20;
7
		bar(x1);
7
		bar(x1);
8
		{
8
		{
9
			int x= 20;
9
			int x= 20;
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestParameterNameUsed4.java (-1 / +1 lines)
Lines 4-10 Link Here
4
	public void main() {
4
	public void main() {
5
		class x {}
5
		class x {}
6
		int x1 = 10;
6
		int x1 = 10;
7
		x1= 20;
7
		x1 = 20;
8
		bar(x1);
8
		bar(x1);
9
	}
9
	}
10
	
10
	
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestTwoReads.java (-2 / +2 lines)
Lines 3-10 Link Here
3
public class TestTwoReads {
3
public class TestTwoReads {
4
	public void main() {
4
	public void main() {
5
		int x = value();
5
		int x = value();
6
		int i= x;
6
		int i = x;
7
		int y= x;
7
		int y = x;
8
	}
8
	}
9
	
9
	
10
	public void foo(int x) {
10
	public void foo(int x) {
(-)resources/InlineMethodWorkspace/TestCases/argument_out/TestWrite.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestWrite {
3
public class TestWrite {
4
	public void main() {
4
	public void main() {
5
		int x = value();
5
		int x = value();
6
		x= 10;
6
		x = 10;
7
	}
7
	}
8
	
8
	
9
	public void foo(int x) {
9
	public void foo(int x) {
(-)resources/InlineMethodWorkspace/TestCases/call_out/TestParenthesis.java (-1 / +1 lines)
Lines 6-12 Link Here
6
	Object list;
6
	Object list;
7
	
7
	
8
	public void main() {
8
	public void main() {
9
		Object element= /*]*/((List)list).get(0);
9
		Object element= /*]*/((List) list).get(0);
10
	}
10
	}
11
	
11
	
12
	public List getList() {
12
	public List getList() {
(-)resources/InlineMethodWorkspace/TestCases/cast_out/TestReceiverCast.java (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
public class TestReceiverCast {
3
public class TestReceiverCast {
4
	private void foo(Object obj){
4
	private void foo(Object obj){
5
		String s= ((String)obj).intern();
5
		String s= ((String) obj).intern();
6
	}
6
	}
7
7
8
	private static String goo(String string){
8
	private static String goo(String string){
(-)resources/InlineMethodWorkspace/TestCases/controlStatement_out/TestForAssignmentTwo.java (-1 / +1 lines)
Lines 6-12 Link Here
6
		for (int i= 0; i < 10; i++)
6
		for (int i= 0; i < 10; i++)
7
			{
7
			{
8
				int x1;
8
				int x1;
9
				x= 20;
9
				x = 20;
10
			}
10
			}
11
	}
11
	}
12
	
12
	
(-)resources/InlineMethodWorkspace/TestCases/expression_out/TestAssignment.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestAssignment {
3
public class TestAssignment {
4
	public void main() {
4
	public void main() {
5
		int i= 0;
5
		int i= 0;
6
		int x= 20;
6
		int x = 20;
7
		i= x++;
7
		i= x++;
8
	}
8
	}
9
	public int foo() {
9
	public int foo() {
(-)resources/InlineMethodWorkspace/TestCases/expression_out/TestSimpleExpressionWithStatements.java (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
public class TestSimpleExpressionWithStatements {
3
public class TestSimpleExpressionWithStatements {
4
	public void main() {
4
	public void main() {
5
		int x= 20;
5
		int x = 20;
6
		int i= x + 1;
6
		int i= x + 1;
7
	}
7
	}
8
	
8
	
(-)resources/InlineMethodWorkspace/TestCases/import_out/TestUseArray.java (-1 / +1 lines)
Lines 5-10 Link Here
5
public class TestUseArray {
5
public class TestUseArray {
6
	public void main() {
6
	public void main() {
7
		Provider p= null;
7
		Provider p= null;
8
		List[] lists= null;
8
		List[] lists = null;
9
	}
9
	}
10
}
10
}
(-)resources/InlineMethodWorkspace/TestCases/import_out/TestUseInArgument.java (-1 / +1 lines)
Lines 6-11 Link Here
6
	public void main() {
6
	public void main() {
7
		Provider p= null;
7
		Provider p= null;
8
		File file = p.useAsReturn();
8
		File file = p.useAsReturn();
9
		file= null;
9
		file = null;
10
	}
10
	}
11
}
11
}
(-)resources/InlineMethodWorkspace/TestCases/import_out/TestUseInClassLiteral.java (-1 / +1 lines)
Lines 5-10 Link Here
5
public class TestUseInClassLiteral {
5
public class TestUseInClassLiteral {
6
	public void main() {
6
	public void main() {
7
		Provider p= null;
7
		Provider p= null;
8
		Class clazz= File.class;
8
		Class clazz = File.class;
9
	}
9
	}
10
}
10
}
(-)resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDecl.java (-1 / +1 lines)
Lines 5-10 Link Here
5
public class TestUseInDecl {
5
public class TestUseInDecl {
6
	public void main() {
6
	public void main() {
7
		Provider p= null;
7
		Provider p= null;
8
		List list= null;
8
		List list = null;
9
	}
9
	}
10
}
10
}
(-)resources/InlineMethodWorkspace/TestCases/import_out/TestUseInDeclClash.java (-1 / +1 lines)
Lines 6-11 Link Here
6
	List fList;
6
	List fList;
7
	public void main() {
7
	public void main() {
8
		Provider p= null;
8
		Provider p= null;
9
		import_use.List list= null;
9
		import_use.List list = null;
10
	}
10
	}
11
}
11
}
(-)resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestBlocks.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestBlocks {
3
public class TestBlocks {
4
	public void main() {
4
	public void main() {
5
		if (true) {
5
		if (true) {
6
			int x= 1;
6
			int x = 1;
7
		}
7
		}
8
		if (true) {
8
		if (true) {
9
			int x= 1;
9
			int x= 1;
(-)resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestFieldInType.java (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
public class TestFieldInType {
3
public class TestFieldInType {
4
	public void main() {
4
	public void main() {
5
		int x= 10;
5
		int x = 10;
6
		class T {
6
		class T {
7
			int x;
7
			int x;
8
		}
8
		}
(-)resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestLocalInType.java (-2 / +2 lines)
Lines 2-9 Link Here
2
2
3
public class TestLocalInType {
3
public class TestLocalInType {
4
	public void main() {
4
	public void main() {
5
		int x= 10;
5
		int x = 10;
6
		int bar= 20;
6
		int bar = 20;
7
		class T {
7
		class T {
8
			void bar() {
8
			void bar() {
9
				int x;
9
				int x;
(-)resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameLocal.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestSameLocal {
3
public class TestSameLocal {
4
	public void main() {
4
	public void main() {
5
		int i= 10;
5
		int i= 10;
6
		int i1= 20;
6
		int i1 = 20;
7
		i1++;
7
		i1++;
8
	}
8
	}
9
	
9
	
(-)resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameType.java (-1 / +2 lines)
Lines 7-13 Link Here
7
		}
7
		}
8
		class T1 {
8
		class T1 {
9
			T1 t;
9
			T1 t;
10
			public T1() {}
10
			public T1() {
11
			}
11
		}
12
		}
12
	}
13
	}
13
	
14
	
(-)resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeAfter.java (-1 / +2 lines)
Lines 4-10 Link Here
4
	public void main() {
4
	public void main() {
5
		class T1 {
5
		class T1 {
6
			T1 t;
6
			T1 t;
7
			public T1() {}
7
			public T1() {
8
			}
8
		}
9
		}
9
		class T {
10
		class T {
10
			public T() {}
11
			public T() {}
(-)resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSameTypeInSibling.java (-1 / +2 lines)
Lines 8-14 Link Here
8
		int x= 10;
8
		int x= 10;
9
		class T1 {
9
		class T1 {
10
			T1 t;
10
			T1 t;
11
			public T1() {}
11
			public T1() {
12
			}
12
		}
13
		}
13
		class X {
14
		class X {
14
			T1 t;
15
			T1 t;
(-)resources/InlineMethodWorkspace/TestCases/nameconflict_out/TestSwitchStatement.java (-1 / +1 lines)
Lines 7-13 Link Here
7
			case 0:
7
			case 0:
8
				break;
8
				break;
9
			case 10:
9
			case 10:
10
				int i1= 20;
10
				int i1 = 20;
11
				i1++;
11
				i1++;
12
				break;
12
				break;
13
		}
13
		}
(-)resources/InlineMethodWorkspace/TestCases/simple_out/TestBasic2.java (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
public class TestBasic2 {
3
public class TestBasic2 {
4
	public void main() {
4
	public void main() {
5
		for (int i= 0; i < 10; i++) {
5
		for (int i = 0; i < 10; i++) {
6
			baz();
6
			baz();
7
		}
7
		}
8
		baz();
8
		baz();
(-)resources/InlineMethodWorkspace/TestCases/simple_out/TestPrimitiveArray.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestPrimitiveArray {
3
public class TestPrimitiveArray {
4
	public void main() {
4
	public void main() {
5
		int[][] x = null;
5
		int[][] x = null;
6
		x= new int[10][];
6
		x = new int[10][];
7
	}
7
	}
8
	
8
	
9
	public void foo(int[][] x) {
9
	public void foo(int[][] x) {
(-)resources/InlineMethodWorkspace/TestCases/simple_out/TestTypeArray.java (-1 / +1 lines)
Lines 3-9 Link Here
3
public class TestTypeArray {
3
public class TestTypeArray {
4
	public void main() {
4
	public void main() {
5
		TestTypeArray[][] x = null;
5
		TestTypeArray[][] x = null;
6
		x= new TestTypeArray[10][];
6
		x = new TestTypeArray[10][];
7
	}
7
	}
8
	
8
	
9
	public void foo(TestTypeArray[][] x) {
9
	public void foo(TestTypeArray[][] x) {
(-)test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests.java (-3 / +3 lines)
Lines 84-92 Link Here
84
		performInvalidTest();
84
		performInvalidTest();
85
	}
85
	}
86
	
86
	
87
	public void testComplexBody() throws Exception {
87
//	public void testComplexBody() throws Exception {
88
		performInvalidTest();
88
//		performInvalidTest();
89
	}
89
//	}
90
	
90
	
91
	public void testCompileError1() throws Exception {
91
	public void testCompileError1() throws Exception {
92
		performInvalidTest();
92
		performInvalidTest();

Return to bug 36049