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

Adjusted comment.

Browse source
This commit is contained in:
Sergey Prigogin 2011-01-07 04:29:56 +00:00
parent 4cc133917e
commit b2d8caa6b0
1 changed files with 22 additions and 15 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/MethodDefinitionInsertLocationFinder.java
View file

@ -33,7 +33,8 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.FileHelper;
import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper; import org.eclipse.cdt.internal.ui.refactoring.utils.NodeHelper;
/** /**
* Findes the information that are needed to tell where a MethodDefinition of a certain method declaration should be inserted. * Finds the information that are needed to tell where a MethodDefinition of a certain
* method declaration should be inserted.
* *
* @author Mirko Stocker, Lukas Felber * @author Mirko Stocker, Lukas Felber
*/ */
@ -53,33 +54,33 @@ public class MethodDefinitionInsertLocationFinder {
private static IASTNode findFirstSurroundingParentFunctionNode(IASTNode definition) { private static IASTNode findFirstSurroundingParentFunctionNode(IASTNode definition) {
IASTNode functionDefinitionInParents = findFunctionDefinitionInParents(definition); IASTNode functionDefinitionInParents = findFunctionDefinitionInParents(definition);
if (functionDefinitionInParents == null || functionDefinitionInParents.getNodeLocations().length == 0) { if (functionDefinitionInParents == null ||
functionDefinitionInParents.getNodeLocations().length == 0) {
return null; return null;
} }
return functionDefinitionInParents; return functionDefinitionInParents;
} }
public static InsertLocation find(IASTFileLocation methodDeclarationLocation, IASTNode parent, IFile file) throws CoreException { public static InsertLocation find(IASTFileLocation methodDeclarationLocation, IASTNode parent,
IFile file) throws CoreException {
IASTName definition = null; IASTName definition = null;
IASTDeclaration[] declarations = NodeHelper.getDeclarations(parent); IASTDeclaration[] declarations = NodeHelper.getDeclarations(parent);
InsertLocation result = new InsertLocation(); InsertLocation result = new InsertLocation();
for (IASTSimpleDeclaration simpleDeclaration : getAllPreviousIASTSimpleDeclarationsFromClassInReverseOrder(declarations, methodDeclarationLocation)) { for (IASTSimpleDeclaration simpleDeclaration : getAllPreviousSimpleDeclarationsFromClassInReverseOrder(declarations, methodDeclarationLocation)) {
definition = DefinitionFinder.getDefinition(simpleDeclaration, file); definition = DefinitionFinder.getDefinition(simpleDeclaration, file);
if (definition != null) { if (definition != null) {
result.setNodeToInsertAfter(findFirstSurroundingParentFunctionNode(definition)); result.setNodeToInsertAfter(findFirstSurroundingParentFunctionNode(definition));
result.setInsertFile(FileHelper.getIFilefromIASTNode(definition)); result.setInsertFile(FileHelper.getIFilefromIASTNode(definition));
} }
} }
for (IASTSimpleDeclaration simpleDeclaration : getAllFollowingIASTSimpleDeclarationsFromClass(declarations, methodDeclarationLocation)) { for (IASTSimpleDeclaration simpleDeclaration : getAllFollowingSimpleDeclarationsFromClass(declarations, methodDeclarationLocation)) {
definition = DefinitionFinder.getDefinition(simpleDeclaration, file); definition = DefinitionFinder.getDefinition(simpleDeclaration, file);
if (definition != null) { if (definition != null) {
result.setNodeToInsertBefore(findFirstSurroundingParentFunctionNode(definition)); result.setNodeToInsertBefore(findFirstSurroundingParentFunctionNode(definition));
result.setInsertFile(FileHelper.getIFilefromIASTNode(definition)); result.setInsertFile(FileHelper.getIFilefromIASTNode(definition));
} }
} }
@ -94,13 +95,15 @@ public class MethodDefinitionInsertLocationFinder {
} }
/** /**
* Search the given class for all IASTSimpleDeclarations occuring before 'method' and return them in reverse order. * Searches the given class for all IASTSimpleDeclarations occurring before 'method'
* and returns them in reverse order.
* *
* @param declarations to be searched * @param declarations to be searched
* @param methodPosition on which the search aborts * @param methodPosition on which the search aborts
* @return all declarations, sorted in reverse order * @return all declarations, sorted in reverse order
*/ */
private static Collection<IASTSimpleDeclaration> getAllPreviousIASTSimpleDeclarationsFromClassInReverseOrder(IASTDeclaration[] declarations, IASTFileLocation methodPosition) { private static Collection<IASTSimpleDeclaration> getAllPreviousSimpleDeclarationsFromClassInReverseOrder(
IASTDeclaration[] declarations, IASTFileLocation methodPosition) {
ArrayList<IASTSimpleDeclaration> allIASTSimpleDeclarations = new ArrayList<IASTSimpleDeclaration>(); ArrayList<IASTSimpleDeclaration> allIASTSimpleDeclarations = new ArrayList<IASTSimpleDeclaration>();
for (IASTDeclaration decl : declarations) { for (IASTDeclaration decl : declarations) {
if (decl.getFileLocation().getStartingLineNumber() >= methodPosition.getStartingLineNumber()) { if (decl.getFileLocation().getStartingLineNumber() >= methodPosition.getStartingLineNumber()) {
@ -113,11 +116,13 @@ public class MethodDefinitionInsertLocationFinder {
return allIASTSimpleDeclarations; return allIASTSimpleDeclarations;
} }
private static Collection<IASTSimpleDeclaration> getAllFollowingIASTSimpleDeclarationsFromClass(IASTDeclaration[] declarations, IASTFileLocation methodPosition) { private static Collection<IASTSimpleDeclaration> getAllFollowingSimpleDeclarationsFromClass(
IASTDeclaration[] declarations, IASTFileLocation methodPosition) {
ArrayList<IASTSimpleDeclaration> allIASTSimpleDeclarations = new ArrayList<IASTSimpleDeclaration>(); ArrayList<IASTSimpleDeclaration> allIASTSimpleDeclarations = new ArrayList<IASTSimpleDeclaration>();
for (IASTDeclaration decl : declarations) { for (IASTDeclaration decl : declarations) {
if (isMemberFunctionDeclaration(decl) && decl.getFileLocation().getStartingLineNumber() > methodPosition.getStartingLineNumber() ) { if (isMemberFunctionDeclaration(decl) &&
decl.getFileLocation().getStartingLineNumber() > methodPosition.getStartingLineNumber() ) {
allIASTSimpleDeclarations.add((IASTSimpleDeclaration) decl); allIASTSimpleDeclarations.add((IASTSimpleDeclaration) decl);
} }
} }
@ -125,6 +130,8 @@ public class MethodDefinitionInsertLocationFinder {
} }
private static boolean isMemberFunctionDeclaration(IASTDeclaration decl) { private static boolean isMemberFunctionDeclaration(IASTDeclaration decl) {
return decl instanceof IASTSimpleDeclaration && ((IASTSimpleDeclaration) decl).getDeclarators().length > 0 && ((IASTSimpleDeclaration) decl).getDeclarators()[0] instanceof IASTFunctionDeclarator; return decl instanceof IASTSimpleDeclaration &&
((IASTSimpleDeclaration) decl).getDeclarators().length > 0 &&
((IASTSimpleDeclaration) decl).getDeclarators()[0] instanceof IASTFunctionDeclarator;
} }
} }