1. Workaround of deadlock condition in DSF

2. Removed unused interface TCFLaunch.TerminateListener

2 files changed, 14 insertions, 33 deletions

diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchLabelProvider.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchLabelProvider.java
index f7ec48a99..1fadeea27 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchLabelProvider.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/adapters/TCFLaunchLabelProvider.java
@@ -26,7 +26,6 @@ class TCFLaunchLabelProvider implements IElementLabelProvider {
             String status = "";
             if (launch.isConnecting()) status = "Connecting";
             else if (launch.isExited()) status = "Exited";
-            else if (launch.isTerminated()) status = "Terminated";
             else if (launch.isDisconnected()) status = "Disconnected";
             Throwable error = launch.getError();
             if (error != null) {
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/TerminateCommand.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/TerminateCommand.java
index 31bea2198..1f5e9b241 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/TerminateCommand.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/TerminateCommand.java
@@ -49,12 +49,9 @@ public class TerminateCommand implements ITerminateHandler {
                         IRunControl.RunControlContext ctx = node.getRunContext();
                         if (ctx != null && ctx.canTerminate()) {
                             res = true;
-                            node = null;
-                        }
-                        else {
-                            node = node.getParent();
-                            if (node == null && model.getLaunch().canTerminate()) res = true;
+                            break;
                         }
+                        node = node.getParent();
                     }
                 }
                 monitor.setEnabled(res);
@@ -78,40 +75,25 @@ public class TerminateCommand implements ITerminateHandler {
                         IRunControl.RunControlContext ctx = node.getRunContext();
                         if (ctx != null && ctx.canTerminate()) {
                             set.add(ctx);
-                            node = null;
-                        }
-                        else {
-                            node = node.getParent();
-                            if (node == null) set.add(null);
+                            break;
                         }
+                        node = node.getParent();
                     }
                 }
                 final Set<IToken> cmds = new HashSet<IToken>();
                 for (Iterator<IRunControl.RunControlContext> i = set.iterator(); i.hasNext();) {
                     IRunControl.RunControlContext ctx = i.next();
-                    if (ctx == null) {
-                        cmds.add(null);
-                        model.getLaunch().terminate(new Runnable() {
-                            public void run() {
-                                assert cmds.contains(null);
-                                cmds.remove(null);
-                                if (cmds.isEmpty()) done();
-                            }
-                        });
-                    }
-                    else {
-                        cmds.add(ctx.terminate(new IRunControl.DoneCommand() {
-                            public void doneCommand(IToken token, Exception error) {
-                                assert cmds.contains(token);
-                                cmds.remove(token);
-                                if (error != null) {
-                                    monitor.setStatus(new Status(IStatus.ERROR,
-                                            Activator.PLUGIN_ID, IStatus.OK, "Cannot resume", error));
-                                }
-                                if (cmds.isEmpty()) done();
+                    cmds.add(ctx.terminate(new IRunControl.DoneCommand() {
+                        public void doneCommand(IToken token, Exception error) {
+                            assert cmds.contains(token);
+                            cmds.remove(token);
+                            if (error != null) {
+                                monitor.setStatus(new Status(IStatus.ERROR,
+                                        Activator.PLUGIN_ID, IStatus.OK, "Cannot resume", error));
                             }
-                        }));
-                    }
+                            if (cmds.isEmpty()) done();
+                        }
+                    }));
                 }
             }
         };