Editor cleanup

app/src/cc/arduino/packages/formatter/AStyle.java

@@ -33,10 +33,8 @@
 import processing.app.BaseNoGui;
 import processing.app.Editor;
 import processing.app.helpers.FileUtils;
-import processing.app.syntax.SketchTextArea;
 import processing.app.tools.Tool;
 
-import javax.swing.text.BadLocationException;
 import java.io.File;
 import java.io.IOException;
 
@@ -78,65 +76,20 @@ public void init(Editor editor) {
 
   @Override
   public void run() {
-    String originalText = editor.getText();
+    String originalText = editor.getCurrentTab().getText();
     String formattedText = aStyleInterface.AStyleMain(originalText, formatterConfiguration);
 
     if (formattedText.equals(originalText)) {
       editor.statusNotice(tr("No changes necessary for Auto Format."));
       return;
     }
 
-    SketchTextArea textArea = editor.getTextArea();
-
-    int line = getLineOfOffset(textArea);
-    int lineOffset = getLineOffset(textArea, line);
-
-    textArea.getUndoManager().beginInternalAtomicEdit();
-    editor.removeAllLineHighlights();
-    editor.setText(formattedText);
-    editor.getSketch().setModified(true);
-    textArea.getUndoManager().endInternalAtomicEdit();
-
-    if (line != -1 && lineOffset != -1) {
-      try {
-        setCaretPosition(textArea, line, lineOffset);
-      } catch (BadLocationException e) {
-        e.printStackTrace();
-      }
-    }
+    editor.getCurrentTab().setText(formattedText);
 
     // mark as finished
     editor.statusNotice(tr("Auto Format finished."));
   }
 
-  private void setCaretPosition(SketchTextArea textArea, int line, int lineOffset) throws BadLocationException {
-    int caretPosition;
-    if (line < textArea.getLineCount()) {
-      caretPosition = Math.min(textArea.getLineStartOffset(line) + lineOffset, textArea.getLineEndOffset(line) - 1);
-    } else {
-      caretPosition = textArea.getText().length() - 1;
-    }
-    textArea.setCaretPosition(caretPosition);
-  }
-
-  private int getLineOffset(SketchTextArea textArea, int line) {
-    try {
-      return textArea.getCaretPosition() - textArea.getLineStartOffset(line);
-    } catch (BadLocationException e) {
-      e.printStackTrace();
-    }
-    return -1;
-  }
-
-  private int getLineOfOffset(SketchTextArea textArea) {
-    try {
-      return textArea.getLineOfOffset(textArea.getCaretPosition());
-    } catch (BadLocationException e) {
-      e.printStackTrace();
-    }
-    return -1;
-  }
-
   @Override
   public String getMenuTitle() {
     return tr("Auto Format");

app/src/cc/arduino/view/GoToLineNumber.java

@@ -127,7 +127,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
   private void okActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okActionPerformed
     try {
       int line = Integer.parseInt(lineNumber.getText());
-      editor.goToLine(line);
+      editor.getCurrentTab().goToLine(line);
       cancelActionPerformed(evt);
     } catch (Exception e) {
       // ignore

app/src/cc/arduino/view/findreplace/FindReplace.java

@@ -31,7 +31,6 @@
 
 import processing.app.Base;
 import processing.app.Editor;
-import processing.app.Sketch;
 import processing.app.helpers.OSUtils;
 
 import java.awt.*;
@@ -292,7 +291,7 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
       return false;
     }
 
-    String text = editor.getText();
+    String text = editor.getCurrentTab().getText();
 
     if (ignoreCaseBox.isSelected()) {
       search = search.toLowerCase();
@@ -302,7 +301,7 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
     int nextIndex;
     if (!backwards) {
       // int selectionStart = editor.textarea.getSelectionStart();
-      int selectionEnd = editor.getSelectionStop();
+      int selectionEnd = editor.getCurrentTab().getSelectionStop();
 
       nextIndex = text.indexOf(search, selectionEnd);
       if (wrap && nextIndex == -1) {
@@ -311,7 +310,7 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
       }
     } else {
       // int selectionStart = editor.textarea.getSelectionStart();
-      int selectionStart = editor.getSelectionStart() - 1;
+      int selectionStart = editor.getCurrentTab().getSelectionStart() - 1;
 
       if (selectionStart >= 0) {
         nextIndex = text.lastIndexOf(search, selectionStart);
@@ -327,31 +326,31 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
     if (nextIndex == -1) {
       // Nothing found on this tab: Search other tabs if required
       if (searchTabs) {
-        // editor.
-        Sketch sketch = editor.getSketch();
-        if (sketch.getCodeCount() > 1) {
-          int realCurrentTab = sketch.getCodeIndex(sketch.getCurrentCode());
+        int numTabs = editor.getTabs().size();
+        if (numTabs > 1) {
+          int realCurrentTab = editor.getCurrentTabIndex();
 
           if (originTab != realCurrentTab) {
             if (originTab < 0) {
               originTab = realCurrentTab;
             }
 
             if (!wrap) {
-              if ((!backwards && realCurrentTab + 1 >= sketch.getCodeCount()) || (backwards && realCurrentTab - 1 < 0)) {
+              if ((!backwards && realCurrentTab + 1 >= numTabs)
+                  || (backwards && realCurrentTab - 1 < 0)) {
                 return false; // Can't continue without wrap
               }
             }
 
             if (backwards) {
-              sketch.handlePrevCode();
+              editor.selectNextTab();
               this.setVisible(true);
-              int l = editor.getText().length() - 1;
-              editor.setSelection(l, l);
+              int l = editor.getCurrentTab().getText().length() - 1;
+              editor.getCurrentTab().setSelection(l, l);
             } else {
-              sketch.handleNextCode();
+              editor.selectPrevTab();
               this.setVisible(true);
-              editor.setSelection(0, 0);
+              editor.getCurrentTab().setSelection(0, 0);
             }
 
             return find(wrap, backwards, true, originTab);
@@ -365,7 +364,7 @@ private boolean find(boolean wrap, boolean backwards, boolean searchTabs, int or
     }
 
     if (nextIndex != -1) {
-      editor.setSelection(nextIndex, nextIndex + search.length());
+      editor.getCurrentTab().setSelection(nextIndex, nextIndex + search.length());
       return true;
     }
 
@@ -381,18 +380,17 @@ private void replace() {
       return;
     }
 
-    int newpos = editor.getSelectionStart() - findField.getText().length();
+    int newpos = editor.getCurrentTab().getSelectionStart() - findField.getText().length();
     if (newpos < 0) {
       newpos = 0;
     }
-    editor.setSelection(newpos, newpos);
+    editor.getCurrentTab().setSelection(newpos, newpos);
 
     boolean foundAtLeastOne = false;
 
     if (find(false, false, searchAllFilesBox.isSelected(), -1)) {
       foundAtLeastOne = true;
-      editor.setSelectedText(replaceField.getText());
-      editor.getSketch().setModified(true); // TODO is this necessary?
+      editor.getCurrentTab().setSelectedText(replaceField.getText());
     }
 
     if (!foundAtLeastOne) {
@@ -420,17 +418,16 @@ private void replaceAll() {
     }
 
     if (searchAllFilesBox.isSelected()) {
-      editor.getSketch().setCurrentCode(0); // select the first tab
+      editor.selectTab(0); // select the first tab
     }
 
-    editor.setSelection(0, 0); // move to the beginning
+    editor.getCurrentTab().setSelection(0, 0); // move to the beginning
 
     boolean foundAtLeastOne = false;
     while (true) {
       if (find(false, false, searchAllFilesBox.isSelected(), -1)) {
         foundAtLeastOne = true;
-        editor.setSelectedText(replaceField.getText());
-        editor.getSketch().setModified(true); // TODO is this necessary?
+        editor.getCurrentTab().setSelectedText(replaceField.getText());
       } else {
         break;
       }