Remove current and currentIndex variables from Sketch

Instead of letting Sketch (also) keep track of the currently selected
tab, this moves the responsibility to Editor instead. When Sketch need
to know the current tab and file, it now asks Editor.

Switching between tabs is still handled through Sketch methods, but that
will be cleaned up later.

Author: matthijskooijman

Diff for: app/src/processing/app/Sketch.java

@@ -57,10 +57,6 @@
  */
 public class Sketch {
   private final Editor editor;
-
-  private SketchCodeDocument current;
-  private int currentIndex;
-
   private final SketchData data;
 
   /**
@@ -93,7 +89,6 @@ private void load() throws IOException {
   }
 
   protected void load(boolean forceUpdate) throws IOException {
-    current = null;
     data.load();
 
     for (SketchCode code : data.getCodes()) {
@@ -103,8 +98,11 @@ protected void load(boolean forceUpdate) throws IOException {
 
     // set the main file to be the current tab
     if (editor != null) {
+      int current = editor.getCurrentTabIndex();
+      if (current < 0)
+        current = 0;
       editor.sketchLoaded(this);
-      setCurrentCode(currentIndex, forceUpdate);
+      setCurrentCode(current, forceUpdate);
     }
   }
 
@@ -138,6 +136,9 @@ public void handleNewCode() {
    * Handler for the Rename Code menu option.
    */
   public void handleRenameCode() {
+    SketchCode current = editor.getCurrentTab().getSketchCode();
+    int currentIndex = editor.getCurrentTabIndex();
+
     editor.status.clearState();
     // make sure the user didn't hide the sketch folder
     ensureExistence();
@@ -164,8 +165,8 @@ public void handleRenameCode() {
     renamingCode = true;
     String prompt = (currentIndex == 0) ?
       "New name for sketch:" : "New name for file:";
-    String oldName = (current.getCode().isExtension("ino")) ?
-      current.getCode().getPrettyName() : current.getCode().getFileName();
+    String oldName = (current.isExtension("ino")) ? current.getPrettyName()
+                                                  : current.getFileName();
     editor.status.edit(prompt, oldName);
   }
 
@@ -178,6 +179,9 @@ public void handleRenameCode() {
    * where they diverge.
    */
   protected void nameCode(String newName) {
+    SketchCode current = editor.getCurrentTab().getSketchCode();
+    int currentIndex = editor.getCurrentTabIndex();
+
     // make sure the user didn't hide the sketch folder
     ensureExistence();
 
@@ -192,7 +196,8 @@ protected void nameCode(String newName) {
     // (osx is case insensitive but preserving, windows insensitive,
     // *nix is sensitive and preserving.. argh)
     if (renamingCode) {
-      if (newName.equalsIgnoreCase(current.getCode().getFileName()) && OSUtils.isWindows()) {
+      if (newName.equalsIgnoreCase(current.getFileName())
+          && OSUtils.isWindows()) {
         // exit quietly for the 'rename' case.
         // if it's a 'new' then an error will occur down below
         return;
@@ -221,7 +226,7 @@ protected void nameCode(String newName) {
     // Don't let the user create the main tab as a .java file instead of .pde
     if (!isDefaultExtension(newExtension)) {
       if (renamingCode) {  // If creating a new tab, don't show this error
-        if (current.getCode() == data.getCode(0)) {  // If this is the main tab, disallow
+        if (current == data.getCode(0)) { // If this is the main tab, disallow
           Base.showWarning(tr("Problem with rename"),
                            tr("The main file can't use an extension.\n" +
                              "(It may be time for your to graduate to a\n" +
@@ -316,21 +321,21 @@ protected void nameCode(String newName) {
         // however this *will* first save the sketch, then rename
 
         // first get the contents of the editor text area
-        if (current.getCode().isModified()) {
+        if (current.isModified()) {
           try {
             // save this new SketchCode
-            current.getCode().save();
+            current.save();
           } catch (Exception e) {
             Base.showWarning(tr("Error"), tr("Could not rename the sketch. (0)"), e);
             return;
           }
         }
 
-        if (!current.getCode().renameTo(newFile)) {
+        if (!current.renameTo(newFile)) {
           Base.showWarning(tr("Error"),
                            I18n.format(
 			     tr("Could not rename \"{0}\" to \"{1}\""),
-			     current.getCode().getFileName(),
+			     current.getFileName(),
 			     newFile.getName()
 			   ), null);
           return;
@@ -370,11 +375,11 @@ protected void nameCode(String newName) {
         editor.base.rebuildSketchbookMenus();
 
       } else {  // else if something besides code[0]
-        if (!current.getCode().renameTo(newFile)) {
+        if (!current.renameTo(newFile)) {
           Base.showWarning(tr("Error"),
                            I18n.format(
 			     tr("Could not rename \"{0}\" to \"{1}\""),
-			     current.getCode().getFileName(),
+                                       current.getFileName(),
 			     newFile.getName()
 			   ), null);
           return;
@@ -425,6 +430,8 @@ protected void nameCode(String newName) {
    * Remove a piece of code from the sketch and from the disk.
    */
   public void handleDeleteCode() throws IOException {
+    SketchCode current = editor.getCurrentTab().getSketchCode();
+    int currentIndex = editor.getCurrentTabIndex();
     editor.status.clearState();
     // make sure the user didn't hide the sketch folder
     ensureExistence();
@@ -443,7 +450,8 @@ public void handleDeleteCode() throws IOException {
     Object[] options = { tr("OK"), tr("Cancel") };
     String prompt = (currentIndex == 0) ?
       tr("Are you sure you want to delete this sketch?") :
-      I18n.format(tr("Are you sure you want to delete \"{0}\"?"), current.getCode().getFileNameWithExtensionIfNotIno());
+      I18n.format(tr("Are you sure you want to delete \"{0}\"?"),
+                  current.getFileNameWithExtensionIfNotIno());
     int result = JOptionPane.showOptionDialog(editor,
                                               prompt,
                                               tr("Delete"),
@@ -470,14 +478,14 @@ public void handleDeleteCode() throws IOException {
 
       } else {
         // delete the file
-        if (!current.getCode().deleteFile(BaseNoGui.getBuildFolder(data).toPath())) {
+        if (!current.deleteFile(BaseNoGui.getBuildFolder(data).toPath())) {
           Base.showMessage(tr("Couldn't do it"),
-                           I18n.format(tr("Could not delete \"{0}\"."), current.getCode().getFileName()));
+                           I18n.format(tr("Could not delete \"{0}\"."), current.getFileName()));
           return;
         }
 
         // remove code from the list
-        data.removeCode(current.getCode());
+        data.removeCode(current);
 
         // just set current tab to the main tab
         setCurrentCode(0);
@@ -493,7 +501,7 @@ public void handleDeleteCode() throws IOException {
    * Move to the previous tab.
    */
   public void handlePrevCode() {
-    int prev = currentIndex - 1;
+    int prev = editor.getCurrentTabIndex() - 1;
     if (prev < 0) prev = data.getCodeCount()-1;
     setCurrentCode(prev);
   }
@@ -503,7 +511,7 @@ public void handlePrevCode() {
    * Move to the next tab.
    */
   public void handleNextCode() {
-    setCurrentCode((currentIndex + 1) % data.getCodeCount());
+    setCurrentCode((editor.getCurrentTabIndex() + 1) % data.getCodeCount());
   }
 
   /**
@@ -716,7 +724,7 @@ protected boolean saveAs() throws IOException {
     data.getCode(0).saveAs(newFile);
 
     editor.handleOpenUnchecked(newFile,
-            currentIndex,
+            editor.getCurrentTabIndex(),
             editor.getCurrentTab().getSelectionStart(),
             editor.getCurrentTab().getSelectionStop(),
             editor.getCurrentTab().getScrollPosition());
@@ -908,7 +916,7 @@ private void importLibrary(File jarPath) throws IOException {
     // import statements into the main sketch file (code[0])
     // if the current code is a .java file, insert into current
     //if (current.flavor == PDE) {
-    if (hasDefaultExtension(current.getCode())) {
+    if (hasDefaultExtension(editor.getCurrentTab().getSketchCode())) {
       setCurrentCode(0);
     }
     // could also scan the text in the file to see if each import
@@ -940,14 +948,11 @@ public void setCurrentCode(int which) {
   }
 
   private void setCurrentCode(int which, boolean forceUpdate) {
-    // if current is null, then this is the first setCurrent(0)
-    if (!forceUpdate && (currentIndex == which) && (current != null)) {
+    if (!forceUpdate && (editor.getCurrentTabIndex() == which)) {
       return;
     }
 
-    current = (SketchCodeDocument) data.getCode(which).getMetadata();
-    currentIndex = which;
-    editor.setCode(current);
+    editor.setCode((SketchCodeDocument)editor.getTabs().get(which).getSketchCode().getMetadata());
     editor.header.rebuild();
   }
 
@@ -1329,11 +1334,6 @@ public int getCodeIndex(SketchCode who) {
   }
 
 
-  public SketchCode getCurrentCode() {
-    return current.getCode();
-  }
-
-
   private void setUntitled(boolean u) {
     editor.untitled = u;
   }