Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2013-08-12 14:21:41 +0000
committerUwe Stieber2013-08-12 14:21:41 +0000
commit944a2ddfbe527b9adceaa47a07de6dde6e9f9d81 (patch)
treefc065ee1045adb6c48ad133da625d4952a7cfb3b /target_explorer
parent481e54aa370055890b1c1f0bc77be1d4a726c328 (diff)
downloadorg.eclipse.tcf-944a2ddfbe527b9adceaa47a07de6dde6e9f9d81.tar.gz
org.eclipse.tcf-944a2ddfbe527b9adceaa47a07de6dde6e9f9d81.tar.xz
org.eclipse.tcf-944a2ddfbe527b9adceaa47a07de6dde6e9f9d81.zip
Target Explorer: Improve CLI peer filter
Diffstat (limited to 'target_explorer')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/ScannerRunnable.java14
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProviderDelegate.java5
2 files changed, 15 insertions, 4 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/ScannerRunnable.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/ScannerRunnable.java
index fb68ed9ee..0f3aa767b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/ScannerRunnable.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/ScannerRunnable.java
@@ -139,8 +139,12 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
return;
}
- // Don't scan "Eclipse CLI" peers
- if (peer.getName() != null && peer.getName().startsWith("Eclipse CLI")) { //$NON-NLS-1$
+ // Don't scan "CLI" peers
+ boolean isCLI = peer.getName() != null
+ && (peer.getName().startsWith("Eclipse CLI") //$NON-NLS-1$
+ || peer.getName().endsWith("CLI Server") //$NON-NLS-1$
+ || peer.getName().endsWith("CLI Client")); //$NON-NLS-1$
+ if (isCLI) {
if (callback != null) callback.done(this, Status.OK_STATUS);
return;
}
@@ -292,7 +296,11 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
peerNode.setProperty(IPeerModelProperties.PROP_INSTANCE, new Peer(attrs));
}
- if (channel.getRemotePeer().getName() != null && channel.getRemotePeer().getName().startsWith("Eclipse CLI")) { //$NON-NLS-1$
+ boolean isCLI = channel.getRemotePeer().getName() != null
+ && (channel.getRemotePeer().getName().startsWith("Eclipse CLI") //$NON-NLS-1$
+ || channel.getRemotePeer().getName().endsWith("CLI Server") //$NON-NLS-1$
+ || channel.getRemotePeer().getName().endsWith("CLI Client")); //$NON-NLS-1$
+ if (isCLI) {
onDone(peerNode, changed);
} else {
// Get the peers from the remote locator
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProviderDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProviderDelegate.java
index 16cd685b8..e9b15b507 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProviderDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProviderDelegate.java
@@ -129,7 +129,10 @@ public class ContentProviderDelegate implements ICommonContentProvider, ITreePat
filtered |= !peerModel.isVisible();
}
- filtered |= peerModel.getPeer().getName() != null && peerModel.getPeer().getName().startsWith("Eclipse CLI"); //$NON-NLS-1$
+ filtered |= peerModel.getPeer().getName() != null
+ && (peerModel.getPeer().getName().startsWith("Eclipse CLI") //$NON-NLS-1$
+ || peerModel.getPeer().getName().endsWith("CLI Server") //$NON-NLS-1$
+ || peerModel.getPeer().getName().endsWith("CLI Client")); //$NON-NLS-1$
return filtered;
}

Back to the top