diff --git a/java/src/processing/mode/java/DebugToolbar.java b/java/src/processing/mode/java/DebugToolbar.java
deleted file mode 100644
index f43e52257..000000000
--- a/java/src/processing/mode/java/DebugToolbar.java
+++ /dev/null
@@ -1,939 +0,0 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
-/*
-Part of the Processing project - http://processing.org
-Copyright (c) 2012-15 The Processing Foundation
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-package processing.mode.java;
-
-import java.awt.event.ActionEvent;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.swing.Box;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import processing.app.Base;
-import processing.app.EditorButton;
-import processing.app.Language;
-import processing.app.Mode;
-
-
-/** Toolbar for the top of the DebugTray */
-public class DebugToolbar extends JPanel {  //Component implements MouseInputListener, KeyListener {
-  static public final int GAP = 13;
-
-  // preserve original button id's, but re-define so they are accessible 
-  // (they are used by DebugEditor, so they want to be public)
-
-//  static final int BUTTON_GAP = 13;
-//  static final int BUTTON_DIM = 46;
-  
-//  static protected final int RUN    = 100; // change this, to be able to get it's name via getTitle()
-//  static protected final int DEBUG = JavaToolbar.RUN;
-
-//  static protected final int CONTINUE = 101;
-//  static protected final int STEP = 102;
-//  static protected final int BREAKPOINT = 103;
-//  static protected final int TOGGLE_VAR_INSPECTOR = 104;
-//  static protected final int STOP   = JavaToolbar.STOP;
-
-//  static protected final int NEW    = JavaToolbar.NEW;
-//  static protected final int OPEN   = JavaToolbar.OPEN;
-//  static protected final int SAVE   = JavaToolbar.SAVE;
-//  static protected final int EXPORT = JavaToolbar.EXPORT;
-
-//  enum DebugButton {
-//    CONTINUE, STEP, BREAKPOINT;
-//    
-//    String getTitle(boolean shift) {
-//      if (this == CONTINUE) {
-//        return Language.text("toolbar.debug.continue");
-//      } else if (this == BREAKPOINT) {
-//        return Language.text("toolbar.debug.toggle_breakpoints");
-//      } else if (this == STEP) {
-//        if (shift) {
-//          return Language.text("toolbar.debug.step_into");
-//        } else {
-//          return Language.text("toolbar.debug.step");
-//        }
-//      }
-//    }
-//    
-//    String getFilename() {
-//      if (this == CONTINUE) {
-//        return "debug-continue";
-//      } else if (this == STEP) {
-//        return "debug-step";
-//      } else if (this == BREAKPOINT) {
-//        return "debug-breakpoint";
-//      }
-//      throw new IllegalStateException("How did you get here?");
-//    }
-//  }
-  
-//  // the sequence of button ids. (this maps button position = index to button ids)
-//  static protected final int[] buttonSequence = {
-//    CONTINUE, STEP, BREAKPOINT
-////    DEBUG, CONTINUE, STEP, STOP, TOGGLE_BREAKPOINT, TOGGLE_VAR_INSPECTOR 
-////    NEW, OPEN, SAVE, EXPORT
-//  }; 
-
-  
-//    /** Width of each toolbar button. */
-//  static final int BUTTON_WIDTH = 27;
-//  /** Height of each toolbar button. */
-////  static final int BUTTON_HEIGHT = 32;
-//  /** The amount of space between groups of buttons on the toolbar. */
-//  static final int BUTTON_GAP = 5;
-//  /** Size (both width and height) of the buttons in the source image. */
-//  static final int BUTTON_IMAGE_SIZE = 33;
-
-    // DISABLED, ENABLED, SELECTED, ROLLOVER, PRESSED
-  // if no selected available, defaults to pressed (or vice versa?)
-
-//  static final int INACTIVE = 0;
-//  static final int ROLLOVER = 1;
-//  static final int ACTIVE   = 2;
-  
-//  protected Base base;
-//  protected Editor editor;
-//  protected Mode mode;
-//
-//  Image offscreen;
-//  int width, height;
-//
-//  Color bgColor;
-//
-//  protected Button rollover;
-//
-//  Font statusFont;
-//  int statusAscent;
-//  Color statusColor;
-//  
-//  boolean shiftPressed;
-
-//  // what the mode indicator looks like
-//  Color modeButtonColor;
-//  Font modeTextFont;
-//  int modeTextAscent;
-//  Color modeTextColor;
-//  String modeTitle;
-//  int modeX1, modeY1;
-//  int modeX2, modeY2;
-//  JMenu modeMenu;
-  
-//  protected List<Button> buttons;
-
-//  static final int ARROW_WIDTH = 7;
-//  static final int ARROW_HEIGHT = 6;
-//  static Image modeArrow;
-  
-  EditorButton continueButton;
-  EditorButton stepButton;
-  EditorButton breakpointButton;
-
-  
-  public DebugToolbar(final JavaEditor editor, Base base) {
-//    this.editor = editor;
-//    this.base = base;
-//
-//    buttons = new ArrayList<Button>();
-//    rollover = null;
-//
-//    mode = editor.getMode();
-    
-    final Mode mode = editor.getMode();
-    Box box = Box.createHorizontalBox();
-
-    continueButton = 
-      new EditorButton(mode, "debug-continue", 
-                       Language.text("toolbar.debug.continue")) {
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Continue' toolbar button");
-        editor.debugger.continueDebug();
-      }
-    };
-    box.add(continueButton);
-    box.add(Box.createHorizontalStrut(GAP));
-    
-    stepButton = 
-      new EditorButton(mode, "debug-step",
-                       Language.text("toolbar.debug.step"),
-                       Language.text("toolbar.debug.step_into")) {
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        if (isShiftDown()) {
-          Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Step Into' toolbar button");
-          editor.debugger.stepInto();
-        } else {
-          Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Step' toolbar button");
-          editor.debugger.stepOver();
-        }
-      }
-    };
-    box.add(stepButton);
-    box.add(Box.createHorizontalStrut(GAP));
-
-    breakpointButton = 
-      new EditorButton(mode, "debug-breakpoint",
-                       Language.text("toolbar.debug.toggle_breakpoints")) {
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Toggle Breakpoint' toolbar button");
-        editor.debugger.toggleBreakpoint();
-      }
-    };
-    add(breakpointButton);
-    box.add(Box.createHorizontalStrut(GAP));
-
-//    int x = GAP;
-//    int y = GAP;
-//    final int DIM = EditorButton.DIM;
-//    continueButton.setBounds(x, y, DIM, DIM);
-//    x += DIM + GAP;
-//    stepButton.setBounds(x, y, DIM, DIM);
-//    x += DIM + GAP;
-//    breakpointButton.setBounds(x, y, DIM, DIM);
-//    x += DIM + GAP;
-    
-    JLabel label = new JLabel();
-    box.add(label);
-    continueButton.setRolloverLabel(label);
-    stepButton.setRolloverLabel(label);
-    breakpointButton.setRolloverLabel(label);
-    
-    add(box);
-
-    /*
-    bgColor = mode.getColor("buttons.bgcolor");
-    statusFont = mode.getFont("buttons.status.font");
-    statusColor = mode.getColor("buttons.status.color");
-//    modeTitle = mode.getTitle().toUpperCase();
-    modeTitle = mode.getTitle();
-    modeTextFont = mode.getFont("mode.button.font");
-    modeButtonColor = mode.getColor("mode.button.color");    
-    */
-  }
-
-  
-  protected void activateContinue() {
-  }
-
-
-  protected void deactivateContinue() {
-  }
-
-
-  protected void activateStep() {
-  }
-
-
-  protected void deactivateStep() {
-  }
-  
-
-//  /**
-//   * Load button images and slice them up. Only call this from paintComponent,  
-//   * or when the comp is displayable, otherwise createImage() might fail.
-//   * (Using BufferedImage instead of createImage() nowadays, so that may 
-//   * no longer be relevant.) 
-//   */
-//  public Image[][] loadImages() {
-//    int res = Toolkit.highResDisplay() ? 2 : 1;
-//    
-//    String suffix = null; 
-//    Image allButtons = null;
-//    // Some modes may not have a 2x version. If a mode doesn't have a 1x 
-//    // version, this will cause an error... they should always have 1x.
-//    if (res == 2) {
-//      suffix = "-2x.png";
-//      allButtons = mode.loadImage("theme/buttons" + suffix);
-//      if (allButtons == null) {
-//        res = 1;  // take him down a notch
-//      }
-//    }
-//    if (res == 1) {
-//      suffix = ".png";
-//      allButtons = mode.loadImage("theme/buttons" + suffix);
-//      if (allButtons == null) {
-//        // use the old (pre-2.0b9) file name
-//        suffix = ".gif";
-//        allButtons = mode.loadImage("theme/buttons" + suffix);
-//      }
-//    }
-//
-//    int count = allButtons.getWidth(this) / BUTTON_DIM*res;
-//    Image[][] buttonImages = new Image[count][3];
-//    
-//    for (int i = 0; i < count; i++) {
-//      for (int state = 0; state < 3; state++) {
-//        Image image = new BufferedImage(BUTTON_DIM*res, Preferences.GRID_SIZE*res, BufferedImage.TYPE_INT_ARGB);
-//        Graphics g = image.getGraphics();
-//        g.drawImage(allButtons, 
-//                    -(i*BUTTON_IMAGE_SIZE*res) - 3, 
-//                    (state-2)*BUTTON_IMAGE_SIZE*res, null);
-//        g.dispose();
-//        buttonImages[i][state] = image;
-//      }
-//    }
-//    
-//    return buttonImages;
-//  }
-  
-  
-//  abstract static public String getTitle(int index, boolean shift);
-
-
-//  @Override
-//  public void paintComponent(Graphics screen) {
-//    if (buttons.size() == 0) {
-//      init();
-//    }
-//
-//    Dimension size = getSize();
-//    if ((offscreen == null) ||
-//        (size.width != width) || (size.height != height)) {
-//      if (Toolkit.highResDisplay()) {
-//        offscreen = createImage(size.width*2, size.height*2);
-//      } else {
-//        offscreen = createImage(size.width, size.height);
-//      }
-//
-//      width = size.width;
-//      height = size.height;
-//
-//      int offsetX = 3;
-//      for (Button b : buttons) {
-//        b.left = offsetX;
-//        if (b.gap) {
-//          b.left += BUTTON_GAP;
-//        }
-//        b.right = b.left + BUTTON_WIDTH; 
-//        offsetX = b.right;
-//      }
-////      for (int i = 0; i < buttons.size(); i++) {
-////        x1[i] = offsetX;
-////        if (i == 2) x1[i] += BUTTON_GAP;
-////        x2[i] = x1[i] + BUTTON_WIDTH;
-////        offsetX = x2[i];
-////      }
-//    }
-//    Graphics g = offscreen.getGraphics();
-//    /*Graphics2D g2 =*/ Toolkit.prepareGraphics(g);
-//
-//    g.setColor(hiding ? hideColor : bgColor);
-//    g.fillRect(0, 0, width, height);
-////    if (backgroundImage != null) {
-////      g.drawImage(backgroundImage, 0, 0, BACKGROUND_WIDTH, BACKGROUND_HEIGHT, null);
-////    }
-//    if (!hiding) {
-//      mode.drawBackground(g, 0);
-//    }
-//
-////    for (int i = 0; i < buttonCount; i++) {
-////      g.drawImage(stateImage[i], x1[i], y1, null);
-////    }
-//    for (Button b : buttons) {
-//      g.drawImage(b.stateImage, b.left, 0, BUTTON_WIDTH, Preferences.GRID_SIZE, null);
-//    }
-//
-//    g.setColor(statusColor);
-//    g.setFont(statusFont);
-//    if (statusAscent == 0) {
-//      statusAscent = (int) Toolkit.getAscent(g);
-//    }
-//
-//    // If I ever find the guy who wrote the Java2D API, I will hurt him.
-////    Graphics2D g2 = (Graphics2D) g;
-////    FontRenderContext frc = g2.getFontRenderContext();
-////    float statusW = (float) statusFont.getStringBounds(status, frc).getWidth();
-////    float statusX = (getSize().width - statusW) / 2;
-////    g2.drawString(status, statusX, statusY);
-//
-////    if (currentRollover != -1) {
-//    if (rollover != null) {
-//      //int statusY = (BUTTON_HEIGHT + g.getFontMetrics().getAscent()) / 2;
-//      int statusY = (Preferences.GRID_SIZE + statusAscent) / 2;
-//      //String status = shiftPressed ? titleShift[currentRollover] : title[currentRollover];
-//      String status = shiftPressed ? rollover.titleShift : rollover.title;
-//      g.drawString(status, buttons.size() * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
-//    }
-//
-//    g.setFont(modeTextFont);
-//    FontMetrics metrics = g.getFontMetrics();
-//    if (modeTextAscent == 0) {
-//      modeTextAscent = (int) Toolkit.getAscent(g); //metrics.getAscent();
-//    }
-//    int modeTextWidth = metrics.stringWidth(modeTitle);
-//    final int modeGapWidth = 8;
-//    final int modeBoxHeight = 20;
-//    modeX2 = getWidth() - 16;
-//    modeX1 = modeX2 - (modeGapWidth + modeTextWidth + modeGapWidth + ARROW_WIDTH + modeGapWidth);
-////    modeY1 = 8; //(getHeight() - modeBoxHeight) / 2;
-//    modeY1 = (getHeight() - modeBoxHeight) / 2;
-//    modeY2 = modeY1 + modeBoxHeight; //modeY1 + modeH + modeGapV*2;
-//    g.setColor(modeButtonColor);
-//    g.drawRect(modeX1, modeY1, modeX2 - modeX1, modeY2 - modeY1 - 1);
-//    
-//    g.drawString(modeTitle, 
-//                 modeX1 + modeGapWidth, 
-//                 modeY1 + (modeBoxHeight + modeTextAscent) / 2);
-//                 //modeY1 + modeTextAscent + (modeBoxHeight - modeTextAscent) / 2);
-//    g.drawImage(modeArrow, 
-//                modeX2 - ARROW_WIDTH - modeGapWidth, 
-//                modeY1 + (modeBoxHeight - ARROW_HEIGHT) / 2, 
-//                ARROW_WIDTH, ARROW_HEIGHT, null);
-//
-////    g.drawLine(modeX1, modeY2, modeX2, modeY2);
-////    g.drawLine(0, size.height, size.width, size.height);
-////    g.fillRect(modeX1 - modeGapWidth*2,  modeY1, modeGapWidth, modeBoxHeight);
-//    
-//    screen.drawImage(offscreen, 0, 0, size.width, size.height, null);
-//
-//    // dim things out when not enabled (not currently in use) 
-////    if (!isEnabled()) {
-////      screen.setColor(new Color(0, 0, 0, 100));
-////      screen.fillRect(0, 0, getWidth(), getHeight());
-////    }
-//  }
-
-  
-//  protected void checkRollover(int x, int y) {
-//    Button over = findSelection(x, y);
-//    if (over != null) {
-//      //        if (state[sel] != ACTIVE) {
-//      if (over.state != ACTIVE) {
-//        //          setState(sel, ROLLOVER, true);
-//        over.setState(ROLLOVER, true);
-//        //          currentRollover = sel;
-//        rollover = over;
-//      }
-//    }
-//  }
-
-
-//  public void mouseMoved(MouseEvent e) {
-//    if (!isEnabled()) return;
-//
-//    // ignore mouse events before the first paintComponent() call
-//    if (offscreen == null) return;
-//
-//    // TODO this isn't quite right, since it's gonna kill rollovers too
-////    if (state[OPEN] != INACTIVE) {
-////      // avoid flicker, since there should be another update event soon
-////      setState(OPEN, INACTIVE, false);
-////    }
-//
-//    int x = e.getX();
-//    int y = e.getY();
-//
-//    if (rollover != null) {
-//      //if (y > TOP && y < BOTTOM && x > rollover.left && x < rollover.right) {
-//      if (y > 0 && y < getHeight() && x > rollover.left && x < rollover.right) {
-//        // nothing has changed
-//        return;
-//
-//      } else {
-//        if (rollover.state == ROLLOVER) {
-//          rollover.setState(INACTIVE, true);
-//        }
-//        rollover = null;
-//      }
-//    }
-//    checkRollover(x, y);
-//  }
-
-
-//  public void mouseDragged(MouseEvent e) { }
-
-
-//  public void handleMouse(MouseEvent e) {
-//    int x = e.getX();
-//    int y = e.getY();
-//
-////    if (currentRollover != -1) {
-//    if (rollover != null) {
-////      if ((x > x1[currentRollover]) && (y > y1) &&
-////          (x < x2[currentRollover]) && (y < y2)) {
-//      if (y > y1 && y < y2 && x > rollover.left && x < rollover.right) {
-//        // nothing has changed
-//        return;
-//
-//      } else {
-////        setState(currentRollover, INACTIVE, true);
-//        rollover.setState(INACTIVE, true);
-////        currentRollover = -1;
-//        rollover = null;
-//      }
-//    }
-////    int sel = findSelection(x, y);
-//    Button over = findSelection(x, y);
-//    if (over != null) {
-////      if (state[sel] != ACTIVE) {
-//      if (over.state != ACTIVE) {
-////        setState(sel, ROLLOVER, true);
-//        over.setState(ROLLOVER, true);
-////        currentRollover = sel;
-//        rollover = over;
-//      }
-//    }
-//  }
-
-
-//  private int findSelection(int x, int y) {
-//    // if app loads slowly and cursor is near the buttons
-//    // when it comes up, the app may not have time to load
-//    if ((x1 == null) || (x2 == null)) return -1;
-//
-//    for (int i = 0; i < buttonCount; i++) {
-//      if ((y > y1) && (x > x1[i]) &&
-//          (y < y2) && (x < x2[i])) {
-//        //System.out.println("sel is " + i);
-//        return i;
-//      }
-//    }
-//    return -1;
-//  }
-
-  
-//  private Button findSelection(int x, int y) {
-//    // if app loads slowly and cursor is near the buttons
-//    // when it comes up, the app may not have time to load
-//    if (offscreen != null && y > 0 && y < getHeight()) {
-//      for (Button b : buttons) {
-//        if (x > b.left && x < b.right) {
-//          return b;
-//        }
-//      }
-//    }
-//    return null;
-//  }
-
-
-//  private void setState(int slot, int newState, boolean updateAfter) {
-//    if (buttonImages != null) {
-//      state[slot] = newState;
-//      stateImage[slot] = buttonImages[which[slot]][newState];
-//      if (updateAfter) {
-//        repaint();
-//      }
-//    }
-//  }
-
-
-//  public void mouseEntered(MouseEvent e) {
-////    handleMouse(e);
-//  }
-//
-//
-//  public void mouseExited(MouseEvent e) {
-////    // if the 'open' popup menu is visible, don't register this,
-////    // because the popup being set visible will fire a mouseExited() event
-////    if ((popup != null) && popup.isVisible()) return;
-//    // this might be better
-//    if (e.getComponent() != this) {
-//      return;
-//    }
-//
-//    // TODO another weird one.. come back to this
-////    if (state[OPEN] != INACTIVE) {
-////      setState(OPEN, INACTIVE, true);
-////    }
-////    handleMouse(e);
-//    
-//    // there is no more rollover, make sure that the rollover text goes away
-////    currentRollover = -1;
-//    if (rollover != null) {
-//      if (rollover.state == ROLLOVER) {
-//        rollover.setState(INACTIVE, true);
-//      }
-//      rollover = null;
-//    }
-//  }
-//
-////  int wasDown = -1;
-//
-//
-//  public void mousePressed(MouseEvent e) {
-//    // ignore mouse presses so hitting 'run' twice doesn't cause problems
-//    if (isEnabled()) {
-//      int x = e.getX();
-//      int y = e.getY();
-//      if (x > modeX1 && x < modeX2 && y > modeY1 && y < modeY2) {
-//        JPopupMenu popup = editor.getModeMenu().getPopupMenu();
-//        popup.show(this, x, y);
-//      }
-//      
-//      // Need to reset the rollover here. If the window isn't active, 
-//      // the rollover wouldn't have been updated.
-//      // http://code.google.com/p/processing/issues/detail?id=561
-//      checkRollover(x, y);
-//      if (rollover != null) {
-//        //handlePressed(rollover);
-//        handlePressed(e, buttons.indexOf(rollover));
-//      }
-//    }
-//  }
-  
-  
-//  public void mouseClicked(MouseEvent e) { }
-//
-//
-//  public void mouseReleased(MouseEvent e) { }
-//
-//
-////  public void handlePressed(Button b) {
-////    handlePressed(buttons.indexOf(b));
-////  }
-//    
-//  
-//  /**
-//   * Set a particular button to be active.
-//   */
-//  public void activate(int what) {
-////    setState(what, ACTIVE, true);
-//    buttons.get(what).setState(ACTIVE, true);
-//  }
-//
-//
-//  /**
-//   * Set a particular button to be active.
-//   */
-//  public void deactivate(int what) {
-////    setState(what, INACTIVE, true);
-//    buttons.get(what).setState(INACTIVE, true);
-//  }
-
-
-//  public Dimension getPreferredSize() {
-//    return getMinimumSize();
-//  }
-//
-//
-//  public Dimension getMinimumSize() {
-//    //int wide = 
-//    return new Dimension((buttons.size() + 1)*BUTTON_WIDTH, GAP + DIM + GAP);
-//  }
-//
-//
-//  public Dimension getMaximumSize() {
-//    return new Dimension(3000, Preferences.GRID_SIZE);
-//  }
-//
-//
-//  public void keyPressed(KeyEvent e) {
-//    if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
-//      shiftPressed = true;
-//      repaint();
-//    }
-//  }
-//
-//
-//  public void keyReleased(KeyEvent e) {
-//    if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
-//      shiftPressed = false;
-//      repaint();
-//    }
-//  }
-//
-//
-//  public void keyTyped(KeyEvent e) { }
-//
-//  
-//  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-//
-//  
-//  public void addButton(String title, String shiftTitle, Image[] images, boolean gap) {
-//    Button b = new Button(title, shiftTitle, images, gap);
-//    buttons.add(b);
-//  }
-//  
-//
-//  public class Button {
-//    /** Button's description. */ 
-//    String title;
-//    /** Description of alternate behavior when shift is down. */ 
-//    String titleShift;
-//    /** Three state images. */
-////    Image[] images;
-//    Map<ButtonState, Image> images;
-//    /** Current state value, one of ACTIVE, INACTIVE, ROLLOVER. */
-//    int state;
-//    /** Current state image. */
-//    Image stateImage;
-//    /** Left and right coordinates. */
-//    int left, right;
-//    /** Whether there's a gap before this button. */
-//    boolean gap;
-//    
-////    JPopupMenu popup;
-////    JMenu menu;
-//
-//
-//    public Button(String title, String titleShift, Image[] images, boolean gap) {
-//      this.title = title;
-//      this.titleShift = titleShift;
-//      this.images = images;
-//      this.gap = gap;
-//      
-//      state = INACTIVE;
-//      stateImage = images[INACTIVE];
-//    }
-//    
-//    
-////    public void setMenu(JMenu menu) {
-////      this.menu = menu;
-////    }
-//
-//    
-//    public void setState(int newState, boolean updateAfter) {
-//      state = newState;
-//      stateImage = images[newState];
-//      if (updateAfter) {
-//        repaint();
-//      }
-//    }
-//  }
-//  
-//  
-//  public Image[][] loadDebugImages() {
-//    int res = Toolkit.highResDisplay() ? 2 : 1;
-//    
-//    String suffix = null; 
-//    Image allButtons = null;
-//    // Some modes may not have a 2x version. If a mode doesn't have a 1x 
-//    // version, this will cause an error... they should always have 1x.
-//    if (res == 2) {
-//      suffix = "-2x.png";
-//      allButtons = mode.loadImage("theme/buttons-debug" + suffix);
-//      if (allButtons == null) {
-//        res = 1;  // take him down a notch
-//      }
-//    }
-//    if (res == 1) {
-//      suffix = ".png";
-//      allButtons = mode.loadImage("theme/buttons-debug" + suffix);
-//      if (allButtons == null) {
-//        // use the old (pre-2.0b9) file name
-//        suffix = ".gif";
-//        allButtons = mode.loadImage("theme/buttons-debug" + suffix);
-//      }
-//    }
-//    
-//    // The following three final fields were not accessible, so just copied the values here
-//    // for the time being. TODO: inform Ben, make these fields public
-//    /** Width of each toolbar button. */
-//    final int BUTTON_WIDTH = 27;
-//    /** Size (both width and height) of the buttons in the source image. */
-//    final int BUTTON_IMAGE_SIZE = 33;
-//    int count = allButtons.getWidth(this) / BUTTON_WIDTH*res;
-//    final int GRID_SIZE = 32;
-//    
-//    Image[][] buttonImages = new Image[count][3];
-//    
-//    for (int i = 0; i < count; i++) {
-//      for (int state = 0; state < 3; state++) {
-//        Image image = new BufferedImage(BUTTON_WIDTH*res, GRID_SIZE*res, BufferedImage.TYPE_INT_ARGB);
-//        Graphics g = image.getGraphics();
-//        g.drawImage(allButtons, 
-//                    -(i*BUTTON_IMAGE_SIZE*res) - 3, 
-//                    (state-2)*BUTTON_IMAGE_SIZE*res, null);
-//        g.dispose();
-//        buttonImages[i][state] = image;
-//      }
-//    }
-//    
-//    return buttonImages;
-//  }
-//  
-//  
-//  /**
-//   * Initialize buttons. Loads images and adds the buttons to the toolbar.
-//   */
-//  @Override
-//  public void init() {
-//    Image[][] images = loadDebugImages();
-//    for (int idx = 0; idx < buttonSequence.length; idx++) {
-//      int id = buttonId(idx);
-//      //addButton(getTitle(id, false), getTitle(id, true), images[idx], id == NEW || id == TOGGLE_BREAKPOINT);
-//      addButton(getTitle(id, false), getTitle(id, true), images[idx], id == TOGGLE_BREAKPOINT);
-//    }
-//  }
-//
-//  
-//  /**
-//   * Get the title for a toolbar button. Displayed in the toolbar when
-//   * hovering over a button.
-//   * @param id id of the toolbar button
-//   * @param shift true if shift is pressed
-//   * @return the title
-//   */
-//  public static String getTitle(int id, boolean shift) {
-//    switch (id) {
-//    case DebugToolbar.RUN:
-//      return JavaToolbar.getTitle(JavaToolbar.RUN, shift);
-//    case STOP:
-//      return JavaToolbar.getTitle(JavaToolbar.STOP, shift);
-////    case NEW:
-////      return JavaToolbar.getTitle(JavaToolbar.NEW, shift);
-////    case OPEN:
-////      return JavaToolbar.getTitle(JavaToolbar.OPEN, shift);
-////    case SAVE:
-////      return JavaToolbar.getTitle(JavaToolbar.SAVE, shift);
-////    case EXPORT:
-////      return JavaToolbar.getTitle(JavaToolbar.EXPORT, shift);
-//    case DEBUG:
-//      if (shift) {
-//        return Language.text("toolbar.run");
-//      } else {
-//        return Language.text("toolbar.debug.debug");
-//      }
-//    case TOGGLE_VAR_INSPECTOR:
-//      return Language.text("toolbar.debug.variable_inspector");
-//    }
-//    return null;
-//  }
-//
-//  
-//  /**
-//   * Event handler called when a toolbar button is clicked.
-//   * @param e the mouse event
-//   * @param idx index (i.e. position) of the toolbar button clicked
-//   */
-//  @Override
-//  public void handlePressed(MouseEvent e, int idx) {
-//    boolean shift = e.isShiftDown();
-//    JavaEditor deditor = (JavaEditor) editor;
-//    int id = buttonId(idx); // convert index/position to button id
-//
-//    switch (id) {
-////            case DebugToolbar.RUN:
-////                super.handlePressed(e, JavaToolbar.RUN);
-////                break;
-//    case STOP:
-//      Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Stop' toolbar button");
-//      super.handlePressed(e, JavaToolbar.STOP);
-//      break;
-////    case NEW:
-////      Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'New' toolbar button");
-////      super.handlePressed(e, JavaToolbar.NEW);
-////      break;
-////    case OPEN:
-////      Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Open' toolbar button");
-////      super.handlePressed(e, JavaToolbar.OPEN);
-////      break;
-////    case SAVE:
-////      Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Save' toolbar button");
-////      super.handlePressed(e, JavaToolbar.SAVE);
-////      break;
-////    case EXPORT:
-////      Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Export' toolbar button");
-////      super.handlePressed(e, JavaToolbar.EXPORT);
-////      break;
-//    case DEBUG:
-//      deditor.handleStop(); // Close any running sketches
-//      deditor.showProblemListView(XQConsoleToggle.CONSOLE);
-//      if (shift) {
-//        Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Run' toolbar button");
-//        deditor.handleRun();
-//      } else {
-//        Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Debug' toolbar button");
-//        deditor.debugger.startDebug();
-//      }
-//      break;
-//    case CONTINUE:
-//      Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Continue' toolbar button");
-//      deditor.debugger.continueDebug();
-//      break;
-//    case TOGGLE_BREAKPOINT:
-//      Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Toggle Breakpoint' toolbar button");
-//      deditor.debugger.toggleBreakpoint();
-//      break;
-//    case STEP:
-//      if (shift) {
-//        Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Step Into' toolbar button");
-//        deditor.debugger.stepInto();
-//      } else {
-//        Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Step' toolbar button");
-//        deditor.debugger.stepOver();
-//      }
-//      break;
-////            case STEP_INTO:
-////                deditor.dbg.stepInto();
-////                break;
-////            case STEP_OUT:
-////                deditor.dbg.stepOut();
-////                break;
-//    case TOGGLE_VAR_INSPECTOR:
-//      Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Variable Inspector' toolbar button");
-//      deditor.toggleVariableInspector();
-//      break;
-//    }
-//  }
-//
-//  
-//  /**
-//   * Activate (light up) a button.
-//   * @param id the button id
-//   */
-//  @Override
-//  public void activate(int id) {
-//    //System.out.println("activate button idx: " + buttonIndex(id));
-//    super.activate(buttonIndex(id));
-//  }
-//
-//  
-//  /**
-//   * Set a button to be inactive.
-//   * @param id the button id
-//   */
-//  @Override
-//  public void deactivate(int id) {
-//    //System.out.println("deactivate button idx: " + buttonIndex(id));
-//    super.deactivate(buttonIndex(id));
-//  }
-//
-//  
-//  /**
-//   * Get button position (index) from it's id.
-//   * @param buttonId the button id
-//   * ({@link #RUN}, {@link #DEBUG}, {@link #CONTINUE}), {@link #STEP}, ...)
-//   * @return the button index
-//   */
-//  protected int buttonIndex(int buttonId) {
-//    for (int i = 0; i < buttonSequence.length; i++) {
-//      if (buttonSequence[i] == buttonId) {
-//        return i;
-//      }
-//    }
-//    return -1;
-//  }
-//
-//  
-//  /**
-//   * Get the button id from its position (index).
-//   * @param buttonIdx the button index
-//   * @return the button id
-//   * ({@link #RUN}, {@link #DEBUG}, {@link #CONTINUE}), {@link #STEP}, ...)
-//   */
-//  protected int buttonId(int buttonIdx) {
-//    return buttonSequence[buttonIdx];
-//  }
-}
diff --git a/java/src/processing/mode/java/DebugTray.java b/java/src/processing/mode/java/DebugTray.java
index a48348444..cce12dd7e 100644
--- a/java/src/processing/mode/java/DebugTray.java
+++ b/java/src/processing/mode/java/DebugTray.java
@@ -21,6 +21,7 @@
 package processing.mode.java;
 
 import java.awt.*;
+import java.awt.event.ActionEvent;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 import java.awt.image.BufferedImage;
@@ -41,11 +42,15 @@ import org.netbeans.swing.outline.*;
 
 import com.sun.jdi.Value;
 
+import processing.app.EditorButton;
+import processing.app.Language;
 import processing.app.Mode;
 import processing.mode.java.debug.VariableNode;
 
 
 public class DebugTray extends JFrame {
+  static public final int GAP = 13;
+  
   /// the root node (invisible)
   protected DefaultMutableTreeNode rootNode;
   
@@ -83,18 +88,97 @@ public class DebugTray extends JFrame {
   // The tray will be placed at this amount from the top of the editor window,
   // and extend to this amount from the bottom of the editor window.
   final int VERTICAL_OFFSET = 64;
+  
+  EditorButton continueButton;
+  EditorButton stepButton;
+  EditorButton breakpointButton;
     
   
-  public DebugTray(JavaEditor editor) {
-    this.editor = editor;
-    
+  public DebugTray(final JavaEditor editor) {
     setUndecorated(true);
+    
+    this.editor = editor;    
     editor.addComponentListener(new EditorFollower());
 
+    setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+    add(createToolbar());
+    add(createScrollPane());
+    pack();
+    
+    /*
+    bgColor = mode.getColor("buttons.bgcolor");
+    statusFont = mode.getFont("buttons.status.font");
+    statusColor = mode.getColor("buttons.status.color");
+//    modeTitle = mode.getTitle().toUpperCase();
+    modeTitle = mode.getTitle();
+    modeTextFont = mode.getFont("mode.button.font");
+    modeButtonColor = mode.getColor("mode.button.color");    
+    */
+  }
+  
+  
+  Container createToolbar() {
+    final Mode mode = editor.getMode();
+    Box box = Box.createHorizontalBox();
+
+    continueButton = 
+      new EditorButton(mode, "debug-continue", 
+                       Language.text("toolbar.debug.continue")) {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        Logger.getLogger(DebugTray.class.getName()).log(Level.INFO, "Invoked 'Continue' toolbar button");
+        editor.debugger.continueDebug();
+      }
+    };
+    box.add(continueButton);
+    box.add(Box.createHorizontalStrut(GAP));
+    
+    stepButton = 
+      new EditorButton(mode, "debug-step",
+                       Language.text("toolbar.debug.step"),
+                       Language.text("toolbar.debug.step_into")) {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        if (isShiftDown()) {
+          Logger.getLogger(DebugTray.class.getName()).log(Level.INFO, "Invoked 'Step Into' toolbar button");
+          editor.debugger.stepInto();
+        } else {
+          Logger.getLogger(DebugTray.class.getName()).log(Level.INFO, "Invoked 'Step' toolbar button");
+          editor.debugger.stepOver();
+        }
+      }
+    };
+    box.add(stepButton);
+    box.add(Box.createHorizontalStrut(GAP));
+
+    breakpointButton = 
+      new EditorButton(mode, "debug-breakpoint",
+                       Language.text("toolbar.debug.toggle_breakpoints")) {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        Logger.getLogger(DebugTray.class.getName()).log(Level.INFO, "Invoked 'Toggle Breakpoint' toolbar button");
+        editor.debugger.toggleBreakpoint();
+      }
+    };
+    add(breakpointButton);
+    box.add(Box.createHorizontalStrut(GAP));
+
+    JLabel label = new JLabel();
+    box.add(label);
+    continueButton.setRolloverLabel(label);
+    stepButton.setRolloverLabel(label);
+    breakpointButton.setRolloverLabel(label);
+    
+    return box;
+  }
+  
+  
+  Container createScrollPane() {
     scrollPane = new JScrollPane();
     tree = new Outline();
     scrollPane.setViewportView(tree);
 
+    /*
     GroupLayout layout = new GroupLayout(getContentPane());
     getContentPane().setLayout(layout);
     layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -111,6 +195,7 @@ public class DebugTray extends JFrame {
                                                     GroupLayout.DEFAULT_SIZE, 
                                                     300, Short.MAX_VALUE)));
     pack();
+    */
     
     // setup Outline
     rootNode = new DefaultMutableTreeNode("root");
@@ -140,23 +225,38 @@ public class DebugTray extends JFrame {
     thisFields = new ArrayList<VariableNode>();
     declaredThisFields = new ArrayList<VariableNode>();
 
-//    this.setTitle(editor.getSketch().getName());
+    return scrollPane;
   }
+
   
-  
-  class TrayToolbar extends JComponent {
+  protected void activateContinue() {
+  }
+
+
+  protected void deactivateContinue() {
+  }
+
+
+  protected void activateStep() {
+  }
+
+
+  protected void deactivateStep() {
+  }  
     
-  }
-  
   
   /** Keeps the debug window adjacent the editor at all times. */
   class EditorFollower implements ComponentListener {
 
     @Override
-    public void componentShown(ComponentEvent e) { }
+    public void componentShown(ComponentEvent e) { 
+      setVisible(true);
+    }
 
     @Override
-    public void componentHidden(ComponentEvent e) { }
+    public void componentHidden(ComponentEvent e) { 
+      setVisible(false);
+    }
 
     @Override
     public void componentResized(ComponentEvent e) {
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 1ce21e281..c04dc96f0 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -49,8 +49,8 @@ public class JavaEditor extends Editor {
   // Runner associated with this editor window
   private Runner runtime;
 
-  // Need to sort through the rest of these additions... 
-  
+  // Need to sort through the rest of these additions...
+
   protected Color breakpointColor;  // = new Color(240, 240, 240); // the background color for highlighting lines
   protected Color currentLineColor; // = new Color(255, 255, 150); // the background color for highlighting lines
   protected Color breakpointMarkerColor; // = new Color(74, 84, 94); // the color of breakpoint gutter markers
@@ -66,20 +66,20 @@ public class JavaEditor extends Editor {
   protected DebugTray tray;
 
 //  private EditorToolbar javaToolbar;
-  private DebugToolbar debugToolbar;
-    
+//  private DebugToolbar debugToolbar;
+
   private ErrorBar errorBar;
-    
+
   protected XQConsoleToggle btnShowConsole;
   protected XQConsoleToggle btnShowErrors;
   protected JScrollPane errorTableScrollPane;
-  protected JPanel consoleProblemsPane;    
+  protected JPanel consoleProblemsPane;
   protected XQErrorTable errorTable;
 
   // TODO how is this different from hasJavaTabs?
 //  public boolean compilationCheckEnabled = true;
   private boolean hasJavaTabs;
-  
+
 
   protected JavaEditor(Base base, String path, EditorState state, Mode mode) {
     super(base, path, state, mode);
@@ -103,7 +103,7 @@ public class JavaEditor extends Editor {
       public void actionPerformed(ActionEvent e) {
         handleRefactor();
       }
-    });        
+    });
 
     // TODO: Add support for word select on right click and rename.
     //        ta.customPainter.addMouseListener(new MouseAdapter() {
@@ -140,12 +140,12 @@ public class JavaEditor extends Editor {
 
     getJavaTextArea().setECSandThemeforTextArea(errorCheckerService, jmode);
 
-    addXQModeUI();    
+    addXQModeUI();
 //    debugToolbarEnabled = new AtomicBoolean(false);
     //log("Sketch Path: " + path);
   }
-  
-  
+
+
   protected JEditTextArea createTextArea() {
     //return new JEditTextArea(new PdeTextAreaDefaults(mode), new JavaInputHandler(this));
     return new JavaTextArea(new PdeTextAreaDefaults(mode), this);
@@ -208,7 +208,7 @@ public class JavaEditor extends Editor {
         handleStop();
       }
     });
-    
+
     JMenuItem tweakItem = Toolkit.newJMenuItemShift(Language.text("menu.sketch.tweak"), 'T');
       tweakItem.setSelected(JavaMode.enableTweak);
       tweakItem.addActionListener(new ActionListener() {
@@ -218,12 +218,12 @@ public class JavaEditor extends Editor {
         }
       });
 
-    return buildSketchMenu(new JMenuItem[] { 
-      runItem, presentItem, tweakItem, stopItem 
+    return buildSketchMenu(new JMenuItem[] {
+      runItem, presentItem, tweakItem, stopItem
     });
   }
 
-  
+
   public JMenu buildHelpMenu() {
     JMenu menu = new JMenu(Language.text("menu.help"));
     JMenuItem item;
@@ -264,28 +264,28 @@ public class JavaEditor extends Editor {
       }
     });
     menu.add(item);
-    
+
     menu.addSeparator();
-    
+
     final JMenu libRefSubmenu = new JMenu(Language.text("menu.help.libraries_reference"));
-    // Populate only when sub-menu is opened, to avoid having spurious menu 
+    // Populate only when sub-menu is opened, to avoid having spurious menu
     // options if a library is deleted, or a missing menu option if a library is added
     libRefSubmenu.addMenuListener(new MenuListener() {
-      
+
       @Override
       public void menuSelected(MenuEvent e) {
         boolean isCoreLibMenuItemAdded = false;
         boolean isContribLibMenuItemAdded = false;
-        
+
         // Adding this in case references are included in a core library,
         // or other core libraries are incuded in future
         isCoreLibMenuItemAdded = addLibReferencesToSubMenu(mode.coreLibraries, libRefSubmenu);
-        
+
         if (isCoreLibMenuItemAdded && !mode.contribLibraries.isEmpty())
           libRefSubmenu.addSeparator();
-        
+
         isContribLibMenuItemAdded = addLibReferencesToSubMenu(mode.contribLibraries, libRefSubmenu);
-        
+
         if (!isContribLibMenuItemAdded && !isCoreLibMenuItemAdded) {
           JMenuItem emptyMenuItem = new JMenuItem(Language.text("menu.help.empty"));
           emptyMenuItem.setEnabled(false);
@@ -299,38 +299,38 @@ public class JavaEditor extends Editor {
           addLibReferencesToSubMenu(mode.coreLibraries, libRefSubmenu);
         }
       }
-      
+
       @Override
       public void menuDeselected(MenuEvent e) {
         libRefSubmenu.removeAll();
       }
-      
+
       @Override
       public void menuCanceled(MenuEvent e) {
         menuDeselected(e);
       }
     });
     menu.add(libRefSubmenu);
-    
+
     final JMenu toolRefSubmenu = new JMenu(Language.text("menu.help.tools_reference"));
-    // Populate only when sub-menu is opened, to avoid having spurious menu 
+    // Populate only when sub-menu is opened, to avoid having spurious menu
     // options if a tool is deleted, or a missing menu option if a library is added
     toolRefSubmenu.addMenuListener(new MenuListener() {
-      
+
       @Override
       public void menuSelected(MenuEvent e) {
         boolean isCoreToolMenuItemAdded = false;
         boolean isContribToolMenuItemAdded = false;
-        
+
         // Adding this in in case a reference folder is added for MovieMaker, or in case
         // other core tools are introduced later
         isCoreToolMenuItemAdded = addToolReferencesToSubMenu(getCoreTools(), toolRefSubmenu);
-        
+
         if (isCoreToolMenuItemAdded && !contribTools.isEmpty())
           toolRefSubmenu.addSeparator();
-        
+
         isContribToolMenuItemAdded = addToolReferencesToSubMenu(contribTools, toolRefSubmenu);
-        
+
         if (!isContribToolMenuItemAdded && !isCoreToolMenuItemAdded) {
           toolRefSubmenu.removeAll(); // in case a separator was added
           final JMenuItem emptyMenuItem = new JMenuItem(Language.text("menu.help.empty"));
@@ -346,12 +346,12 @@ public class JavaEditor extends Editor {
           addToolReferencesToSubMenu(getCoreTools(), toolRefSubmenu);
         }
       }
-      
+
       @Override
       public void menuDeselected(MenuEvent e) {
         toolRefSubmenu.removeAll();
       }
-      
+
       @Override
       public void menuCanceled(MenuEvent e) {
         menuDeselected(e);
@@ -387,7 +387,7 @@ public class JavaEditor extends Editor {
       }
     });
     menu.add(item);
-    
+
     item = new JMenuItem(Language.text("menu.help.foundation"));
     item.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -416,7 +416,7 @@ public class JavaEditor extends Editor {
    * reference accompanying it. The JMenuItems open the index.htm/index.html
    * file of the reference in the user's default browser, or the readme.txt in
    * the user's default text editor.
-   * 
+   *
    * @param libsList
    *          A list of the Libraries to be added
    * @param subMenu
@@ -447,12 +447,12 @@ public class JavaEditor extends Editor {
 
 
   /**
-   * 
+   *
    * Populates the JMenu with JMenuItems, one for each Tool that has a reference
    * accompanying it. The JMenuItems open the index.htm/index.html file of the
    * reference in the user's default browser, or the readme.txt in the user's
    * default text editor.
-   * 
+   *
    * @param toolsList
    *          A list of Tools to be added
    * @param subMenu
@@ -549,10 +549,10 @@ public class JavaEditor extends Editor {
 //    toolbar.deactivate(JavaToolbar.EXPORT);
   }
 
-  
+
 //  JPanel presentColorPanel;
 //  JTextField presentColorPanel;
-  
+
   protected boolean exportApplicationPrompt() throws IOException, SketchException {
     JPanel panel = new JPanel();
     panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
@@ -627,10 +627,10 @@ public class JavaEditor extends Editor {
     platformPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
     panel.add(platformPanel);
     int divWidth = platformPanel.getPreferredSize().width;
-    
+
     //int indent = new JCheckBox().getPreferredSize().width;
     int indent = 0;
-    
+
     final JCheckBox showStopButton = new JCheckBox(Language.text("export.options.show_stop_button"));
     showStopButton.setSelected(Preferences.getBoolean("export.application.stop"));
     showStopButton.addItemListener(new ItemListener() {
@@ -657,7 +657,7 @@ public class JavaEditor extends Editor {
     presentPanel.setLayout(new BoxLayout(presentPanel, BoxLayout.Y_AXIS));
     Box fullScreenBox = Box.createHorizontalBox();
     fullScreenBox.add(fullScreenButton);
-    
+
     /*
     //run.present.stop.color
 //    presentColorPanel = new JTextField();
@@ -681,7 +681,7 @@ public class JavaEditor extends Editor {
     fullScreenBox.add(Box.createHorizontalGlue());
 
     presentPanel.add(fullScreenBox);
-    
+
 //    presentColorPanel.addMouseListener(new MouseAdapter() {
 //      public void mousePressed(MouseEvent e) {
 //        new ColorListener("run.present.bgcolor");
@@ -694,7 +694,7 @@ public class JavaEditor extends Editor {
     showStopBox.add(Box.createHorizontalStrut(10));
     showStopBox.add(Box.createHorizontalGlue());
     presentPanel.add(showStopBox);
-    
+
     //presentPanel.add(showStopButton);
 //    presentPanel.add(Box.createHorizontalStrut(10));
 //    presentPanel.add(Box.createHorizontalGlue());
@@ -709,12 +709,12 @@ public class JavaEditor extends Editor {
 //    good = new Dimension(wide, label2.getPreferredSize().height);
 //    label2.setMaximumSize(good);
 //    good = new Dimension(wide, presentPanel.getPreferredSize().height);
-    
+
     //
-    
+
     JPanel embedPanel = new JPanel();
     embedPanel.setLayout(new BoxLayout(embedPanel, BoxLayout.Y_AXIS));
-    
+
     String platformName = null;
     if (Base.isMacOS()) {
       platformName = "Mac OS X";
@@ -723,16 +723,16 @@ public class JavaEditor extends Editor {
     } else if (Base.isLinux()) {
       platformName = "Linux (" + Base.getNativeBits() + "-bit)";
     }
-    
+
     boolean embed = Preferences.getBoolean("export.application.embed_java");
     final String embedWarning =
-      "<html><div width=\"" + divWidth + "\"><font size=\"2\">" + 
+      "<html><div width=\"" + divWidth + "\"><font size=\"2\">" +
 //      "<html><body><font size=2>" +
       "Embedding Java will make the " + platformName + " application " +
       "larger, but it will be far more likely to work. " +
       "Users on other platforms will need to <a href=\"\">install Java 7</a>.";
-    final String nopeWarning = 
-      "<html><div width=\"" + divWidth + "\"><font size=\"2\">" + 
+    final String nopeWarning =
+      "<html><div width=\"" + divWidth + "\"><font size=\"2\">" +
 //      "<html><body><font size=2>" +
       "Users on all platforms will have to install the latest " +
       "version of Java 7 from <a href=\"\">http://java.com/download</a>. " +
@@ -746,7 +746,7 @@ public class JavaEditor extends Editor {
     });
     warningLabel.setBorder(new EmptyBorder(3, 13 + indent, 3, 13));
 
-    final JCheckBox embedJavaButton = 
+    final JCheckBox embedJavaButton =
       new JCheckBox(Language.text("export.embed_java.for") + " " + platformName);
     embedJavaButton.setSelected(embed);
     embedJavaButton.addItemListener(new ItemListener() {
@@ -761,48 +761,48 @@ public class JavaEditor extends Editor {
       }
     });
     embedJavaButton.setBorder(new EmptyBorder(3, 13, 3, 13));
-    
+
     embedPanel.add(embedJavaButton);
     embedPanel.add(warningLabel);
     embedPanel.setBorder(new TitledBorder(Language.text("export.embed_java")));
     panel.add(embedPanel);
-    
+
     //
-    
+
     if (Base.isMacOS()) {
       JPanel signPanel = new JPanel();
       signPanel.setLayout(new BoxLayout(signPanel, BoxLayout.Y_AXIS));
       signPanel.setBorder(new TitledBorder(Language.text("export.code_signing")));
-      
+
       // gatekeeper: http://support.apple.com/kb/ht5290
       // for developers: https://developer.apple.com/developer-id/
       String thePain =
         //"<html><body><font size=2>" +
-        "In recent versions of OS X, Apple has introduced the \u201CGatekeeper\u201D system, " + 
+        "In recent versions of OS X, Apple has introduced the \u201CGatekeeper\u201D system, " +
         "which makes it more difficult to run applications like those exported from Processing. ";
-      
+
       if (new File("/usr/bin/codesign_allocate").exists()) {
-        thePain +=  
+        thePain +=
           "This application will be \u201Cself-signed\u201D which means that Finder may report that the " +
-          "application is from an \u201Cunidentified developer\u201D. If the application will not " + 
+          "application is from an \u201Cunidentified developer\u201D. If the application will not " +
           "run, try right-clicking the app and selecting Open from the pop-up menu. Or you can visit " +
-          "System Preferences \u2192 Security & Privacy and select Allow apps downloaded from: anywhere. ";          
+          "System Preferences \u2192 Security & Privacy and select Allow apps downloaded from: anywhere. ";
       } else {
-        thePain += 
+        thePain +=
           "Gatekeeper requires applications to be \u201Csigned\u201D, or they will be reported as damaged. " +
-          "To prevent this message, install Xcode (and the Command Line Tools) from the App Store, or visit " + 
+          "To prevent this message, install Xcode (and the Command Line Tools) from the App Store, or visit " +
           "System Preferences \u2192 Security & Privacy and select Allow apps downloaded from: anywhere. ";
       }
-      thePain += 
+      thePain +=
         "To avoid the messages entirely, manually code sign your app. " +
         "For more information: <a href=\"\">https://developer.apple.com/developer-id/</a>";
-      
+
       // xattr -d com.apple.quarantine thesketch.app
-      
+
       //signPanel.add(new JLabel(thePain));
       //JEditorPane area = new JEditorPane("text/html", thePain);
       //JTextPane area = new JEditorPane("text/html", thePain);
-      
+
 //      JTextArea area = new JTextArea(thePain);
 //      area.setBackground(null);
 //      area.setFont(new Font("Dialog", Font.PLAIN, 10));
@@ -810,27 +810,27 @@ public class JavaEditor extends Editor {
 //      area.setWrapStyleWord(true);
       // Are you f-king serious, Java API developers?
       JLabel area = new JLabel("<html><div width=\"" + divWidth + "\"><font size=\"2\">" + thePain + "</div></html>");
-      
+
       area.setBorder(new EmptyBorder(3, 13, 3, 13));
 //      area.setPreferredSize(new Dimension(embedPanel.getPreferredSize().width, 100));
 //      area.setPreferredSize(new Dimension(300, 200));
       signPanel.add(area);
 //      signPanel.add(Box.createHorizontalGlue());
       signPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
-      
+
       area.addMouseListener(new MouseAdapter() {
         public void mousePressed(MouseEvent event) {
           Base.openURL("https://developer.apple.com/developer-id/");
         }
       });
-      
+
       panel.add(signPanel);
     }
     //System.out.println(panel.getPreferredSize());
 //    panel.setMinimumSize(new Dimension(316, 461));
 //    panel.setPreferredSize(new Dimension(316, 461));
 //    panel.setMaximumSize(new Dimension(316, 461));
-    
+
     //
 
     String[] options = { Language.text("prompt.export"), Language.text("prompt.cancel") };
@@ -846,7 +846,7 @@ public class JavaEditor extends Editor {
     final JDialog dialog = new JDialog(this, Language.text("export"), true);
     dialog.setContentPane(optionPane);
 //    System.out.println(optionPane.getLayout());
-    
+
     optionPane.addPropertyChangeListener(new PropertyChangeListener() {
       public void propertyChange(PropertyChangeEvent e) {
         String prop = e.getPropertyName();
@@ -854,7 +854,7 @@ public class JavaEditor extends Editor {
         if (dialog.isVisible() &&
             (e.getSource() == optionPane) &&
             (prop.equals(JOptionPane.VALUE_PROPERTY))) {
-          // If you were going to check something before  
+          // If you were going to check something before
           // closing the window, you'd do it here.
           dialog.setVisible(false);
         }
@@ -864,13 +864,13 @@ public class JavaEditor extends Editor {
 //    System.out.println("after pack: " + panel.getPreferredSize());
 //    dialog.setSize(optionPane.getPreferredSize());
     dialog.setResizable(false);
-    
+
     // Center the window in the middle of the editor
     Rectangle bounds = getBounds();
     dialog.setLocation(bounds.x + (bounds.width - dialog.getSize().width) / 2,
                        bounds.y + (bounds.height - dialog.getSize().height) / 2);
     dialog.setVisible(true);
-    
+
     //System.out.println(panel.getSize());
 
     Object value = optionPane.getValue();
@@ -885,9 +885,9 @@ public class JavaEditor extends Editor {
 
   /*
   Color bgcolor = Preferences.getColor("run.present.bgcolor");
-  final ColorChooser c = new ColorChooser(JavaEditor.this, true, bgcolor, 
+  final ColorChooser c = new ColorChooser(JavaEditor.this, true, bgcolor,
                                           "Select", new ActionListener() {
-    
+
     @Override
     public void actionPerformed(ActionEvent e) {
       Preferences.setColor("run.present.bgcolor", c.getColor());
@@ -899,7 +899,7 @@ public class JavaEditor extends Editor {
   class ColorListener implements ActionListener {
     ColorChooser chooser;
     String prefName;
-    
+
     public ColorListener(String prefName) {
       this.prefName = prefName;
       Color color = Preferences.getColor(prefName);
@@ -914,21 +914,21 @@ public class JavaEditor extends Editor {
 //      presentColorPanel.setBackground(color);
       presentColorPanel.repaint();
       chooser.hide();
-    }    
+    }
   }
   */
-  
+
   class ColorPreference extends JPanel implements ActionListener {
     ColorChooser chooser;
     String prefName;
-    
+
     public ColorPreference(String pref) {
       prefName = pref;
-      
+
       setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED));
       setPreferredSize(new Dimension(30, 20));
       setMaximumSize(new Dimension(30, 20));
-      
+
       addMouseListener(new MouseAdapter() {
         public void mouseReleased(MouseEvent e) {
           Color color = Preferences.getColor(prefName);
@@ -937,7 +937,7 @@ public class JavaEditor extends Editor {
         }
       });
     }
-    
+
     public void paintComponent(Graphics g) {
       g.setColor(Preferences.getColor(prefName));
       Dimension size = getSize();
@@ -952,13 +952,13 @@ public class JavaEditor extends Editor {
       chooser.hide();
     }
   }
-  
-  
+
+
 //  protected void selectColor(String prefName) {
 //    Color color = Preferences.getColor(prefName);
-//    final ColorChooser chooser = new ColorChooser(JavaEditor.this, true, color, 
+//    final ColorChooser chooser = new ColorChooser(JavaEditor.this, true, color,
 //                                            "Select", new ActionListener() {
-//      
+//
 //      @Override
 //      public void actionPerformed(ActionEvent e) {
 //        Preferences.setColor(prefName, c.getColor());
@@ -966,7 +966,7 @@ public class JavaEditor extends Editor {
 //    });
 //  }
 
-  
+
   /**
    * Checks to see if the sketch has been modified, and if so,
    * asks the user to save the sketch or cancel the export.
@@ -1040,7 +1040,7 @@ public class JavaEditor extends Editor {
   public void handleStop() {
     if (debugger.isStarted()) {
       debugger.stopDebug();
-      
+
     } else {
       toolbar.activate(JavaToolbar.STOP);
 
@@ -1063,8 +1063,8 @@ public class JavaEditor extends Editor {
       toFront();
     }
   }
-  
-  
+
+
   public void handleSave() {
 //    toolbar.activate(JavaToolbar.SAVE);
     super.handleSave(true);
@@ -1117,7 +1117,7 @@ public class JavaEditor extends Editor {
     if (mode.isDefaultExtension(sketch.getCurrentCode())) {
       sketch.setCurrentCode(0);
     }
-    
+
     Library lib = mode.findLibraryByName(libraryName);
     if (lib == null) {
       statusError("Unable to locate library: "+libraryName);
@@ -1127,9 +1127,9 @@ public class JavaEditor extends Editor {
     // could also scan the text in the file to see if each import
     // statement is already in there, but if the user has the import
     // commented out, then this will be a problem.
-    String[] list = lib.getSpecifiedImports(); // ask the library for its imports 
+    String[] list = lib.getSpecifiedImports(); // ask the library for its imports
     if (list == null) {
-      
+
       // Default to old behavior and load each package in the primary jar
       list = Base.packageListFromClassPath(lib.getJarPath());
     }
@@ -1182,74 +1182,72 @@ public class JavaEditor extends Editor {
     }
     handleStop();
   }
-    
-  
+
+
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-  
-  // Additions from PDE X, Debug Mode, Twerk Mode... 
 
-  
-    private void addXQModeUI(){
-      
-      // Adding ErrorBar
-      JPanel textAndError = new JPanel();
-      Box box = (Box) textarea.getParent();
-      box.remove(2); // Remove textArea from it's container, i.e Box
-      textAndError.setLayout(new BorderLayout());
-      errorBar =  new ErrorBar(this, textarea.getMinimumSize().height, jmode);
-      textAndError.add(errorBar, BorderLayout.EAST);
-      textarea.setBounds(0, 0, errorBar.getX() - 1, textarea.getHeight());
-      textAndError.add(textarea);
-      box.add(textAndError);
-      
-      // Adding Error Table in a scroll pane
-      errorTableScrollPane = new JScrollPane();
-      errorTable = new XQErrorTable(errorCheckerService);
-      // errorTableScrollPane.setBorder(new EmptyBorder(2, 2, 2, 2));
-      errorTableScrollPane.setBorder(new EtchedBorder());
-      errorTableScrollPane.setViewportView(errorTable);
+  // Additions from PDE X, Debug Mode, Twerk Mode...
 
-      // Adding toggle console button
-      consolePanel.remove(2);
-      JPanel lineStatusPanel = new JPanel();
-      lineStatusPanel.setLayout(new BorderLayout());
-      btnShowConsole = new XQConsoleToggle(this,
-          XQConsoleToggle.CONSOLE, lineStatus.getHeight());
-      btnShowErrors = new XQConsoleToggle(this,
-          XQConsoleToggle.ERRORSLIST, lineStatus.getHeight());
-      btnShowConsole.addMouseListener(btnShowConsole);
 
-      // lineStatusPanel.add(btnShowConsole, BorderLayout.EAST);
-      // lineStatusPanel.add(btnShowErrors);
-      btnShowErrors.addMouseListener(btnShowErrors);
+  private void addXQModeUI(){
+    // Adding ErrorBar
+    JPanel textAndError = new JPanel();
+    Box box = (Box) textarea.getParent();
+    box.remove(2); // Remove textArea from it's container, i.e Box
+    textAndError.setLayout(new BorderLayout());
+    errorBar =  new ErrorBar(this, textarea.getMinimumSize().height, jmode);
+    textAndError.add(errorBar, BorderLayout.EAST);
+    textarea.setBounds(0, 0, errorBar.getX() - 1, textarea.getHeight());
+    textAndError.add(textarea);
+    box.add(textAndError);
 
-      JPanel toggleButtonPanel = new JPanel(new BorderLayout());
-      toggleButtonPanel.add(btnShowConsole, BorderLayout.EAST);
-      toggleButtonPanel.add(btnShowErrors, BorderLayout.WEST);
-      lineStatusPanel.add(toggleButtonPanel, BorderLayout.EAST);
-      lineStatus.setBounds(0, 0, toggleButtonPanel.getX() - 1,
-          toggleButtonPanel.getHeight());
-      lineStatusPanel.add(lineStatus);
-      consolePanel.add(lineStatusPanel, BorderLayout.SOUTH);
-      lineStatusPanel.repaint();
+    // Adding Error Table in a scroll pane
+    errorTableScrollPane = new JScrollPane();
+    errorTable = new XQErrorTable(errorCheckerService);
+    // errorTableScrollPane.setBorder(new EmptyBorder(2, 2, 2, 2));
+    errorTableScrollPane.setBorder(new EtchedBorder());
+    errorTableScrollPane.setViewportView(errorTable);
 
-      // Adding JPanel with CardLayout for Console/Problems Toggle
-      consolePanel.remove(1);
-      consoleProblemsPane = new JPanel(new CardLayout());
-      consoleProblemsPane.add(errorTableScrollPane, XQConsoleToggle.ERRORSLIST);
-      consoleProblemsPane.add(console, XQConsoleToggle.CONSOLE);
-      consolePanel.add(consoleProblemsPane, BorderLayout.CENTER);
-      
-      // ensure completion gets hidden on editor losing focus
-      addWindowFocusListener(new WindowFocusListener() {        
-        public void windowLostFocus(WindowEvent e) {
-         getJavaTextArea().hideSuggestion();
-        }        
-        public void windowGainedFocus(WindowEvent e) {
-          
-        }
-      });
-    }
+    // Adding toggle console button
+    consolePanel.remove(2);
+    JPanel lineStatusPanel = new JPanel();
+    lineStatusPanel.setLayout(new BorderLayout());
+    btnShowConsole = new XQConsoleToggle(this,
+                                         XQConsoleToggle.CONSOLE, lineStatus.getHeight());
+    btnShowErrors = new XQConsoleToggle(this,
+                                        XQConsoleToggle.ERRORSLIST, lineStatus.getHeight());
+    btnShowConsole.addMouseListener(btnShowConsole);
+
+    // lineStatusPanel.add(btnShowConsole, BorderLayout.EAST);
+    // lineStatusPanel.add(btnShowErrors);
+    btnShowErrors.addMouseListener(btnShowErrors);
+
+    JPanel toggleButtonPanel = new JPanel(new BorderLayout());
+    toggleButtonPanel.add(btnShowConsole, BorderLayout.EAST);
+    toggleButtonPanel.add(btnShowErrors, BorderLayout.WEST);
+    lineStatusPanel.add(toggleButtonPanel, BorderLayout.EAST);
+    lineStatus.setBounds(0, 0, toggleButtonPanel.getX() - 1,
+                         toggleButtonPanel.getHeight());
+    lineStatusPanel.add(lineStatus);
+    consolePanel.add(lineStatusPanel, BorderLayout.SOUTH);
+    lineStatusPanel.repaint();
+
+    // Adding JPanel with CardLayout for Console/Problems Toggle
+    consolePanel.remove(1);
+    consoleProblemsPane = new JPanel(new CardLayout());
+    consoleProblemsPane.add(errorTableScrollPane, XQConsoleToggle.ERRORSLIST);
+    consoleProblemsPane.add(console, XQConsoleToggle.CONSOLE);
+    consolePanel.add(consoleProblemsPane, BorderLayout.CENTER);
+
+    // ensure completion gets hidden on editor losing focus
+    addWindowFocusListener(new WindowFocusListener() {
+      public void windowLostFocus(WindowEvent e) {
+        getJavaTextArea().hideSuggestion();
+      }
+
+      public void windowGainedFocus(WindowEvent e) { }
+    });
+  }
 
 //    /**
 //     * Event handler called when closing the editor window. Kills the variable
@@ -1263,37 +1261,38 @@ public class JavaEditor extends Editor {
 //        // quit running debug session
 //        dbg.stopDebug();
 //    }
-    /**
-     * Used instead of the windowClosing event handler, since it's not called on
-     * mode switch. Called when closing the editor window. Stops running debug
-     * sessions and kills the variable inspector window.
-     */
-    @Override
-    public void dispose() {
-        //System.out.println("window dispose");
-        // quit running debug session
-        debugger.stopDebug();        
-        // remove var.inspector
-        tray.dispose();
-        errorCheckerService.stopThread();
-        // original dispose
-        super.dispose();
-    }
-    
-    
-    /**
-     * Writes all error messages to a csv file.
-     * For analytics purposes only.
-     */
-    private void writeErrorsToFile() {
+
+  /**
+   * Used instead of the windowClosing event handler, since it's not called on
+   * mode switch. Called when closing the editor window. Stops running debug
+   * sessions and kills the variable inspector window.
+   */
+  @Override
+  public void dispose() {
+    //System.out.println("window dispose");
+    // quit running debug session
+    debugger.stopDebug();
+    // remove var.inspector
+    tray.dispose();
+    errorCheckerService.stopThread();
+    // original dispose
+    super.dispose();
+  }
+
+
+  /**
+   * Writes all error messages to a csv file.
+   * For analytics purposes only.
+   */
+  private void writeErrorsToFile() {
     if (errorCheckerService.tempErrorLog.size() == 0) return;
 
     try {
       System.out.println("Writing errors");
       StringBuilder sb = new StringBuilder();
       sb.append("Sketch: " + getSketch().getFolder() + ", "
-              + new java.sql.Timestamp(new java.util.Date().getTime())
-              + "\nComma in error msg is substituted with ^ symbol\nFor separating arguments in error args | symbol is used\n");
+                + new java.sql.Timestamp(new java.util.Date().getTime())
+                + "\nComma in error msg is substituted with ^ symbol\nFor separating arguments in error args | symbol is used\n");
       sb.append("ERROR TYPE, ERROR ARGS, ERROR MSG\n");
 
       for (String errMsg : errorCheckerService.tempErrorLog.keySet()) {
@@ -1306,33 +1305,33 @@ public class JavaEditor extends Editor {
             sb.append(ip.getArguments()[i]);
             if (i < ip.getArguments().length-1)
               sb.append("| ");
-            }
-            sb.append("}");
-            sb.append(',');
-            sb.append(ip.getMessage().replace(',', '^'));
-            sb.append("\n");
           }
+          sb.append("}");
+          sb.append(',');
+          sb.append(ip.getMessage().replace(',', '^'));
+          sb.append("\n");
         }
-        System.out.println(sb);
-        File opFile = new File(getSketch().getFolder(), "ErrorLogs"
-          + File.separator + "ErrorLog_" + System.currentTimeMillis() + ".csv");
-        PApplet.saveStream(opFile, new ByteArrayInputStream(sb.toString()
-          .getBytes(Charset.defaultCharset())));
-      } catch (Exception e) {
-        System.err.println("Failed to save log file for sketch " + getSketch().getName());
-        e.printStackTrace();
       }
+      System.out.println(sb);
+      File opFile = new File(getSketch().getFolder(), "ErrorLogs"
+                             + File.separator + "ErrorLog_" + System.currentTimeMillis() + ".csv");
+      PApplet.saveStream(opFile, new ByteArrayInputStream(sb.toString()
+                                                          .getBytes(Charset.defaultCharset())));
+    } catch (Exception e) {
+      System.err.println("Failed to save log file for sketch " + getSketch().getName());
+      e.printStackTrace();
     }
+  }
 
-    
-    /*
+
+  /*
     private AtomicBoolean debugToolbarEnabled;
-    
+
     public boolean isDebugToolbarEnabled() {
       return debugToolbarEnabled != null && debugToolbarEnabled.get();
     }
 
-    
+
     /// Toggles between java mode and debug mode toolbar
     protected void switchToolbars(){
       final EditorToolbar nextToolbar;
@@ -1352,16 +1351,16 @@ public class JavaEditor extends Editor {
         debugToolbarEnabled.set(true);
         Base.log("Switching to Debugger Toolbar");
       }
-      
+
       SwingUtilities.invokeLater(new Runnable() {
         public void run() {
-          Box upper = (Box)splitPane.getComponent(0);          
+          Box upper = (Box)splitPane.getComponent(0);
           upper.remove(0);
           upper.add(nextToolbar, 0);
           upper.validate();
           nextToolbar.repaint();
           toolbar = nextToolbar;
-          // The toolbar responds to shift down/up events 
+          // The toolbar responds to shift down/up events
           // in order to show the alt version of toolbar buttons.
           // With toolbar switch, KeyListener has to be changed as well
           for (KeyListener kl : textarea.getKeyListeners()) {
@@ -1376,307 +1375,307 @@ public class JavaEditor extends Editor {
         }
       });
     }
-    */
+  */
 
-    /**
-     * Creates the debug menu. Includes ActionListeners for the menu items.
-     * Intended for adding to the menu bar.
-     *
-     * @return The debug menu
-     */
-    protected JMenu buildDebugMenu() {
-      debugMenu = new JMenu(Language.text("menu.debug"));
-      JMenuItem item;
+  /**
+   * Creates the debug menu. Includes ActionListeners for the menu items.
+   * Intended for adding to the menu bar.
+   *
+   * @return The debug menu
+   */
+  protected JMenu buildDebugMenu() {
+    debugMenu = new JMenu(Language.text("menu.debug"));
+    JMenuItem item;
 
-      toggleDebugger = new JCheckBoxMenuItem("Use the Debugger");
-        //new JCheckBoxMenuItem(Language.text("menu.debug.show_debug_toolbar"));
-      toggleDebugger.setSelected(false);
-      toggleDebugger.addActionListener(new ActionListener() {          
+    toggleDebugger = new JCheckBoxMenuItem("Use the Debugger");
+    //new JCheckBoxMenuItem(Language.text("menu.debug.show_debug_toolbar"));
+    toggleDebugger.setSelected(false);
+    toggleDebugger.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           //switchToolbars();
         }
       });
-      debugMenu.add(toggleDebugger);
-      
-      item = Toolkit.newJMenuItemAlt(Language.text("menu.debug.debug"), KeyEvent.VK_R);
-      item.addActionListener(new ActionListener() {
+    debugMenu.add(toggleDebugger);
+
+    item = Toolkit.newJMenuItemAlt(Language.text("menu.debug.debug"), KeyEvent.VK_R);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Debug' menu item");
-          debugger.startDebug();            
+          debugger.startDebug();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      item = Toolkit.newJMenuItem(Language.text("menu.debug.continue"), KeyEvent.VK_U);
-      item.addActionListener(new ActionListener() {
+    item = Toolkit.newJMenuItem(Language.text("menu.debug.continue"), KeyEvent.VK_U);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Continue' menu item");
           debugger.continueDebug();
         }
       });
-      debugMenu.add(item);
-      
-      item = new JMenuItem(Language.text("menu.debug.stop"));
-      item.addActionListener(new ActionListener() {
+    debugMenu.add(item);
+
+    item = new JMenuItem(Language.text("menu.debug.stop"));
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Stop' menu item");
           debugger.stopDebug();
         }
       });
-      debugMenu.add(item);
-      
-      debugMenu.addSeparator();
+    debugMenu.add(item);
 
-      item =  
-        Toolkit.newJMenuItem(Language.text("menu.debug.toggle_breakpoint"), KeyEvent.VK_B);
-      item.addActionListener(new ActionListener() {
+    debugMenu.addSeparator();
+
+    item =
+      Toolkit.newJMenuItem(Language.text("menu.debug.toggle_breakpoint"), KeyEvent.VK_B);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Toggle Breakpoint' menu item");
           debugger.toggleBreakpoint();
         }
       });
-      debugMenu.add(item);
-      
-      item = new JMenuItem(Language.text("menu.debug.list_breakpoints"));
-      item.addActionListener(new ActionListener() {
+    debugMenu.add(item);
+
+    item = new JMenuItem(Language.text("menu.debug.list_breakpoints"));
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'List Breakpoints' menu item");
-          debugger.listBreakpoints();    
+          debugger.listBreakpoints();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      debugMenu.addSeparator();
-      
-      item = Toolkit.newJMenuItem(Language.text("menu.debug.step"), KeyEvent.VK_J);
-      item.addActionListener(new ActionListener() {
+    debugMenu.addSeparator();
+
+    item = Toolkit.newJMenuItem(Language.text("menu.debug.step"), KeyEvent.VK_J);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Step Over' menu item");
           debugger.stepOver();
         }
       });
-      debugMenu.add(item);
-      
-      item = Toolkit.newJMenuItemShift(Language.text("menu.debug.step_into"), KeyEvent.VK_J);
-      item.addActionListener(new ActionListener() {
+    debugMenu.add(item);
+
+    item = Toolkit.newJMenuItemShift(Language.text("menu.debug.step_into"), KeyEvent.VK_J);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Step Into' menu item");
           debugger.stepInto();
-         }
+        }
       });
-      debugMenu.add(item);
-      
-      item = Toolkit.newJMenuItemAlt(Language.text("menu.debug.step_out"), KeyEvent.VK_J);
-      item.addActionListener(new ActionListener() {
+    debugMenu.add(item);
+
+    item = Toolkit.newJMenuItemAlt(Language.text("menu.debug.step_out"), KeyEvent.VK_J);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Step Out' menu item");
           debugger.stepOut();
         }
       });
-      debugMenu.add(item);
-      
-      debugMenu.addSeparator();
+    debugMenu.add(item);
 
-      item = new JMenuItem(Language.text("menu.debug.print_stack_trace"));
-      item.addActionListener(new ActionListener() {
+    debugMenu.addSeparator();
+
+    item = new JMenuItem(Language.text("menu.debug.print_stack_trace"));
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Print Stack Trace' menu item");
           debugger.printStackTrace();
         }
       });
-      debugMenu.add(item);
-      
-      item = new JMenuItem(Language.text("menu.debug.print_locals"));
-      item.addActionListener(new ActionListener() {
+    debugMenu.add(item);
+
+    item = new JMenuItem(Language.text("menu.debug.print_locals"));
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Print Locals' menu item");
           debugger.printLocals();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      item = new JMenuItem(Language.text("menu.debug.print_fields"));
-      item.addActionListener(new ActionListener() {
+    item = new JMenuItem(Language.text("menu.debug.print_fields"));
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Print This' menu item");
           debugger.printThis();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      item = new JMenuItem(Language.text("menu.debug.print_source_location"));
-      item.addActionListener(new ActionListener() {
+    item = new JMenuItem(Language.text("menu.debug.print_source_location"));
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Print Source' menu item");
           debugger.printSource();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      item = new JMenuItem(Language.text("menu.debug.print_threads"));
-      item.addActionListener(new ActionListener() {
+    item = new JMenuItem(Language.text("menu.debug.print_threads"));
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Print Threads' menu item");
           debugger.printThreads();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      debugMenu.addSeparator();
+    debugMenu.addSeparator();
 
-      item = Toolkit.newJMenuItem(Language.text("menu.debug.toggle_variable_inspector"), KeyEvent.VK_I);
-      item.addActionListener(new ActionListener() {
+    item = Toolkit.newJMenuItem(Language.text("menu.debug.toggle_variable_inspector"), KeyEvent.VK_I);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Toggle Variable Inspector' menu item");
           toggleVariableInspector();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      item = Toolkit.newJMenuItem(Language.text("menu.debug.show_sketch_outline"), KeyEvent.VK_L);
-      item.addActionListener(new ActionListener() {
+    item = Toolkit.newJMenuItem(Language.text("menu.debug.show_sketch_outline"), KeyEvent.VK_L);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Base.log("Show Sketch Outline:");
           errorCheckerService.getASTGenerator().showSketchOutline();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      item = Toolkit.newJMenuItem(Language.text("menu.debug.show_tabs_list"), KeyEvent.VK_Y);
-      item.addActionListener(new ActionListener() {
+    item = Toolkit.newJMenuItem(Language.text("menu.debug.show_tabs_list"), KeyEvent.VK_Y);
+    item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           Base.log("Show Tab Outline:");
           errorCheckerService.getASTGenerator().showTabOutline();
         }
       });
-      debugMenu.add(item);
+    debugMenu.add(item);
 
-      return debugMenu;
-    }
-    
-    
-    @Override
-    public JMenu buildModeMenu() {
-      return buildDebugMenu();
+    return debugMenu;
+  }
+
+
+  @Override
+  public JMenu buildModeMenu() {
+    return buildDebugMenu();
+  }
+
+
+  /**
+   * Event handler called when loading another sketch in this editor. Clears
+   * breakpoints of previous sketch.
+   *
+   * @param path
+   * @return true if a sketch was opened, false if aborted
+   */
+  @Override
+  protected boolean handleOpenInternal(String path) {
+    // log("handleOpenInternal, path: " + path);
+    boolean didOpen = super.handleOpenInternal(path);
+    if (didOpen && debugger != null) {
+      // should already been stopped (open calls handleStop)
+      debugger.clearBreakpoints();
+      clearBreakpointedLines(); // force clear breakpoint highlights
+      variableInspector().reset(); // clear contents of variable inspector
     }
+    //if(didOpen){
+    // autosaver = new AutoSaveUtil(this, ExperimentalMode.autoSaveInterval); // this is used instead of loadAutosaver(), temp measure
+    // loadAutoSaver();
+    // viewingAutosaveBackup = autosaver.isAutoSaveBackup();
+    // log("handleOpenInternal, viewing autosave? " + viewingAutosaveBackup);
+    //}
+    return didOpen;
+  }
 
 
-    /**
-     * Event handler called when loading another sketch in this editor. Clears
-     * breakpoints of previous sketch.
-     *
-     * @param path
-     * @return true if a sketch was opened, false if aborted
-     */
-    @Override
-    protected boolean handleOpenInternal(String path) {
-      // log("handleOpenInternal, path: " + path);
-      boolean didOpen = super.handleOpenInternal(path);
-      if (didOpen && debugger != null) {
-        // should already been stopped (open calls handleStop)
-        debugger.clearBreakpoints();
-        clearBreakpointedLines(); // force clear breakpoint highlights
-        variableInspector().reset(); // clear contents of variable inspector
-      }
-      //if(didOpen){
-      // autosaver = new AutoSaveUtil(this, ExperimentalMode.autoSaveInterval); // this is used instead of loadAutosaver(), temp measure
-      // loadAutoSaver();
-      // viewingAutosaveBackup = autosaver.isAutoSaveBackup();
-      // log("handleOpenInternal, viewing autosave? " + viewingAutosaveBackup);
-      //}
-      return didOpen;
-    }
-    
+  /**
+   * Extract breakpointed lines from source code marker comments. This removes
+   * marker comments from the editor text. Intended to be called on loading a
+   * sketch, since re-setting the sketches contents after removing the markers
+   * will clear all breakpoints.
+   *
+   * @return the list of {@link LineID}s where breakpoint marker comments were
+   * removed from.
+   */
+  protected List<LineID> stripBreakpointComments() {
+    List<LineID> bps = new ArrayList<LineID>();
+    // iterate over all tabs
+    Sketch sketch = getSketch();
+    for (int i = 0; i < sketch.getCodeCount(); i++) {
+      SketchCode tab = sketch.getCode(i);
+      String code = tab.getProgram();
+      String lines[] = code.split("\\r?\\n"); // newlines not included
+      //System.out.println(code);
 
-    /**
-     * Extract breakpointed lines from source code marker comments. This removes
-     * marker comments from the editor text. Intended to be called on loading a
-     * sketch, since re-setting the sketches contents after removing the markers
-     * will clear all breakpoints.
-     *
-     * @return the list of {@link LineID}s where breakpoint marker comments were
-     * removed from.
-     */
-    protected List<LineID> stripBreakpointComments() {
-      List<LineID> bps = new ArrayList<LineID>();
-      // iterate over all tabs
-      Sketch sketch = getSketch();
-      for (int i = 0; i < sketch.getCodeCount(); i++) {
-        SketchCode tab = sketch.getCode(i);
-        String code = tab.getProgram();
-        String lines[] = code.split("\\r?\\n"); // newlines not included
-        //System.out.println(code);
-
-        // scan code for breakpoint comments
-        int lineIdx = 0;
-        for (String line : lines) {
-          //System.out.println(line);
-          if (line.endsWith(breakpointMarkerComment)) {
-            LineID lineID = new LineID(tab.getFileName(), lineIdx);
-            bps.add(lineID);
-            //System.out.println("found breakpoint: " + lineID);
-            // got a breakpoint
-            //dbg.setBreakpoint(lineID);
-            int index = line.lastIndexOf(breakpointMarkerComment);
-            lines[lineIdx] = line.substring(0, index);
-          }
-          lineIdx++;
+      // scan code for breakpoint comments
+      int lineIdx = 0;
+      for (String line : lines) {
+        //System.out.println(line);
+        if (line.endsWith(breakpointMarkerComment)) {
+          LineID lineID = new LineID(tab.getFileName(), lineIdx);
+          bps.add(lineID);
+          //System.out.println("found breakpoint: " + lineID);
+          // got a breakpoint
+          //dbg.setBreakpoint(lineID);
+          int index = line.lastIndexOf(breakpointMarkerComment);
+          lines[lineIdx] = line.substring(0, index);
         }
-        //tab.setProgram(code);
-        code = PApplet.join(lines, "\n");
-        setTabContents(tab.getFileName(), code);
+        lineIdx++;
       }
-      return bps;
+      //tab.setProgram(code);
+      code = PApplet.join(lines, "\n");
+      setTabContents(tab.getFileName(), code);
     }
-    
+    return bps;
+  }
 
-    /**
-     * Add breakpoint marker comments to the source file of a specific tab. This
-     * acts on the source file on disk, not the editor text. Intended to be
-     * called just after saving the sketch.
-     *
-     * @param tabFilename the tab file name
+
+  /**
+   * Add breakpoint marker comments to the source file of a specific tab. This
+   * acts on the source file on disk, not the editor text. Intended to be
+   * called just after saving the sketch.
+   *
+   * @param tabFilename the tab file name
+   */
+  protected void addBreakpointComments(String tabFilename) {
+    SketchCode tab = getTab(tabFilename);
+    if (tab == null) {
+      // this method gets called twice when saving sketch for the first time
+      // once with new name and another with old(causing NPE). Keep an eye out
+      // for potential issues. See #2675. TODO:
+      Base.loge("Illegal tab name to addBreakpointComments() " + tabFilename);
+      return;
+    }
+    List<LineBreakpoint> bps = debugger.getBreakpoints(tab.getFileName());
+
+    // load the source file
+    File sourceFile = new File(sketch.getFolder(), tab.getFileName());
+    //System.out.println("file: " + sourceFile);
+    try {
+      String code = Base.loadFile(sourceFile);
+      //System.out.println("code: " + code);
+      String lines[] = code.split("\\r?\\n"); // newlines not included
+      for (LineBreakpoint bp : bps) {
+        //System.out.println("adding bp: " + bp.lineID());
+        lines[bp.lineID().lineIdx()] += breakpointMarkerComment;
+      }
+      code = PApplet.join(lines, "\n");
+      //System.out.println("new code: " + code);
+      Base.saveFile(code, sourceFile);
+    } catch (IOException ex) {
+      Logger.getLogger(JavaEditor.class.getName()).log(Level.SEVERE, null, ex);
+    }
+  }
+
+
+  @Override
+  public boolean handleSave(boolean immediately) {
+    //System.out.println("handleSave " + immediately);
+
+    //log("handleSave, viewing autosave? " + viewingAutosaveBackup);
+    /* If user wants to save a backup, the backup sketch should get
+     * copied to the main sketch directory, simply reload the main sketch.
      */
-    protected void addBreakpointComments(String tabFilename) {
-      SketchCode tab = getTab(tabFilename);
-      if (tab == null) {
-        // this method gets called twice when saving sketch for the first time
-        // once with new name and another with old(causing NPE). Keep an eye out 
-        // for potential issues. See #2675. TODO:
-        Base.loge("Illegal tab name to addBreakpointComments() " + tabFilename);          
-        return;
-      }
-      List<LineBreakpoint> bps = debugger.getBreakpoints(tab.getFileName());
-
-      // load the source file
-      File sourceFile = new File(sketch.getFolder(), tab.getFileName());
-      //System.out.println("file: " + sourceFile);
-      try {
-        String code = Base.loadFile(sourceFile);
-        //System.out.println("code: " + code);
-        String lines[] = code.split("\\r?\\n"); // newlines not included
-        for (LineBreakpoint bp : bps) {
-          //System.out.println("adding bp: " + bp.lineID());
-          lines[bp.lineID().lineIdx()] += breakpointMarkerComment;
-        }
-        code = PApplet.join(lines, "\n");
-        //System.out.println("new code: " + code);
-        Base.saveFile(code, sourceFile);
-      } catch (IOException ex) {
-        Logger.getLogger(JavaEditor.class.getName()).log(Level.SEVERE, null, ex);
-      }
-    }
-    
-
-    @Override
-    public boolean handleSave(boolean immediately) {
-        //System.out.println("handleSave " + immediately);
-      
-        //log("handleSave, viewing autosave? " + viewingAutosaveBackup);
-        /* If user wants to save a backup, the backup sketch should get
-         * copied to the main sketch directory, simply reload the main sketch. 
-         */
-        if(viewingAutosaveBackup){
+    if(viewingAutosaveBackup){
           /*
           File files[] = autosaver.getSketchBackupFolder().listFiles();
           File src = autosaver.getSketchBackupFolder(), dst = autosaver
@@ -1701,778 +1700,716 @@ public class JavaEditor extends Editor {
           getBase().handleOpen(sk.getAbsolutePath() + File.separator + sk.getName() + ".pde");
           //viewingAutosaveBackup = false;
           */
+    }
+
+    // note modified tabs
+    final List<String> modified = new ArrayList<String>();
+    for (int i = 0; i < getSketch().getCodeCount(); i++) {
+      SketchCode tab = getSketch().getCode(i);
+      if (tab.isModified()) {
+        modified.add(tab.getFileName());
+      }
+    }
+
+    boolean saved = super.handleSave(immediately);
+    if (saved) {
+      if (immediately) {
+        for (String tabFilename : modified) {
+          addBreakpointComments(tabFilename);
         }
-      
-        // note modified tabs
-        final List<String> modified = new ArrayList<String>();
-        for (int i = 0; i < getSketch().getCodeCount(); i++) {
-            SketchCode tab = getSketch().getCode(i);
-            if (tab.isModified()) {
-                modified.add(tab.getFileName());
+      } else {
+        EventQueue.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+              for (String tabFilename : modified) {
+                addBreakpointComments(tabFilename);
+              }
             }
-        }
+          });
+      }
+    }
+    //  if file location has changed, update autosaver
+    // autosaver.reloadAutosaveDir();
+    return saved;
+  }
 
-        boolean saved = super.handleSave(immediately);
-        if (saved) {
-            if (immediately) {
-                for (String tabFilename : modified) {
-                    addBreakpointComments(tabFilename);
-                }
-            } else {
-                EventQueue.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        for (String tabFilename : modified) {
-                            addBreakpointComments(tabFilename);
-                        }
-                    }
-                });
-            }
-        }
-        //  if file location has changed, update autosaver
-        // autosaver.reloadAutosaveDir();
-        return saved;
+
+  private boolean viewingAutosaveBackup;
+
+
+  /**
+   * Set text contents of a specific tab. Updates underlying document and text
+   * area. Clears Breakpoints.
+   *
+   * @param tabFilename the tab file name
+   * @param code the text to set
+   */
+  protected void setTabContents(String tabFilename, String code) {
+    // remove all breakpoints of this tab
+    debugger.clearBreakpoints(tabFilename);
+
+    SketchCode currentTab = getCurrentTab();
+
+    // set code of tab
+    SketchCode tab = getTab(tabFilename);
+    if (tab != null) {
+      tab.setProgram(code);
+      // this updates document and text area
+      // TODO: does this have any negative effects? (setting the doc to null)
+      tab.setDocument(null);
+      setCode(tab);
+
+      // switch back to original tab
+      setCode(currentTab);
+    }
+  }
+
+
+  public void clearConsole() {
+    console.clear();
+  }
+
+
+  public void clearSelection() {
+    setSelection(getCaretOffset(), getCaretOffset());
+  }
+
+
+  /**
+   * Select a line in the current tab.
+   * @param lineIdx 0-based line number
+   */
+  public void selectLine(int lineIdx) {
+    setSelection(getLineStartOffset(lineIdx), getLineStopOffset(lineIdx));
+  }
+
+
+  /**
+   * Set the cursor to the start of a line.
+   * @param lineIdx 0-based line number
+   */
+  public void cursorToLineStart(int lineIdx) {
+    setSelection(getLineStartOffset(lineIdx), getLineStartOffset(lineIdx));
+  }
+
+
+  /**
+   * Set the cursor to the end of a line.
+   * @param lineIdx 0-based line number
+   */
+  public void cursorToLineEnd(int lineIdx) {
+    setSelection(getLineStopOffset(lineIdx), getLineStopOffset(lineIdx));
+  }
+
+
+  /**
+   * Switch to a tab.
+   * @param tabFileName the file name identifying the tab. (as in
+   * {@link SketchCode#getFileName()})
+   */
+  public void switchToTab(String tabFileName) {
+    Sketch s = getSketch();
+    for (int i = 0; i < s.getCodeCount(); i++) {
+      if (tabFileName.equals(s.getCode(i).getFileName())) {
+        s.setCurrentCode(i);
+        break;
+      }
+    }
+  }
+
+
+  public Debugger getDebugger() {
+    return debugger;
+  }
+
+
+  /**
+   * Access the custom text area object.
+   * @return the text area object
+   */
+  public JavaTextArea getJavaTextArea() {
+    return (JavaTextArea) textarea;
+  }
+
+
+  /**
+   * Grab current contents of the sketch window, advance the console, stop any
+   * other running sketches, auto-save the user's code... not in that order.
+   */
+  @Override
+  public void prepareRun() {
+    autoSave();
+    super.prepareRun();
+  }
+
+  /**
+   * Displays a JDialog prompting the user to save when the user hits
+   * run/present/etc.
+   */
+  protected void autoSave() {
+    if (!JavaMode.autoSaveEnabled) {
+      return;
     }
 
+    try {
+      if (sketch.isModified() && !sketch.isUntitled()) {
+        if (JavaMode.autoSavePromptEnabled) {
+          final JDialog autoSaveDialog = new JDialog(
+                                                     base.getActiveEditor(), this.getSketch().getName(),
+                                                     true);
+          Container container = autoSaveDialog.getContentPane();
 
-    private boolean viewingAutosaveBackup;
-    
+          JPanel panelMain = new JPanel();
+          panelMain.setBorder(BorderFactory.createEmptyBorder(4, 0,
+                                                              2, 2));
+          panelMain.setLayout(new BoxLayout(panelMain,
+                                            BoxLayout.PAGE_AXIS));
 
-    /**
-     * Set text contents of a specific tab. Updates underlying document and text
-     * area. Clears Breakpoints.
-     *
-     * @param tabFilename the tab file name
-     * @param code the text to set
-     */
-    protected void setTabContents(String tabFilename, String code) {
-        // remove all breakpoints of this tab
-        debugger.clearBreakpoints(tabFilename);
-
-        SketchCode currentTab = getCurrentTab();
-
-        // set code of tab
-        SketchCode tab = getTab(tabFilename);
-        if (tab != null) {
-            tab.setProgram(code);
-            // this updates document and text area
-            // TODO: does this have any negative effects? (setting the doc to null)
-            tab.setDocument(null);
-            setCode(tab);
-
-            // switch back to original tab
-            setCode(currentTab);
-        }
-    }
-
-    
-    /**
-     * Clear the console.
-     */
-    public void clearConsole() {
-        console.clear();
-    }
-
-    
-    /**
-     * Clear current text selection.
-     */
-    public void clearSelection() {
-        setSelection(getCaretOffset(), getCaretOffset());
-    }
-
-    
-    /**
-     * Select a line in the current tab.
-     *
-     * @param lineIdx 0-based line number
-     */
-    public void selectLine(int lineIdx) {
-        setSelection(getLineStartOffset(lineIdx), getLineStopOffset(lineIdx));
-    }
-
-    
-    /**
-     * Set the cursor to the start of a line.
-     *
-     * @param lineIdx 0-based line number
-     */
-    public void cursorToLineStart(int lineIdx) {
-        setSelection(getLineStartOffset(lineIdx), getLineStartOffset(lineIdx));
-    }
-
-    
-    /**
-     * Set the cursor to the end of a line.
-     *
-     * @param lineIdx 0-based line number
-     */
-    public void cursorToLineEnd(int lineIdx) {
-        setSelection(getLineStopOffset(lineIdx), getLineStopOffset(lineIdx));
-    }
-
-    /**
-     * Switch to a tab.
-     *
-     * @param tabFileName the file name identifying the tab. (as in
-     * {@link SketchCode#getFileName()})
-     */
-    public void switchToTab(String tabFileName) {
-        Sketch s = getSketch();
-        for (int i = 0; i < s.getCodeCount(); i++) {
-            if (tabFileName.equals(s.getCode(i).getFileName())) {
-                s.setCurrentCode(i);
-                break;
-            }
-        }
-    }
-
-    
-    /**
-     * Access the debugger.
-     *
-     * @return the debugger controller object
-     */
-    public Debugger getDebugger() {
-        return debugger;
-    }
-
-    
-    /**
-     * Access the custom text area object.
-     * @return the text area object
-     */
-    public JavaTextArea getJavaTextArea() {
-      return (JavaTextArea) textarea;
-    }
-
-    
-    /**
-     * Grab current contents of the sketch window, advance the console, stop any
-     * other running sketches, auto-save the user's code... not in that order.
-     */
-    @Override
-    public void prepareRun() {
-        autoSave();
-        super.prepareRun();
-    }
-
-    /**
-     * Displays a JDialog prompting the user to save when the user hits
-     * run/present/etc.
-     */
-    protected void autoSave() {
-        if (!JavaMode.autoSaveEnabled)
-            return;
-
-        try {
-            // if (sketch.isUntitled() &&
-            // ExperimentalMode.untitledAutoSaveEnabled) {
-            // if (handleSave(true))
-            // statusTimedNotice("Saved. Running...", 5);
-            // else
-            // statusTimedNotice("Save Canceled. Running anyway...", 5);
-            // }
-            // else
-            if (sketch.isModified() && !sketch.isUntitled()) {
-                if (JavaMode.autoSavePromptEnabled) {
-                    final JDialog autoSaveDialog = new JDialog(
-                            base.getActiveEditor(), this.getSketch().getName(),
-                            true);
-                    Container container = autoSaveDialog.getContentPane();
-
-                    JPanel panelMain = new JPanel();
-                    panelMain.setBorder(BorderFactory.createEmptyBorder(4, 0,
-                            2, 2));
-                    panelMain.setLayout(new BoxLayout(panelMain,
-                            BoxLayout.PAGE_AXIS));
-
-                    JPanel panelLabel = new JPanel(new FlowLayout(
-                            FlowLayout.LEFT));
-                    JLabel label = new JLabel(
-                            "<html><body>&nbsp;There are unsaved"
+          JPanel panelLabel = new JPanel(new FlowLayout(
+                                                        FlowLayout.LEFT));
+          JLabel label = new JLabel(
+                                    "<html><body>&nbsp;There are unsaved"
                                     + " changes in your sketch.<br />"
                                     + "&nbsp;&nbsp;&nbsp; Do you want to save it before"
                                     + " running? </body></html>");
-                    label.setFont(new Font(label.getFont().getName(),
-                            Font.PLAIN, label.getFont().getSize() + 1));
-                    panelLabel.add(label);
-                    panelMain.add(panelLabel);
-                    final JCheckBox dontRedisplay = new JCheckBox(
-                            "Remember this decision");
+          label.setFont(new Font(label.getFont().getName(),
+                                 Font.PLAIN, label.getFont().getSize() + 1));
+          panelLabel.add(label);
+          panelMain.add(panelLabel);
+          final JCheckBox dontRedisplay = new JCheckBox(
+                                                        "Remember this decision");
 
-                    JPanel panelButtons = new JPanel(new FlowLayout(
-                            FlowLayout.CENTER, 8, 2));
-                    JButton btnRunSave = new JButton("Save and Run");
-                    btnRunSave.addActionListener(new ActionListener() {
+          JPanel panelButtons = new JPanel(new FlowLayout(
+                                                          FlowLayout.CENTER, 8, 2));
+          JButton btnRunSave = new JButton("Save and Run");
+          btnRunSave.addActionListener(new ActionListener() {
 
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            handleSave(true);
-                            if (dontRedisplay.isSelected()) {
-                                JavaMode.autoSavePromptEnabled = !dontRedisplay.isSelected();
-                                JavaMode.defaultAutoSaveEnabled = true;
-                                jmode.savePreferences();
-                            }
-                            autoSaveDialog.dispose();
-                        }
-                    });
-                    panelButtons.add(btnRunSave);
-                    JButton btnRunNoSave = new JButton("Run, Don't Save");
-                    btnRunNoSave.addActionListener(new ActionListener() {
-
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            if (dontRedisplay.isSelected()) {
-                                JavaMode.autoSavePromptEnabled = !dontRedisplay.isSelected();
-                                JavaMode.defaultAutoSaveEnabled = false;
-                                jmode.savePreferences();
-                            }
-                            autoSaveDialog.dispose();
-                        }
-                    });
-                    panelButtons.add(btnRunNoSave);
-                    panelMain.add(panelButtons);
-
-                    JPanel panelCheck = new JPanel();
-                    panelCheck
-                            .setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
-                    panelCheck.add(dontRedisplay);
-                    panelMain.add(panelCheck);
-
-                    container.add(panelMain);
-
-                    autoSaveDialog.setResizable(false);
-                    autoSaveDialog.pack();
-                    autoSaveDialog
-                            .setLocationRelativeTo(base.getActiveEditor());
-                    autoSaveDialog.setVisible(true);
-
-                } else if (JavaMode.defaultAutoSaveEnabled) {
-                    handleSave(true);
+              @Override
+              public void actionPerformed(ActionEvent e) {
+                handleSave(true);
+                if (dontRedisplay.isSelected()) {
+                  JavaMode.autoSavePromptEnabled = !dontRedisplay.isSelected();
+                  JavaMode.defaultAutoSaveEnabled = true;
+                  jmode.savePreferences();
                 }
-            }
-        } catch (Exception e) {
-            statusError(e);
+                autoSaveDialog.dispose();
+              }
+            });
+          panelButtons.add(btnRunSave);
+          JButton btnRunNoSave = new JButton("Run, Don't Save");
+          btnRunNoSave.addActionListener(new ActionListener() {
+
+              @Override
+              public void actionPerformed(ActionEvent e) {
+                if (dontRedisplay.isSelected()) {
+                  JavaMode.autoSavePromptEnabled = !dontRedisplay.isSelected();
+                  JavaMode.defaultAutoSaveEnabled = false;
+                  jmode.savePreferences();
+                }
+                autoSaveDialog.dispose();
+              }
+            });
+          panelButtons.add(btnRunNoSave);
+          panelMain.add(panelButtons);
+
+          JPanel panelCheck = new JPanel();
+          panelCheck
+            .setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+          panelCheck.add(dontRedisplay);
+          panelMain.add(panelCheck);
+
+          container.add(panelMain);
+
+          autoSaveDialog.setResizable(false);
+          autoSaveDialog.pack();
+          autoSaveDialog.setLocationRelativeTo(base.getActiveEditor());
+          autoSaveDialog.setVisible(true);
+
+        } else if (JavaMode.defaultAutoSaveEnabled) {
+          handleSave(true);
         }
-
-    }    
-    
-    /**
-     * Access variable inspector window.
-     *
-     * @return the variable inspector object
-     */
-    public DebugTray variableInspector() {
-        return tray;
-    }
-
-    
-    /*
-    public DebugToolbar toolbar() {
-      if (toolbar instanceof DebugToolbar)
-        return (DebugToolbar) toolbar;
-      return null;
-    }
-    */
-    
-    
-    protected void activateRun() {
-      toolbar.activate(JavaToolbar.RUN);
-    }
-    
-    
-    protected void activateDebug() {
-      //debugToolbar.activate(DebugToolbar.DEBUG);
-      activateRun();
-    }
-
-    
-    protected void deactivateDebug() {
-      deactivateRun();
-    }
-    
-    
-    protected void activateContinue() {
-      debugToolbar.activateContinue();
-    }
-    
-
-    protected void deactivateContinue() {
-      debugToolbar.deactivateContinue();
-    }
-    
-
-    protected void activateStep() {
-      debugToolbar.activateStep();
-    }
-
-    
-    protected void deactivateStep() {
-      debugToolbar.deactivateStep();
-    }
-
-    
-    /**
-     * Show the variable inspector window.
-     */
-    public void showVariableInspector() {
-        tray.setVisible(true);
-    }
-
-    /**
-     * Set visibility of the variable inspector window.
-     *
-     * @param visible true to set the variable inspector visible, false for
-     * invisible.
-     */
-    public void showVariableInspector(boolean visible) {
-        tray.setVisible(visible);
-    }
-
-    /**
-     * Hide the variable inspector window.
-     */
-    public void hideVariableInspector() {
-        tray.setVisible(true);
-    }
-
-    /**
-     * Toggle visibility of the variable inspector window.
-     */
-    public void toggleVariableInspector() {
-        tray.setFocusableWindowState(false); // to not get focus when set visible
-        tray.setVisible(!tray.isVisible());
-        tray.setFocusableWindowState(true); // allow to get focus again
-    }
-
-
-    /**
-     * Set the line to highlight as currently suspended at. Will override the
-     * breakpoint color, if set. Switches to the appropriate tab and scroll to
-     * the line by placing the cursor there.
-     *
-     * @param line the line to highlight as current suspended line
-     */
-    public void setCurrentLine(LineID line) {
-      clearCurrentLine();
-      if (line == null) {
-        return; // safety, e.g. when no line mapping is found and the null line is used.
       }
-      switchToTab(line.fileName());
-      // scroll to line, by setting the cursor
-      cursorToLineStart(line.lineIdx());
-      // highlight line
-      currentLine = new LineHighlight(line.lineIdx(), currentLineColor, this);
-      currentLine.setMarker(getJavaTextArea().currentLineMarker, currentLineMarkerColor);
-      currentLine.setPriority(10); // fixes current line being hidden by the breakpoint when moved down
+    } catch (Exception e) {
+      statusError(e);
     }
 
-    /**
-     * Clear the highlight for the debuggers current line.
-     */
-    public void clearCurrentLine() {
-      if (currentLine != null) {
-        currentLine.clear();
-        currentLine.dispose();
+  }
 
-        // revert to breakpoint color if any is set on this line
-        for (LineHighlight hl : breakpointedLines) {
-          if (hl.getLineID().equals(currentLine.getLineID())) {
-            hl.paint();
-            break;
-          }
-        }
-        currentLine = null;
-      }
+
+  /**
+   * Access variable inspector window.
+   * @return the variable inspector object
+   */
+  public DebugTray variableInspector() {
+    return tray;
+  }
+
+
+  protected void activateRun() {
+    toolbar.activate(JavaToolbar.RUN);
+  }
+
+
+  protected void activateDebug() {
+    //debugToolbar.activate(DebugToolbar.DEBUG);
+    activateRun();
+  }
+
+
+  protected void deactivateDebug() {
+    deactivateRun();
+  }
+
+
+  protected void activateContinue() {
+    tray.activateContinue();
+  }
+
+
+  protected void deactivateContinue() {
+    tray.deactivateContinue();
+  }
+
+
+  protected void activateStep() {
+    tray.activateStep();
+  }
+
+
+  protected void deactivateStep() {
+    tray.deactivateStep();
+  }
+
+
+  public void showVariableInspector() {
+    tray.setVisible(true);
+  }
+
+
+  /**
+   * Set visibility of the variable inspector window.
+   * @param visible true to set the variable inspector visible,
+   * false for invisible.
+   */
+  public void showVariableInspector(boolean visible) {
+    tray.setVisible(visible);
+  }
+
+
+  public void hideVariableInspector() {
+    tray.setVisible(true);
+  }
+
+
+  /** Toggle visibility of the variable inspector window. */
+  public void toggleVariableInspector() {
+    tray.setFocusableWindowState(false); // to not get focus when set visible
+    tray.setVisible(!tray.isVisible());
+    tray.setFocusableWindowState(true); // allow to get focus again
+  }
+
+
+  /**
+   * Set the line to highlight as currently suspended at. Will override the
+   * breakpoint color, if set. Switches to the appropriate tab and scroll to
+   * the line by placing the cursor there.
+   * @param line the line to highlight as current suspended line
+   */
+  public void setCurrentLine(LineID line) {
+    clearCurrentLine();
+    if (line == null) {
+      // safety, e.g. when no line mapping is found and the null line is used.
+      return;
     }
+    switchToTab(line.fileName());
+    // scroll to line, by setting the cursor
+    cursorToLineStart(line.lineIdx());
+    // highlight line
+    currentLine = new LineHighlight(line.lineIdx(), currentLineColor, this);
+    currentLine.setMarker(getJavaTextArea().currentLineMarker, currentLineMarkerColor);
+    currentLine.setPriority(10); // fixes current line being hidden by the breakpoint when moved down
+  }
 
-    /**
-     * Add highlight for a breakpointed line.
-     *
-     * @param lineID the line id to highlight as breakpointed
-     */
-    public void addBreakpointedLine(LineID lineID) {
-      LineHighlight hl = new LineHighlight(lineID, breakpointColor, this);
-      hl.setMarker(getJavaTextArea().breakpointMarker, breakpointMarkerColor);
-      breakpointedLines.add(hl);
-      // repaint current line if it's on this line
-      if (currentLine != null && currentLine.getLineID().equals(lineID)) {
-        currentLine.paint();
-      }
-    }
 
-    /**
-     * Add highlight for a breakpointed line on the current tab.
-     *
-     * @param lineIdx the line index on the current tab to highlight as
-     * breakpointed
-     */
-    //TODO: remove and replace by {@link #addBreakpointedLine(LineID lineID)}
-    public void addBreakpointedLine(int lineIdx) {
-      addBreakpointedLine(getLineIDInCurrentTab(lineIdx));
-    }
+  /** Clear the highlight for the debuggers current line. */
+  public void clearCurrentLine() {
+    if (currentLine != null) {
+      currentLine.clear();
+      currentLine.dispose();
 
-    /**
-     * Remove a highlight for a breakpointed line. Needs to be on the current
-     * tab.
-     *
-     * @param lineIdx the line index on the current tab to remove a breakpoint
-     * highlight from
-     */
-    public void removeBreakpointedLine(int lineIdx) {
-      LineID line = getLineIDInCurrentTab(lineIdx);
-      //System.out.println("line id: " + line.fileName() + " " + line.lineIdx());
-      LineHighlight foundLine = null;
+      // revert to breakpoint color if any is set on this line
       for (LineHighlight hl : breakpointedLines) {
-        if (hl.getLineID().equals(line)) {
-          foundLine = hl;
+        if (hl.getLineID().equals(currentLine.getLineID())) {
+          hl.paint();
           break;
         }
       }
-      if (foundLine != null) {
-        foundLine.clear();
-        breakpointedLines.remove(foundLine);
-        foundLine.dispose();
-        // repaint current line if it's on this line
-        if (currentLine != null && currentLine.getLineID().equals(line)) {
+      currentLine = null;
+    }
+  }
+
+
+  /**
+   * Add highlight for a breakpointed line.
+   * @param lineID the line id to highlight as breakpointed
+   */
+  public void addBreakpointedLine(LineID lineID) {
+    LineHighlight hl = new LineHighlight(lineID, breakpointColor, this);
+    hl.setMarker(getJavaTextArea().breakpointMarker, breakpointMarkerColor);
+    breakpointedLines.add(hl);
+    // repaint current line if it's on this line
+    if (currentLine != null && currentLine.getLineID().equals(lineID)) {
+      currentLine.paint();
+    }
+  }
+
+
+  /**
+   * Add highlight for a breakpointed line on the current tab.
+   * @param lineIdx the line index on the current tab to highlight as
+   * breakpointed
+   */
+  //TODO: remove and replace by {@link #addBreakpointedLine(LineID lineID)}
+  public void addBreakpointedLine(int lineIdx) {
+    addBreakpointedLine(getLineIDInCurrentTab(lineIdx));
+  }
+
+
+  /**
+   * Remove a highlight for a breakpointed line. Needs to be on the current tab.
+   * @param lineIdx the line index on the current tab to remove a breakpoint
+   * highlight from
+   */
+  public void removeBreakpointedLine(int lineIdx) {
+    LineID line = getLineIDInCurrentTab(lineIdx);
+    //System.out.println("line id: " + line.fileName() + " " + line.lineIdx());
+    LineHighlight foundLine = null;
+    for (LineHighlight hl : breakpointedLines) {
+      if (hl.getLineID().equals(line)) {
+        foundLine = hl;
+        break;
+      }
+    }
+    if (foundLine != null) {
+      foundLine.clear();
+      breakpointedLines.remove(foundLine);
+      foundLine.dispose();
+      // repaint current line if it's on this line
+      if (currentLine != null && currentLine.getLineID().equals(line)) {
+        currentLine.paint();
+      }
+    }
+  }
+
+
+  /** Remove all highlights for breakpointed lines. */
+  public void clearBreakpointedLines() {
+    for (LineHighlight hl : breakpointedLines) {
+      hl.clear();
+      hl.dispose();
+    }
+    breakpointedLines.clear(); // remove all breakpoints
+    // fix highlights not being removed when tab names have
+    // changed due to opening a new sketch in same editor
+    getJavaTextArea().clearLineBgColors(); // force clear all highlights
+    getJavaTextArea().clearGutterText();
+
+    // repaint current line
+    if (currentLine != null) {
+      currentLine.paint();
+    }
+  }
+
+
+  /**
+   * Retrieve a {@link LineID} object for a line on the current tab.
+   * @param lineIdx the line index on the current tab
+   * @return the {@link LineID} object representing a line index on the
+   * current tab
+   */
+  public LineID getLineIDInCurrentTab(int lineIdx) {
+    return new LineID(getSketch().getCurrentCode().getFileName(), lineIdx);
+  }
+
+
+  /**
+   * Retrieve line of sketch where the cursor currently resides.
+   * @return the current {@link LineID}
+   */
+  protected LineID getCurrentLineID() {
+    String tab = getSketch().getCurrentCode().getFileName();
+    int lineNo = getTextArea().getCaretLine();
+    return new LineID(tab, lineNo);
+  }
+
+
+  /**
+   * Check whether a {@link LineID} is on the current tab.
+   * @param line the {@link LineID}
+   * @return true, if the {@link LineID} is on the current tab.
+   */
+  public boolean isInCurrentTab(LineID line) {
+    return line.fileName().equals(getSketch().getCurrentCode().getFileName());
+  }
+
+
+  /**
+   * Event handler called when switching between tabs. Loads all line
+   * background colors set for the tab.
+   * @param code tab to switch to
+   */
+  @Override
+  protected void setCode(SketchCode code) {
+    //System.out.println("tab switch: " + code.getFileName());
+    // set the new document in the textarea, etc. need to do this first
+    super.setCode(code);
+
+    // set line background colors for tab
+    final JavaTextArea ta = getJavaTextArea();
+    // can be null when setCode is called the first time (in constructor)
+    if (ta != null) {
+      // clear all line backgrounds
+      ta.clearLineBgColors();
+      // clear all gutter text
+      ta.clearGutterText();
+      // load appropriate line backgrounds for tab
+      // first paint breakpoints
+      for (LineHighlight hl : breakpointedLines) {
+        if (isInCurrentTab(hl.getLineID())) {
+          hl.paint();
+        }
+      }
+      // now paint current line (if any)
+      if (currentLine != null) {
+        if (isInCurrentTab(currentLine.getLineID())) {
           currentLine.paint();
         }
       }
     }
+    if (getDebugger() != null && getDebugger().isStarted()) {
+      getDebugger().startTrackingLineChanges();
+    }
+  }
 
-    /**
-     * Remove all highlights for breakpointed lines.
-     */
-    public void clearBreakpointedLines() {
-      for (LineHighlight hl : breakpointedLines) {
-        hl.clear();
-        hl.dispose();
-      }
-      breakpointedLines.clear(); // remove all breakpoints
-      // fix highlights not being removed when tab names have changed due to opening a new sketch in same editor
-      getJavaTextArea().clearLineBgColors(); // force clear all highlights
-      getJavaTextArea().clearGutterText();
 
-      // repaint current line
-      if (currentLine != null) {
-        currentLine.paint();
+  /**
+   * Get a tab by its file name.
+   * @param fileName the filename to search for.
+   * @return the {@link SketchCode} object representing the tab, or null if
+   * not found
+   */
+  public SketchCode getTab(String fileName) {
+    Sketch s = getSketch();
+    for (SketchCode c : s.getCode()) {
+      if (c.getFileName().equals(fileName)) {
+        return c;
       }
     }
+    return null;
+  }
 
-    /**
-     * Retrieve a {@link LineID} object for a line on the current tab.
-     *
-     * @param lineIdx the line index on the current tab
-     * @return the {@link LineID} object representing a line index on the
-     * current tab
-     */
-    public LineID getLineIDInCurrentTab(int lineIdx) {
-      return new LineID(getSketch().getCurrentCode().getFileName(), lineIdx);
+
+  /**
+   * Retrieve the current tab.
+   * @return the {@link SketchCode} representing the current tab
+   */
+  public SketchCode getCurrentTab() {
+    return getSketch().getCurrentCode();
+  }
+
+
+  /**
+   * Access the currently edited document.
+   * @return the document object
+   */
+  public Document currentDocument() {
+    //return ta.getDocument();
+    return getCurrentTab().getDocument();
+  }
+
+
+  /**
+   * Event Handler for double clicking in the left hand gutter area.
+   * @param lineIdx the line (0-based) that was double clicked
+   */
+  public void gutterDblClicked(int lineIdx) {
+    if (debugger != null) {
+      debugger.toggleBreakpoint(lineIdx);
     }
+  }
 
-    /**
-     * Retrieve line of sketch where the cursor currently resides.
-     *
-     * @return the current {@link LineID}
-     */
-    protected LineID getCurrentLineID() {
-      String tab = getSketch().getCurrentCode().getFileName();
-      int lineNo = getTextArea().getCaretLine();
-      return new LineID(tab, lineNo);
-    }
 
-    /**
-     * Check whether a {@link LineID} is on the current tab.
-     *
-     * @param line the {@link LineID}
-     * @return true, if the {@link LineID} is on the current tab.
-     */
-    public boolean isInCurrentTab(LineID line) {
-      return line.fileName().equals(getSketch().getCurrentCode().getFileName());
-    }
+  public void statusBusy() {
+    statusNotice("Debugger busy...");
+  }
 
-    /**
-     * Event handler called when switching between tabs. Loads all line
-     * background colors set for the tab.
-     *
-     * @param code tab to switch to
-     */
-    @Override
-    protected void setCode(SketchCode code) {
-      //System.out.println("tab switch: " + code.getFileName());
-      super.setCode(code); // set the new document in the textarea, etc. need to do this first
 
-      // set line background colors for tab
-      final JavaTextArea ta = getJavaTextArea();
-      if (ta != null) { // can be null when setCode is called the first time (in constructor)
-        // clear all line backgrounds
-        ta.clearLineBgColors();
-        // clear all gutter text
-        ta.clearGutterText();
-        // load appropriate line backgrounds for tab
-        // first paint breakpoints
-        for (LineHighlight hl : breakpointedLines) {
-          if (isInCurrentTab(hl.getLineID())) {
-            hl.paint();
-          }
-        }
-        // now paint current line (if any)
-        if (currentLine != null) {
-          if (isInCurrentTab(currentLine.getLineID())) {
-            currentLine.paint();
-          }
-        }
-      }
-      if (getDebugger() != null && getDebugger().isStarted()) {
-        getDebugger().startTrackingLineChanges();
+  public void statusHalted() {
+    statusNotice("Debugger halted.");
+  }
+
+
+  public static final int STATUS_EMPTY = 100, STATUS_COMPILER_ERR = 200,
+    STATUS_WARNING = 300, STATUS_INFO = 400, STATUS_ERR = 500;
+  public int statusMessageType = STATUS_EMPTY;
+  public String statusMessage;
+  public void statusMessage(final String what, int type){
+    // Don't re-display the old message again
+    if (type != STATUS_EMPTY) {
+      if (what.equals(statusMessage) && type == statusMessageType) {
+        return;
       }
     }
-
-    /**
-     * Get a tab by its file name.
-     *
-     * @param fileName the filename to search for.
-     * @return the {@link SketchCode} object representing the tab, or null if
-     * not found
-     */
-    public SketchCode getTab(String fileName) {
-      Sketch s = getSketch();
-      for (SketchCode c : s.getCode()) {
-        if (c.getFileName().equals(fileName)) {
-          return c;
-        }
-      }
-      return null;
+    statusMessage = new String(what);
+    statusMessageType = type;
+    switch (type) {
+    case STATUS_COMPILER_ERR:
+    case STATUS_ERR:
+      super.statusError(what);
+      break;
+    case STATUS_INFO:
+    case STATUS_WARNING:
+      statusNotice(what);
+      break;
     }
+    // Don't need to clear compiler error messages
+    if (type == STATUS_COMPILER_ERR) return;
 
-    /**
-     * Retrieve the current tab.
-     *
-     * @return the {@link SketchCode} representing the current tab
-     */
-    public SketchCode getCurrentTab() {
-      return getSketch().getCurrentCode();
-    }
-
-    /**
-     * Access the currently edited document.
-     *
-     * @return the document object
-     */
-    public Document currentDocument() {
-      //return ta.getDocument();
-      return getCurrentTab().getDocument();
-    }
-
-    /**
-     * Factory method for the editor toolbar. Instantiates the customized
-     * toolbar.
-     *
-     * @return the toolbar
-     */
-    /*@Override
-    public EditorToolbar createToolbar() {
-        return new DebugToolbar(this, base);
-    }*/
-
-    /**
-     * Event Handler for double clicking in the left hand gutter area.
-     *
-     * @param lineIdx the line (0-based) that was double clicked
-     */
-    public void gutterDblClicked(int lineIdx) {
-      if (debugger != null) {
-        debugger.toggleBreakpoint(lineIdx);
-      }
-    }
-
-    public void statusBusy() {
-      statusNotice("Debugger busy...");
-    }
-
-    public void statusHalted() {
-      statusNotice("Debugger halted.");
-    }
-
-    public static final int STATUS_EMPTY = 100, STATUS_COMPILER_ERR = 200,
-        STATUS_WARNING = 300, STATUS_INFO = 400, STATUS_ERR = 500;
-    public int statusMessageType = STATUS_EMPTY;
-    public String statusMessage;
-    public void statusMessage(final String what, int type){
-      // Don't re-display the old message again
-      if(type != STATUS_EMPTY) {
-        if(what.equals(statusMessage) && type == statusMessageType) {
-          return;
-        }
-      }
-      statusMessage = new String(what);
-      statusMessageType = type;
-      switch (type) {
-      case STATUS_COMPILER_ERR:
-      case STATUS_ERR:
-        super.statusError(what);
-        break;
-      case STATUS_INFO:
-      case STATUS_WARNING:  
-        statusNotice(what);        
-        break;
-      }
-      // Don't need to clear compiler error messages
-      if(type == STATUS_COMPILER_ERR) return;
-
-      // Clear the message after a delay
-      SwingWorker<Object, Object> s = new SwingWorker<Object, Object>() {
-        @Override
-        protected Object doInBackground() throws Exception {
-          try {
-            Thread.sleep(2 * 1000);
-          } catch (InterruptedException e) {
-            e.printStackTrace();
-          }
-          statusEmpty();
-          return null;
-        }
-      };
-      s.execute();
-    }
-
-    public void statusEmpty(){
-      statusMessage = null;
-      statusMessageType = STATUS_EMPTY;
-      super.statusEmpty();
-    }
-
-    public ErrorCheckerService errorCheckerService;
-
-    /**
-     * Initializes and starts Error Checker Service
-     */
-    private void initializeErrorChecker() {
-      Thread errorCheckerThread = null;
-
-      if (errorCheckerThread == null) {
-        errorCheckerService = new ErrorCheckerService(this);
-        errorCheckerThread = new Thread(errorCheckerService);
+    // Clear the message after a delay
+    SwingWorker<Object, Object> s = new SwingWorker<Object, Object>() {
+      @Override
+      protected Object doInBackground() throws Exception {
         try {
-          errorCheckerThread.start();
-        } catch (Exception e) {
-          System.err
-          .println("Error Checker Service not initialized [XQEditor]: "
-              + e);
-          // e.printStackTrace();
+          Thread.sleep(2 * 1000);
+        } catch (InterruptedException e) {
+          e.printStackTrace();
         }
-        // System.out.println("Error Checker Service initialized.");
+        statusEmpty();
+        return null;
       }
-
-    }
+    };
+    s.execute();
+  }
 
 
-    public void updateErrorBar(List<Problem> problems) {
-      errorBar.updateErrorPoints(problems);
-    }
-    
-    
-    public List<ErrorMarker> getErrorPoints() {
-      return errorBar.errorPoints;
-    }
-    
-    
-    public void repaintErrorBar() {
-      errorBar.repaint();
-    }
+  public void statusEmpty(){
+    statusMessage = null;
+    statusMessageType = STATUS_EMPTY;
+    super.statusEmpty();
+  }
 
 
-    /**
-     * Toggle between Console and Errors List
-     * 
-     * @param buttonName
-     *            - Button Label
-     */
-    public void showProblemListView(String buttonName) {
-      CardLayout cl = (CardLayout) consoleProblemsPane.getLayout();
-      cl.show(consoleProblemsPane, buttonName);
-    }
+  public ErrorCheckerService errorCheckerService;
 
-    /**
-     * Updates the error table
-     * @param tableModel
-     * @return
-     */
-    synchronized public boolean updateTable(final TableModel tableModel) {
-      return errorTable.updateTable(tableModel);
-    }
+  /**
+   * Initializes and starts Error Checker Service
+   */
+  private void initializeErrorChecker() {
+    Thread errorCheckerThread = null;
 
-    
-    /**
-     * Handle whether the tiny red error indicator is shown near the error button
-     * at the bottom of the PDE
-     */
-    public void updateErrorToggle(){
-      btnShowErrors.updateMarker(JavaMode.errorCheckEnabled &&
-                                 errorCheckerService.hasErrors(), 
-                                 errorBar.errorColor);
-    }
-
-    
-    /**
-     * Handle refactor operation
-     */
-    private void handleRefactor() {
-      Base.log("Caret at:" + textarea.getLineText(textarea.getCaretLine()));
-      errorCheckerService.getASTGenerator().handleRefactor();
-    }
-
-    
-    /**
-     * Handle show usage operation
-     */
-    private void handleShowUsage() {
-      Base.log("Caret at:" + textarea.getLineText(textarea.getCaretLine()));
-      errorCheckerService.getASTGenerator().handleShowUsage();
-    }
-
-    
-    public boolean hasJavaTabs() {
-      return hasJavaTabs;
-    }
-    
-    
-    /**
-     * Checks if the sketch contains java tabs. If it does, the editor ain't 
-     * built for it, yet. Also, user should really start looking at a full IDE 
-     * like Eclipse. Disable compilation check and some more features.
-     */
-    private boolean checkForJavaTabs() {
-      for (SketchCode code : getSketch().getCode()) {
-        if (code.getExtension().equals("java")) {
-          final String msg = 
-            getSketch().getName() + " contains .java tabs. Some editor " +
-            "features are not supported for .java tabs and will be disabled.";
-          Base.showWarning("Cannot debug advanced sketches", msg);
-          return true;
-        }
-      }
-      return false;
-    }
-
-    
-    protected void applyPreferences() {
-      super.applyPreferences();
-      if (jmode != null) {
-        jmode.loadPreferences();
-        Base.log("Applying prefs");
-        // trigger it once to refresh UI
-        errorCheckerService.runManualErrorCheck();
+    if (errorCheckerThread == null) {
+      errorCheckerService = new ErrorCheckerService(this);
+      errorCheckerThread = new Thread(errorCheckerService);
+      try {
+        errorCheckerThread.start();
+      } catch (Exception e) {
+        Base.loge("Error Checker Service not initialized", e);
       }
     }
+  }
 
-    
-    // TweakMode code
-    /**
-     * Show warnings menu item
-     */
-    //protected JCheckBoxMenuItem enableTweakCB;
+
+  public void updateErrorBar(List<Problem> problems) {
+    errorBar.updateErrorPoints(problems);
+  }
+
+
+  public List<ErrorMarker> getErrorPoints() {
+    return errorBar.errorPoints;
+  }
+
+
+  public void repaintErrorBar() {
+    errorBar.repaint();
+  }
+
+
+  /** Toggle between Console and Errors List */
+  public void showProblemListView(String buttonName) {
+    CardLayout cl = (CardLayout) consoleProblemsPane.getLayout();
+    cl.show(consoleProblemsPane, buttonName);
+  }
+
+
+  /** Updates the error table */
+  synchronized public boolean updateTable(final TableModel tableModel) {
+    return errorTable.updateTable(tableModel);
+  }
+
+
+  /**
+   * Handle whether the tiny red error indicator is shown near
+   * the error button at the bottom of the PDE
+   */
+  public void updateErrorToggle() {
+    btnShowErrors.updateMarker(JavaMode.errorCheckEnabled &&
+                               errorCheckerService.hasErrors(),
+                               errorBar.errorColor);
+  }
+
+
+  /** Handle refactor operation */
+  private void handleRefactor() {
+    Base.log("Caret at:" + textarea.getLineText(textarea.getCaretLine()));
+    errorCheckerService.getASTGenerator().handleRefactor();
+  }
+
+
+  /** Handle show usage operation */
+  private void handleShowUsage() {
+    Base.log("Caret at:" + textarea.getLineText(textarea.getCaretLine()));
+    errorCheckerService.getASTGenerator().handleShowUsage();
+  }
+
+
+  public boolean hasJavaTabs() {
+    return hasJavaTabs;
+  }
+
+
+  /**
+   * Checks if the sketch contains java tabs. If it does, the editor ain't
+   * built for it, yet. Also, user should really start looking at a full IDE
+   * like Eclipse. Disable compilation check and some more features.
+   */
+  private boolean checkForJavaTabs() {
+    for (SketchCode code : getSketch().getCode()) {
+      if (code.getExtension().equals("java")) {
+        final String msg =
+          getSketch().getName() + " contains .java tabs. Some editor " +
+          "features are not supported for .java tabs and will be disabled.";
+        Base.showWarning("Cannot debug advanced sketches", msg);
+        return true;
+      }
+    }
+    return false;
+  }
+
+
+  protected void applyPreferences() {
+    super.applyPreferences();
+    if (jmode != null) {
+      jmode.loadPreferences();
+      Base.log("Applying prefs");
+      // trigger it once to refresh UI
+      errorCheckerService.runManualErrorCheck();
+    }
+  }
+
+
+  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+  // TWEAK MODE
 
   public static final String prefTweakPort = "tweak.port";
   public static final String prefTweakShowCode = "tweak.showcode";
@@ -2483,12 +2420,12 @@ public class JavaEditor extends Editor {
 
   UDPTweakClient tweakClient;
 
-  
+
   public void startInteractiveMode() {
     getJavaTextArea().startInteractiveMode();
   }
 
-  
+
   //public void stopInteractiveMode(ArrayList<Handle> handles[]) {
   public void stopInteractiveMode(List<List<Handle>> handles) {
     tweakClient.shutdown();
@@ -2517,7 +2454,7 @@ public class JavaEditor extends Editor {
         loadSavedCode();
         // update the painter to draw the saved (old) code
         textarea.invalidate();
-      
+
       } else {
         // YES! keep changes
         // the new values are already present, just make sure the user can save the modified tabs
@@ -2560,13 +2497,13 @@ public class JavaEditor extends Editor {
     }
   }
 
-  
-  public void updateInterface(List<List<Handle>> handles, 
+
+  public void updateInterface(List<List<Handle>> handles,
                               List<List<ColorControlBox>> colorBoxes) {
     getJavaTextArea().updateInterface(handles, colorBoxes);
   }
 
-  
+
   private boolean[] getModifiedTabs(List<List<Handle>> handles) {
     boolean[] modifiedTabs = new boolean[handles.size()];
 
@@ -2580,7 +2517,7 @@ public class JavaEditor extends Editor {
     return modifiedTabs;
   }
 
-  
+
   public void initBaseCode() {
     SketchCode[] code = sketch.getCode();
 
@@ -2596,10 +2533,9 @@ public class JavaEditor extends Editor {
       baseCode[i] = space + baseCode[i] + space;
     }
   }
-  
 
-  public void initEditorCode(List<List<Handle>> handles, boolean withSpaces)
-  {
+
+  public void initEditorCode(List<List<Handle>> handles, boolean withSpaces) {
     SketchCode[] sketchCode = sketch.getCode();
     for (int tab=0; tab<baseCode.length; tab++) {
         // beautify the numbers
@@ -2632,8 +2568,8 @@ public class JavaEditor extends Editor {
     setCode(sketch.getCurrentCode());
   }
 
-  private void loadSavedCode()
-  {
+
+  private void loadSavedCode() {
     SketchCode[] code = sketch.getCode();
     for (int i=0; i<code.length; i++) {
       if (!code[i].getProgram().equals(code[i].getSavedProgram())) {
@@ -2643,13 +2579,12 @@ public class JavaEditor extends Editor {
         code[i].setDocument(null);
       }
     }
-
     // this will update the current code
     setCode(sketch.getCurrentCode());
   }
 
-  private void removeSpacesFromCode()
-  {
+
+  private void removeSpacesFromCode() {
     SketchCode[] code = sketch.getCode();
     for (int i=0; i<code.length; i++) {
       String c = code[i].getProgram();
@@ -2663,47 +2598,44 @@ public class JavaEditor extends Editor {
     setCode(sketch.getCurrentCode());
   }
 
-    /**
-     * Replace all numbers with variables and add code to initialize these variables and handle update messages.
-     * @param sketch
-     *  the sketch to work on
-     * @param handles
-     *  list of numbers to replace in this sketch
-     * @return
-     *  true on success
-     */
-    //public boolean automateSketch(Sketch sketch, ArrayList<Handle> handles[])
-    public boolean automateSketch(Sketch sketch, List<List<Handle>> handles) {
-      SketchCode[] code = sketch.getCode();
 
-      if (code.length<1)
-        return false;
+  /**
+   * Replace all numbers with variables and add code to initialize
+   * these variables and handle update messages.
+   */
+  //public boolean automateSketch(Sketch sketch, ArrayList<Handle> handles[])
+  public boolean automateSketch(Sketch sketch, List<List<Handle>> handles) {
+    SketchCode[] code = sketch.getCode();
 
-      if (handles.size() == 0)
-        return false;
+    if (code.length < 1) {
+      return false;
+    }
 
-      int setupStartPos = SketchParser.getSetupStart(baseCode[0]);
-      if (setupStartPos < 0) {
-        return false;
-      }
+    if (handles.size() == 0) {
+      return false;
+    }
 
-      // get port number from preferences.txt
-      int port;
-      String portStr = Preferences.get(prefTweakPort);
-      if (portStr == null) {
-        Preferences.set(prefTweakPort, "auto");
-        portStr = "auto";
-      }
-      
-      if (portStr.equals("auto")) {
-            // random port for udp (0xc000 - 0xffff)
-        port = (int)(Math.random()*0x3fff) + 0xc000;      
-      }
-      else {
-        port = Preferences.getInteger(prefTweakPort);
-      }
-      
-      /* create the client that will send the new values to the sketch */
+    int setupStartPos = SketchParser.getSetupStart(baseCode[0]);
+    if (setupStartPos < 0) {
+      return false;
+    }
+
+    // get port number from preferences.txt
+    int port;
+    String portStr = Preferences.get(prefTweakPort);
+    if (portStr == null) {
+      Preferences.set(prefTweakPort, "auto");
+      portStr = "auto";
+    }
+
+    if (portStr.equals("auto")) {
+      // random port for udp (0xc000 - 0xffff)
+      port = (int)(Math.random()*0x3fff) + 0xc000;
+    } else {
+      port = Preferences.getInteger(prefTweakPort);
+    }
+
+    // create the client that will send the new values to the sketch
     tweakClient = new UDPTweakClient(port);
     // update handles with a reference to the client object
     for (int tab=0; tab<code.length; tab++) {
@@ -2711,106 +2643,104 @@ public class JavaEditor extends Editor {
         h.setTweakClient(tweakClient);
       }
     }
-    
+
 
     // Copy current program to interactive program
-
-      /* modify the code below, replace all numbers with their variable names */
-      // loop through all tabs in the current sketch
-      for (int tab=0; tab<code.length; tab++)
-      {
-        int charInc = 0;
+    // modify the code below, replace all numbers with their variable names
+    // loop through all tabs in the current sketch
+    for (int tab=0; tab<code.length; tab++) {
+      int charInc = 0;
       String c = baseCode[tab];
-      for (Handle n : handles.get(tab))
-        {
-          // replace number value with a variable
-          c = replaceString(c, n.startChar + charInc, n.endChar + charInc, n.name);
-          charInc += n.name.length() - n.strValue.length();
-        }
+      for (Handle n : handles.get(tab)) {
+        // replace number value with a variable
+        c = replaceString(c, n.startChar + charInc, n.endChar + charInc, n.name);
+        charInc += n.name.length() - n.strValue.length();
+      }
       code[tab].setProgram(c);
-      }
-
-      /* add the main header to the code in the first tab */
-      String c = code[0].getProgram();
-
-      // header contains variable declaration, initialization, and OSC listener function
-      String header;
-      header = "\n\n" +
-         "/*************************/\n" +
-         "/* MODIFIED BY TWEAKMODE */\n" +
-       "/*************************/\n" +
-         "\n\n";
-
-      // add needed OSC imports and the global OSC object
-      header += "import java.net.*;\n";
-      header += "import java.io.*;\n";
-      header += "import java.nio.*;\n\n";
-
-      // write a declaration for int and float arrays
-      int numOfInts = howManyInts(handles);
-      int numOfFloats = howManyFloats(handles);
-      if (numOfInts > 0) {
-        header += "int[] tweakmode_int = new int["+numOfInts+"];\n";
-      }
-      if (numOfFloats > 0) {
-        header += "float[] tweakmode_float = new float["+numOfFloats+"];\n\n";
-      }
-      
-      /* add the server code that will receive the value change messages */
-      header += UDPTweakClient.getServerCode(port, numOfInts>0, numOfFloats>0);
-      header += "TweakModeServer tweakmode_Server;\n";
-          
-
-      header += "void tweakmode_initAllVars() {\n";
-      //for (int i=0; i<handles.length; i++) {
-      for (List<Handle> list : handles) {
-        //for (Handle n : handles[i]) {
-        for (Handle n : list) {
-          header += "  " + n.name + " = " + n.strValue + ";\n";
-        }
-      }
-      header += "}\n\n";
-      header += "void tweakmode_initCommunication() {\n";
-      header += " tweakmode_Server = new TweakModeServer();\n";
-      header += " tweakmode_Server.setup();\n";
-      header += " tweakmode_Server.start();\n";
-      header += "}\n";
-
-      header += "\n\n\n\n\n";
-
-      // add call to our initAllVars and initOSC functions from the setup() function.
-      String addToSetup = "\n"+
-                " tweakmode_initAllVars();\n"+
-                " tweakmode_initCommunication();\n\n";
-      
-      setupStartPos = SketchParser.getSetupStart(c);
-      c = replaceString(c, setupStartPos, setupStartPos, addToSetup);
-
-      code[0].setProgram(header + c);
-
-      /* print out modified code */
-      String showModCode = Preferences.get(prefTweakShowCode);
-      if (showModCode == null) {
-        Preferences.setBoolean(prefTweakShowCode, false);
-      }
-      
-      if (Preferences.getBoolean(prefTweakShowCode)) {
-        System.out.println("\nTweakMode modified code:\n");
-        for (int i=0; i<code.length; i++)
-        {
-          System.out.println("tab " + i + "\n");
-          System.out.println("=======================================================\n");
-          System.out.println(code[i].getProgram());
-        }
-      }
-
-      return true;
     }
 
+    // add the main header to the code in the first tab
+    String c = code[0].getProgram();
+
+    // header contains variable declaration, initialization,
+    // and OSC listener function
+    String header;
+    header = "\n\n" +
+      "/*************************/\n" +
+      "/* MODIFIED BY TWEAKMODE */\n" +
+      "/*************************/\n" +
+      "\n\n";
+
+    // add needed OSC imports and the global OSC object
+    header += "import java.net.*;\n";
+    header += "import java.io.*;\n";
+    header += "import java.nio.*;\n\n";
+
+    // write a declaration for int and float arrays
+    int numOfInts = howManyInts(handles);
+    int numOfFloats = howManyFloats(handles);
+    if (numOfInts > 0) {
+      header += "int[] tweakmode_int = new int["+numOfInts+"];\n";
+    }
+    if (numOfFloats > 0) {
+      header += "float[] tweakmode_float = new float["+numOfFloats+"];\n\n";
+    }
+
+    // add the server code that will receive the value change messages
+    header += UDPTweakClient.getServerCode(port, numOfInts>0, numOfFloats>0);
+    header += "TweakModeServer tweakmode_Server;\n";
+
+    header += "void tweakmode_initAllVars() {\n";
+    //for (int i=0; i<handles.length; i++) {
+    for (List<Handle> list : handles) {
+      //for (Handle n : handles[i]) {
+      for (Handle n : list) {
+        header += "  " + n.name + " = " + n.strValue + ";\n";
+      }
+    }
+    header += "}\n\n";
+    header += "void tweakmode_initCommunication() {\n";
+    header += " tweakmode_Server = new TweakModeServer();\n";
+    header += " tweakmode_Server.setup();\n";
+    header += " tweakmode_Server.start();\n";
+    header += "}\n";
+
+    header += "\n\n\n\n\n";
+
+    // add call to our initAllVars and initOSC functions
+    // from the setup() function.
+    String addToSetup = "\n"+
+      " tweakmode_initAllVars();\n"+
+      " tweakmode_initCommunication();\n\n";
+
+    setupStartPos = SketchParser.getSetupStart(c);
+    c = replaceString(c, setupStartPos, setupStartPos, addToSetup);
+
+    code[0].setProgram(header + c);
+
+    // print out modified code
+    String showModCode = Preferences.get(prefTweakShowCode);
+    if (showModCode == null) {
+      Preferences.setBoolean(prefTweakShowCode, false);
+    }
+
+    if (Preferences.getBoolean(prefTweakShowCode)) {
+      System.out.println("\nTweakMode modified code:\n");
+      for (int i=0; i<code.length; i++) {
+        System.out.println("tab " + i + "\n");
+        System.out.println("=======================================================\n");
+        System.out.println(code[i].getProgram());
+      }
+    }
+    return true;
+  }
+
+
   private String replaceString(String str, int start, int end, String put) {
     return str.substring(0, start) + put + str.substring(end, str.length());
   }
 
+
   //private int howManyInts(ArrayList<Handle> handles[])
   private int howManyInts(List<List<Handle>> handles) {
     int count = 0;
@@ -2826,6 +2756,7 @@ public class JavaEditor extends Editor {
     return count;
   }
 
+
   //private int howManyFloats(ArrayList<Handle> handles[])
   private int howManyFloats(List<List<Handle>> handles) {
     int count = 0;