mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 08:55:25 +02:00
Code Issues Wiki Activity

Code streamlining.

Browse source
This commit is contained in:
Sergey Prigogin 2013-12-02 18:00:46 -08:00
parent 3a7a88486b
commit bd0e88a3e2
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionRefactoring.java
View file

@ -137,7 +137,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
final Map<String, Integer> names; final Map<String, Integer> names;
final Container<Integer> namesCounter; final Container<Integer> namesCounter;
final Container<Integer> trailPos; final Container<Integer> trailPos;
private final Container<Integer> returnNumber; private int returnNumber;
HashMap<String, Integer> nameTrail; HashMap<String, Integer> nameTrail;
@ -155,7 +155,6 @@ public class ExtractFunctionRefactoring extends CRefactoring {
names = new HashMap<String, Integer>(); names = new HashMap<String, Integer>();
namesCounter = new Container<Integer>(NULL_INTEGER); namesCounter = new Container<Integer>(NULL_INTEGER);
trailPos = new Container<Integer>(NULL_INTEGER); trailPos = new Container<Integer>(NULL_INTEGER);
returnNumber = new Container<Integer>(NULL_INTEGER);
formattingOptions = new DefaultCodeFormatterOptions(project.getOptions(true)); formattingOptions = new DefaultCodeFormatterOptions(project.getOptions(true));
} }
@ -486,7 +485,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
if (info.getReturnVariable() != null && if (info.getReturnVariable() != null &&
info.getReturnVariable().getName().getRawSignature().equals( info.getReturnVariable().getName().getRawSignature().equals(
name.getRawSignature())) { name.getRawSignature())) {
returnNumber.setObject(Integer.valueOf(actCount)); returnNumber = actCount;
} }
trail.add(trailName); trail.add(trailName);
@ -503,8 +502,8 @@ public class ExtractFunctionRefactoring extends CRefactoring {
return trail; return trail;
} }
boolean isStatementInTrail(IASTStatement stmt, final List<IASTNode> trail) { boolean isStatementInTrail(final IASTStatement stmt, final List<IASTNode> trail) {
final Container<Boolean> same = new Container<Boolean>(Boolean.TRUE); final boolean same[] = { true };
final TrailNodeEqualityChecker equalityChecker = final TrailNodeEqualityChecker equalityChecker =
new TrailNodeEqualityChecker(names, namesCounter, index); new TrailNodeEqualityChecker(names, namesCounter, index);
@ -514,7 +513,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
int pos = trailPos.getObject().intValue(); int pos = trailPos.getObject().intValue();
if (trail.size() <= 0 || pos >= trail.size()) { if (trail.size() <= 0 || pos >= trail.size()) {
same.setObject(Boolean.FALSE); same[0] = false;
return PROCESS_ABORT; return PROCESS_ABORT;
} }
@ -533,13 +532,13 @@ public class ExtractFunctionRefactoring extends CRefactoring {
return super.visitAll(node); return super.visitAll(node);
} }
} else { } else {
same.setObject(new Boolean(false)); same[0] = false;
return PROCESS_ABORT; return PROCESS_ABORT;
} }
} }
}); });
return same.getObject().booleanValue(); return same[0];
} }
private boolean isMethodAllreadyDefined(IASTSimpleDeclaration methodDeclaration, private boolean isMethodAllreadyDefined(IASTSimpleDeclaration methodDeclaration,
@ -709,8 +708,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
for (Entry<String, Integer> entry : similarNameTable.entrySet()) { for (Entry<String, Integer> entry : similarNameTable.entrySet()) {
if (entry.getValue().equals(trailSeqNumber)) { if (entry.getValue().equals(trailSeqNumber)) {
origName = entry.getKey(); origName = entry.getKey();
if (info.getReturnVariable() != null && if (info.getReturnVariable() != null && trailSeqNumber.intValue() == returnNumber) {
trailSeqNumber.equals(returnNumber.getObject())) {
theRetName = true; theRetName = true;
} }
} }

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailName.java
View file

@ -12,7 +12,6 @@
package org.eclipse.cdt.internal.ui.refactoring.extractfunction; package org.eclipse.cdt.internal.ui.refactoring.extractfunction;
import org.eclipse.cdt.core.dom.ast.DOMException; 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.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IBinding; 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.core.dom.parser.ASTNode;
import org.eclipse.cdt.internal.ui.refactoring.utils.ASTHelper;
class TrailName extends ASTNode { class TrailName extends ASTNode {
private int nameNumber; private int nameNumber;
private final IASTNode declaration = null; private IASTName realName;
private IASTName realName = null;
public TrailName(IASTName realName) { public TrailName(IASTName realName) {
super(); super();
@ -40,10 +36,6 @@ class TrailName extends ASTNode {
this.nameNumber = nameNumber; this.nameNumber = nameNumber;
} }
public IASTDeclSpecifier getDeclSpecifier() {
return ASTHelper.getDeclarationSpecifier(declaration);
}
public IASTName getRealName() { public IASTName getRealName() {
return realName; return realName;
} }