Simplify sorting in SketchData

Instead of manually sorting the primary file at the start, and fiddling
to keep it there during resorting, this just modifies the sorting
comparator used to sort any primary files at the start. This is slightly
more generic than needed, also supporting multiple primary files, to at
least not break the Comparator preconditions when for some reason there
are multiple primary files.

Author: matthijskooijman

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

@@ -45,6 +45,10 @@ public class SketchData {
   private static final Comparator<SketchCode> CODE_DOCS_COMPARATOR = new Comparator<SketchCode>() {
     @Override
     public int compare(SketchCode x, SketchCode y) {
+      if (x.isPrimary() && !y.isPrimary())
+        return -1;
+      if (y.isPrimary() && !x.isPrimary())
+        return 1;
       return x.getFileName().compareTo(y.getFileName());
     }
   };
@@ -146,16 +150,6 @@ protected void load() throws IOException {
     if (getCodeCount() == 0)
       throw new IOException(tr("No valid code files found"));
 
-    // move the main class to the first tab
-    // start at 1, if it's at zero, don't bother
-    for (SketchCode code : getCodes()) {
-      //if (code[i].file.getName().equals(mainFilename)) {
-      if (code.getFile().equals(primaryFile)) {
-        moveCodeToFront(code);
-        break;
-      }
-    }
-
     // sort the entries at the top
     sortCode();
   }
@@ -201,11 +195,6 @@ public void addCode(SketchCode sketchCode) {
     codes.add(sketchCode);
   }
 
-  public void moveCodeToFront(SketchCode codeDoc) {
-    codes.remove(codeDoc);
-    codes.add(0, codeDoc);
-  }
-
   protected void replaceCode(SketchCode newCode) {
     for (SketchCode code : codes) {
       if (code.getFileName().equals(newCode.getFileName())) {
@@ -216,11 +205,7 @@ protected void replaceCode(SketchCode newCode) {
   }
 
   protected void sortCode() {
-    if (codes.size() < 2)
-      return;
-    SketchCode first = codes.remove(0);
     Collections.sort(codes, CODE_DOCS_COMPARATOR);
-    codes.add(0, first);
   }
 
   public SketchCode getCode(int i) {