rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-31 20:52:13 +01:00
Code Issues Releases Activity

Trim trailing spaces from Editor.java

Browse Source
This commit is contained in:
Flavio Monteiro 2017-09-15 14:07:28 -03:00 committed by Cristian Maglie
parent bafd66ba4f
commit 4a80f50d28
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,8 +399,7 @@ public class Editor extends JFrame implements RunnerListener {
statusNotice(tr("One file added to the sketch.")); statusNotice(tr("One file added to the sketch."));
} else { } else {
statusNotice( statusNotice(I18n.format(tr("{0} files added to the sketch."), successful));
I18n.format(tr("{0} files added to the sketch."), successful));
} }
return true; return true;
} }
@ -948,14 +947,14 @@ public class Editor extends JFrame implements RunnerListener {
} finally { } finally {
if (zipFile != null) { if (zipFile != null) {
try { try {
zipFile.close(); zipFile.close();
} catch (IOException e) { } catch (IOException e) {
// noop // noop
} }
} }
} }
return null; return null;
} }
public void updateKeywords(PdeKeywords keywords) { public void updateKeywords(PdeKeywords keywords) {
for (EditorTab tab : tabs) for (EditorTab tab : tabs)
@ -2097,18 +2096,19 @@ public class Editor extends JFrame implements RunnerListener {
names[i] = portMenu.getItem(i).getText(); names[i] = portMenu.getItem(i).getText();
} }
// FIXME: This is horribly unreadable
String result = (String) String result = (String)
JOptionPane.showInputDialog(this, JOptionPane.showInputDialog(this,
I18n.format( I18n.format(
tr("Serial port {0} not found.\n" + tr("Serial port {0} not found.\n" +
"Retry the upload with another serial port?"), "Retry the upload with another serial port?"),
PreferencesData.get("serial.port") PreferencesData.get("serial.port")
), ),
"Serial port not found", "Serial port not found",
JOptionPane.PLAIN_MESSAGE, JOptionPane.PLAIN_MESSAGE,
null, null,
names, names,
0); 0);
if (result == null) return false; if (result == null) return false;
selectSerialPort(result); selectSerialPort(result);
base.onBoardOrPortChange(); base.onBoardOrPortChange();