Skip to content

Commit e9a4848

Browse files
committed
Use lambdas for Runnables
1 parent d0439fb commit e9a4848

File tree

8 files changed

+35
-77
lines changed

8 files changed

+35
-77
lines changed

src/main/java/org/scijava/ui/swing/script/ErrorHandler.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,14 @@ public void markLine() throws BadLocationException {
127127
public void scrollToVisible(final int offset) {
128128
if (textArea == null) return;
129129
final JTextArea textArea = this.textArea;
130-
final Runnable task = new Runnable() {
131-
132-
@Override
133-
public void run() {
134-
try {
135-
textArea.scrollRectToVisible(textArea.modelToView(textArea
136-
.getDocument().getLength()));
137-
textArea.scrollRectToVisible(textArea.modelToView(offset));
138-
}
139-
catch (final BadLocationException e) {
140-
// ignore
141-
}
130+
final Runnable task = () -> {
131+
try {
132+
textArea.scrollRectToVisible(textArea.modelToView(textArea.getDocument()
133+
.getLength()));
134+
textArea.scrollRectToVisible(textArea.modelToView(offset));
135+
}
136+
catch (final BadLocationException e) {
137+
// ignore
142138
}
143139
};
144140
if (SwingUtilities.isEventDispatchThread()) {

src/main/java/org/scijava/ui/swing/script/FileFunctions.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -407,16 +407,12 @@ public void insertUpdate(final DocumentEvent e) {
407407
else newLine += width;
408408

409409
final int removeCount = remove, at = newLine;
410-
SwingUtilities.invokeLater(new Runnable() {
411-
412-
@Override
413-
public void run() {
414-
try {
415-
if (removeCount > 0) document.remove(at, removeCount);
416-
document.insertString(at, "\n", null);
417-
}
418-
catch (final BadLocationException e2) { /* ignore */}
410+
SwingUtilities.invokeLater(() -> {
411+
try {
412+
if (removeCount > 0) document.remove(at, removeCount);
413+
document.insertString(at, "\n", null);
419414
}
415+
catch (final BadLocationException e2) { /* ignore */}
420416
});
421417
}
422418
}

src/main/java/org/scijava/ui/swing/script/FileSystemTree.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -378,12 +378,7 @@ public DefaultTreeModel getModel() {
378378
}
379379

380380
public void updateUILater() {
381-
SwingUtilities.invokeLater(new Runnable() {
382-
@Override
383-
public void run() {
384-
FileSystemTree.this.updateUI();
385-
}
386-
});
381+
SwingUtilities.invokeLater(() -> FileSystemTree.this.updateUI());
387382
}
388383

389384
/**
@@ -507,12 +502,10 @@ public void run() {
507502
if (null != node) nodes.add(node);
508503
}
509504

510-
SwingUtilities.invokeLater(new Runnable() {
511-
public void run() {
512-
for (final Node node : nodes) {
513-
node.updateChildrenList(FileSystemTree.this.getModel());
514-
FileSystemTree.this.expandPath(new TreePath(node.getPath()));
515-
}
505+
SwingUtilities.invokeLater(() -> {
506+
for (final Node node : nodes) {
507+
node.updateChildrenList(FileSystemTree.this.getModel());
508+
FileSystemTree.this.expandPath(new TreePath(node.getPath()));
516509
}
517510
});
518511

src/main/java/org/scijava/ui/swing/script/JTextAreaOutputStream.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,8 @@ public class JTextAreaOutputStream extends OutputStream {
6060
*/
6161
public JTextAreaOutputStream(final JTextArea textArea) {
6262
this.textArea = textArea;
63-
updater.scheduleWithFixedDelay(new Runnable() {
64-
65-
@Override
66-
public void run() {
67-
flushQueue();
68-
}
69-
}, 10, 400, TimeUnit.MILLISECONDS);
63+
updater.scheduleWithFixedDelay(() -> flushQueue(), 10, 400,
64+
TimeUnit.MILLISECONDS);
7065
}
7166

7267
@Override

src/main/java/org/scijava/ui/swing/script/JTextAreaWriter.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,8 @@ public JTextAreaWriter(final JTextArea textArea, final LogService logService)
6565
{
6666
this.textArea = textArea;
6767
log = logService;
68-
updater.scheduleWithFixedDelay(new Runnable() {
69-
70-
@Override
71-
public void run() {
72-
flushQueue();
73-
}
74-
}, 10, 400, TimeUnit.MILLISECONDS);
68+
updater.scheduleWithFixedDelay(() -> flushQueue(), 10, 400,
69+
TimeUnit.MILLISECONDS);
7570
}
7671

7772
public void print(final String line) {

src/main/java/org/scijava/ui/swing/script/PromptPane.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,20 +169,13 @@ private void execute() {
169169
textArea.setText("");
170170
executing = true;
171171

172-
threadService().run(new Runnable() {
173-
174-
@Override
175-
public void run() {
176-
final boolean result = repl.evaluate(text);
177-
threadService().queue(new Runnable() {
178-
@Override
179-
public void run() {
180-
executing = false;
181-
if (!result) quit();
182-
vars.update();
183-
}
184-
});
185-
}
172+
threadService().run(() -> {
173+
final boolean result = repl.evaluate(text);
174+
threadService().queue(() -> {
175+
executing = false;
176+
if (!result) quit();
177+
vars.update();
178+
});
186179
});
187180
}
188181

src/main/java/org/scijava/ui/swing/script/TextEditorTab.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import java.awt.dnd.DropTargetListener;
4646
import java.awt.event.ActionEvent;
4747
import java.awt.event.ActionListener;
48-
import java.beans.PropertyChangeListener;
4948
import java.io.File;
5049
import java.util.List;
5150

@@ -363,15 +362,11 @@ public void prepare() {
363362
}
364363

365364
public void restore() {
366-
SwingUtilities.invokeLater(new Runnable() {
367-
368-
@Override
369-
public void run() {
370-
editorPane.setEditable(true);
371-
runit.setEnabled(true);
372-
killit.setEnabled(false);
373-
setExecutor(null);
374-
}
365+
SwingUtilities.invokeLater(() -> {
366+
editorPane.setEditable(true);
367+
runit.setEnabled(true);
368+
killit.setEnabled(false);
369+
setExecutor(null);
375370
});
376371
}
377372

src/test/java/org/scijava/ui/swing/script/ScriptEditorTestDrive.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,7 @@ public static void main(String[] args) throws Exception {
5656
editor.addWindowListener(new WindowAdapter() {
5757
@Override
5858
public void windowClosed(final WindowEvent e) {
59-
SwingUtilities.invokeLater(new Runnable() {
60-
@Override
61-
public void run() {
62-
context.dispose();
63-
}
64-
});
59+
SwingUtilities.invokeLater(() -> context.dispose());
6560
}
6661
});
6762
editor.setVisible(true);

0 commit comments

Comments
 (0)