mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-04-18 17:38:40 +00:00
parent 0f416da87c
commit 6c11ab94ca
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder2.java
View file

@ -46,25 +46,28 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper;
* @author Mirko Stocker, Lukas Felber * @author Mirko Stocker, Lukas Felber
*/ */
public class MethodDefinitionInsertLocationFinder2 { public class MethodDefinitionInsertLocationFinder2 {
// We cache DefinitionFinder2.getDefinition results because refactorings like Implement Method
// We cache DefinitionFinder2.getDefinition results because refactorings like Implement Method might want to find multiple // might want to find multiple insert locations in the same translation unit. This prevents
// insert locations in the same translation unit. This prevents many redundant calls to DefinitionFinder2.getDefinition // many redundant calls to DefinitionFinder2.getDefinition and speeds up the process quite
// and speeds up the process quite a bit. Unfortunately, this has the minor side-effect or having to instantiate this class. //a bit. Unfortunately, this has the minor side-effect or having to instantiate this class.
Map<IASTSimpleDeclaration, IASTName> cachedDeclarationToDefinition = new HashMap<IASTSimpleDeclaration, IASTName>(); Map<IASTSimpleDeclaration, IASTName> cachedDeclarationToDefinition =
new HashMap<IASTSimpleDeclaration, IASTName>();
public InsertLocation2 find(ITranslationUnit declarationTu, IASTFileLocation methodDeclarationLocation, public InsertLocation2 find(ITranslationUnit declarationTu, IASTFileLocation methodDeclarationLocation,
IASTNode parent, RefactoringASTCache astCache, IProgressMonitor pm) throws CoreException { IASTNode parent, RefactoringASTCache astCache, IProgressMonitor pm) throws CoreException {
IASTDeclaration[] declarations = NodeHelper.getDeclarations(parent); IASTDeclaration[] declarations = NodeHelper.getDeclarations(parent);
InsertLocation2 insertLocation = new InsertLocation2(); InsertLocation2 insertLocation = new InsertLocation2();
Collection<IASTSimpleDeclaration> allPreviousSimpleDeclarationsFromClassInReverseOrder = getAllPreviousSimpleDeclarationsFromClassInReverseOrder(declarations, methodDeclarationLocation, pm); Collection<IASTSimpleDeclaration> allPreviousSimpleDeclarationsFromClassInReverseOrder =
Collection<IASTSimpleDeclaration> allFollowingSimpleDeclarationsFromClass = getAllFollowingSimpleDeclarationsFromClass(declarations, methodDeclarationLocation, pm); getAllPreviousSimpleDeclarationsFromClassInReverseOrder(declarations, methodDeclarationLocation, pm);
Collection<IASTSimpleDeclaration> allFollowingSimpleDeclarationsFromClass =
getAllFollowingSimpleDeclarationsFromClass(declarations, methodDeclarationLocation, pm);
for (IASTSimpleDeclaration simpleDeclaration : allPreviousSimpleDeclarationsFromClassInReverseOrder) { for (IASTSimpleDeclaration simpleDeclaration : allPreviousSimpleDeclarationsFromClassInReverseOrder) {
if (pm != null && pm.isCanceled()) { if (pm != null && pm.isCanceled()) {
throw new OperationCanceledException(); throw new OperationCanceledException();
} }
IASTName definition = null; IASTName definition = null;
if (cachedDeclarationToDefinition.containsKey(simpleDeclaration)) { if (cachedDeclarationToDefinition.containsKey(simpleDeclaration)) {
definition = cachedDeclarationToDefinition.get(simpleDeclaration); definition = cachedDeclarationToDefinition.get(simpleDeclaration);
@ -74,7 +77,7 @@ public class MethodDefinitionInsertLocationFinder2 {
cachedDeclarationToDefinition.put(simpleDeclaration, definition); cachedDeclarationToDefinition.put(simpleDeclaration, definition);
} }
} }
if (definition != null) { if (definition != null) {
insertLocation.setNodeToInsertAfter(findFirstSurroundingParentFunctionNode( insertLocation.setNodeToInsertAfter(findFirstSurroundingParentFunctionNode(
definition), definition.getTranslationUnit().getOriginatingTranslationUnit()); definition), definition.getTranslationUnit().getOriginatingTranslationUnit());
@ -95,13 +98,13 @@ public class MethodDefinitionInsertLocationFinder2 {
cachedDeclarationToDefinition.put(simpleDeclaration, definition); cachedDeclarationToDefinition.put(simpleDeclaration, definition);
} }
} }
if (definition != null) { if (definition != null) {
insertLocation.setNodeToInsertBefore(findFirstSurroundingParentFunctionNode(definition), insertLocation.setNodeToInsertBefore(findFirstSurroundingParentFunctionNode(definition),
definition.getTranslationUnit().getOriginatingTranslationUnit()); definition.getTranslationUnit().getOriginatingTranslationUnit());
} }
} }
if (insertLocation.getTranslationUnit() == null) { if (insertLocation.getTranslationUnit() == null) {
ITranslationUnit partner = SourceHeaderPartnerFinder.getPartnerTranslationUnit( ITranslationUnit partner = SourceHeaderPartnerFinder.getPartnerTranslationUnit(
declarationTu, astCache); declarationTu, astCache);
@ -124,7 +127,7 @@ public class MethodDefinitionInsertLocationFinder2 {
} }
return findFunctionDefinitionInParents(node.getParent()); return findFunctionDefinitionInParents(node.getParent());
} }
private static IASTNode findFirstSurroundingParentFunctionNode(IASTNode definition) { private static IASTNode findFirstSurroundingParentFunctionNode(IASTNode definition) {
IASTNode functionDefinitionInParents = findFunctionDefinitionInParents(definition); IASTNode functionDefinitionInParents = findFunctionDefinitionInParents(definition);
if (functionDefinitionInParents == null) { if (functionDefinitionInParents == null) {