Skip to content

Commit 6c50007

Browse files
committed
Editor: renamed status bar field serialport -> port
1 parent 7bc086a commit 6c50007

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/src/processing/app/Editor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2585,7 +2585,7 @@ protected void onBoardOrPortChange() {
25852585
lineStatus.setBoardName(boardPreferences.get("name"));
25862586
else
25872587
lineStatus.setBoardName("-");
2588-
lineStatus.setSerialPort(PreferencesData.get("serial.port"));
2588+
lineStatus.setPort(PreferencesData.get("serial.port"));
25892589
lineStatus.repaint();
25902590
}
25912591

app/src/processing/app/EditorLineStatus.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class EditorLineStatus extends JComponent {
5151

5252
String text = "";
5353
String name = "";
54-
String serialport = "";
54+
String port = "";
5555
String serialnumber = "";
5656

5757
public EditorLineStatus() {
@@ -92,13 +92,13 @@ public void set(int newStart, int newStop) {
9292

9393
public void paintComponent(Graphics graphics) {
9494
Graphics2D g = Theme.setupGraphics2D(graphics);
95-
if (name.isEmpty() && serialport.isEmpty()) {
95+
if (name.isEmpty() && port.isEmpty()) {
9696
PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences();
9797
if (boardPreferences != null)
9898
setBoardName(boardPreferences.get("name"));
9999
else
100100
setBoardName("-");
101-
setSerialPort(PreferencesData.get("serial.port"));
101+
setPort(PreferencesData.get("serial.port"));
102102
}
103103
g.setColor(background);
104104
Dimension size = getSize();
@@ -112,8 +112,8 @@ public void paintComponent(Graphics graphics) {
112112
g.setColor(messageForeground);
113113

114114
String statusText;
115-
if (serialport != null && !serialport.isEmpty()) {
116-
statusText = I18n.format(tr("{0} on {1}"), name, serialport);
115+
if (port != null && !port.isEmpty()) {
116+
statusText = I18n.format(tr("{0} on {1}"), name, port);
117117
} else {
118118
statusText = name;
119119
}
@@ -132,8 +132,8 @@ public void setBoardName(String name) {
132132
this.name = name;
133133
}
134134

135-
public void setSerialPort(String serialport) {
136-
this.serialport = serialport;
135+
public void setPort(String port) {
136+
this.port = port;
137137
}
138138

139139
public void setSerialNumber(String serialnumber) {

0 commit comments

Comments
 (0)