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

Editor: renamed status bar field serialport -> port

Browse Source
This commit is contained in:
Cristian Maglie 2018-12-07 12:36:09 +01:00
parent 7bc086a301
commit 6c50007e22
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2585,7 +2585,7 @@ public class Editor extends JFrame implements RunnerListener {
lineStatus.setBoardName(boardPreferences.get("name")); lineStatus.setBoardName(boardPreferences.get("name"));
else else
lineStatus.setBoardName("-"); lineStatus.setBoardName("-");
lineStatus.setSerialPort(PreferencesData.get("serial.port")); lineStatus.setPort(PreferencesData.get("serial.port"));
lineStatus.repaint(); lineStatus.repaint();
} }

14
app/src/processing/app/EditorLineStatus.java
View File

@ -51,7 +51,7 @@ public class EditorLineStatus extends JComponent {
String text = ""; String text = "";
String name = ""; String name = "";
String serialport = ""; String port = "";
String serialnumber = ""; String serialnumber = "";
public EditorLineStatus() { public EditorLineStatus() {
@ -92,13 +92,13 @@ public class EditorLineStatus extends JComponent {
public void paintComponent(Graphics graphics) { public void paintComponent(Graphics graphics) {
Graphics2D g = Theme.setupGraphics2D(graphics); Graphics2D g = Theme.setupGraphics2D(graphics);
if (name.isEmpty() && serialport.isEmpty()) { if (name.isEmpty() && port.isEmpty()) {
PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences(); PreferencesMap boardPreferences = BaseNoGui.getBoardPreferences();
if (boardPreferences != null) if (boardPreferences != null)
setBoardName(boardPreferences.get("name")); setBoardName(boardPreferences.get("name"));
else else
setBoardName("-"); setBoardName("-");
setSerialPort(PreferencesData.get("serial.port")); setPort(PreferencesData.get("serial.port"));
} }
g.setColor(background); g.setColor(background);
Dimension size = getSize(); Dimension size = getSize();
@ -112,8 +112,8 @@ public class EditorLineStatus extends JComponent {
g.setColor(messageForeground); g.setColor(messageForeground);
String statusText; String statusText;
if (serialport != null && !serialport.isEmpty()) { if (port != null && !port.isEmpty()) {
statusText = I18n.format(tr("{0} on {1}"), name, serialport); statusText = I18n.format(tr("{0} on {1}"), name, port);
} else { } else {
statusText = name; statusText = name;
} }
@ -132,8 +132,8 @@ public class EditorLineStatus extends JComponent {
this.name = name; this.name = name;
} }
public void setSerialPort(String serialport) { public void setPort(String port) {
this.serialport = serialport; this.port = port;
} }
public void setSerialNumber(String serialnumber) { public void setSerialNumber(String serialnumber) {