diff options
| author | William Chen | 2012-06-14 09:42:52 +0000 |
|---|---|---|
| committer | William Chen | 2012-06-14 09:42:52 +0000 |
| commit | a804c0d58533b437a6e5489550cfea42c7e63f95 (patch) | |
| tree | 57cd00cf6bb7b2f131b16297f19053286c3b4511 /target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core | |
| parent | fab509bb4215807c94dcfac542a68c1b51bad4eb (diff) | |
| download | org.eclipse.tcf-a804c0d58533b437a6e5489550cfea42c7e63f95.tar.gz org.eclipse.tcf-a804c0d58533b437a6e5489550cfea42c7e63f95.tar.xz org.eclipse.tcf-a804c0d58533b437a6e5489550cfea42c7e63f95.zip | |
Target Explorer: Changes Find feature based on feedback(TBC).
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core')
3 files changed, 6 insertions, 5 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/QueryDoneOpenChannel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/QueryDoneOpenChannel.java index 4b52b8270..5d41d9999 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/QueryDoneOpenChannel.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/QueryDoneOpenChannel.java @@ -11,6 +11,7 @@ package org.eclipse.tcf.te.tcf.processes.core.callbacks; import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.tcf.protocol.IChannel;
import org.eclipse.tcf.protocol.Protocol;
@@ -58,7 +59,7 @@ public class QueryDoneOpenChannel implements IChannelManager.DoneOpenChannel { @Override
public void doneOpenChannel(Throwable error, final IChannel channel) {
Assert.isTrue(Protocol.isDispatchThread());
- if (error == null && channel != null) {
+ if (error == null) {
ISysMonitor service = channel.getRemoteService(ISysMonitor.class);
if (service != null) {
service.getChildren(parentNode.id, new QueryDoneGetChildren(new Callback(){
@@ -76,8 +77,8 @@ public class QueryDoneOpenChannel implements IChannelManager.DoneOpenChannel { callback.done(this, Status.OK_STATUS);
}
}
- else if (callback != null) {
- IStatus status = error == null ? Status.OK_STATUS : new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(), error.getMessage(), error);
+ else if (!(error instanceof OperationCanceledException) && callback != null) {
+ IStatus status = new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(), error.getMessage(), error);
callback.done(this, status);
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/RefreshChildrenDoneOpenChannel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/RefreshChildrenDoneOpenChannel.java index d042613de..96325fa54 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/RefreshChildrenDoneOpenChannel.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/RefreshChildrenDoneOpenChannel.java @@ -47,7 +47,7 @@ public class RefreshChildrenDoneOpenChannel implements IChannelManager.DoneOpenC @Override
public void doneOpenChannel(Throwable error, final IChannel channel) {
Assert.isTrue(Protocol.isDispatchThread());
- if (error == null && channel != null) {
+ if (error == null) {
ISysMonitor service = channel.getRemoteService(ISysMonitor.class);
if (service != null) {
final CallbackMonitor monitor = new CallbackMonitor(new Callback(){
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/RefreshDoneOpenChannel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/RefreshDoneOpenChannel.java index d22cd5b5e..e034a9904 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/RefreshDoneOpenChannel.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/src/org/eclipse/tcf/te/tcf/processes/core/callbacks/RefreshDoneOpenChannel.java @@ -47,7 +47,7 @@ public class RefreshDoneOpenChannel implements IChannelManager.DoneOpenChannel { @Override
public void doneOpenChannel(Throwable error, final IChannel channel) {
Assert.isTrue(Protocol.isDispatchThread());
- if (error == null && channel != null) {
+ if (error == null) {
ISysMonitor service = channel.getRemoteService(ISysMonitor.class);
if (service != null) {
Queue<ProcessTreeNode> queue = new ConcurrentLinkedQueue<ProcessTreeNode>();
|