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

Method name adjustment.

Browse source
This commit is contained in:
Sergey Prigogin 2011-10-27 18:40:40 -07:00
parent 168e1f4460
commit b1be2dbaac
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/StatementWriter.java
View file

@ -448,7 +448,7 @@ public class StatementWriter extends NodeWriter{
}
protected int writeMixedStatement(IASTStatement statement) {
IFile file = FileHelper.getIFilefromIASTNode(statement);
IFile file = FileHelper.getFileFromNode(statement);
int offset = statement.getFileLocation().getNodeOffset();
int length = statement.getFileLocation().getNodeLength();
String code =FileContentHelper.getContent(file, offset, length);

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
View file

@ -215,7 +215,7 @@ public class ChangeGenerator extends ASTVisitor {
targetLocation = lastDecl.getFileLocation();
}
String lineDelimiter = FileHelper.determineLineDelimiter(
FileHelper.getIFilefromIASTNode(modification.getTargetNode()));
FileHelper.getFileFromNode(modification.getTargetNode()));
edit.addChild(new InsertEdit(targetLocation.getNodeOffset() + targetLocation.getNodeLength(),
lineDelimiter + lineDelimiter + newNodeCode));
break;
@ -224,7 +224,7 @@ public class ChangeGenerator extends ASTVisitor {
}
private void createChange(IASTNode synthNode, String synthSource) {
IFile relevantFile = FileHelper.getIFilefromIASTNode(synthNode);
IFile relevantFile = FileHelper.getFileFromNode(synthNode);
String originalCode = originalCodeOfNode(synthNode);
CodeComparer codeComparer = new CodeComparer(originalCode, synthSource);
@ -242,7 +242,7 @@ public class ChangeGenerator extends ASTVisitor {
public String originalCodeOfNode(IASTNode node) {
if (node.getFileLocation() != null) {
IFile sourceFile = FileHelper.getIFilefromIASTNode(node);
IFile sourceFile = FileHelper.getFileFromNode(node);
int nodeOffset = getOffsetIncludingComments(node);
int nodeLength = getNodeLengthIncludingComments(node);
@ -294,7 +294,7 @@ public class ChangeGenerator extends ASTVisitor {
IASTFileLocation fileLocation = nextNode.getFileLocation();
int length = fileLocation.getNodeOffset() - getOffsetForNodeFile(nextNode);
String originalSource = FileContentHelper.getContent(FileHelper.getIFilefromIASTNode(nextNode),
String originalSource = FileContentHelper.getContent(FileHelper.getFileFromNode(nextNode),
getOffsetForNodeFile(nextNode), length);
StringBuilder indent = new StringBuilder(originalSource);
indent.reverse();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/util/FileHelper.java
View file

@ -31,7 +31,7 @@ import org.eclipse.jface.text.TextUtilities;
public class FileHelper {
private static final String DEFAULT_LINE_DELIMITTER = "\n"; //$NON-NLS-1$
public static IFile getIFilefromIASTNode(IASTNode node) {
public static IFile getFileFromNode(IASTNode node) {
IPath implPath = new Path(node.getContainingFilename());
return ResourceLookup.selectFileForLocation(implPath, null);
}