Skip to content

Commit fb20d40

Browse files
committed
Trim trailing spaces from Editor.java
1 parent 9daeaf6 commit fb20d40

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

app/src/processing/app/Editor.java

Lines changed: 28 additions & 28 deletions
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
}
@@ -947,14 +946,14 @@ private String findClassInZipFile(String base, File file) {
947946
} finally {
948947
if (zipFile != null) {
949948
try {
950-
zipFile.close();
951-
} catch (IOException e) {
952-
// noop
953-
}
954-
}
955-
}
956-
return null;
957-
}
949+
zipFile.close();
950+
} catch (IOException e) {
951+
// noop
952+
}
953+
}
954+
}
955+
return null;
956+
}
958957

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

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

@@ -2351,14 +2351,14 @@ public void handleSerial() {
23512351
}
23522352

23532353
serialMonitor = new MonitorFactory().newMonitor(port);
2354-
2354+
23552355
if (serialMonitor == null) {
23562356
String board = port.getPrefs().get("board");
23572357
String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);
23582358
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));
23592359
return;
23602360
}
2361-
2361+
23622362
Base.setIcon(serialMonitor);
23632363

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

24202420
}
2421-
2421+
24222422
public void handlePlotter() {
24232423
if(serialMonitor != null) {
24242424
if(serialMonitor.isClosed()) {
@@ -2428,7 +2428,7 @@ public void handlePlotter() {
24282428
return;
24292429
}
24302430
}
2431-
2431+
24322432
if (serialPlotter != null) {
24332433
// The serial plotter already exists
24342434

0 commit comments

Comments
 (0)