diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 433ead15e..daa2069ee 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -456,9 +456,9 @@ public class Base {
       }
 
       // Error during build or upload
-      int res = editor.status.mode;
-      if (res == EditorStatus.ERR)
+      if (editor.status.isErr()) {
         System.exit(1);
+      }
 
       // No errors exit gracefully
       System.exit(0);
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index c990ac79b..226785da0 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -250,9 +250,9 @@ public class Editor extends JFrame implements RunnerListener {
     // For rev 0120, placing things inside a JPanel
     Container contentPain = getContentPane();
     contentPain.setLayout(new BorderLayout());
-    JPanel pain = new JPanel();
-    pain.setLayout(new BorderLayout());
-    contentPain.add(pain, BorderLayout.CENTER);
+    JPanel pane = new JPanel();
+    pane.setLayout(new BorderLayout());
+    contentPain.add(pane, BorderLayout.CENTER);
 
     Box box = Box.createVerticalBox();
     Box upper = Box.createVerticalBox();
@@ -326,12 +326,12 @@ public class Editor extends JFrame implements RunnerListener {
     // hopefully these are no longer needed w/ swing
     // (har har har.. that was wishful thinking)
     // listener = new EditorListener(this, textarea);
-    pain.add(box);
+    pane.add(box);
 
     // get shift down/up events so we can show the alt version of toolbar buttons
     textarea.addKeyListener(toolbar);
 
-    pain.setTransferHandler(new FileDropHandler());
+    pane.setTransferHandler(new FileDropHandler());
 
 //    System.out.println("t1");
 
diff --git a/app/src/processing/app/EditorStatus.java b/app/src/processing/app/EditorStatus.java
index 611457543..36c2d6778 100644
--- a/app/src/processing/app/EditorStatus.java
+++ b/app/src/processing/app/EditorStatus.java
@@ -23,14 +23,14 @@
 
 package processing.app;
 
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
-
 import processing.app.helpers.OSUtils;
 
-import java.awt.datatransfer.*;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 
 import static processing.app.I18n._;
 
@@ -38,135 +38,105 @@ import static processing.app.I18n._;
 /**
  * Panel just below the editing area that contains status messages.
  */
-public class EditorStatus extends JPanel /*implements ActionListener*/ {
-  static Color bgcolor[];
-  static Color fgcolor[];
+public class EditorStatus extends JPanel {
 
-  static final int NOTICE = 0;
-  static final int ERR    = 1;
-  //static final int PROMPT = 2;
-  //static final int EDIT   = 3;
-  static final int EDIT   = 2;
-  static final int PROGRESS = 5;
+  private static final int NOTICE = 0;
+  private static final int ERR = 1;
+  private static final int EDIT = 2;
+  private static final int PROGRESS = 5;
+  private static final String NO_MESSAGE = "";
 
-  static final int YES    = 1;
-  static final int NO     = 2;
-  static final int CANCEL = 3;
-  static final int OK     = 4;
+  private static final Color[] BGCOLOR;
+  private static final Color[] FGCOLOR;
 
-  static final String NO_MESSAGE = "";
+  static {
+    BGCOLOR = new Color[6];
+    BGCOLOR[0] = Theme.getColor("status.notice.bgcolor");
+    BGCOLOR[1] = Theme.getColor("status.error.bgcolor");
+    BGCOLOR[2] = Theme.getColor("status.edit.bgcolor");
+    BGCOLOR[3] = null;
+    BGCOLOR[4] = null;
+    BGCOLOR[5] = Theme.getColor("status.notice.bgcolor");
 
-  Editor editor;
+    FGCOLOR = new Color[6];
+    FGCOLOR[0] = Theme.getColor("status.notice.fgcolor");
+    FGCOLOR[1] = Theme.getColor("status.error.fgcolor");
+    FGCOLOR[2] = Theme.getColor("status.edit.fgcolor");
+    FGCOLOR[3] = null;
+    FGCOLOR[4] = null;
+    FGCOLOR[5] = Theme.getColor("status.notice.fgcolor");
+  }
 
-  int mode;
-  String message;
+  private final Editor editor;
+  private final Font font;
 
-  Font font;
-  FontMetrics metrics;
-  int ascent;
+  private int mode;
+  private String message;
 
-  Image offscreen;
-  int sizeW, sizeH;
-  int imageW, imageH;
+  private Image offscreen;
+  private int sizeW;
+  private int sizeH;
+  private int imageW;
+  private int imageH;
 
-  //JButton yesButton;
-  //JButton noButton;
-  JButton cancelButton;
-  JButton okButton;
-  JTextField editField;
-  JProgressBar progressBar;
-  JButton copyErrorButton;
-
-  //Thread promptThread;
-  int response;
-
-  boolean initialized = false;
+  private JButton cancelButton;
+  private JButton okButton;
+  private JTextField editField;
+  private JProgressBar progressBar;
+  private JButton copyErrorButton;
 
   public EditorStatus(Editor editor) {
     this.editor = editor;
-    empty();
-
-    if (bgcolor == null) {
-      bgcolor = new Color[6];
-      bgcolor[0] = Theme.getColor("status.notice.bgcolor");
-      bgcolor[1] = Theme.getColor("status.error.bgcolor");
-      bgcolor[2] = Theme.getColor("status.edit.bgcolor");
-      bgcolor[3] = null;
-      bgcolor[4] = null;
-      bgcolor[5] = Theme.getColor("status.notice.bgcolor");
-
-      fgcolor = new Color[6];
-      fgcolor[0] = Theme.getColor("status.notice.fgcolor");
-      fgcolor[1] = Theme.getColor("status.error.fgcolor");
-      fgcolor[2] = Theme.getColor("status.edit.fgcolor");
-      fgcolor[3] = null;
-      fgcolor[4] = null;
-      fgcolor[5] = Theme.getColor("status.notice.fgcolor");
-}
+    this.message = NO_MESSAGE;
+    this.mode = NOTICE;
+    this.font = Theme.getFont("status.font");
+    initialize();
   }
 
+  private void clearState() {
+    changeState(NOTICE);
+  }
 
-  public void empty() {
-    mode = NOTICE;
+  private void changeState(int newMode) {
+    if (mode == newMode) {
+      return;
+    }
+
+    mode = newMode;
+
+    if (cancelButton.isVisible()) {
+      cancelButton.doClick();
+    }
+    cancelButton.setVisible(false);
+    okButton.setVisible(false);
+    editField.setVisible(false);
+    progressBar.setVisible(false);
+    copyErrorButton.setVisible(false);
     message = NO_MESSAGE;
-    //update();
-    repaint();
   }
 
-
   public void notice(String message) {
-    mode = NOTICE;
+    changeState(NOTICE);
     this.message = message;
-    if (copyErrorButton != null)
+    if (copyErrorButton != null) {
       copyErrorButton.setVisible(false);
-    //update();
+    }
     repaint();
   }
 
-  public void unnotice(String unmessage) {
-    if (message.equals(unmessage)) empty();
-  }
-
-
   public void error(String message) {
-    mode = ERR;
+    changeState(ERR);
     this.message = message;
-    if (copyErrorButton != null)
+    if (copyErrorButton != null) {
       copyErrorButton.setVisible(true);
+    }
     repaint();
   }
 
-
-  /*
-  public void prompt(String message) {
-    mode = PROMPT;
-    this.message = message;
-
-    response = 0;
-    yesButton.setVisible(true);
-    noButton.setVisible(true);
-    cancelButton.setVisible(true);
-    yesButton.requestFocus();
-
-    repaint();
-  }
-
-
-  // prompt has been handled, re-hide the buttons
-  public void unprompt() {
-    yesButton.setVisible(false);
-    noButton.setVisible(false);
-    cancelButton.setVisible(false);
-    empty();
-  }
-  */
-
-
   public void edit(String message, String dflt) {
-    mode = EDIT;
+    changeState(EDIT);
     this.message = message;
 
-    response = 0;
     okButton.setVisible(true);
     cancelButton.setVisible(true);
     editField.setVisible(true);
@@ -177,16 +147,16 @@ public class EditorStatus extends JPanel /*implements ActionListener*/ {
     repaint();
   }
 
-  public void unedit() {
+  private void unedit() {
     okButton.setVisible(false);
     cancelButton.setVisible(false);
     editField.setVisible(false);
-    empty();
+    clearState();
+    repaint();
   }
 
-  public void progress(String message)
-  {
-    mode = PROGRESS;
+  public void progress(String message) {
+    changeState(PROGRESS);
     this.message = message;
     progressBar.setIndeterminate(false);
     progressBar.setVisible(true);
@@ -195,72 +165,30 @@ public class EditorStatus extends JPanel /*implements ActionListener*/ {
     repaint();
   }
 
-  
-  public void progressIndeterminate(String message)
-  {
-    mode = PROGRESS;
+  public void progressNotice(String message) {
     this.message = message;
-    progressBar.setIndeterminate(true);
-    progressBar.setValue(50);
-    progressBar.setVisible(true);
-    copyErrorButton.setVisible(false);
-    setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
     repaint();
   }
 
-  
-  public void progressNotice(String message) {
-    //mode = NOTICE;
-    this.message = message;
-    //update();
-    repaint();
-  }
-  
-  
-  public void unprogress()
-  {
+  public void unprogress() {
     if (PreferencesData.getBoolean("editor.beep.compile")) {
       Toolkit.getDefaultToolkit().beep();
     }
-    if (progressBar == null) return;
+    if (progressBar == null) {
+      return;
+    }
     progressBar.setVisible(false);
     progressBar.setValue(0);
     setCursor(null);
-    //empty();
   }
-  
-  
-  public void progressUpdate(int value)
-  {
+
+  public void progressUpdate(int value) {
     if (progressBar == null) return;
     progressBar.setValue(value);
     repaint();
   }
 
-  /*
-  public void update() {
-    Graphics g = this.getGraphics();
-    try {
-      setBackground(bgcolor[mode]);
-    } catch (NullPointerException e) { } // if not ready yet
-    if (g != null) paint(g);
-  }
-
-  public void update(Graphics g) {
-    paint(g);
-  }
-  */
-
-
   public void paintComponent(Graphics screen) {
-    //if (screen == null) return;
-    if (!initialized) {
-      setup();
-      initialized = true;
-    }
-
-    //System.out.println("status.paintComponent");
-
     Dimension size = getSize();
     if ((size.width != sizeW) || (size.height != sizeH)) {
       // component has been resized
@@ -286,231 +214,174 @@ public class EditorStatus extends JPanel /*implements ActionListener*/ {
       offscreen = createImage(imageW, imageH);
     }
 
-    Graphics g = offscreen.getGraphics();
-    if (font == null) {
-      font = Theme.getFont("status.font");
-      //new Font("SansSerif", Font.PLAIN, 12));
-      g.setFont(font);
-      metrics = g.getFontMetrics();
-      ascent = metrics.getAscent();
-    }
+    Graphics graphics = offscreen.getGraphics();
+    graphics.setColor(BGCOLOR[mode]);
+    graphics.fillRect(0, 0, imageW, imageH);
+    graphics.setColor(FGCOLOR[mode]);
 
-    //setBackground(bgcolor[mode]);  // does nothing
-
-    g.setColor(bgcolor[mode]);
-    g.fillRect(0, 0, imageW, imageH);
-
-    g.setColor(fgcolor[mode]);
-    g.setFont(font); // needs to be set each time on osx
-    g.drawString(message, Preferences.GUI_SMALL, (sizeH + ascent) / 2);
+    graphics.setFont(font); // needs to be set each time on osx
+    int ascent = graphics.getFontMetrics().getAscent();
+    assert message != null;
+    graphics.drawString(message, Preferences.GUI_SMALL, (sizeH + ascent) / 2);
 
     screen.drawImage(offscreen, 0, 0, null);
   }
 
+  private void initialize() {
+    cancelButton = new JButton(I18n.PROMPT_CANCEL);
+    okButton = new JButton(I18n.PROMPT_OK);
 
-  protected void setup() {
-    if (okButton == null) {
-      cancelButton = new JButton(I18n.PROMPT_CANCEL);
-      okButton = new JButton(I18n.PROMPT_OK);
-
-      cancelButton.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          if (mode == EDIT) {
-            unedit();
-            //editor.toolbar.clear();
-          }
-        }
-      });
-      
-      okButton.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          // answering to rename/new code question
-          if (mode == EDIT) {  // this if() isn't (shouldn't be?) necessary
-            String answer = editField.getText();
-            editor.getSketch().nameCode(answer);
-            unedit();
-          }
-        }
-      });
-
-      // !@#(* aqua ui #($*(( that turtle-neck wearing #(** (#$@)(
-      // os9 seems to work if bg of component is set, but x still a bastard
-      if (OSUtils.isMacOS()) {
-        //yesButton.setBackground(bgcolor[EDIT]);
-        //noButton.setBackground(bgcolor[EDIT]);
-        cancelButton.setBackground(bgcolor[EDIT]);
-        okButton.setBackground(bgcolor[EDIT]);
+    cancelButton.addActionListener(e -> {
+      if (mode == EDIT) {
+        unedit();
       }
-      setLayout(null);
+    });
 
-      /*
-      yesButton.addActionListener(this);
-      noButton.addActionListener(this);
-      cancelButton.addActionListener(this);
-      okButton.addActionListener(this);
-      */
-
-      //add(yesButton);
-      //add(noButton);
-      add(cancelButton);
-      add(okButton);
-
-      //yesButton.setVisible(false);
-      //noButton.setVisible(false);
-      cancelButton.setVisible(false);
-      okButton.setVisible(false);
-
-      editField = new JTextField();
-      // disabling, was not in use
-      //editField.addActionListener(this);
-
-      //if (Base.platform != Base.MACOSX) {
-      editField.addKeyListener(new KeyAdapter() {
-        
-          // Grab ESC with keyPressed, because it's not making it to keyTyped
-          public void keyPressed(KeyEvent event) {
-            if (event.getKeyChar() == KeyEvent.VK_ESCAPE) {
-              unedit();
-              //editor.toolbar.clear();
-              event.consume();
-            }
-          }
-
-          // use keyTyped to catch when the feller is actually
-          // added to the text field. with keyTyped, as opposed to
-          // keyPressed, the keyCode will be zero, even if it's
-          // enter or backspace or whatever, so the keychar should
-          // be used instead. grr.
-          public void keyTyped(KeyEvent event) {
-            //System.out.println("got event " + event);
-            int c = event.getKeyChar();
-
-            if (c == KeyEvent.VK_ENTER) {  // accept the input
-              String answer = editField.getText();
-              editor.getSketch().nameCode(answer);
-              unedit();
-              event.consume();
-
-              // easier to test the affirmative case than the negative
-            } else if ((c == KeyEvent.VK_BACK_SPACE) ||
-                       (c == KeyEvent.VK_DELETE) ||
-                       (c == KeyEvent.VK_RIGHT) ||
-                       (c == KeyEvent.VK_LEFT) ||
-                       (c == KeyEvent.VK_UP) ||
-                       (c == KeyEvent.VK_DOWN) ||
-                       (c == KeyEvent.VK_HOME) ||
-                       (c == KeyEvent.VK_END) ||
-                       (c == KeyEvent.VK_SHIFT)) {
-              // these events are ignored
-
-              /*
-            } else if (c == KeyEvent.VK_ESCAPE) {
-              unedit();
-              editor.toolbar.clear();
-              event.consume();
-              */
-
-            } else if (c == KeyEvent.VK_SPACE) {
-              String t = editField.getText();
-              int start = editField.getSelectionStart();
-              int end = editField.getSelectionEnd();
-              editField.setText(t.substring(0, start) + "_" +
-                                t.substring(end));
-              editField.setCaretPosition(start+1);
-              event.consume();
-
-            } else if ((c == '_') || (c == '.') ||  // allow .pde and .java
-                       ((c >= 'A') && (c <= 'Z')) ||
-                       ((c >= 'a') && (c <= 'z'))) {
-              // these are ok, allow them through
-              
-            } else if ((c >= '0') && (c <= '9')) {
-              // getCaretPosition == 0 means that it's the first char
-              // and the field is empty.
-              // getSelectionStart means that it *will be* the first
-              // char, because the selection is about to be replaced
-              // with whatever is typed.
-              if ((editField.getCaretPosition() == 0) ||
-                  (editField.getSelectionStart() == 0)) {
-                // number not allowed as first digit
-                //System.out.println("bad number bad");
-                event.consume();
-              }
-            } else {
-              event.consume();
-              //System.out.println("code is " + code + "  char = " + c);
-            }
-            //System.out.println("code is " + code + "  char = " + c);
-          }
-        });
-      add(editField);
-      editField.setVisible(false);
-
-      progressBar = new JProgressBar(JScrollBar.HORIZONTAL);
-      progressBar.setIndeterminate(false);
-      if (OSUtils.isMacOS()) {
-        //progressBar.setBackground(bgcolor[PROGRESS]);
-        //progressBar.putClientProperty("JProgressBar.style", "circular");
+    okButton.addActionListener(e -> {
+      // answering to rename/new code question
+      if (mode == EDIT) {  // this if() isn't (shouldn't be?) necessary
+        String answer = editField.getText();
+        editor.getSketch().nameCode(answer);
+        unedit();
       }
-      progressBar.setValue(0);
-      progressBar.setBorderPainted(true);
-      //progressBar.setStringPainted(true);
-      add(progressBar);
-      progressBar.setVisible(false);
-      
-      copyErrorButton = new JButton(_("Copy error messages"));
-      add(copyErrorButton);
-      copyErrorButton.setVisible(false);
-      copyErrorButton.addActionListener(new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          String message = "";
-          message += _("Arduino: ") + BaseNoGui.VERSION_NAME_LONG + " (" + System.getProperty("os.name") + "), ";
-          message += _("Board: ") + "\"" + BaseNoGui.getBoardPreferences().get("name") + "\"\n\n";
-          message += editor.console.getText();
-          if ((PreferencesData.getBoolean("build.verbose")) == false) {
-            message += "\n\n";
-            message += "  " + _("This report would have more information with") + "\n";
-            message += "  \"" + _("Show verbose output during compilation") + "\"\n";
-            message += "  " + _("enabled in File > Preferences.") + "\n";
-          }
-          Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-          StringSelection data = new StringSelection(message);
-          clipboard.setContents(data, null);
-          Clipboard unixclipboard = Toolkit.getDefaultToolkit().getSystemSelection();
-          if (unixclipboard != null) unixclipboard.setContents(data, null);
-        }
-      });
+    });
+
+    if (OSUtils.isMacOS()) {
+      cancelButton.setBackground(BGCOLOR[EDIT]);
+      okButton.setBackground(BGCOLOR[EDIT]);
     }
+    setLayout(null);
+
+    add(cancelButton);
+    add(okButton);
+
+    cancelButton.setVisible(false);
+    okButton.setVisible(false);
+
+    editField = new JTextField();
+
+    editField.addKeyListener(new KeyAdapter() {
+
+      // Grab ESC with keyPressed, because it's not making it to keyTyped
+      public void keyPressed(KeyEvent event) {
+        if (event.getKeyChar() == KeyEvent.VK_ESCAPE) {
+          unedit();
+          event.consume();
+        }
+      }
+
+      // use keyTyped to catch when the feller is actually
+      // added to the text field. with keyTyped, as opposed to
+      // keyPressed, the keyCode will be zero, even if it's
+      // enter or backspace or whatever, so the keychar should
+      // be used instead. grr.
+      public void keyTyped(KeyEvent event) {
+        int c = event.getKeyChar();
+
+        if (c == KeyEvent.VK_ENTER) {  // accept the input
+          String answer = editField.getText();
+          editor.getSketch().nameCode(answer);
+          unedit();
+          event.consume();
+
+          // easier to test the affirmative case than the negative
+        } else if ((c == KeyEvent.VK_BACK_SPACE) ||
+          (c == KeyEvent.VK_DELETE) ||
+          (c == KeyEvent.VK_RIGHT) ||
+          (c == KeyEvent.VK_LEFT) ||
+          (c == KeyEvent.VK_UP) ||
+          (c == KeyEvent.VK_DOWN) ||
+          (c == KeyEvent.VK_HOME) ||
+          (c == KeyEvent.VK_END) ||
+          (c == KeyEvent.VK_SHIFT)) {
+          // these events are ignored
+
+        } else if (c == KeyEvent.VK_SPACE) {
+          String t = editField.getText();
+          int start = editField.getSelectionStart();
+          int end = editField.getSelectionEnd();
+          editField.setText(t.substring(0, start) + "_" +
+            t.substring(end));
+          editField.setCaretPosition(start + 1);
+          event.consume();
+
+
+        } else if ((c == '_') || (c == '.') || ((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z'))) { // allow .pde and .java
+          // these are ok, allow them through
+
+        } else if ((c >= '0') && (c <= '9')) {
+          // getCaretPosition == 0 means that it's the first char
+          // and the field is empty.
+          // getSelectionStart means that it *will be* the first
+          // char, because the selection is about to be replaced
+          // with whatever is typed.
+          if ((editField.getCaretPosition() == 0) ||
+            (editField.getSelectionStart() == 0)) {
+            // number not allowed as first digit
+            event.consume();
+          }
+        } else {
+          event.consume();
+        }
+      }
+    });
+    add(editField);
+    editField.setVisible(false);
+
+    progressBar = new JProgressBar(JScrollBar.HORIZONTAL);
+    progressBar.setIndeterminate(false);
+    progressBar.setValue(0);
+    progressBar.setBorderPainted(true);
+    add(progressBar);
+    progressBar.setVisible(false);
+
+    copyErrorButton = new JButton(_("Copy error messages"));
+    add(copyErrorButton);
+    copyErrorButton.setVisible(false);
+    copyErrorButton.addActionListener(e -> {
+      String message1 = "";
+      message1 += _("Arduino: ") + BaseNoGui.VERSION_NAME_LONG + " (" + System.getProperty("os.name") + "), ";
+      message1 += _("Board: ") + "\"" + BaseNoGui.getBoardPreferences().get("name") + "\"\n\n";
+      message1 += editor.console.getText();
+      if (!(PreferencesData.getBoolean("build.verbose"))) {
+        message1 += "\n\n";
+        message1 += "  " + _("This report would have more information with") + "\n";
+        message1 += "  \"" + _("Show verbose output during compilation") + "\"\n";
+        message1 += "  " + _("enabled in File > Preferences.") + "\n";
+      }
+      Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+      StringSelection data = new StringSelection(message1);
+      clipboard.setContents(data, null);
+      Clipboard unixclipboard = Toolkit.getDefaultToolkit().getSystemSelection();
+      if (unixclipboard != null) {
+        unixclipboard.setContents(data, null);
+      }
+    });
   }
 
 
-  protected void setButtonBounds() {
+  private void setButtonBounds() {
     int top = (sizeH - Preferences.BUTTON_HEIGHT) / 2;
     int eachButton = Preferences.GUI_SMALL + Preferences.BUTTON_WIDTH;
 
-    int cancelLeft = sizeW      - eachButton;
-    int noLeft     = cancelLeft - eachButton;
-    int yesLeft    = noLeft     - eachButton;
+    int cancelLeft = sizeW - eachButton;
+    int noLeft = cancelLeft - eachButton;
+    int yesLeft = noLeft - eachButton;
 
-    //yesButton.setLocation(yesLeft, top);
-    //noButton.setLocation(noLeft, top);
     cancelButton.setLocation(cancelLeft, top);
     okButton.setLocation(noLeft, top);
     progressBar.setLocation(noLeft, top);
 
-    //yesButton.setSize(Preferences.BUTTON_WIDTH, Preferences.BUTTON_HEIGHT);
-    //noButton.setSize(Preferences.BUTTON_WIDTH, Preferences.BUTTON_HEIGHT);
     cancelButton.setSize(Preferences.BUTTON_WIDTH, Preferences.BUTTON_HEIGHT);
     okButton.setSize(Preferences.BUTTON_WIDTH, Preferences.BUTTON_HEIGHT);
-    progressBar.setSize(2*Preferences.BUTTON_WIDTH, Preferences.BUTTON_HEIGHT); 
+    progressBar.setSize(2 * Preferences.BUTTON_WIDTH, Preferences.BUTTON_HEIGHT);
 
     // edit field height is awkward, and very different between mac and pc,
     // so use at least the preferred height for now.
-    int editWidth = 2*Preferences.BUTTON_WIDTH;
+    int editWidth = 2 * Preferences.BUTTON_WIDTH;
     int editHeight = editField.getPreferredSize().height;
     int editTop = (1 + sizeH - editHeight) / 2;  // add 1 for ceil
-    editField.setBounds(yesLeft - Preferences.BUTTON_WIDTH, editTop,
-                        editWidth, editHeight);
+    editField.setBounds(yesLeft - Preferences.BUTTON_WIDTH, editTop, editWidth, editHeight);
     progressBar.setBounds(noLeft, editTop, editWidth, editHeight);
 
     Dimension copyErrorButtonSize = copyErrorButton.getPreferredSize();
@@ -518,7 +389,6 @@ public class EditorStatus extends JPanel /*implements ActionListener*/ {
     copyErrorButton.setSize(copyErrorButtonSize.width, Preferences.BUTTON_HEIGHT);
   }
 
-
   public Dimension getPreferredSize() {
     return getMinimumSize();
   }
@@ -531,23 +401,8 @@ public class EditorStatus extends JPanel /*implements ActionListener*/ {
     return new Dimension(3000, Preferences.GRID_SIZE);
   }
 
-
-  public void actionPerformed(ActionEvent e) {
-    if (e.getSource() == cancelButton) {
-      if (mode == EDIT) unedit();
-      //editor.toolbar.clear();
-
-    } else if (e.getSource() == okButton) {
-      // answering to rename/new code question
-      if (mode == EDIT) {  // this if() isn't (shouldn't be?) necessary
-        String answer = editField.getText();
-        editor.getSketch().nameCode(answer);
-        unedit();
-      }
-    }
-  }
-  
-  public boolean isInitialized() {
-    return initialized;
+  public boolean isErr() {
+    return mode == ERR;
   }
+
 }