Skip to content

Commit 4a80f50

Browse files
feiknamecmaglie
authored andcommitted
Trim trailing spaces from Editor.java
1 parent bafd66b commit 4a80f50

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

app/src/processing/app/Editor.java

+28-28
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public boolean test(SketchController sketch) {
158158

159159
static volatile AbstractMonitor serialMonitor;
160160
static AbstractMonitor serialPlotter;
161-
161+
162162
final EditorHeader header;
163163
EditorStatus status;
164164
EditorConsole console;
@@ -248,7 +248,7 @@ public void windowDeactivated(WindowEvent e) {
248248

249249
//PdeKeywords keywords = new PdeKeywords();
250250
//sketchbook = new Sketchbook(this);
251-
251+
252252
buildMenuBar();
253253

254254
// For rev 0120, placing things inside a JPanel
@@ -399,8 +399,7 @@ public boolean importData(JComponent src, Transferable transferable) {
399399
statusNotice(tr("One file added to the sketch."));
400400

401401
} else {
402-
statusNotice(
403-
I18n.format(tr("{0} files added to the sketch."), successful));
402+
statusNotice(I18n.format(tr("{0} files added to the sketch."), successful));
404403
}
405404
return true;
406405
}
@@ -948,14 +947,14 @@ private String findClassInZipFile(String base, File file) {
948947
} finally {
949948
if (zipFile != null) {
950949
try {
951-
zipFile.close();
952-
} catch (IOException e) {
953-
// noop
954-
}
955-
}
956-
}
957-
return null;
958-
}
950+
zipFile.close();
951+
} catch (IOException e) {
952+
// noop
953+
}
954+
}
955+
}
956+
return null;
957+
}
959958

960959
public void updateKeywords(PdeKeywords keywords) {
961960
for (EditorTab tab : tabs)
@@ -2097,18 +2096,19 @@ private boolean serialPrompt() {
20972096
names[i] = portMenu.getItem(i).getText();
20982097
}
20992098

2099+
// FIXME: This is horribly unreadable
21002100
String result = (String)
2101-
JOptionPane.showInputDialog(this,
2102-
I18n.format(
2103-
tr("Serial port {0} not found.\n" +
2104-
"Retry the upload with another serial port?"),
2105-
PreferencesData.get("serial.port")
2106-
),
2107-
"Serial port not found",
2108-
JOptionPane.PLAIN_MESSAGE,
2109-
null,
2110-
names,
2111-
0);
2101+
JOptionPane.showInputDialog(this,
2102+
I18n.format(
2103+
tr("Serial port {0} not found.\n" +
2104+
"Retry the upload with another serial port?"),
2105+
PreferencesData.get("serial.port")
2106+
),
2107+
"Serial port not found",
2108+
JOptionPane.PLAIN_MESSAGE,
2109+
null,
2110+
names,
2111+
0);
21122112
if (result == null) return false;
21132113
selectSerialPort(result);
21142114
base.onBoardOrPortChange();
@@ -2322,7 +2322,7 @@ public void handleSerial() {
23222322
return;
23232323
}
23242324
}
2325-
2325+
23262326
if (serialMonitor != null) {
23272327
// The serial monitor already exists
23282328

@@ -2352,14 +2352,14 @@ public void handleSerial() {
23522352
}
23532353

23542354
serialMonitor = new MonitorFactory().newMonitor(port);
2355-
2355+
23562356
if (serialMonitor == null) {
23572357
String board = port.getPrefs().get("board");
23582358
String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);
23592359
statusError(I18n.format(tr("Serial monitor is not supported on network ports such as {0} for the {1} in this release"), PreferencesData.get("serial.port"), boardName));
23602360
return;
23612361
}
2362-
2362+
23632363
Base.setIcon(serialMonitor);
23642364

23652365
// If currently uploading, disable the monitor (it will be later
@@ -2419,7 +2419,7 @@ public void handleSerial() {
24192419
} while (serialMonitor.requiresAuthorization() && !success);
24202420

24212421
}
2422-
2422+
24232423
public void handlePlotter() {
24242424
if(serialMonitor != null) {
24252425
if(serialMonitor.isClosed()) {
@@ -2429,7 +2429,7 @@ public void handlePlotter() {
24292429
return;
24302430
}
24312431
}
2432-
2432+
24332433
if (serialPlotter != null) {
24342434
// The serial plotter already exists
24352435

0 commit comments

Comments
 (0)