Target Explorer: Eclipse command server peer name changed

3 files changed, 14 insertions, 27 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 da4f638a9..fa60f79a5 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,12 +139,10 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
 			return;
 		}
 
-		// 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) {
+		// Don't scan command server peers
+		boolean isCommandServer = peer.getName() != null
+						&& peer.getName().endsWith("Command Server"); //$NON-NLS-1$
+		if (isCommandServer) {
 			if (callback != null) callback.done(this, Status.OK_STATUS);
 			return;
 		}
@@ -344,17 +342,13 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
 		String remoteIP = channel.getRemotePeer().getAttributes().get(IPeer.ATTR_IP_HOST);
 		boolean isLocal = remoteIP != null && IPAddressUtil.getInstance().isLocalHost(remoteIP);
 
-		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$
+		boolean isCommandServer = channel.getRemotePeer().getName() != null
+						&& channel.getRemotePeer().getName().endsWith("Command Server"); //$NON-NLS-1$
 
-		isCLI |= channel.getLocalPeer().getName() != null
-					&& (channel.getLocalPeer().getName().startsWith("Eclipse CLI") //$NON-NLS-1$
-							|| channel.getLocalPeer().getName().endsWith("CLI Server") //$NON-NLS-1$
-							|| channel.getLocalPeer().getName().endsWith("CLI Client")); //$NON-NLS-1$
+		isCommandServer |= channel.getLocalPeer().getName() != null
+					&& channel.getLocalPeer().getName().endsWith("Command Server"); //$NON-NLS-1$
 
-		return !isLocal && !isCLI;
+		return !isLocal && !isCommandServer;
     }
 
     /**
@@ -413,14 +407,11 @@ public class ScannerRunnable implements Runnable, IChannel.IChannelListener {
 								String value = attributes.get("ValueAdd"); //$NON-NLS-1$
 								boolean isValueAdd = value != null && ("1".equals(value.trim()) || Boolean.parseBoolean(value.trim())); //$NON-NLS-1$
 
-								// Don't process CLI service or clients
+								// Don't process command server service server or clients
 								String name = attributes.get(IPeer.ATTR_NAME);
-								boolean isCLI = name != null
-												&& (name.startsWith("Eclipse CLI") //$NON-NLS-1$
-														|| name.endsWith("CLI Server") //$NON-NLS-1$
-														|| name.endsWith("CLI Client")); //$NON-NLS-1$
+								boolean isCommandServer = name != null && name.endsWith("Command Server"); //$NON-NLS-1$
 
-								if (isValueAdd || isCLI) continue;
+								if (isValueAdd || isCommandServer) continue;
 
 								// Get the peer id
 								String peerId = attributes.get(IPeer.ATTR_ID);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/listener/LocatorListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/listener/LocatorListener.java
index bb0b390f2..42476448b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/listener/LocatorListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/listener/LocatorListener.java
@@ -75,9 +75,7 @@ public final class LocatorListener implements ILocator.LocatorListener {
 			filtered |= isValueAdd && hideValueAdds;
 
 			filtered |= 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$
+							&& peer.getName().endsWith("Command Server"); //$NON-NLS-1$
 		}
 
 		return filtered;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java
index 23c8b2b4d..0aea57a77 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/navigator/ContentProvider.java
@@ -132,9 +132,7 @@ public class ContentProvider implements ICommonContentProvider, ITreePathContent
 		}
 
 		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$
+						&& peerModel.getPeer().getName().endsWith("Command Server"); //$NON-NLS-1$
 
 		return filtered;
 	}