diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java index b41d67122e9..7fe00bb1405 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java @@ -41,7 +41,6 @@ import org.eclipse.cdt.core.dom.ast.IASTProblemTypeId; import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTTypeId; -import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.model.CModelException; @@ -56,12 +55,11 @@ import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.internal.ui.refactoring.utils.SelectionHelper; /** - * The baseclass for all other refactorings, provides some common implementations for + * The base class for all other refactorings, provides some common implementations for * condition checking, change generating, selection handling and translation unit loading. * */ public abstract class CRefactoring extends Refactoring { - private static final int AST_STYLE = ITranslationUnit.AST_CONFIGURE_USING_SOURCE_CONTEXT | ITranslationUnit.AST_SKIP_INDEXED_HEADERS; protected String name = Messages.Refactoring_name; @@ -88,8 +86,7 @@ public abstract class CRefactoring extends Refactoring { } catch (CModelException e) { CUIPlugin.log(e); } - } - else { + } else { this.file = file; this.region = SelectionHelper.getRegion(selection); } @@ -100,12 +97,11 @@ public abstract class CRefactoring extends Refactoring { } } - private class ProblemFinder extends ASTVisitor{ - + private class ProblemFinder extends ASTVisitor { private boolean problemFound = false; private final RefactoringStatus status; - public ProblemFinder(RefactoringStatus status){ + public ProblemFinder(RefactoringStatus status) { this.status = status; } @@ -160,12 +156,11 @@ public abstract class CRefactoring extends Refactoring { } private void addWarningToState() { - if(!problemFound){ + if (!problemFound) { status.addWarning(Messages.Refactoring_CompileErrorInTU); problemFound = true; } } - } @Override @@ -180,19 +175,19 @@ public abstract class CRefactoring extends Refactoring { throws CoreException, OperationCanceledException { SubMonitor sm = SubMonitor.convert(pm, 10); sm.subTask(Messages.Refactoring_PM_LoadTU); - if(isProgressMonitorCanceld(sm, initStatus)) { + if (isProgressMonitorCanceld(sm, initStatus)) { return initStatus; } - if(!loadTranslationUnit(initStatus, sm.newChild(8))){ + if (!loadTranslationUnit(initStatus, sm.newChild(8))) { initStatus.addError(Messages.Refactoring_CantLoadTU); return initStatus; } - if(isProgressMonitorCanceld(sm, initStatus)) { + if (isProgressMonitorCanceld(sm, initStatus)) { return initStatus; } sm.subTask(Messages.Refactoring_PM_CheckTU); translationUnitHasProblem(); - if(translationUnitIsAmbiguous()) { + if (translationUnitIsAmbiguous()) { initStatus.addError(Messages.Refactoring_Ambiguity); } sm.worked(2); @@ -203,7 +198,7 @@ public abstract class CRefactoring extends Refactoring { protected boolean isProgressMonitorCanceld(IProgressMonitor sm, RefactoringStatus initStatus2) { - if(sm.isCanceled()) { + if (sm.isCanceled()) { initStatus2.addFatalError(Messages.Refactoring_CanceledByUser); return true; } @@ -236,12 +231,12 @@ public abstract class CRefactoring extends Refactoring { try { subMonitor.subTask(Messages.Refactoring_PM_ParseTU); unit = loadTranslationUnit(file); - if(unit == null) { + if (unit == null) { subMonitor.done(); return false; } subMonitor.worked(2); - if(isProgressMonitorCanceld(subMonitor, initStatus)) { + if (isProgressMonitorCanceld(subMonitor, initStatus)) { return true; } subMonitor.subTask(Messages.Refactoring_PM_MergeComments); @@ -264,7 +259,7 @@ public abstract class CRefactoring extends Refactoring { protected IASTTranslationUnit loadTranslationUnit(IFile file) throws CoreException { ITranslationUnit tu = (ITranslationUnit) CCorePlugin.getDefault().getCoreModel().create(file); - if(tu == null){ + if (tu == null) { initStatus.addFatalError(NLS.bind(Messages.CRefactoring_FileNotFound, file.getName())); return null; } @@ -301,8 +296,6 @@ public abstract class CRefactoring extends Refactoring { return fIndex; } - - public IASTTranslationUnit getUnit() { return unit; } @@ -310,8 +303,7 @@ public abstract class CRefactoring extends Refactoring { protected ArrayList findAllMarkedNames() { final ArrayList namesVector = new ArrayList(); - unit.accept(new CPPASTVisitor() { - + unit.accept(new ASTVisitor() { { shouldVisitNames = true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java index cb310ec317d..16db2179066 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/NodeContainer.java @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.IASTArrayDeclarator; import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; @@ -35,7 +36,6 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.INodeFactory; import org.eclipse.cdt.core.dom.ast.IVariable; -import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTReferenceOperator; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleTypeTemplateParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding; @@ -47,15 +47,12 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName; import org.eclipse.cdt.internal.core.dom.rewrite.astwriter.ASTWriter; public class NodeContainer { - - public final NameInformation NULL_NAME_INFORMATION = new NameInformation( - new CPPASTName()); + public final NameInformation NULL_NAME_INFORMATION = new NameInformation(new CPPASTName()); private final ArrayList vec; private final ArrayList names; public class NameInformation { - private IASTName name; private IASTName declaration; private final ArrayList references; @@ -202,7 +199,7 @@ public class NodeContainer { } public boolean isDeclarationInScope() { - if(declaration != null && declaration.toCharArray().length > 0) { + if (declaration != null && declaration.toCharArray().length > 0) { int declOffset = declaration.getFileLocation().getNodeOffset(); return declOffset >= getStartOffset() && declOffset <= getEndOffset(); @@ -212,8 +209,7 @@ public class NodeContainer { @Override public String toString() { - return Messages.NodeContainer_Name + name + ' ' - + isDeclarationInScope(); + return Messages.NodeContainer_Name + name + ' ' + isDeclarationInScope(); } public boolean isReference() { @@ -290,7 +286,7 @@ public class NodeContainer { public void findAllNames() { for (IASTNode node : vec) { - node.accept(new CPPASTVisitor() { + node.accept(new ASTVisitor() { { shouldVisitNames = true; } @@ -304,11 +300,9 @@ public class NodeContainer { ICPPBinding cppBind = (ICPPBinding) bind; try { if (!cppBind.isGloballyQualified()) { - NameInformation nameInformation = new NameInformation( - name); + NameInformation nameInformation = new NameInformation(name); - IASTName[] refs = name.getTranslationUnit() - .getReferences(bind); + IASTName[] refs = name.getTranslationUnit().getReferences(bind); for (IASTName ref : refs) { nameInformation.addReference(ref); } @@ -321,12 +315,11 @@ public class NodeContainer { .getMessage(), e); logger.log(status); } - }else if(bind instanceof IVariable) { + } else if (bind instanceof IVariable) { NameInformation nameInformation = new NameInformation( name); - IASTName[] refs = name.getTranslationUnit() - .getReferences(bind); + IASTName[] refs = name.getTranslationUnit().getReferences(bind); for (IASTName ref : refs) { nameInformation.addReference(ref); } @@ -469,10 +462,10 @@ public class NodeContainer { if (location instanceof IASTMacroExpansionLocation) { IASTMacroExpansionLocation macroLoc = (IASTMacroExpansionLocation) location; nodeOffset = macroLoc.asFileLocation().getNodeOffset(); - }else { + } else { nodeOffset = node.getFileLocation().getNodeOffset(); } - if(nodeOffset < nodeStart) { + if (nodeOffset < nodeStart) { nodeStart = nodeOffset; } } @@ -509,11 +502,11 @@ public class NodeContainer { IASTMacroExpansionLocation macroLoc = (IASTMacroExpansionLocation) location; nodeOffset = macroLoc.asFileLocation().getNodeOffset(); nodeLength = macroLoc.asFileLocation().getNodeLength(); - }else { + } else { nodeOffset = location.getNodeOffset(); nodeLength = location.getNodeLength(); } - if(fileOffset < nodeOffset) { + if (fileOffset < nodeOffset) { fileOffset = nodeOffset; length = nodeLength; }