Fix issue #8055 missing timestamps on serial monitor

Author: nitram509

app/src/processing/app/AbstractTextMonitor.java

@@ -43,21 +43,18 @@ public abstract class AbstractTextMonitor extends AbstractMonitor {
   protected JComboBox lineEndings;
   protected JComboBox serialRates;
 
-  private SimpleDateFormat logDateFormat;
-  
   public AbstractTextMonitor(BoardPort boardPort) {
     super(boardPort);
-    logDateFormat = new SimpleDateFormat("HH:mm:ss.SSS -> ");
   }
-  
+
   protected void onCreateWindow(Container mainPane) {
     Font consoleFont = Theme.getFont("console.font");
     Font editorFont = PreferencesData.getFont("editor.font");
     Font font = Theme.scale(new Font(consoleFont.getName(), consoleFont.getStyle(), editorFont.getSize()));
 
     mainPane.setLayout(new BorderLayout());
 
-    textArea = new TextAreaFIFO(8000000);
+    textArea = new TextAreaFIFO(8_000_000);
     textArea.setRows(16);
     textArea.setColumns(40);
     textArea.setEditable(false);
@@ -70,7 +67,7 @@ protected void onCreateWindow(Container mainPane) {
     scrollPane = new JScrollPane(textArea);
 
     mainPane.add(scrollPane, BorderLayout.CENTER);
-  
+
     JPanel upperPane = new JPanel();
     upperPane.setLayout(new BoxLayout(upperPane, BoxLayout.X_AXIS));
     upperPane.setBorder(new EmptyBorder(4, 4, 4, 4));
@@ -165,49 +162,65 @@ public void onSendCommand(ActionListener listener) {
     textField.addActionListener(listener);
     sendButton.addActionListener(listener);
   }
-  
+
   public void onClearCommand(ActionListener listener) {
     clearButton.addActionListener(listener);
   }
 
   public void onSerialRateChange(ActionListener listener) {
     serialRates.addActionListener(listener);
   }
-  
-  public void message(final String s) {
-    SwingUtilities.invokeLater(new Runnable() {
-      // Pre-allocate all objects used for streaming data
-      Date t = new Date();
-      String now;
-      StringBuilder out = new StringBuilder(16384);
-      boolean isStartingLine = false;
-
-      public void run() {
-        if (addTimeStampBox.isSelected()) {
-          t.setTime(System.currentTimeMillis());
-          now = logDateFormat.format(t);
-          out.setLength(0);
-
-          StringTokenizer tokenizer = new StringTokenizer(s, "\n", true);
-          while (tokenizer.hasMoreTokens()) {
-            if (isStartingLine) {
-              out.append(now);
-            }
-            String token = tokenizer.nextToken();
-            out.append(token);
-            // tokenizer returns "\n" as a single token
-            isStartingLine = token.charAt(0) == '\n';
-          }
-
-          textArea.append(out.toString());
-        } else {
-          textArea.append(s);
-        }
 
-        if (autoscrollBox.isSelected()) {
-          textArea.setCaretPosition(textArea.getDocument().getLength());
+  public void message(final String msg) {
+    SwingUtilities.invokeLater(new UpdateTextAreaAction(textArea,
+                                                        addTimeStampBox.isSelected(),
+                                                        autoscrollBox.isSelected(),
+                                                        msg));
+  }
+
+  static class UpdateTextAreaAction implements Runnable {
+
+    private static final String LINE_SEPARATOR = "\n";
+
+    private String msg;
+    private boolean addTimeStamp;
+    private boolean doAutoscroll;
+    private TextAreaFIFO textArea;
+
+    UpdateTextAreaAction(TextAreaFIFO textArea, boolean addTimeStamp,
+                         boolean doAutoscroll, String msg) {
+      this.msg = msg;
+      this.textArea = textArea;
+      this.addTimeStamp = addTimeStamp;
+      this.doAutoscroll = doAutoscroll;
+    }
+
+    public void run() {
+      if (addTimeStamp) {
+        textArea.append(addTimestamps(msg));
+      } else {
+        textArea.append(msg);
+      }
+      if (doAutoscroll) {
+        textArea.setCaretPosition(textArea.getDocument().getLength());
+      }
+    }
+
+    private String addTimestamps(String text) {
+      String now = new SimpleDateFormat("HH:mm:ss.SSS -> ").format(new Date());
+      final StringBuilder sb = new StringBuilder(text.length() + now.length());
+      boolean isStartingLine = true;
+      StringTokenizer tokenizer = new StringTokenizer(text, LINE_SEPARATOR, true);
+      while (tokenizer.hasMoreTokens()) {
+        if (isStartingLine) {
+          sb.append(now);
         }
+        String token = tokenizer.nextToken();
+        sb.append(token);
+        // tokenizer returns "\n" as a single token
+        isStartingLine = token.equals(LINE_SEPARATOR);
       }
-    });
+      return sb.toString();
+    }
   }
 }