From ea4ce17b7d71374c7badc2ceddf53fef6ee36670 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Tue, 17 May 2011 00:28:10 +0000
Subject: [PATCH] Cosmetics.

---
 .../ExtractFunctionRefactoringTest.java       | 19 +++++++------------
 .../ExtractFunctionTestSuite.java             |  4 +---
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java
index 53ec3d742ed..cae7a2489da 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java
@@ -53,20 +53,17 @@ public class ExtractFunctionRefactoringTest extends RefactoringTest {
 	protected void runTest() throws Throwable {
 		IFile refFile = project.getFile(fileName);
 		ExtractFunctionInformation info = new ExtractFunctionInformation();
-		CRefactoring refactoring = new ExtractFunctionRefactoring( refFile, selection, info, cproject);
+		CRefactoring refactoring = new ExtractFunctionRefactoring(refFile, selection, info, cproject);
 		RefactoringStatus checkInitialConditions = refactoring.checkInitialConditions(NULL_PROGRESS_MONITOR);
 		
-		if(fatalError){
+		if (fatalError) {
 			assertConditionsFatalError(checkInitialConditions);
 			return;
-		}
-		else{
+		} else {
 			assertConditionsOk(checkInitialConditions);
 			setValues(info);
 			executeRefactoring(refactoring);
 		}
-		
-		
 	}
 
 	protected void executeRefactoring(CRefactoring refactoring) throws CoreException, Exception {
@@ -80,25 +77,24 @@ public class ExtractFunctionRefactoringTest extends RefactoringTest {
 	private void setValues(ExtractFunctionInformation info) {
 		info.setMethodName(methodName);
 		info.setReplaceDuplicates(replaceDuplicates);
-		if(info.getInScopeDeclaredVariable() == null){
-			if(returnValue) {
+		if (info.getInScopeDeclaredVariable() == null) {
+			if (returnValue) {
 				info.setReturnVariable(info.getAllAfterUsedNames().get(returnParameterIndex));
 				info.getAllAfterUsedNames().get(returnParameterIndex).setUserSetIsReference(false);
 			}
 		} else {
-			info.setReturnVariable( info.getInScopeDeclaredVariable() );
+			info.setReturnVariable(info.getInScopeDeclaredVariable());
 		}
 		info.setVisibility(visibility);
 		info.setVirtual(virtual);
 		
 		for (NameInformation name : info.getAllAfterUsedNames()) {
-			if(!name.isUserSetIsReturnValue()){
+			if (!name.isUserSetIsReturnValue()) {
 				name.setUserSetIsReference(name.isReference());
 			}
 		}
 	}
 
-	
 	@Override
 	protected void configureRefactoring(Properties refactoringProperties) {
 		methodName = refactoringProperties.getProperty("methodname", "exp"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -109,5 +105,4 @@ public class ExtractFunctionRefactoringTest extends RefactoringTest {
 		visibility = VisibilityEnum.getEnumForStringRepresentation(refactoringProperties.getProperty("visibility", VisibilityEnum.v_private.toString())); //$NON-NLS-1$
 		virtual = Boolean.valueOf(refactoringProperties.getProperty("virtual", "false")).booleanValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
-
 }
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionTestSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionTestSuite.java
index 562ff556e9a..0f9339b18a6 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionTestSuite.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionTestSuite.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  *  
  * Contributors: 
- * Institute for Software - initial API and implementation
+ *     Institute for Software - initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.ui.tests.refactoring.extractfunction;
 
@@ -18,7 +18,6 @@ import org.eclipse.cdt.ui.tests.refactoring.RefactoringTester;
 
 /**
  * @author Emanuel Graf
- * 
  */
 public class ExtractFunctionTestSuite extends TestSuite {
 
@@ -33,5 +32,4 @@ public class ExtractFunctionTestSuite extends TestSuite {
 		suite.addTest(RefactoringTester.suite("Extract Function Dublicates Test", "resources/refactoring/ExtractMethodDuplicates.rts"));
 		return suite;
 	}
-
 }