Attachment #142588 for bug #48056




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Extract method and continue https://bugs.eclipse.org/bugs/show_bug.cgi?id=48056
 *******************************************************************************/
package org.eclipse.jdt.internal.corext.refactoring.code;


import org.eclipse.jdt.core.compiler.ITerminalSymbols;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
import org.eclipse.jdt.core.dom.Assignment;
import org.eclipse.jdt.core.dom.Block;

import org.eclipse.jdt.core.dom.ClassInstanceCreation;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.dom.ConstructorInvocation;
import org.eclipse.jdt.core.dom.ContinueStatement;
import org.eclipse.jdt.core.dom.DoStatement;
import org.eclipse.jdt.core.dom.EnhancedForStatement;
import org.eclipse.jdt.core.dom.Expression;
import org.eclipse.jdt.core.dom.FieldAccess;
import org.eclipse.jdt.core.dom.ForStatement;

import org.eclipse.jdt.core.dom.ITypeBinding;
import org.eclipse.jdt.core.dom.IVariableBinding;
import org.eclipse.jdt.core.dom.Initializer;
import org.eclipse.jdt.core.dom.LabeledStatement;
import org.eclipse.jdt.core.dom.Message;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.PrimitiveType;
import org.eclipse.jdt.core.dom.QualifiedName;
import org.eclipse.jdt.core.dom.SimpleName;
import org.eclipse.jdt.core.dom.Statement;
import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
import org.eclipse.jdt.core.dom.SwitchCase;

import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
import org.eclipse.jdt.core.dom.WhileStatement;
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;

import org.eclipse.jdt.internal.corext.dom.ASTNodeFactory;


	private boolean fForceStatic;
	private boolean fIsLastStatementSelected;
	private SimpleName fEnclosingLoopLabel;
	
	public ExtractMethodAnalyzer(ICompilationUnit unit, Selection selection) throws CoreException {
		super(unit, selection, false);
	}

		fInputFlowInfo= flowAnalyzer.perform(getSelectedNodes());

		if (fInputFlowInfo.branches()) {
			if (!canHandleBranches()) {
				status.addFatalError(RefactoringCoreMessages.ExtractMethodAnalyzer_branch_mismatch, JavaStatusContext.create(fCUnit, getSelection()));
				fReturnKind= ERROR;
				return status;
			}
		}
		if (fInputFlowInfo.isValueReturn()) {
			fReturnKind= RETURN_STATEMENT_VALUE;

		return status;
	}

	private boolean canHandleBranches() {
		ASTNode[] selectedNodes= getSelectedNodes();
		final ASTNode lastSelectedNode= selectedNodes[selectedNodes.length - 1];
		Statement body= getParentLoopBody(lastSelectedNode.getParent());
		ASTNode lastStatmentInLoop= null;
		if (body != null) {
			if (body instanceof Block) {
				Block block= (Block)body;
				lastStatmentInLoop= (ASTNode)block.statements().get(block.statements().size() - 1);
			}
		}
		final boolean continueMatchesLoop[]= new boolean[1];
		continueMatchesLoop[0]= false;
		for (int i= 0; i < selectedNodes.length; i++) {
			final ASTNode astNode= selectedNodes[i];
			astNode.accept(new ASTVisitor() {
				public void endVisit(ContinueStatement node) {
					super.endVisit(node);
					final SimpleName label= node.getLabel();
					if (label == null) {
						continueMatchesLoop[0]= true;
					} else if (fEnclosingLoopLabel != null) {
						continueMatchesLoop[0]= label.getIdentifier().equals(fEnclosingLoopLabel.getIdentifier());
					}
				}
			});
		}
		return lastSelectedNode == lastStatmentInLoop && continueMatchesLoop[0] && fReturnValue == null;
	}

	private Statement getParentLoopBody(ASTNode node) {
		Statement stmt= null;
		ASTNode start= node;
		while (start != null
				&& !(start instanceof ForStatement)
				&& !(start instanceof DoStatement)
				&& !(start instanceof WhileStatement)
				&& !(start instanceof EnhancedForStatement)) {
			start= start.getParent();
		}
		if (start instanceof ForStatement) {
			stmt= ((ForStatement)start).getBody();
		} else if (start instanceof DoStatement) {
			stmt= ((DoStatement)start).getBody();
		} else if (start instanceof WhileStatement) {
			stmt= ((WhileStatement)start).getBody();
		} else if (start instanceof EnhancedForStatement) {
			stmt= ((EnhancedForStatement)start).getBody();
		}
		if (start.getParent() instanceof LabeledStatement) {
			LabeledStatement labeledStatement= (LabeledStatement)start.getParent();
			fEnclosingLoopLabel= labeledStatement.getLabel();
		}
		return stmt;
	}

	private boolean isVoidMethod() {
		// if we have an initializer
		if (fEnclosingMethodBinding == null)




 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     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
 *******************************************************************************/
package org.eclipse.jdt.internal.corext.refactoring.code;


import org.eclipse.jdt.core.dom.BodyDeclaration;
import org.eclipse.jdt.core.dom.ChildListPropertyDescriptor;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.dom.ContinueStatement;
import org.eclipse.jdt.core.dom.DoStatement;
import org.eclipse.jdt.core.dom.EnhancedForStatement;
import org.eclipse.jdt.core.dom.EnumDeclaration;
import org.eclipse.jdt.core.dom.Expression;
import org.eclipse.jdt.core.dom.ExpressionStatement;
import org.eclipse.jdt.core.dom.FieldAccess;
import org.eclipse.jdt.core.dom.FieldDeclaration;
import org.eclipse.jdt.core.dom.ForStatement;
import org.eclipse.jdt.core.dom.IMethodBinding;
import org.eclipse.jdt.core.dom.ITypeBinding;
import org.eclipse.jdt.core.dom.IVariableBinding;
import org.eclipse.jdt.core.dom.Initializer;
import org.eclipse.jdt.core.dom.Javadoc;
import org.eclipse.jdt.core.dom.LabeledStatement;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.MethodInvocation;
import org.eclipse.jdt.core.dom.Modifier;

import org.eclipse.jdt.core.dom.VariableDeclaration;
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
import org.eclipse.jdt.core.dom.WhileStatement;
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;

			}

			replaceDuplicates(result);
			replaceBranches(result);

			if (fImportRewriter.hasRecordedChanges()) {
				TextEdit edit= fImportRewriter.rewriteImports(null);


	}

	private void replaceBranches(final CompilationUnitChange result) {
		ASTNode[] selectedNodes= fAnalyzer.getSelectedNodes();
		for (int i= 0; i < selectedNodes.length; i++) {
			final ASTNode astNode= selectedNodes[i];
			astNode.accept(new ASTVisitor() {
				private boolean inLoop;

				private List innerLabels= new ArrayList();

				public boolean visit(ForStatement node) {
					inLoop= true;
					if (node.getParent() instanceof LabeledStatement) {
						LabeledStatement labeledStatement= (LabeledStatement)node.getParent();
						final String identifier= labeledStatement.getLabel().getIdentifier();
						innerLabels.add(identifier);
					}
					return super.visit(node);
				}

				public void endVisit(ForStatement node) {
					super.endVisit(node);
					inLoop= false;
				}

				public boolean visit(WhileStatement node) {
					inLoop= true;
					return super.visit(node);
				}

				public void endVisit(WhileStatement node) {
					super.endVisit(node);
					inLoop= false;
				}

				public boolean visit(EnhancedForStatement node) {
					inLoop= true;
					return super.visit(node);
				}

				public void endVisit(EnhancedForStatement node) {
					super.endVisit(node);
					inLoop= false;
				}

				public boolean visit(DoStatement node) {
					inLoop= true;
					return super.visit(node);
				}

				public void endVisit(DoStatement node) {
					super.endVisit(node);
					inLoop= false;
				}

				public void endVisit(ContinueStatement node) {
					final SimpleName label= node.getLabel();
					if (!inLoop || (label != null && !innerLabels.contains(label.getIdentifier()))) {
						TextEditGroup description= new TextEditGroup(RefactoringCoreMessages.ExtractMethodRefactoring_replace_continue);
						result.addTextEditGroup(description);

						ReturnStatement rs= fAST.newReturnStatement();
						IVariableBinding returnValue= fAnalyzer.getReturnValue();
						if (returnValue != null) {
							rs.setExpression(fAST.newSimpleName(getName(returnValue)));
						}

						new StatementRewrite(fRewriter, new ASTNode[] { node }).replace(new ASTNode[] { rs }, description);
					}
				}
			});
		}
	}

	private ExtractMethodDescriptor getRefactoringDescriptor() {
		final Map arguments= new HashMap();
		String project= null;

Lines 160-165 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/refactoring.properties (+1 lines)
160	ExtractMethodRefactoring_error_nameInUse=''{0}'' is already used as a name in the selected code	160	ExtractMethodRefactoring_error_nameInUse=''{0}'' is already used as a name in the selected code
161	ExtractMethodRefactoring_error_sameParameter=A parameter ''{0}'' already exists	161	ExtractMethodRefactoring_error_sameParameter=A parameter ''{0}'' already exists
162	ExtractMethodRefactoring_visibility_pattern=Declared visibility: ''{0}''	162	ExtractMethodRefactoring_visibility_pattern=Declared visibility: ''{0}''
		163	ExtractMethodRefactoring_replace_continue=Replace continue(s) with return.
163	ExtractMethodRefactoring_replace_occurrences=Replace occurrences of statements with method	164	ExtractMethodRefactoring_replace_occurrences=Replace occurrences of statements with method
164	ExtractMethodRefactoring_error_vararg_ordering=The variable arity parameter ''{0}'' cannot be followed by another parameter	165	ExtractMethodRefactoring_error_vararg_ordering=The variable arity parameter ''{0}'' cannot be followed by another parameter
165	ExtractMethodRefactoring_descriptor_description=Extract method ''{0}'' from ''{1}'' to ''{2}''	166	ExtractMethodRefactoring_descriptor_description=Extract method ''{0}'' from ''{1}'' to ''{2}''

Lines 7-12 Link Here

(-)core refactoring/org/eclipse/jdt/internal/corext/refactoring/RefactoringCoreMessages.java (+3 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Extract method and continue https://bugs.eclipse.org/bugs/show_bug.cgi?id=48056
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.corext.refactoring;	12	package org.eclipse.jdt.internal.corext.refactoring;
12		13
Lines 634-639 Link Here
634		635
635	public static String ExtractMethodRefactoring_organize_imports;	636	public static String ExtractMethodRefactoring_organize_imports;
636		637
		638	public static String ExtractMethodRefactoring_replace_continue;
		639
637	public static String ExtractMethodRefactoring_replace_occurrences;	640	public static String ExtractMethodRefactoring_replace_occurrences;
638		641
639	public static String ExtractMethodRefactoring_substitute_with_call;	642	public static String ExtractMethodRefactoring_substitute_with_call;

Lines 10-15 Link Here

(-)test cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java (+63 lines)
10	* 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	10	* 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
11	* Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Missing return value, while extracting code out of a loop - https://bugs.eclipse.org/bugs/show_bug.cgi?id=213519	11	* Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Missing return value, while extracting code out of a loop - https://bugs.eclipse.org/bugs/show_bug.cgi?id=213519
12	* Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] missing return type when code can throw exception - https://bugs.eclipse.org/bugs/show_bug.cgi?id=97413	12	* Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] missing return type when code can throw exception - https://bugs.eclipse.org/bugs/show_bug.cgi?id=97413
		13	* Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Extract method and continue https://bugs.eclipse.org/bugs/show_bug.cgi?id=48056
13	*******************************************************************************/	14	*******************************************************************************/
14	package org.eclipse.jdt.ui.tests.refactoring;	15	package org.eclipse.jdt.ui.tests.refactoring;
15		16
Lines 651-656 Link Here
651	public void test196() throws Exception {	652	public void test196() throws Exception {
652	invalidSelectionTest();	653	invalidSelectionTest();
653	}	654	}
		655
		656	//---- continue not possible
		657
		658	public void test197() throws Exception {
		659	invalidSelectionTest();
		660	}
654		661
655		662
656		663
Lines 1616-1621 Link Here
1616	branchTest();	1623	branchTest();
1617	}	1624	}
1618		1625
		1626	public void test756() throws Exception {
		1627	branchTest();
		1628	}
		1629
		1630	public void test757() throws Exception {
		1631	branchTest();
		1632	}
		1633
		1634	public void test758() throws Exception {
		1635	branchTest();
		1636	}
		1637
		1638	public void test759() throws Exception {
		1639	branchTest();
		1640	}
		1641
		1642	public void test760() throws Exception {
		1643	branchTest();
		1644	}
		1645
		1646	public void test761() throws Exception {
		1647	branchTest();
		1648	}
		1649
		1650	public void test762() throws Exception {
		1651	branchTest();
		1652	}
		1653
		1654	public void test763() throws Exception {
		1655	branchTest();
		1656	}
		1657
		1658	public void test764() throws Exception {
		1659	branchTest();
		1660	}
		1661
		1662	public void test765() throws Exception {
		1663	branchTest();
		1664	}
		1665
		1666	public void test766() throws Exception {
		1667	branchTest();
		1668	}
		1669
		1670	public void test767() throws Exception {
		1671	branchTest();
		1672	}
		1673
		1674	public void test768() throws Exception {
		1675	branchTest();
		1676	}
		1677
		1678	public void test769() throws Exception {
		1679	branchTest();
		1680	}
		1681
1619	//---- Test for CUs with compiler errors	1682	//---- Test for CUs with compiler errors
1620		1683
1621	public void test800() throws Exception {	1684	public void test800() throws Exception {




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();
		/*]*/
	}
}





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);
	}
}





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();
			/*]*/
		}
	}
}





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);
	}
}





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();
			}
		}
		/*]*/
	}
}





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();
				/*]*/
			}
		}
	}
}





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();
		}
		/*]*/
	}
}





package branch_in;

public class A_test759 {

	public void foo(int a) {
		/*[*/
		while (a > 0) {
			if(a == 3) {
				continue;
			}
			System.out.println();
		}
		/*]*/
	}
}





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();
				}
			}
			/*]*/
		}
	}
}





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();
		/*]*/
	}
}





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;
	}
}





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;
	}
}





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();
		}
		/*]*/
	}
}





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();
		}
		/*]*/
	}
}





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;
			}
		}
		/*]*/
	}
}





package branch_in;

public class A_test756 {

	public void foo() {
		for (int i= 0; i < 3; i++) {
			/*[*/
			if(i == 2) {
				continue;
			}
			System.out.println();
			/*]*/
		}
	}
}





package branch_in;

public class A_test769 {

	public void foo(int[] a) {
		for(int i : a) {
			/*[*/
			if( i == 3 ) {
				continue;
			}
			System.out.println();
			/*]*/
		}
	}
}





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();
			}
			/*]*/
		}
	}
}





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();
		/*]*/
	}
}





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;
	}
}





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);
	}
}





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();
		}
		/*]*/
	}
}





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;
				}
			}
			/*]*/
		}
	}
}





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);
		/*]*/
	}
}





package branch_in;

public class A_test760 {

	public void foo(int a) {
		/*[*/
		do {
			if(a == 3) {
				continue;
			}
			System.out.println();
		} while (a > 0);
		/*]*/
	}
}





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();
		}
		/*]*/
	}
}





package branch_in;

public class A_test757 {

	public void foo() {
		/*[*/
		for (int i= 0; i < 3; i++) {
			if(i == 2) {
				continue;
			}
			System.out.println();
		}
		/*]*/
	}
}





package branch_in;

public class A_test768 {

	public void foo() {
		int i = 0;
		do {
			/*[*/
			if( i == 3 ) {
				continue;
			}
			System.out.println();
			/*]*/
		} while ( i < 10 );
	}
}





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();
		/*]*/
	}
}


Return to bug 48056

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test768.java (+21 lines)
1	package branch_out;
2
3	public class A_test768 {
4
5	public void foo() {
6	int i = 0;
7	do {
8	extracted(i);
9	} while ( i < 10 );
10	}
11
12	protected void extracted(int i) {
13	/[/
14	if( i == 3 ) {
15	return;
16	}
17	System.out.println();
18	/]/
19	}
20	}
21

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test765.java (+19 lines)
1	package branch_in;
2
3	public class A_test765 {
4
5	public void foo() {
6	int x = 0;
7	for (int i= 0; i < 3; i++) {
8	/[/
9	if(i == 2) {
10	x = (i*3);
11	continue;
12	}
13	System.out.println();
14	/]/
15	}
16	System.out.println(x);
17	}
18	}
19

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test763.java (+16 lines)
1	package branch_in;
2
3	public class A_test763 {
4
5	public void foo() {
6	inner: for (int i= 0; i < 3; i++) {
7	/[/
8	if(i == 2) {
9	continue inner;
10	}
11	System.out.println();
12	/]/
13	}
14	}
15	}
16

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test766.java (+19 lines)
1	package branch_in;
2
3	public class A_test766 {
4
5	public void foo() {
6	int x = 0;
7	foo: for (int i= 0; i < 3; i++) {
8	/[/
9	if(i == 2) {
10	x = (i*3);
11	continue;
12	}
13	System.out.println();
14	/]/
15	}
16	System.out.println(x);
17	}
18	}
19

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test762.java (+24 lines)
1	package branch_out;
2
3	public class A_test762 {
4
5	public void foo() {
6	outer: for (int i= 0; i < 3; i++) {
7	extracted();
8	}
9	}
10
11	protected void extracted() {
12	/[/
13	for (int j= 0; j < 3; j++) {
14	for (int k= 0; k < 3; k++) {
15	if(j == 3) {
16	return;
17	}
18	System.out.println();
19	}
20	}
21	/]/
22	}
23	}
24

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/invalidSelection/A_test197.java (+18 lines)
1	package invalidSelection;
2
3	public class A_test197 {
4
5	public void foo() {
6	outer: for (int i= 0; i < 3; i++) {
7	for (int j= 0; j < 3; j++) {
8	/[/
9	if(j == 3) {
10	continue outer;
11	}
12	System.out.println();
13	/]/
14	}
15	}
16	}
17	}
18

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test757.java (+20 lines)
1	package branch_out;
2
3	public class A_test757 {
4
5	public void foo() {
6	extracted();
7	}
8
9	protected void extracted() {
10	/[/
11	for (int i= 0; i < 3; i++) {
12	if(i == 2) {
13	continue;
14	}
15	System.out.println();
16	}
17	/]/
18	}
19	}
20

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test759.java (+16 lines)
1	package branch_in;
2
3	public class A_test759 {
4
5	public void foo(int a) {
6	/[/
7	while (a > 0) {
8	if(a == 3) {
9	continue;
10	}
11	System.out.println();
12	}
13	/]/
14	}
15	}
16

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test769.java (+20 lines)
1	package branch_out;
2
3	public class A_test769 {
4
5	public void foo(int[] a) {
6	for(int i : a) {
7	extracted(i);
8	}
9	}
10
11	protected void extracted(int i) {
12	/[/
13	if( i == 3 ) {
14	return;
15	}
16	System.out.println();
17	/]/
18	}
19	}
20

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test764.java (+24 lines)
1	package branch_out;
2
3	public class A_test764 {
4
5	public void foo() {
6	int x = 0;
7	for (int i= 0; i < 3; i++) {
8	x = extracted(x, i);
9	}
10	System.out.println(x);
11	}
12
13	protected int extracted(int x, int i) {
14	/[/
15	if(i == 2) {
16	x = 2;
17	return x;
18	}
19	System.out.println();
20	/]/
21	return x;
22	}
23	}
24

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test758.java (+18 lines)
1	package branch_in;
2
3	import java.util.List;
4
5	public class A_test758 {
6
7	public void foo(List a) {
8	/[/
9	for (Object x : a) {
10	if(x == null) {
11	continue;
12	}
13	System.out.println();
14	}
15	/]/
16	}
17	}
18

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test767.java (+22 lines)
1	package branch_out;
2
3	public class A_test767 {
4
5	public void foo() {
6	for (int i = 0; i < 3; i++) {
7	extracted();
8	}
9	}
10
11	protected void extracted() {
12	/[/
13	inner: for (int j = 0; j < 10; j++) {
14	if (j == 2) {
15	System.out.println();
16	continue inner;
17	}
18	}
19	/]/
20	}
21	}
22

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test756.java (+16 lines)
1	package branch_in;
2
3	public class A_test756 {
4
5	public void foo() {
6	for (int i= 0; i < 3; i++) {
7	/[/
8	if(i == 2) {
9	continue;
10	}
11	System.out.println();
12	/]/
13	}
14	}
15	}
16

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_in/A_test761.java (+18 lines)
1	package branch_in;
2
3	public class A_test761 {
4
5	public void foo() {
6	outer: for (int i= 0; i < 3; i++) {
7	/[/
8	for (int j= 0; j < 3; j++) {
9	if(j == 3) {
10	continue outer;
11	}
12	System.out.println();
13	}
14	/]/
15	}
16	}
17	}
18

Added Link Here

(-)resources/ExtractMethodWorkSpace/ExtractMethodTests/branch_out/A_test760.java (+20 lines)
1	package branch_out;
2
3	public class A_test760 {
4
5	public void foo(int a) {
6	extracted(a);
7	}
8
9	protected void extracted(int a) {
10	/[/
11	do {
12	if(a == 3) {
13	continue;
14	}
15	System.out.println();
16	} while (a > 0);
17	/]/
18	}
19	}
20