Rename SketchCode to SketchFile

That name more accurately reflects its purpose: It represents a single
file within a sketch. This just updates the class name and variable
names referring to these objects and some comments, so no behaviour
should change.

Author: matthijskooijman

app/src/processing/app/Editor.java

@@ -1649,13 +1649,13 @@ public void selectPrevTab() {
     selectTab((currentTabIndex - 1 + tabs.size()) % tabs.size());
   }
 
-  public EditorTab findTab(final SketchCode doc) {
-    return tabs.get(findTabIndex(doc));
+  public EditorTab findTab(final SketchFile file) {
+    return tabs.get(findTabIndex(file));
   }
 
-  public int findTabIndex(final SketchCode doc) {
+  public int findTabIndex(final SketchFile file) {
     for (int i = 0; i < tabs.size(); ++i) {
-      if (tabs.get(i).getSketchCode() == doc)
+      if (tabs.get(i).getSketchFile() == file)
         return i;
     }
     return -1;
@@ -1669,9 +1669,9 @@ public void createTabs() {
     tabs.clear();
     currentTabIndex = -1;
     tabs.ensureCapacity(sketch.getCodeCount());
-    for (SketchCode code : sketch.getCodes()) {
+    for (SketchFile file : sketch.getFiles()) {
       try {
-        addTab(code, null);
+        addTab(file, null);
       } catch(IOException e) {
         // TODO: Improve / move error handling
         System.err.println(e);
@@ -1683,15 +1683,15 @@ public void createTabs() {
   /**
    * Add a new tab.
    *
-   * @param code
+   * @param file
    *          The file to show in the tab.
    * @param contents
-   *          The contents to show in the tab, or null to load the
-   *          contents from the given file.
+   *          The contents to show in the tab, or null to load the contents from
+   *          the given file.
    * @throws IOException
    */
-  protected void addTab(SketchCode code, String contents) throws IOException {
-    EditorTab tab = new EditorTab(this, code, contents);
+  protected void addTab(SketchFile file, String contents) throws IOException {
+    EditorTab tab = new EditorTab(this, file, contents);
     tabs.add(tab);
   }
 
@@ -2007,7 +2007,7 @@ private void updateTitle() {
     if (sketchController == null) {
       return;
     }
-    SketchCode current = getCurrentTab().getSketchCode();
+    SketchFile current = getCurrentTab().getSketchFile();
     if (current.isPrimary()) {
       setTitle(I18n.format(tr("{0} | Arduino {1}"), sketch.getName(),
                            BaseNoGui.VERSION_NAME_LONG));
@@ -2570,7 +2570,7 @@ private void handlePrint() {
       printerJob.setPrintable(getCurrentTab().getTextArea());
     }
     // set the name of the job to the code name
-    printerJob.setJobName(getCurrentTab().getSketchCode().getPrettyName());
+    printerJob.setJobName(getCurrentTab().getSketchFile().getPrettyName());
 
     if (printerJob.printDialog()) {
       try {

app/src/processing/app/EditorHeader.java

@@ -238,11 +238,11 @@ public void paintComponent(Graphics screen) {
     int x = 6; // offset from left edge of the component
     int i = 0;
     for (EditorTab tab : tabs) {
-      SketchCode code = tab.getSketchCode();
-      String codeName = code.getPrettyName();
+      SketchFile file = tab.getSketchFile();
+      String filename = file.getPrettyName();
 
       // if modified, add the li'l glyph next to the name
-      String text = "  " + codeName + (code.isModified() ? " \u00A7" : "  ");
+      String text = "  " + filename + (file.isModified() ? " \u00A7" : "  ");
 
       Graphics2D g2 = (Graphics2D) g;
       int textWidth = (int)
@@ -320,9 +320,9 @@ public void rebuildMenu() {
 
       int i = 0;
       for (EditorTab tab : editor.getTabs()) {
-        SketchCode code = tab.getSketchCode();
+        SketchFile file = tab.getSketchFile();
         final int index = i++;
-        item = new JMenuItem(code.getPrettyName());
+        item = new JMenuItem(file.getPrettyName());
         item.addActionListener((ActionEvent e) -> {
           editor.selectTab(index);
         });

app/src/processing/app/EditorTab.java

@@ -64,11 +64,11 @@
 /**
  * Single tab, editing a single file, in the main window.
  */
-public class EditorTab extends JPanel implements SketchCode.TextStorage {
+public class EditorTab extends JPanel implements SketchFile.TextStorage {
   protected Editor editor;
   protected SketchTextArea textarea;
   protected RTextScrollPane scrollPane;
-  protected SketchCode code;
+  protected SketchFile file;
   protected boolean modified;
   /** Is external editing mode currently enabled? */
   protected boolean external;
@@ -78,32 +78,32 @@ public class EditorTab extends JPanel implements SketchCode.TextStorage {
    *
    * @param editor
    *          The Editor this tab runs in
-   * @param code
+   * @param file
    *          The file to display in this tab
    * @param contents
-   *          Initial contents to display in this tab. Can be used when
-   *          editing a file that doesn't exist yet. If null is passed,
-   *          code.load() is called and displayed instead.
+   *          Initial contents to display in this tab. Can be used when editing
+   *          a file that doesn't exist yet. If null is passed, code.load() is
+   *          called and displayed instead.
    * @throws IOException
    */
-  public EditorTab(Editor editor, SketchCode code, String contents)
+  public EditorTab(Editor editor, SketchFile file, String contents)
       throws IOException {
     super(new BorderLayout());
 
     // Load initial contents contents from file if nothing was specified.
     if (contents == null) {
-      contents = code.load();
+      contents = file.load();
       modified = false;
     } else {
       modified = true;
     }
 
     this.editor = editor;
-    this.code = code;
+    this.file = file;
     RSyntaxDocument document = createDocument(contents);
     this.textarea = createTextArea(document);
     this.scrollPane = createScrollPane(this.textarea);
-    code.setStorage(this);
+    file.setStorage(this);
     applyPreferences();
     add(this.scrollPane, BorderLayout.CENTER);
 
@@ -291,14 +291,14 @@ public void applyPreferences() {
         textarea.setEditable(false);
         // Detach from the code, since we are no longer the authoritative source
         // for file contents.
-        code.setStorage(null);
+        file.setStorage(null);
         // Reload, in case the file contents already changed.
         reload();
       } else {
         textarea.setBackground(Theme.getColor("editor.bgcolor"));
         textarea.setHighlightCurrentLine(Theme.getBoolean("editor.linehighlight"));
         textarea.setEditable(true);
-        code.setStorage(this);
+        file.setStorage(this);
         // Reload once just before disabling external mode, to ensure we have
         // the latest contents.
         reload();
@@ -334,10 +334,10 @@ public void activated() {
   private void reload() {
     String text;
     try {
-      text = code.load();
+      text = file.load();
     } catch (IOException e) {
       System.err.println(I18n.format("Warning: Failed to reload file: \"{0}\"",
-                                     code.getFileName()));
+                                     file.getFileName()));
       return;
     }
     setText(text);
@@ -363,10 +363,10 @@ public SketchController getSketch() {
   }
 
   /**
-   * Get the SketchCodeDocument that is being edited in this tab.
+   * Get the SketchFile that is being edited in this tab.
    */
-  public SketchCode getSketchCode() {
-    return this.code;
+  public SketchFile getSketchFile() {
+    return this.file;
   }
 
   /**
@@ -405,8 +405,8 @@ public boolean isModified() {
   }
 
   /**
-   * Clear modified status. Should only be called by SketchCode through
-   * the TextStorage interface.
+   * Clear modified status. Should only be called by SketchFile through the
+   * TextStorage interface.
    */
   public void clearModified() {
     setModified(false);