diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
index 5eaff116e..feb986264 100644
--- a/java/src/processing/mode/java/pdex/ASTGenerator.java
+++ b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -1752,7 +1752,7 @@ public class ASTGenerator {
       //errorCheckerService.highlightNode(simpName2);
       ASTNodeWrapper declWrap = new ASTNodeWrapper(simpName2, nodeLabel);
       //errorCheckerService.highlightNode(declWrap);
-      if (!declWrap.highlightNode(this)) {
+      if (!declWrap.highlightNode(editor)) {
         Messages.loge("Highlighting failed.");
       }
     }
@@ -1885,7 +1885,7 @@ public class ASTGenerator {
                 .getLastSelectedPathComponent();
             if (tnode.getUserObject() instanceof ASTNodeWrapper) {
               ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject();
-              awrap.highlightNode(thisASTGenerator);
+              awrap.highlightNode(editor);
               // errorCheckerService.highlightNode(awrap);
 
               //--
@@ -1984,7 +1984,7 @@ public class ASTGenerator {
             if (tnode.getUserObject() instanceof ASTNodeWrapper) {
               ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject();
               //errorCheckerService.highlightNode(awrap);
-              awrap.highlightNode(thisASTGenerator);
+              awrap.highlightNode(editor);
             }
           }
         };
diff --git a/java/src/processing/mode/java/pdex/ASTNodeWrapper.java b/java/src/processing/mode/java/pdex/ASTNodeWrapper.java
index 472a943f2..2a2426935 100644
--- a/java/src/processing/mode/java/pdex/ASTNodeWrapper.java
+++ b/java/src/processing/mode/java/pdex/ASTNodeWrapper.java
@@ -46,6 +46,7 @@ import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import processing.app.Base;
 import processing.app.Messages;
+import processing.mode.java.JavaEditor;
 
 
 /**
@@ -541,21 +542,20 @@ public class ASTNodeWrapper {
   /**
    * Highlight the ASTNode in the editor, if it's of type
    * SimpleName
-   * @param astGenerator
+   * @param editor
    * @return - true if highlighting was successful
    */
-  public boolean highlightNode(ASTGenerator astGenerator){
-    if (!(Node instanceof SimpleName)) {
+  public boolean highlightNode(JavaEditor editor){
+    if (!(node instanceof SimpleName)) {
       return false;
     }
     SimpleName nodeName = (SimpleName) node;
     try {
       //TODO: Redundant code. See ASTGenerator.getJavaSourceCodeline()
       int javaLineNumber = getLineNumber(nodeName);
-      int pdeOffs[] = astGenerator.errorCheckerService
-          .calculateTabIndexAndLineNumber(javaLineNumber);
+      int pdeOffs[] = editor.getErrorChecker().calculateTabIndexAndLineNumber(javaLineNumber);
       PlainDocument javaSource = new PlainDocument();
-      javaSource.insertString(0, astGenerator.errorCheckerService.sourceCode, null);
+      javaSource.insertString(0, editor.getErrorChecker().sourceCode, null);
       Element lineElement = javaSource.getDefaultRootElement()
           .getElement(javaLineNumber-1);
       if(lineElement == null) {
@@ -566,8 +566,8 @@ public class ASTNodeWrapper {
       String javaLine = javaSource.getText(lineElement.getStartOffset(),
                                            lineElement.getEndOffset()
                                                - lineElement.getStartOffset());
-      astGenerator.editor.getSketch().setCurrentCode(pdeOffs[0]);
-      String pdeLine = astGenerator.editor.getLineText(pdeOffs[1]);
+      editor.getSketch().setCurrentCode(pdeOffs[0]);
+      String pdeLine = editor.getLineText(pdeOffs[1]);
       String lookingFor = nodeName.toString();
       Messages.log(lookingFor + ", " + nodeName.getStartPosition());
       Messages.log(javaLineNumber +" JL " + javaLine + " LSO " + lineElement.getStartOffset() + ","
@@ -587,9 +587,9 @@ public class ASTNodeWrapper {
         		"Please file a bug report.");
         return false;
       }
-      int lso = astGenerator.editor.getTextArea().getLineStartOffset(pdeOffs[1]);
+      int lso = editor.getTextArea().getLineStartOffset(pdeOffs[1]);
       highlightStart += lso;
-      astGenerator.editor.setSelection(highlightStart, highlightStart
+      editor.setSelection(highlightStart, highlightStart
           + nodeName.getLength());
       /*
       // First find the name in the java line, and marks its index
diff --git a/java/src/processing/mode/java/pdex/SketchOutline.java b/java/src/processing/mode/java/pdex/SketchOutline.java
index 4f2f1f4f0..d5432101c 100644
--- a/java/src/processing/mode/java/pdex/SketchOutline.java
+++ b/java/src/processing/mode/java/pdex/SketchOutline.java
@@ -157,7 +157,7 @@ public class SketchOutline {
                 .getLastSelectedPathComponent();
             if (tnode.getUserObject() instanceof ASTNodeWrapper) {
               ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject();
-              awrap.highlightNode(errorCheckerService.astGenerator);
+              awrap.highlightNode(editor);
               //errorCheckerService.highlightNode(awrap);
               close();
             }
@@ -284,7 +284,7 @@ public class SketchOutline {
             .getLastSelectedPathComponent();
         if (tnode.getUserObject() instanceof ASTNodeWrapper) {
           ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject();
-          awrap.highlightNode(errorCheckerService.astGenerator);
+          awrap.highlightNode(editor);
           // log(awrap);
           //errorCheckerService.highlightNode(awrap);
           close();