rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Remove Base dependency from AstractTextMonitor

Browse Source 
See https://github.com/arduino/Arduino/pull/8704#issuecomment-477585720
This commit is contained in:
Cristian Maglie 2019-03-28 15:55:55 +01:00 committed by Martino Facchin
parent 1cacd79689
commit 2f68d2af1b
6 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/cc/arduino/packages/MonitorFactory.java
View File

@ -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);
}
}

19
app/src/processing/app/AbstractTextMonitor.java
View File

@ -8,6 +8,8 @@ import java.awt.Dimension;
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

3
app/src/processing/app/Editor.java
View File

@ -2212,7 +2212,7 @@ public class Editor extends JFrame implements RunnerListener {
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 class Editor extends JFrame implements RunnerListener {
return;
}
base.addEditorFontResizeListeners(serialMonitor);
Base.setIcon(serialMonitor);
// If currently uploading, disable the monitor (it will be later

2
app/src/processing/app/EditorTab.java
View File

@ -30,8 +30,6 @@ import java.awt.BorderLayout;
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;

4
app/src/processing/app/NetworkMonitor.java
View File

@ -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) {

4
app/src/processing/app/SerialMonitor.java
View File

@ -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"));