mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 03:05:39 +02:00
Code Issues Wiki Activity

Removed dependency on a deprecated class.

Browse source
This commit is contained in:
Sergey Prigogin 2010-10-20 23:30:53 +00:00
parent 2f97f50ca5
commit fc2e8389f9
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import org.eclipse.ltk.core.refactoring.RefactoringDescriptor;
import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.text.edits.TextEditGroup; import org.eclipse.text.edits.TextEditGroup;
import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression; import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTComment;
import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement; import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
@ -59,7 +60,6 @@ import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.IField; import org.eclipse.cdt.core.dom.ast.IField;
import org.eclipse.cdt.core.dom.ast.INodeFactory; import org.eclipse.cdt.core.dom.ast.INodeFactory;
import org.eclipse.cdt.core.dom.ast.IParameter; import org.eclipse.cdt.core.dom.ast.IParameter;
import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConversionName; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTConversionName;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier;
@ -284,14 +284,12 @@ public class ExtractFunctionRefactoring extends CRefactoring {
try { try {
finalConditions = super.checkFinalConditions(pm); finalConditions = super.checkFinalConditions(pm);
final IASTName astMethodName = new CPPASTName(info.getMethodName().toCharArray());
final IASTName astMethodName = new CPPASTName(info.getMethodName()
.toCharArray());
MethodContext context = NodeHelper.findMethodContext(container.getNodesToWrite().get(0), getIndex()); MethodContext context = NodeHelper.findMethodContext(container.getNodesToWrite().get(0), getIndex());
if (context.getType() == ContextType.METHOD && !context.isInline()) { if (context.getType() == ContextType.METHOD && !context.isInline()) {
ICPPASTCompositeTypeSpecifier classDeclaration = (ICPPASTCompositeTypeSpecifier) context ICPPASTCompositeTypeSpecifier classDeclaration =
.getMethodDeclaration().getParent(); (ICPPASTCompositeTypeSpecifier) context.getMethodDeclaration().getParent();
IASTSimpleDeclaration methodDeclaration = getDeclaration(astMethodName); IASTSimpleDeclaration methodDeclaration = getDeclaration(astMethodName);
if (isMethodAllreadyDefined(methodDeclaration, classDeclaration, getIndex())) { if (isMethodAllreadyDefined(methodDeclaration, classDeclaration, getIndex())) {
@ -303,10 +301,8 @@ public class ExtractFunctionRefactoring extends CRefactoring {
if (name.isUserSetIsReturnValue()) { if (name.isUserSetIsReturnValue()) {
info.setReturnVariable(name); info.setReturnVariable(name);
} }
} }
} } finally {
finally {
unlockIndex(); unlockIndex();
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -872,7 +868,7 @@ public class ExtractFunctionRefactoring extends CRefactoring {
private NodeContainer findExtractableNodes() { private NodeContainer findExtractableNodes() {
final NodeContainer container = new NodeContainer(); final NodeContainer container = new NodeContainer();
unit.accept(new CPPASTVisitor() { unit.accept(new ASTVisitor() {
{ {
shouldVisitStatements = true; shouldVisitStatements = true;
shouldVisitExpressions = true; shouldVisitExpressions = true;