Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schwarz2014-11-11 07:48:25 +0000
committerTobias Schwarz2014-11-11 07:48:25 +0000
commit926d2099b12c734aaddfc4f0ef2089cef3c50acf (patch)
tree837b72e242c5fca2f236b952751cbfa381ecf338
parent1363b7c845a576fe7bc400b5681ef74edb9b89d6 (diff)
downloadorg.eclipse.tcf-926d2099b12c734aaddfc4f0ef2089cef3c50acf.tar.gz
org.eclipse.tcf-926d2099b12c734aaddfc4f0ef2089cef3c50acf.tar.xz
org.eclipse.tcf-926d2099b12c734aaddfc4f0ef2089cef3c50acf.zip
SM: fix callback and progress message
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/channelmanager/steps/LaunchValueAddStep.java9
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java4
2 files changed, 5 insertions, 8 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/channelmanager/steps/LaunchValueAddStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/channelmanager/steps/LaunchValueAddStep.java
index 65b2d074a..1b9697063 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/channelmanager/steps/LaunchValueAddStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/channelmanager/steps/LaunchValueAddStep.java
@@ -108,17 +108,12 @@ public class LaunchValueAddStep extends AbstractPeerStep {
final boolean keepalive = StepperAttributeUtil.getBooleanProperty(valueAdd.getId() + POSTFIX_KEEP_ALIVE, fullQualifiedId, data);
if (useValueAdds && !keepalive) {
- Runnable runnable = new Runnable() {
- @SuppressWarnings("synthetic-access")
+ Protocol.invokeLater(new Runnable() {
@Override
public void run() {
valueAdd.shutdown(peerId, callback);
- LaunchValueAddStep.super.rollback(context, data, status, fullQualifiedId, monitor, callback);
}
- };
-
- if (Protocol.isDispatchThread()) runnable.run();
- else Protocol.invokeLater(runnable);
+ });
} else {
super.rollback(context, data, status, fullQualifiedId, monitor, callback);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java
index 3cc07984c..76c9f2f50 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java
@@ -163,7 +163,9 @@ public class WaitForReadyStep extends AbstractPeerNodeStep {
// Try again until timed out
refreshCount++;
ProgressHelper.worked(monitor, 1);
- Protocol.invokeLater(refreshCount < 20 ? 500 : 1000, thisRunnable);
+ int delay = refreshCount < 20 ? 500 : 1000;
+ monitor.setTaskName(getLabel());
+ Protocol.invokeLater(delay, thisRunnable);
}
}, monitor);
}

Back to the top