From 89a364ab506d16d1af6d791d59829fc81f420d6d Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 20 Jan 2020 17:03:34 +0100
Subject: [PATCH 1/3] fixed some warnings

---
 app/src/processing/app/AbstractMonitor.java | 4 +---
 app/src/processing/app/SerialMonitor.java   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
index 42c095aad13..b6ba0d7652e 100644
--- a/app/src/processing/app/AbstractMonitor.java
+++ b/app/src/processing/app/AbstractMonitor.java
@@ -1,7 +1,6 @@
 package processing.app;
 
 import cc.arduino.packages.BoardPort;
-import cc.arduino.packages.DiscoveryManager;
 import processing.app.legacy.PApplet;
 
 import javax.swing.*;
@@ -10,7 +9,6 @@
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.List;
 
 @SuppressWarnings("serial")
 public abstract class AbstractMonitor extends JFrame implements ActionListener {
@@ -85,7 +83,7 @@ public void actionPerformed(ActionEvent ae) {
               suspend();
             }
           } else {
-            if (closed && (Editor.isUploading() == false)) {
+            if (closed && !Editor.isUploading()) {
               resume(boardPort);
             }
           }
diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java
index 435f19956c3..acdfc9cb921 100644
--- a/app/src/processing/app/SerialMonitor.java
+++ b/app/src/processing/app/SerialMonitor.java
@@ -23,7 +23,6 @@
 
 import java.awt.Color;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 

From 0e90d7967776e6eec17a416658585e14f845ef88 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 20 Jan 2020 17:04:04 +0100
Subject: [PATCH 2/3] Do not clear serial monitor when disabled for upload
 (@PaulStoffregen)

Fix #9234
---
 .../processing/app/AbstractTextMonitor.java   | 25 ++++++++++++++++---
 app/src/processing/app/SerialMonitor.java     |  1 -
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/src/processing/app/AbstractTextMonitor.java b/app/src/processing/app/AbstractTextMonitor.java
index 4e35d4e448f..733bae41bff 100644
--- a/app/src/processing/app/AbstractTextMonitor.java
+++ b/app/src/processing/app/AbstractTextMonitor.java
@@ -3,6 +3,7 @@
 import static processing.app.I18n.tr;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -170,9 +171,27 @@ public void windowGainedFocus(WindowEvent e) {
   }
 
   @Override
-  protected void onEnableWindow(boolean enable)
-  {
-    textArea.setEnabled(enable);
+  protected void onEnableWindow(boolean enable) {
+    Thread.dumpStack();
+    System.out.println("onEnableWindow " + enable);
+    // never actually disable textArea, so people can
+    // still select & copy text, even when the port
+    // is closed or disconnected
+    textArea.setEnabled(true);
+    if (enable) {
+      // setting these to null for system default
+      // gives a wrong gray background on Windows
+      // so assume black text on white background
+      textArea.setForeground(Color.BLACK);
+      textArea.setBackground(Color.WHITE);
+    } else {
+      // In theory, UIManager.getDefaults() should
+      // give us the system's colors for disabled
+      // windows.  But it doesn't seem to work.  :(
+      textArea.setForeground(new Color(64, 64, 64));
+      textArea.setBackground(new Color(238, 238, 238));
+    }
+    textArea.invalidate();
     clearButton.setEnabled(enable);
     scrollPane.setEnabled(enable);
     textField.setEnabled(enable);
diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java
index acdfc9cb921..9af95d8d4cd 100644
--- a/app/src/processing/app/SerialMonitor.java
+++ b/app/src/processing/app/SerialMonitor.java
@@ -142,7 +142,6 @@ public void close() throws Exception {
       int[] location = getPlacement();
       String locationStr = PApplet.join(PApplet.str(location), ",");
       PreferencesData.set("last.serial.location", locationStr);
-      textArea.setText("");
       serial.dispose();
       serial = null;
     }

From c249656d5fba73360baa28e22eef7f07354cd52d Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 20 Jan 2020 17:08:11 +0100
Subject: [PATCH 3/3] Removed some debugging leftovers...

---
 app/src/processing/app/AbstractTextMonitor.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/processing/app/AbstractTextMonitor.java b/app/src/processing/app/AbstractTextMonitor.java
index 733bae41bff..d6d256b1c70 100644
--- a/app/src/processing/app/AbstractTextMonitor.java
+++ b/app/src/processing/app/AbstractTextMonitor.java
@@ -172,8 +172,6 @@ public void windowGainedFocus(WindowEvent e) {
 
   @Override
   protected void onEnableWindow(boolean enable) {
-    Thread.dumpStack();
-    System.out.println("onEnableWindow " + enable);
     // never actually disable textArea, so people can
     // still select & copy text, even when the port
     // is closed or disconnected