Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2f68d2a

Browse files
cmagliefacchinm
authored andcommitted
Remove Base dependency from AstractTextMonitor
See #8704 (comment) 
1 parent 1cacd79 commit 2f68d2a

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

‎app/src/cc/arduino/packages/MonitorFactory.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,23 @@
3030
package cc.arduino.packages;
3131

3232
import processing.app.AbstractMonitor;
33-
import processing.app.Base;
3433
import processing.app.NetworkMonitor;
3534
import processing.app.SerialMonitor;
3635

3736
public class MonitorFactory {
3837

39-
public AbstractMonitor newMonitor(Basebase, BoardPort port) {
38+
public AbstractMonitor newMonitor(BoardPort port) {
4039
if ("network".equals(port.getProtocol())) {
4140
if ("yes".equals(port.getPrefs().get("ssh_upload"))) {
4241
// the board is SSH capable
43-
return new NetworkMonitor(base, port);
42+
return new NetworkMonitor(port);
4443
} else {
4544
// SSH not supported, no monitor support
4645
return null;
4746
}
4847
}
4948

50-
return new SerialMonitor(base, port);
49+
return new SerialMonitor(port);
5150
}
5251

5352
}

‎app/src/processing/app/AbstractTextMonitor.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import java.awt.Font;
99
import java.awt.event.ActionEvent;
1010
import java.awt.event.ActionListener;
11+
import java.awt.event.KeyListener;
12+
import java.awt.event.MouseWheelListener;
1113
import java.awt.event.WindowAdapter;
1214
import java.awt.event.WindowEvent;
1315
import java.text.SimpleDateFormat;
@@ -46,12 +48,21 @@ public abstract class AbstractTextMonitor extends AbstractMonitor {
4648
protected JComboBox<String> lineEndings;
4749
protected JComboBox<String> serialRates;
4850

49-
public AbstractTextMonitor(Basebase, BoardPort boardPort) {
51+
public AbstractTextMonitor(BoardPort boardPort) {
5052
super(boardPort);
53+
}
5154

52-
// Add font size adjustment listeners. This has to be done here due to
53-
// super(boardPort) invoking onCreateWindow(...) before we can store base.
54-
base.addEditorFontResizeListeners(textArea);
55+
@Override
56+
public synchronized void addMouseWheelListener(MouseWheelListener l) {
57+
super.addMouseWheelListener(l);
58+
textArea.addMouseWheelListener(l);
59+
}
60+
61+
@Override
62+
public synchronized void addKeyListener(KeyListener l) {
63+
super.addKeyListener(l);
64+
textArea.addKeyListener(l);
65+
textField.addKeyListener(l);
5566
}
5667

5768
@Override

‎app/src/processing/app/Editor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2212,7 +2212,7 @@ public void handleSerial() {
22122212
return;
22132213
}
22142214

2215-
serialMonitor = new MonitorFactory().newMonitor(base, port);
2215+
serialMonitor = new MonitorFactory().newMonitor(port);
22162216

22172217
if (serialMonitor == null) {
22182218
String board = port.getPrefs().get("board");
@@ -2221,6 +2221,7 @@ public void handleSerial() {
22212221
return;
22222222
}
22232223

2224+
base.addEditorFontResizeListeners(serialMonitor);
22242225
Base.setIcon(serialMonitor);
22252226

22262227
// If currently uploading, disable the monitor (it will be later

‎app/src/processing/app/EditorTab.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import java.awt.Font;
3131
import java.awt.event.ActionEvent;
3232
import java.awt.event.ActionListener;
33-
import java.awt.event.MouseWheelListener;
34-
import java.awt.event.MouseWheelEvent;
3533

3634
import java.io.IOException;
3735

‎app/src/processing/app/NetworkMonitor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public class NetworkMonitor extends AbstractTextMonitor implements MessageConsum
3131
private Channel channel;
3232
private int connectionAttempts;
3333

34-
public NetworkMonitor(Basebase, BoardPort port) {
35-
super(base, port);
34+
public NetworkMonitor(BoardPort port) {
35+
super(port);
3636

3737
onSendCommand(new ActionListener() {
3838
public void actionPerformed(ActionEvent event) {

‎app/src/processing/app/SerialMonitor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public class SerialMonitor extends AbstractTextMonitor {
3232
private Serial serial;
3333
private int serialRate;
3434

35-
public SerialMonitor(Basebase, BoardPort port) {
36-
super(base, port);
35+
public SerialMonitor(BoardPort port) {
36+
super(port);
3737

3838
serialRate = PreferencesData.getInteger("serial.debug_rate");
3939
serialRates.setSelectedItem(serialRate + " " + tr("baud"));

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /