diff options
author | Alexander Kurtakov | 2017-09-08 07:12:28 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2017-09-08 07:12:51 +0000 |
commit | b3c56b7f12d085ef7a40b169876746c16871d8c6 (patch) | |
tree | 05d941656f31ec643c278002abf8518f37466a41 /org.eclipse.debug.tests | |
parent | fa2b847f155ce5cc60fac6a40a39aae766823467 (diff) | |
download | eclipse.platform.debug-b3c56b7f12d085ef7a40b169876746c16871d8c6.tar.gz eclipse.platform.debug-b3c56b7f12d085ef7a40b169876746c16871d8c6.tar.xz eclipse.platform.debug-b3c56b7f12d085ef7a40b169876746c16871d8c6.zip |
Revert "Bug 521038 - Replaced anonymous Runnable classes by lambda expression"
This reverts commit d8621eaf55a1e95ff894dda0a241af08cc6111fe.
Change-Id: I30777d3cf90d9a14f5de5e599b8a0ceefe1c8292
Diffstat (limited to 'org.eclipse.debug.tests')
4 files changed, 81 insertions, 51 deletions
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java index f37fd3638..5ae877f15 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleManagerTests.java @@ -145,18 +145,21 @@ public class ConsoleManagerTests extends AbstractDebugTest { } private void showConsole(final ConsoleMock console) { - executorService.execute(() -> { - // last one arriving here triggers execution for all at same - // time - latch.countDown(); - try { - latch.await(1, TimeUnit.MINUTES); - System.out.println("Requesting to show: " + console); //$NON-NLS-1$ - manager.showConsoleView(console); - TestUtil.waitForJobs(getName(), 200, 5000); - } catch (InterruptedException e) { - e.printStackTrace(); - Thread.interrupted(); + executorService.execute(new Runnable() { + @Override + public void run() { + // last one arriving here triggers execution for all at same + // time + latch.countDown(); + try { + latch.await(1, TimeUnit.MINUTES); + System.out.println("Requesting to show: " + console); //$NON-NLS-1$ + manager.showConsoleView(console); + TestUtil.waitForJobs(getName(), 200, 5000); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.interrupted(); + } } }); } diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java index 3ad940fe3..626466eb6 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/expressions/ExpressionManagerTests.java @@ -538,23 +538,29 @@ public class ExpressionManagerTests extends AbstractDebugTest { public void testConcurrentAccess() throws InterruptedException { final boolean[] done = new boolean[]{false}; final Exception[] ex = new Exception[]{null}; - Runnable add = () -> { - try { - for (int i = 0; i < 1000; i++) { - getManager().addExpression(getManager().newWatchExpression(Integer.toHexString(i))); + Runnable add = new Runnable() { + @Override + public void run() { + try { + for (int i = 0; i < 1000; i++) { + getManager().addExpression(getManager().newWatchExpression(Integer.toHexString(i))); + } + done[0] = true; + } catch (Exception e) { + ex[0] = e; } - done[0] = true; - } catch (Exception e) { - ex[0] = e; } }; - Runnable remove = () -> { - try { - do { - getManager().removeExpressions(getManager().getExpressions()); - } while (!done[0] || getManager().getExpressions().length > 0); - } catch (Exception e) { - ex[0] = e; + Runnable remove = new Runnable() { + @Override + public void run() { + try { + do { + getManager().removeExpressions(getManager().getExpressions()); + } while (!done[0] || getManager().getExpressions().length > 0); + } catch (Exception e) { + ex[0] = e; + } } }; Thread t1 = new Thread(add); diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java index d2661fbad..2e50be204 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java @@ -64,34 +64,50 @@ public class LaunchTests extends AbstractLaunchTest { } }; - readIsTerminatedTask = () -> launch.isTerminated(); - - readIsDisconnectedTask = () -> launch.isDisconnected(); - - writeProcessesTask = () -> { - IProcess process = createProcessProxy(); - launch.addProcess(process); - launch.removeProcess(process); - try { - Thread.sleep(0, 1); - } catch (InterruptedException e) { - // + readIsTerminatedTask = new Runnable() { + @Override + public void run() { + launch.isTerminated(); + } + }; + + readIsDisconnectedTask = new Runnable() { + @Override + public void run() { + launch.isDisconnected(); + } + }; + + writeProcessesTask = new Runnable() { + @Override + public void run() { + IProcess process = createProcessProxy(); + launch.addProcess(process); + launch.removeProcess(process); + try { + Thread.sleep(0, 1); + } catch (InterruptedException e) { + // + } + launch.addProcess(process); + launch.removeProcess(process); } - launch.addProcess(process); - launch.removeProcess(process); }; - writeDebugTargetsTask = () -> { - IDebugTarget target2 = createDebugTargetProxy(); - launch.addDebugTarget(target2); - launch.removeDebugTarget(target2); - try { - Thread.sleep(0, 1); - } catch (InterruptedException e) { - // + writeDebugTargetsTask = new Runnable() { + @Override + public void run() { + IDebugTarget target2 = createDebugTargetProxy(); + launch.addDebugTarget(target2); + launch.removeDebugTarget(target2); + try { + Thread.sleep(0, 1); + } catch (InterruptedException e) { + // + } + launch.addDebugTarget(target2); + launch.removeDebugTarget(target2); } - launch.addDebugTarget(target2); - launch.removeDebugTarget(target2); }; } diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java index 6c2ce830a..7ec70948f 100644 --- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java +++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java @@ -274,7 +274,12 @@ public class TestModel implements IElementContentProvider, IElementLabelProvider if (fQueueingUpdates) { fQueuedUpdates.addAll(Arrays.asList(updates)); } else if (fDelayUpdates) { - Display.getDefault().asyncExec(() -> processUpdates(updates)); + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + processUpdates(updates); + } + }); } else { processUpdates(updates); } |