From bd0e88a3e263fb5fffb1e7e7b56d4561047bca95 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Mon, 2 Dec 2013 18:00:46 -0800
Subject: [PATCH] Code streamlining.

---
 .../ExtractFunctionRefactoring.java            | 18 ++++++++----------
 .../refactoring/extractfunction/TrailName.java | 10 +---------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java
index 7c195270662..5d22fadb4bd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java
@@ -137,7 +137,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
 	final Map<String, Integer> names;
 	final Container<Integer> namesCounter;
 	final Container<Integer> trailPos;
-	private final Container<Integer> returnNumber;
+	private int returnNumber;
 
 	HashMap<String, Integer> nameTrail;
 
@@ -155,7 +155,6 @@ public class ExtractFunctionRefactoring extends CRefactoring {
 		names = new HashMap<String, Integer>();
 		namesCounter = new Container<Integer>(NULL_INTEGER);
 		trailPos = new Container<Integer>(NULL_INTEGER);
-		returnNumber = new Container<Integer>(NULL_INTEGER);
 		formattingOptions = new DefaultCodeFormatterOptions(project.getOptions(true));
 	}
 
@@ -486,7 +485,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
 							if (info.getReturnVariable() != null &&
 									info.getReturnVariable().getName().getRawSignature().equals(
 											name.getRawSignature())) {
-								returnNumber.setObject(Integer.valueOf(actCount));
+								returnNumber = actCount;
 							}
 
 							trail.add(trailName);
@@ -503,8 +502,8 @@ public class ExtractFunctionRefactoring extends CRefactoring {
 		return trail;
 	}
 
-	boolean isStatementInTrail(IASTStatement stmt, final List<IASTNode> trail) {
-		final Container<Boolean> same = new Container<Boolean>(Boolean.TRUE);
+	boolean isStatementInTrail(final IASTStatement stmt, final List<IASTNode> trail) {
+		final boolean same[] = { true };
 		final TrailNodeEqualityChecker equalityChecker =
 				new TrailNodeEqualityChecker(names, namesCounter, index);
 
@@ -514,7 +513,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
 				int pos = trailPos.getObject().intValue();
 
 				if (trail.size() <= 0 || pos >= trail.size()) {
-					same.setObject(Boolean.FALSE);
+					same[0] = false;
 					return PROCESS_ABORT;
 				}
 
@@ -533,13 +532,13 @@ public class ExtractFunctionRefactoring extends CRefactoring {
 						return super.visitAll(node);
 					}
 				} else {
-					same.setObject(new Boolean(false));
+					same[0] = false;
 					return PROCESS_ABORT;
 				}
 			}
 		});
 
-		return same.getObject().booleanValue();
+		return same[0];
 	}
 
 	private boolean isMethodAllreadyDefined(IASTSimpleDeclaration methodDeclaration,
@@ -709,8 +708,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
 			for (Entry<String, Integer> entry : similarNameTable.entrySet()) {
 				if (entry.getValue().equals(trailSeqNumber)) {
 					origName = entry.getKey();
-					if (info.getReturnVariable() != null &&
-							trailSeqNumber.equals(returnNumber.getObject())) {
+					if (info.getReturnVariable() != null &&	trailSeqNumber.intValue() == returnNumber) {
 						theRetName = true;
 					}
 				}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java
index 8e912b64235..566ea72ed97 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java
@@ -12,7 +12,6 @@
 package org.eclipse.cdt.internal.ui.refactoring.extractfunction;
 
 import org.eclipse.cdt.core.dom.ast.DOMException;
-import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 import org.eclipse.cdt.core.dom.ast.IBinding;
@@ -20,12 +19,9 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding;
 
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 
-import org.eclipse.cdt.internal.ui.refactoring.utils.ASTHelper;
-
 class TrailName extends ASTNode {
 	private int nameNumber;
-	private final IASTNode declaration = null;
-	private IASTName realName = null;
+	private IASTName realName;
 	
 	public TrailName(IASTName realName) {
 		super();
@@ -40,10 +36,6 @@ class TrailName extends ASTNode {
 		this.nameNumber = nameNumber;
 	}
 
-	public IASTDeclSpecifier getDeclSpecifier() {
-		return ASTHelper.getDeclarationSpecifier(declaration);
-	}
-
 	public IASTName getRealName() {
 		return realName;
 	}