Let SketchFile figure out if it is primary by itself

Previously, the caller of the constructor did this, but now that
SketchFile keeps a reference to its containing sketch, it can figure it
out itself.

Author: matthijskooijman

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

@@ -103,9 +103,7 @@ private List<SketchFile> listSketchFiles(boolean showWarnings) throws IOExceptio
     Set<SketchFile> result = new TreeSet<>(CODE_DOCS_COMPARATOR);
     for (File file : FileUtils.listFiles(folder, false, EXTENSIONS)) {
       if (BaseNoGui.isSanitaryName(file.getName())) {
-        FileUtils.SplitFile split = FileUtils.splitFilename(file);
-        boolean isPrimary = split.basename.equals(folder.getName()) && SKETCH_EXTENSIONS.contains(split.extension);
-        result.add(new SketchFile(this, file, isPrimary));
+        result.add(new SketchFile(this, file));
       } else if (showWarnings) {
         System.err.println(I18n.format(tr("File name {0} is invalid: ignored"), file.getName()));
       }
@@ -287,7 +285,7 @@ public SketchFile addFile(String newName) throws IOException {
     checkNewFilename(newFile);
 
     // Add a new sketchFile
-    SketchFile sketchFile = new SketchFile(this, newFile, false);
+    SketchFile sketchFile = new SketchFile(this, newFile);
     files.add(sketchFile);
     Collections.sort(files, CODE_DOCS_COMPARATOR);
 

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

@@ -91,10 +91,12 @@ public static interface TextStorage {
    * @param primary
    *          Whether this file is the primary file of the sketch
    */
-  public SketchFile(Sketch sketch, File file, boolean primary) {
+  public SketchFile(Sketch sketch, File file) {
     this.sketch = sketch;
     this.file = file;
-    this.primary = primary;
+    FileUtils.SplitFile split = FileUtils.splitFilename(file);
+    this.primary = split.basename.equals(sketch.getFolder().getName())
+        && Sketch.SKETCH_EXTENSIONS.contains(split.extension);
   }
 
   /**