Attachment 236344 Details for Bug 394030 – Patch with fix and tests

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch with fix and tests

Bug 394030.patch (text/plain), 9.04 KB, created by Samrat Dhillon

on 2013-10-10 12:22:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Samrat Dhillon

Created: 2013-10-10 12:22:04 EDT

Size: 9.04 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1253.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1253.java
>new file mode 100644
>index 0000000..e960890
>--- /dev/null
>+++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1253.java
>@@ -0,0 +1,11 @@
>+package generics_in;
>+import java.util.Map;
>+
>+public class A_test1253<V> {
>+    public A_test1253(Map<?, ? extends V> c) {
>+        this(/*[*/c.size()/*]*/);
>+    }
>+
>+    public A_test1253(int size) {
>+    }
>+}
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1254.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1254.java
>new file mode 100644
>index 0000000..4fffa73
>--- /dev/null
>+++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1254.java
>@@ -0,0 +1,10 @@
>+package generics_in;
>+import java.util.ArrayList;
>+import java.util.List;
>+
>+public class A_test1254{
>+	public <E> void foo() {
>+		List<? extends E> t = new ArrayList<E>();
>+		/*[*/t.size();/*]*/
>+	}
>+}
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1253.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1253.java
>new file mode 100644
>index 0000000..a2fb9fc
>--- /dev/null
>+++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1253.java
>@@ -0,0 +1,15 @@
>+package generics_out;
>+import java.util.Map;
>+
>+public class A_test1253<V> {
>+    public A_test1253(Map<?, ? extends V> c) {
>+        this(extracted(c));
>+    }
>+
>+	protected static <V> int extracted(Map<?, ? extends V> c) {
>+		return /*[*/c.size()/*]*/;
>+	}
>+
>+    public A_test1253(int size) {
>+    }
>+}
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1254.java b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1254.java
>new file mode 100644
>index 0000000..eb179cb
>--- /dev/null
>+++ b/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1254.java
>@@ -0,0 +1,14 @@
>+package generics_out;
>+import java.util.ArrayList;
>+import java.util.List;
>+
>+public class A_test1254{
>+	public <E> void foo() {
>+		List<? extends E> t = new ArrayList<E>();
>+		extracted(t);
>+	}
>+
>+	protected <E> void extracted(List<? extends E> t) {
>+		/*[*/t.size();/*]*/
>+	}
>+}
>\ No newline at end of file
>diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java
>index 6d649d8..52a7c85 100644
>--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java
>+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2012 IBM Corporation and others.
>+ * Copyright (c) 2000, 2013, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -13,6 +13,7 @@
>  *     Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Extract method and continue https://bugs.eclipse.org/bugs/show_bug.cgi?id=48056
>  *     Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] should declare method static if extracted from anonymous in static method - https://bugs.eclipse.org/bugs/show_bug.cgi?id=152004
>  *     Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] extracting return value results in compile error - https://bugs.eclipse.org/bugs/show_bug.cgi?id=264606
>+ *     Samrat Dhillon <samrat.dhillon@gmail.com> -  [extract method] Extracting expression of parameterized type that is passed as argument to this constructor yields compilation error https://bugs.eclipse.org/bugs/show_bug.cgi?id=394030
>  *******************************************************************************/
> package org.eclipse.jdt.ui.tests.refactoring;
> 
>@@ -2109,6 +2110,14 @@
> 	public void test1252() throws Exception {
> 		fieldInitializerTest();
> 	}
>+		
>+	public void test1253() throws Exception {
>+		genericTest();
>+	}
>+	
>+	public void test1254() throws Exception {
>+		genericTest();
>+	}
> 
> 	//---- Test copied from http://c2.com/cgi/wiki?RefactoringBenchmarksForExtractMethod
> 
>diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java
>index 0279d0b..4e4e1cd 100644
>--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java
>+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2012 IBM Corporation and others.
>+ * Copyright (c) 2000, 2013, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -10,6 +10,7 @@
>  *     Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Does not replace similar code in parent class of anonymous class - https://bugs.eclipse.org/bugs/show_bug.cgi?id=160853
>  *     Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Extract method and continue https://bugs.eclipse.org/bugs/show_bug.cgi?id=48056
>  *     Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] should declare method static if extracted from anonymous in static method - https://bugs.eclipse.org/bugs/show_bug.cgi?id=152004
>+ *     Samrat Dhillon 	 <samrat.dhillon@gmail.com>    - [extract method] Extracting expression of parameterized type that is passed as argument to this constructor yields compilation error - https://bugs.eclipse.org/bugs/show_bug.cgi?id=394030 
>  *******************************************************************************/
> package org.eclipse.jdt.internal.corext.refactoring.code;
> 
>@@ -988,7 +989,7 @@
> 			}
> 		}
> 
>-		ITypeBinding[] typeVariables= computeLocalTypeVariables();
>+		ITypeBinding[] typeVariables= computeLocalTypeVariables(modifiers);
> 		List<TypeParameter> typeParameters= result.typeParameters();
> 		for (int i= 0; i < typeVariables.length; i++) {
> 			TypeParameter parameter= fAST.newTypeParameter();
>@@ -1027,20 +1028,20 @@
> 		return result;
> 	}
> 
>-	private ITypeBinding[] computeLocalTypeVariables() {
>+	private ITypeBinding[] computeLocalTypeVariables(int modifier) {
> 		List<ITypeBinding> result= new ArrayList<ITypeBinding>(Arrays.asList(fAnalyzer.getTypeVariables()));
> 		for (int i= 0; i < fParameterInfos.size(); i++) {
> 			ParameterInfo info= fParameterInfos.get(i);
>-			processVariable(result, info.getOldBinding());
>+			processVariable(result, info.getOldBinding(), modifier);
> 		}
> 		IVariableBinding[] methodLocals= fAnalyzer.getMethodLocals();
> 		for (int i= 0; i < methodLocals.length; i++) {
>-			processVariable(result, methodLocals[i]);
>+			processVariable(result, methodLocals[i], modifier);
> 		}
> 		return result.toArray(new ITypeBinding[result.size()]);
> 	}
> 
>-	private void processVariable(List<ITypeBinding> result, IVariableBinding variable) {
>+	private void processVariable(List<ITypeBinding> result, IVariableBinding variable, int modifier) {
> 		if (variable == null)
> 			return;
> 		ITypeBinding binding= variable.getType();
>@@ -1053,6 +1054,18 @@
> 					if (decl != null && decl.getParent() instanceof MethodDeclaration) {
> 						result.add(arg);
> 					}
>+					if(decl.getParent() instanceof TypeDeclaration && (modifier& Modifier.STATIC)==Modifier.STATIC){
>+						result.add(arg);
>+					}
>+				}
>+				if(arg.isWildcardType() && arg.getBound()!=null && !result.contains(arg.getBound())){
>+					ASTNode decl= fRoot.findDeclaringNode(arg.getBound());
>+					if (decl != null && decl.getParent() instanceof MethodDeclaration) {
>+						result.add(arg.getBound());
>+					}
>+					if(decl.getParent() instanceof TypeDeclaration && (modifier& Modifier.STATIC)==Modifier.STATIC){
>+						result.add(arg.getBound());
>+					}
> 				}
> 			}
> 		}

Actions: View | Diff

Attachments on bug 394030: 236344 | 236550