From 1abaea188f38db5dde9694915db6e4c3ff15d3f8 Mon Sep 17 00:00:00 2001
From: Manindra Moharana <mkmoharana29@gmail.com>
Date: Tue, 18 Jun 2013 00:45:00 +0530
Subject: [PATCH] redundant code. meh.

---
 .../mode/experimental/ASTNodeWrapper.java     | 10 ++++----
 .../experimental/ErrorCheckerService.java     | 25 +++----------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/pdex/src/processing/mode/experimental/ASTNodeWrapper.java b/pdex/src/processing/mode/experimental/ASTNodeWrapper.java
index d2c3bdcf1..7b2b161a3 100644
--- a/pdex/src/processing/mode/experimental/ASTNodeWrapper.java
+++ b/pdex/src/processing/mode/experimental/ASTNodeWrapper.java
@@ -48,18 +48,18 @@ public class ASTNodeWrapper {
    *         node length}
    */
   public int[] getJavaCodeOffsets() {
-    int nodeLineNo = getLineNumber(node), nodeOffset = node.getStartPosition(), nodeLength = node
+    int nodeOffset = node.getStartPosition(), nodeLength = node
         .getLength();
     ASTNode thisNode = node;
     while (thisNode.getParent() != null) {
-      if (getLineNumber(node.getParent()) == nodeLineNo) {
+      if (getLineNumber(node.getParent()) == lineNumber) {
         node = node.getParent();
       } else {
         break;
       }
     }
     return new int[] {
-      nodeLineNo, node.getStartPosition(), nodeOffset, nodeLength };
+      lineNumber, node.getStartPosition(), nodeOffset, nodeLength };
   }
 
   /**
@@ -67,8 +67,8 @@ public class ASTNodeWrapper {
    * @param ecs
    *          - ErrorCheckerService instance
    */
-  public void getPDECodeOffsets(ErrorCheckerService ecs) {
-
+  public int[] getPDECodeOffsets(ErrorCheckerService ecs) {
+    return ecs.JavaToPdeOffsets(lineNumber, node.getStartPosition());
   }
 
   public String toString() {
diff --git a/pdex/src/processing/mode/experimental/ErrorCheckerService.java b/pdex/src/processing/mode/experimental/ErrorCheckerService.java
index 0c4e9bbe1..3ea9e4968 100644
--- a/pdex/src/processing/mode/experimental/ErrorCheckerService.java
+++ b/pdex/src/processing/mode/experimental/ErrorCheckerService.java
@@ -732,9 +732,9 @@ public class ErrorCheckerService implements Runnable{
    *          - line number in java code
    * @param offset
    *          - offset from the start of the 'line'
-   * @return int[0] - tab number, int[1] - line number, int[2] - line start
-   *         offset, int[3] - offset from line start int[2] and int[3] are on
-   *         TODO
+   * @return int[0] - tab number, int[1] - line number in the int[0] tab, int[2]
+   *         - line start offset, int[3] - offset from line start int[2] and
+   *         int[3] are on TODO
    */
   public int[] JavaToPdeOffsets(int line, int offset){
     int codeIndex = 0;
@@ -1045,24 +1045,7 @@ public class ErrorCheckerService implements Runnable{
     
     if (errorIndex < problemsList.size() && errorIndex >= 0) {
       Problem p = problemsList.get(errorIndex);
-      try {
-        editor.toFront();
-        editor.getSketch().setCurrentCode(p.tabIndex);
-        editor.getTextArea().scrollTo(p.lineNumber - 1, 0);
-        editor.setSelection(editor.getTextArea()
-            .getLineStartNonWhiteSpaceOffset(p.lineNumber - 1)
-            + editor.getTextArea().getLineText(p.lineNumber - 1)
-                .trim().length(), editor.getTextArea()
-            .getLineStartNonWhiteSpaceOffset(p.lineNumber - 1));
-        editor.repaint();
-      } catch (Exception e) {
-        System.err
-            .println(e
-                + " : Error while selecting text in scrollToErrorLine()");
-        // e.printStackTrace();
-      }
-      // System.out.println("---");
-
+      scrollToErrorLine(p);
     }
   }