Target Explorer + TCF Debugger: Activate TCFLaunch with an already opened channel. This change is replacing the previous IValueAddService OSGi service implementation.

2 files changed, 0 insertions, 64 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/interfaces/IChannelManager.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/interfaces/IChannelManager.java
index a45257351..b5e2b90db 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/interfaces/IChannelManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/interfaces/IChannelManager.java
@@ -13,7 +13,6 @@ import java.util.Map;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.tcf.osgi.services.IValueAddService;
 import org.eclipse.tcf.protocol.IChannel;
 import org.eclipse.tcf.protocol.IPeer;
 
@@ -102,15 +101,6 @@ public interface IChannelManager extends IAdaptable {
 	public IChannel getChannel(IPeer peer);
 
 	/**
-	 * Returns the redirection path for the given peer. If needed, the required
-	 * value-add's are launched.
-	 *
-	 * @param peer The peer. Must not be <code>null</code>.
-	 * @param done The client callback. Must not be <code>null</code>.
-	 */
-	public void getRedirectionPath(IPeer peer, IValueAddService.DoneGetRedirectionPath done);
-
-	/**
 	 * Closes the given channel.
 	 * <p>
 	 * If the given channel is a reference counted channel, the channel will be closed if the reference counter
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java
index abfb0ab40..3274e1979 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java
@@ -24,7 +24,6 @@ import org.eclipse.core.runtime.PlatformObject;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.tcf.core.AbstractPeer;
-import org.eclipse.tcf.osgi.services.IValueAddService;
 import org.eclipse.tcf.protocol.IChannel;
 import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
@@ -358,59 +357,6 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.tcf.core.interfaces.IChannelManager#getRedirectionPath(org.eclipse.tcf.protocol.IPeer, org.eclipse.tcf.osgi.services.IValueAddService.DoneGetRedirectionPath)
-	 */
-	@Override
-	public void getRedirectionPath(final IPeer peer, final IValueAddService.DoneGetRedirectionPath done) {
-		Runnable runnable = new Runnable() {
-			@Override
-            public void run() {
-				Assert.isTrue(Protocol.isDispatchThread(), "Illegal Thread Access"); //$NON-NLS-1$
-				internalGetRedirectionPath(peer, done);
-			}
-		};
-		if (Protocol.isDispatchThread()) runnable.run();
-		else Protocol.invokeLater(runnable);
-	}
-
-	/**
-	 * Returns the redirection path for the given peer. If needed, the required
-	 * value-add's are launched.
-	 *
-	 * @param peer The peer. Must not be <code>null</code>.
-	 * @param done The client callback. Must not be <code>null</code>.
-	 */
-	/* default */ void internalGetRedirectionPath(final IPeer peer, final IValueAddService.DoneGetRedirectionPath done) {
-		Assert.isNotNull(peer);
-		Assert.isNotNull(done);
-		Assert.isTrue(Protocol.isDispatchThread(), "Illegal Thread Access"); //$NON-NLS-1$
-
-		internalHandleValueAdds(peer, new DoneHandleValueAdds() {
-			@Override
-			public void doneHandleValueAdds(final Throwable error, final IValueAdd[] valueAdds) {
-				StringBuilder redirectionPath = new StringBuilder();
-				String peerId = peer.getID();
-
-				// If the error is null, continue and open the channel
-				if (error == null && valueAdds != null && valueAdds.length > 0) {
-					for (IValueAdd valueAdd : valueAdds) {
-						if (redirectionPath.length() > 0) redirectionPath.append("/"); //$NON-NLS-1$
-						redirectionPath.append(valueAdd.getPeer(peerId).getID());
-					}
-				}
-
-				// Append target peer
-				if (redirectionPath.length() > 0) redirectionPath.append("/"); //$NON-NLS-1$
-				redirectionPath.append(peerId);
-
-				// Invoke the callback
-				done.doneGetRedirectionPath(error, redirectionPath.toString());
-			}
-		});
-	}
-
-
-	/* (non-Javadoc)
 	 * @see org.eclipse.tcf.te.tcf.core.interfaces.IChannelManager#closeChannel(org.eclipse.tcf.protocol.IChannel)
 	 */
 	@Override