Store a SketchCode instance in RunnerException

Previously, the index of the SketchCode instance in the list kept by
Sketch was kept, which isn't really robust.

With this change, Sketch.indexOfCode is no longer needed and is removed.

Author: matthijskooijman

app/src/processing/app/Editor.java

@@ -2614,8 +2614,8 @@ public void statusError(Exception e) {
 
     if (e instanceof RunnerException) {
       RunnerException re = (RunnerException) e;
-      if (re.hasCodeIndex()) {
-        selectTab(re.getCodeIndex());
+      if (re.hasCodeFile()) {
+        selectTab(findTabIndex(re.getCodeFile()));
       }
       if (re.hasCodeLine()) {
         int line = re.getCodeLine();

arduino-core/src/cc/arduino/Compiler.java

@@ -565,8 +565,7 @@ public void message(String s) {
       RunnerException exception = placeException(error, pieces[1], PApplet.parseInt(pieces[2]) - 1);
 
       if (exception != null) {
-        SketchCode code = sketch.getCode(exception.getCodeIndex());
-        String fileName = code.getPrettyName();
+        String fileName = exception.getCodeFile().getPrettyName();
         int lineNum = exception.getCodeLine() + 1;
         s = fileName + ":" + lineNum + ": error: " + error + msg;
       }
@@ -597,7 +596,7 @@ public void message(String s) {
   private RunnerException placeException(String message, String fileName, int line) {
     for (SketchCode code : sketch.getCodes()) {
       if (new File(fileName).getName().equals(code.getFileName())) {
-        return new RunnerException(message, sketch.indexOfCode(code), line);
+        return new RunnerException(message, code, line);
       }
     }
     return null;

arduino-core/src/processing/app/Sketch.java

@@ -205,10 +205,6 @@ protected void removeCode(SketchCode which) {
       System.err.println("removeCode: internal error.. could not find code");
   }
 
-  public int indexOfCode(SketchCode who) {
-    return codes.indexOf(who);
-  }
-
   public String getName() {
     return name;
   }

arduino-core/src/processing/app/debug/RunnerException.java

@@ -23,6 +23,7 @@
 
 package processing.app.debug;
 
+import processing.app.SketchCode;
 
 /**
  * An exception with a line number attached that occurs
@@ -31,7 +32,7 @@
 @SuppressWarnings("serial")
 public class RunnerException extends Exception {
   protected String message;
-  protected int codeIndex;
+  protected SketchCode codeFile;
   protected int codeLine;
   protected int codeColumn;
   protected boolean showStackTrace;
@@ -42,23 +43,23 @@ public RunnerException(String message) {
   }
 
   public RunnerException(String message, boolean showStackTrace) {
-    this(message, -1, -1, -1, showStackTrace);
+    this(message, null, -1, -1, showStackTrace);
   }
 
-  public RunnerException(String message, int file, int line) {
+  public RunnerException(String message, SketchCode file, int line) {
     this(message, file, line, -1, true);
   }
 
 
-  public RunnerException(String message, int file, int line, int column) {
+  public RunnerException(String message, SketchCode file, int line, int column) {
     this(message, file, line, column, true);
   }
 
 
-  public RunnerException(String message, int file, int line, int column, 
+  public RunnerException(String message, SketchCode file, int line, int column, 
                          boolean showStackTrace) {
     this.message = message;
-    this.codeIndex = file;
+    this.codeFile = file;
     this.codeLine = line;
     this.codeColumn = column;
     this.showStackTrace = showStackTrace;
@@ -84,18 +85,17 @@ public void setMessage(String message) {
   }
 
 
-  public int getCodeIndex() {
-    return codeIndex;
+  public SketchCode getCodeFile() {
+    return codeFile;
   }
 
 
-  public void setCodeIndex(int index) {
-    codeIndex = index;
+  public void setCodeFile(SketchCode file) {
+    codeFile = file;
   }
-  
-  
-  public boolean hasCodeIndex() {
-    return codeIndex != -1;
+
+  public boolean hasCodeFile() {
+    return codeFile != null;
   }
 
 
@@ -107,8 +107,7 @@ public int getCodeLine() {
   public void setCodeLine(int line) {
     this.codeLine = line;
   }
-  
-  
+
   public boolean hasCodeLine() {
     return codeLine != -1;
   }
@@ -117,8 +116,7 @@ public boolean hasCodeLine() {
   public void setCodeColumn(int column) {
     this.codeColumn = column;
   }
-  
-  
+
   public int getCodeColumn() {
     return codeColumn;
   }