Remove Base dependency from AstractTextMonitor

cmaglie · facchinm · commit 2f68d2af1b93 · 2019-07-18T10:38:37.000+02:00
See #8704 (comment)
diff --git a/app/src/cc/arduino/packages/MonitorFactory.java b/app/src/cc/arduino/packages/MonitorFactory.java
@@ -30,24 +30,23 @@
 package cc.arduino.packages;
 
 import processing.app.AbstractMonitor;
-import processing.app.Base;
 import processing.app.NetworkMonitor;
 import processing.app.SerialMonitor;
 
 public class MonitorFactory {
 
-  public AbstractMonitor newMonitor(Base base, BoardPort port) {
+  public AbstractMonitor newMonitor(BoardPort port) {
     if ("network".equals(port.getProtocol())) {
       if ("yes".equals(port.getPrefs().get("ssh_upload"))) {
         // the board is SSH capable
-        return new NetworkMonitor(base, port); 
+        return new NetworkMonitor(port);
       } else {
         // SSH not supported, no monitor support
         return null;
       }
     }
 
-    return new SerialMonitor(base, port);
+    return new SerialMonitor(port);
   }
 
 }
diff --git a/app/src/processing/app/AbstractTextMonitor.java b/app/src/processing/app/AbstractTextMonitor.java
@@ -8,6 +8,8 @@
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseWheelListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.text.SimpleDateFormat;
@@ -46,12 +48,21 @@ public abstract class AbstractTextMonitor extends AbstractMonitor {
   protected JComboBox<String> lineEndings;
   protected JComboBox<String> serialRates;
 
-  public AbstractTextMonitor(Base base, BoardPort boardPort) {
+  public AbstractTextMonitor(BoardPort boardPort) {
     super(boardPort);
+  }
 
-    // Add font size adjustment listeners. This has to be done here due to
-    // super(boardPort) invoking onCreateWindow(...) before we can store base.
-    base.addEditorFontResizeListeners(textArea);
+  @Override
+  public synchronized void addMouseWheelListener(MouseWheelListener l) {
+    super.addMouseWheelListener(l);
+    textArea.addMouseWheelListener(l);
+  }
+
+  @Override
+  public synchronized void addKeyListener(KeyListener l) {
+    super.addKeyListener(l);
+    textArea.addKeyListener(l);
+    textField.addKeyListener(l);
   }
 
   @Override
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -2212,7 +2212,7 @@ public void handleSerial() {
       return;
     }
 
-    serialMonitor = new MonitorFactory().newMonitor(base, port);
+    serialMonitor = new MonitorFactory().newMonitor(port);
 
     if (serialMonitor == null) {
       String board = port.getPrefs().get("board");
@@ -2221,6 +2221,7 @@ public void handleSerial() {
       return;
     }
 
+    base.addEditorFontResizeListeners(serialMonitor);
     Base.setIcon(serialMonitor);
 
     // If currently uploading, disable the monitor (it will be later
diff --git a/app/src/processing/app/EditorTab.java b/app/src/processing/app/EditorTab.java
@@ -30,8 +30,6 @@
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseWheelListener;
-import java.awt.event.MouseWheelEvent;
 
 import java.io.IOException;
 
diff --git a/app/src/processing/app/NetworkMonitor.java b/app/src/processing/app/NetworkMonitor.java
@@ -31,8 +31,8 @@ public class NetworkMonitor extends AbstractTextMonitor implements MessageConsum
   private Channel channel;
   private int connectionAttempts;
 
-  public NetworkMonitor(Base base, BoardPort port) {
-    super(base, port);
+  public NetworkMonitor(BoardPort port) {
+    super(port);
 
     onSendCommand(new ActionListener() {
       public void actionPerformed(ActionEvent event) {
diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java
@@ -32,8 +32,8 @@ public class SerialMonitor extends AbstractTextMonitor {
   private Serial serial;
   private int serialRate;
 
-  public SerialMonitor(Base base, BoardPort port) {
-    super(base, port);
+  public SerialMonitor(BoardPort port) {
+    super(port);
 
     serialRate = PreferencesData.getInteger("serial.debug_rate");
     serialRates.setSelectedItem(serialRate + " " + tr("baud"));

Original file line number	Diff line number	Diff line change
`@@ -30,24 +30,23 @@`
`30`	`30`	`package cc.arduino.packages;`
`31`	`31`
`32`	`32`	`import processing.app.AbstractMonitor;`
`33`		`-import processing.app.Base;`
`34`	`33`	`import processing.app.NetworkMonitor;`
`35`	`34`	`import processing.app.SerialMonitor;`
`36`	`35`
`37`	`36`	`public class MonitorFactory {`
`38`	`37`
`39`		`- public AbstractMonitor newMonitor(Base base, BoardPort port) {`
	`38`	`+ public AbstractMonitor newMonitor(BoardPort port) {`
`40`	`39`	`if ("network".equals(port.getProtocol())) {`
`41`	`40`	`if ("yes".equals(port.getPrefs().get("ssh_upload"))) {`
`42`	`41`	`// the board is SSH capable`
`43`		`- return new NetworkMonitor(base, port);`
	`42`	`+ return new NetworkMonitor(port);`
`44`	`43`	`} else {`
`45`	`44`	`// SSH not supported, no monitor support`
`46`	`45`	`return null;`
`47`	`46`	`}`
`48`	`47`	`}`
`49`	`48`
`50`		`- return new SerialMonitor(base, port);`
	`49`	`+ return new SerialMonitor(port);`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2212,7 +2212,7 @@ public void handleSerial() {`
`2212`	`2212`	`return;`
`2213`	`2213`	`}`
`2214`	`2214`
`2215`		`- serialMonitor = new MonitorFactory().newMonitor(base, port);`
	`2215`	`+ serialMonitor = new MonitorFactory().newMonitor(port);`
`2216`	`2216`
`2217`	`2217`	`if (serialMonitor == null) {`
`2218`	`2218`	`String board = port.getPrefs().get("board");`
`@@ -2221,6 +2221,7 @@ public void handleSerial() {`
`2221`	`2221`	`return;`
`2222`	`2222`	`}`
`2223`	`2223`
	`2224`	`+ base.addEditorFontResizeListeners(serialMonitor);`
`2224`	`2225`	`Base.setIcon(serialMonitor);`
`2225`	`2226`
`2226`	`2227`	`// If currently uploading, disable the monitor (it will be later`