eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always cancel futures that don't yield results.

Browse Source
This commit is contained in:
jdf
2010-03-05 17:49:07 +00:00
parent def93e671e
commit 1680fe0d52
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/tool/src/processing/app/tools/android/AndroidTool.java
+5
View File
@@ -161,6 +161,7 @@ public class AndroidTool implements Tool, DeviceListener {
throws Cancelled {
for (int i = 0; i < 120; i++) {
if (monitor.isCanceled()) {
deviceFuture.cancel(true);
throw new Cancelled();
}
try {
@@ -279,6 +280,7 @@ public class AndroidTool implements Tool, DeviceListener {
public void sketchStopped() {
editor.internalRunnerClosed();
editor.statusEmpty();
}
/**
@@ -290,6 +292,7 @@ public class AndroidTool implements Tool, DeviceListener {
try {
runSketchOnDevice(AndroidEnvironment.getInstance().getEmulator());
} catch (final Cancelled ok) {
sketchStopped();
editor.statusNotice("Cancelled.");
}
}
@@ -303,6 +306,7 @@ public class AndroidTool implements Tool, DeviceListener {
try {
runSketchOnDevice(AndroidEnvironment.getInstance().getHardware());
} catch (final Cancelled ok) {
sketchStopped();
editor.statusNotice("Cancelled.");
}
}
@@ -336,4 +340,5 @@ public class AndroidTool implements Tool, DeviceListener {
@SuppressWarnings("serial")
private static class Cancelled extends Exception {
}
}