Slightly improved how EditorConsole works

Author: Federico Fissore

app/src/cc/arduino/ConsoleOutputStream.java

@@ -40,7 +40,6 @@
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
 import javax.swing.text.SimpleAttributeSet;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -57,28 +56,23 @@ public class ConsoleOutputStream extends ByteArrayOutputStream {
   private final PrintStream printStream;
   private final StringBuilder buffer;
   private final Timer timer;
-  private JScrollPane scrollPane;
-  private Document document;
+  private volatile EditorConsole editorConsole;
 
   public ConsoleOutputStream(SimpleAttributeSet attributes, PrintStream printStream) {
     this.attributes = attributes;
     this.printStream = printStream;
     this.buffer = new StringBuilder();
 
     this.timer = new Timer(100, (e) -> {
-      if (scrollPane != null) {
-        synchronized (scrollPane) {
-          scrollPane.getHorizontalScrollBar().setValue(0);
-          scrollPane.getVerticalScrollBar().setValue(scrollPane.getVerticalScrollBar().getMaximum());
-        }
+      if (editorConsole != null) {
+        editorConsole.scrollDown();
       }
     });
     timer.setRepeats(false);
   }
 
-  public synchronized void setCurrentEditorConsole(EditorConsole console) {
-    this.scrollPane = console;
-    this.document = console.getDocument();
+  public void setCurrentEditorConsole(EditorConsole console) {
+    this.editorConsole = console;
   }
 
   public synchronized void flush() {
@@ -102,7 +96,7 @@ private void handleAppend(String message) {
   }
 
   private void resetBufferIfDocumentEmpty() {
-    if (document != null && document.getLength() == 0) {
+    if (editorConsole != null && editorConsole.isEmpty()) {
       buffer.setLength(0);
     }
   }
@@ -113,12 +107,10 @@ private void clearBuffer() {
 
     printStream.print(line);
 
-    if (document != null) {
+    if (editorConsole != null) {
       SwingUtilities.invokeLater(() -> {
         try {
-          String lineWithoutCR = line.replace("\r\n", "\n").replace("\r", "\n");
-          int offset = document.getLength();
-          document.insertString(offset, lineWithoutCR, attributes);
+          editorConsole.insertString(line, attributes);
         } catch (BadLocationException ble) {
           //ignore
         }

app/src/processing/app/EditorConsole.java

@@ -36,7 +36,7 @@ public class EditorConsole extends JScrollPane {
   private static ConsoleOutputStream out;
   private static ConsoleOutputStream err;
 
-  public static synchronized void init(SimpleAttributeSet outStyle, PrintStream outStream, SimpleAttributeSet errStyle, PrintStream errStream) {
+  private static synchronized void init(SimpleAttributeSet outStyle, PrintStream outStream, SimpleAttributeSet errStyle, PrintStream errStream) {
     if (out != null) {
       return;
     }
@@ -116,11 +116,22 @@ public void clear() {
     }
   }
 
+  public void scrollDown() {
+    getHorizontalScrollBar().setValue(0);
+    getVerticalScrollBar().setValue(getVerticalScrollBar().getMaximum());
+  }
+
+  public boolean isEmpty() {
+    return document.getLength() == 0;
+  }
+
+  public void insertString(String line, SimpleAttributeSet attributes) throws BadLocationException {
+    int offset = document.getLength();
+    document.insertString(offset, line, attributes);
+  }
+
   public String getText() {
     return consoleTextPane.getText().trim();
   }
 
-  public Document getDocument() {
-    return document;
-  }
 }