eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-14 10:55:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Manindra Moharana
2014-06-09 21:41:53 +05:30
parent 633a53a6ab
commit 2b6ccf723a
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pdex/src/processing/mode/experimental/ASTGenerator.java
View File

@@ -1574,7 +1574,8 @@ public class ASTGenerator {
*/
public ASTNodeWrapper getASTNodeAt(int lineNumber, String name, int offset,
boolean scrollOnly) {
int originalLN = lineNumber - errorCheckerService.mainClassOffset;
int originalLN = lineNumber;
lineNumber += errorCheckerService.mainClassOffset;
log("----getASTNodeAt---- CU State: " + errorCheckerService.compilationUnitState);
if (errorCheckerService != null) {
editor = errorCheckerService.getEditor();
@@ -1588,6 +1589,7 @@ public class ASTGenerator {
}
}
lineNumber = pdeLineNumToJavaLineNum(lineNumber);
log("getASTNodeAt: Node line number " + lineNumber);
ASTNode lineNode = findLineOfNode(compilationUnit, lineNumber, offset, name);
@@ -1595,10 +1597,8 @@ public class ASTGenerator {
ASTNode decl = null;
String nodeLabel = null;
String nameOfNode = null; // The node name which is to be scrolled to
if (lineNode != null) {
// Being test
//ASTNodeWrapper lineNodeWrap = new ASTNodeWrapper(lineNode);
String pdeCodeLine = errorCheckerService.getPDECodeAtLine(editor
.getSketch().getCurrentCodeIndex(), originalLN);
String javaCodeLine = getJavaSourceCodeline(lineNumber);
@@ -2247,7 +2247,7 @@ public class ASTGenerator {
public int javaCodeOffsetToLineStartOffset(int line, int jOffset){
// Find the first node with this line number, return its offset - jOffset
line = PdeToJavaLineNumber(line);
line = pdeLineNumToJavaLineNum(line);
log("Looking for line: " + line + ", jOff " + jOffset);
Stack temp = new Stack<DefaultMutableTreeNode>();
temp.push(codeTree);
@@ -2271,17 +2271,22 @@ public class ASTGenerator {
return -1;
}
protected int PdeToJavaLineNumber(int lineNum){
int lineNumber = lineNum + errorCheckerService.getPdeImportsCount();
/**
* Converts pde line number to java line number
* @param pdeLineNum - pde line number
* @return
*/
protected int pdeLineNumToJavaLineNum(int pdeLineNum){
int javaLineNumber = pdeLineNum + errorCheckerService.getPdeImportsCount();
// Adjust line number for tabbed sketches
int codeIndex = editor.getSketch().getCodeIndex(editor.getCurrentTab());
if (codeIndex > 0)
for (int i = 0; i < codeIndex; i++) {
SketchCode sc = editor.getSketch().getCode(i);
int len = Base.countLines(sc.getProgram()) + 1;
lineNumber += len;
javaLineNumber += len;
}
return lineNumber;
return javaLineNumber;
}
protected boolean isInstanceOfType(ASTNode node,ASTNode decl, String name){